From 3b2e35b66b0df22093505270bbabfc868a0a9a2b Mon Sep 17 00:00:00 2001
From: neoraider <devnull@localhost>
Date: Mon, 14 May 2007 17:38:01 +0000
Subject: [PATCH] libzoom: XML level loader implemented. zoom: Converted old
 test level to XML.

---
 levels/level.dtd  |  30 ++++--
 levels/level.lvl  | Bin 2111 -> 1066 bytes
 levels/level1.lvl | Bin 1399 -> 0 bytes
 levels/level1.txt | 122 ---------------------
 levels/level2.lvl | Bin 3879 -> 0 bytes
 levels/level2.txt | 266 ----------------------------------------------
 levels/level2.xml |  35 ------
 7 files changed, 20 insertions(+), 433 deletions(-)
 delete mode 100755 levels/level1.lvl
 delete mode 100755 levels/level1.txt
 delete mode 100755 levels/level2.lvl
 delete mode 100755 levels/level2.txt
 delete mode 100644 levels/level2.xml

diff --git a/levels/level.dtd b/levels/level.dtd
index 29397bc..6b757f9 100644
--- a/levels/level.dtd
+++ b/levels/level.dtd
@@ -1,7 +1,7 @@
-<!ELEMENT level (info, triangles, textures)>
+<!ELEMENT level (info, rooms, textures)>
 
 <!ELEMENT info (name, desc, start)>
-<!ELEMENT triangles (triangle)*>
+<!ELEMENT rooms (room)*>
 <!ELEMENT textures (texture)*>
 
 <!ELEMENT name (#PCDATA)>
@@ -13,9 +13,12 @@
   z CDATA #REQUIRED
 >
 
-<!ELEMENT triangle (vertex, texcoords?, vertex, texcoords?, vertex, texcoords?)>
+<!ELEMENT room (triangle)*>
+
+<!ELEMENT triangle (vertex, normal?, texcoords?, vertex, normal?, texcoords?, vertex, normal?, texcoords?)>
 <!ATTLIST triangle
-  type    (wall|floor) #REQUIRED
+  type    (wall|floor) #IMPLIED
+  visible (true|false) "true"
   texture IDREF        #IMPLIED
 >
 
@@ -32,11 +35,18 @@
   z CDATA #REQUIRED
 >
 
-<!ELEMENT texcoords EMPTY>
-<!ATTLIST texcoords
-  s CDATA "0.0"
-  t CDATA "0.0"
-  r CDATA "0.0"
-  q CDATA "0.0"
+<!ELEMENT normal EMPTY>
+<!ATTLIST normal
+  x CDATA #REQUIRED
+  y CDATA #REQUIRED
+  z CDATA #REQUIRED
+>
+
+<!ELEMENT texcoords EMPTY>
+<!ATTLIST texcoords
+  s CDATA #REQUIRED
+  t CDATA #IMPLIED
+  r CDATA #IMPLIED
+  q CDATA #IMPLIED
 >
 
diff --git a/levels/level.lvl b/levels/level.lvl
index f6e324fe234a5898cf067d6696bba285d3c9391a..c93ba04553a4b1bd25df832c6b6aa43030fbe99e 100755
GIT binary patch
literal 1066
zcmV+_1l9W=iwFP!000001KnIrbDJ;_z2{e`x?>q1GCg2trg1vcPNvPlIrQin;xdE5
z10;3w>npzE#Kg8fb|ul1A#8Z7eR|Sr1q4^SO+uccyoj@OO8wE8k|<qeVVtg~^nUTx
z`%JH97s03b&+EmnyBm^3Pf<ed?!VlAyC&3QEQx==WZ8zX`C{H)9glp*ZhlZg>+?}q
zhLqo<KABw*62$34Rvqxebh(LUi>N5cZFM<d^&gsRVN|SU-yiw4B`M;~Hi<}CSvGeK
zSbe=QEy`tHlHHV!s}?-Bzc0-%t3g?Z8syyHqW#C}xH;q}Wgainbp`Xhji&VPGD#?h
z+?9_xKP|_!v*flsX8cM8=}lV9=758GmmO+roM!oEnbgLI4*CbC{HCic%fo^ctx?%G
z+Joa^`@-00(Brp80qf{7$rln`(8wP~?BiBrHQE$e6JfVK&HmjB88q~9wy==@U$Trw
z?DP-}4ejfZ<)0x-VnC?<eK)NN`>i_+%0Y`O%RA4O7&OqNH3YU$Lw2Uw(AcKL1?9Iz
zy5z+*RBhQK%c8U_E9)WQcX-RzL^ypv?>TV)MuUb~=t)7lM3;xom%tKLJ!$}D0nFi0
zoicj@v#2j1Xyf{_DK98&C3!)EJ5YY|JKJ78Q!{F4*f6=g9JcAIhCtBJ_&Ogm^^mCx
zObJ_a=_O7VR6oPv3r$~xl^0My1Fi6)t7{PAl1Vmzxe}*J4H=|lC<l!zEQh$ljhK2)
zYC>6}iM++K#w9lN@t)F$9!6QiW>rHbX3)#7!4@^p>SwTgq07rZyyH;x1=Y_~_&O0Z
ze1U<3Yo;4Vc2Q*J{Lbyy4FwN6;SlI8g5csJLj<=@S<i1x!X#oQ2Q4mdv{oA;3$B+b
z=u2c!!V?$*x^>df6(%tAqe%?9*@jlkLLIGJJRVYknW{lQ%B!R>DQpKALm~_uTA?BZ
z-D(Hef-cR=#0<JLkGAXPAYWK?0qwb|R1kroaZ2-2RUu%qWL7}H#d)cj%c1JLQ*`0R
zOe4*4T3_b&QzVwG==y@{rl#d(kuB7a85&h^#ig?O)wvD*<`6hEXemkz+H_uMjxDnx
zQyx>)uuqCBVEdPqPrkQo<Vkvks@fTFXl#i+7AR=sO);lleE>pM*%1SV#u+3vo-H$}
zEj8@pY-v5thoUZgzQF0S_yi<0v~_Vo=WJNWC_^w{`Y~j#%tTB(ztPB%oyhI&EyOhY
ziOeV{1?}EC%mX4zC1hgQz!Rn#xTd&7-!wl_lzR1BZs`Hj$qhU~0tfC4XFb0)8B>v%
z)N)UpE@<SF1LD5Y(HzwuYYSSYx-Yl2rz8&R0g_Z7j+@eT9!2SBo36XNzqj){yG>Mb
k`s3B)xb38~P2%;Ra&O1Ief1<@?N{yo0lAyUKuJ#k04W^|OaK4?

literal 2111
zcmb7@%}vBW428pTLZSjrR6q;s6DOKLXtf|MD}*RuI>U6vd;XbmLIT2)V~;)l;_)O8
z_ZQPNT|#f5J1FIXL3LGHS@>96yde&0d$;Lxow`AjASi0mhf7(bd4|v0TlQsEkgSR&
zrG18-_2jV?njlkEV+})D(md+Vw(q@3oDP<>K0~e*3ULw#?NU!|9gLI83PDkY_^&kP
zDZ-i7-mD7IPDq~?^1t3@G(ovSX{nG^npi4&+m-LFS1NXJ7gb{daD7fYcyqD1Fuz4p
zMMbFjZG$Eehn;^Roq$aB*`vL`p&&&nC4>DI^d}*E>$EJQmF#r{<4%#WO4>D5RK`Dm
z9VYBGHDhs7!CIlTsTw{lbc=>;m$(H%KwWjkzx_fEVzZlez9>(N3-flT@Rl?qMBMzg
zLBpP;m6Jwgo|FXZ6Y);t>{|S%Nnr>xbg?@X_*9(}l4gA)J^L51e^8Lby7Z>rgAuAP
zqc?1y5lE}LK}!NG-)Sd>OR4=N$uoTRlWJ56f>0xbuNss#bxBgCZ_`MyS-^H$XN?n<
z5c;mY*|Y_Ds*W46I6{>CivR9yNl-z#hQd&mG>`hzd#hFE3$i+T;|!DHb$E)OmUakF
yx<(@*<G<1d3Uj*ztx3H5tFD?}9p4X!^WEF|c>Q|#cs!k6p18O=y&RuE=zRlo7xQWW

diff --git a/levels/level1.lvl b/levels/level1.lvl
deleted file mode 100755
index cefb91b9ad06aef01fb91b96d8e82f6ac8b6cd31..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1399
zcmai!F;2uV5JeM2LBS#R1WQFrl!l5^AP@~gH1s(cQSQPGsJ6pzCf}ZQ;>D789D6)(
z{@C89$G+=2`fciJeVRBdp^w#g{q82;F%8=3_K?<T*u!`{z07x~pKoS<ukVM{XU1vn
zA+6coU1CjL*yU}HSg6pT;tK&1W5{H{_>3r$<*U5i;!B$>T3KUGMAMRqkrL?}Vogi>
zO2mC)p`uS!jg>?n8Q__TwZ4_)=YwaV`IrAH8~0O1p{k0IR9&<-iB$%dh=nSBkcrMN
zXwpX(SAD7)dZMO!oW5zTTjToh2pXXn5gRnlO`@_`Ew7_Rgyk)09D+tFY-fngRgHvk
ztJ`RkBKvJB+RD7^6d8S@p_43{#ESaAKF{L(g+Ne6A(Md-6&<_Rm+d``eo<l8sF#n%
le1kaWCNWVgD)s^~((un3jk0RgzaARro9Fkh*W>5M+aHE%_{snP

diff --git a/levels/level1.txt b/levels/level1.txt
deleted file mode 100755
index c0592c8..0000000
--- a/levels/level1.txt
+++ /dev/null
@@ -1,122 +0,0 @@
-room
-	triangle wall
-		vertices
-			-10 -10 -10
-			10 -10 -10
-			10 10 -10
-		texture blue.png
-			0 0
-			10 0
-			10 10
-	end
-	triangle wall
-		vertices
-			-10 -10 -10
-			10 10 -10
-			-10 10 -10
-		texture blue.png
-			0 0
-			10 10
-			0 10
-	end
-	triangle wall
-		vertices
-			-10 -10 10
-			-10 10 10
-			10 10 10
-		texture blue.png
-			10 10
-			0 10
-			0 0
-	end
-	triangle wall
-		vertices
-			-10 -10 10
-			10 10 10
-			10 -10 10
-		texture blue.png
-			10 10
-			0 0
-			10 0
-	end
-	triangle wall
-		vertices
-			-10 10 -10
-			10 10 -10
-			10 10 10
-		texture blue.png
-			0 0
-			10 0
-			10 10
-	end
-	triangle wall
-		vertices
-			-10 10 -10
-			10 10 10
-			-10 10 10
-		texture blue.png
-			0 0
-			10 10
-			0 10
-	end
-	triangle floor
-		vertices
-			-10 -10 10
-			10 -10 10
-			10 -10 -10
-		texture blue.png
-			0 10
-			10 10
-			10 0
-	end
-	triangle floor
-		vertices
-			-10 -10 10
-			10 -10 -10
-			-10 -10 -10
-		texture blue.png
-			0 10
-			10 0
-			0 0
-	end
-	triangle wall
-		vertices
-			-10 -10 -10
-			-10 10 -10
-			-10 10 10
-		texture blue.png
-			10 10
-			10 0
-			0 0
-	end
-	triangle wall
-		vertices
-			-10 -10 -10
-			-10 10 10
-			-10 -10 10
-		texture blue.png
-			10 10
-			0 0
-			0 10
-	end
-	triangle wall
-		vertices
-			10 -10 10
-			10 10 10
-			10 10 -10
-		texture blue.png
-			10 10
-			10 0
-			0 0
-	end
-	triangle wall
-		vertices
-			10 -10 10
-			10 10 -10
-			10 -10 -10
-		texture blue.png
-			10 10
-			0 0
-			0 10
-	end
-end
diff --git a/levels/level2.lvl b/levels/level2.lvl
deleted file mode 100755
index b8e7b9abcd98aa0f0372e96aca539ada3c44a796..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3879
zcmb7`T}~B25QWE!4`SjTj0^C=4Ny-!xe22LNe~QS0lhPdoq10E^i<FE7;c4g>!+u_
zTir7Qe7`;|%km!j0=-KyP?yrnCPr@chB~ZWxzCt+3e*`*f}rTh7$I#&^A&zpTFzx&
zuvmqZ)?UI7GkI-76RcEe<Z!et&8z;|uKH{eyMrgKpCNOFU{2!ExNUb`W|Ij)(S`c|
zXi4-tQD?I*b|)cYdf0ih4KzW!Li7}DMjK~4l_#WkD_SXWuZ&^ddGe%u`YySCL^Fb-
z1+uu!X)6iWE(1+apfr5O%wcEFCTO8_qBf_Ev-Nulg6)VT8Dr9Iu7<U+k&@LT+IBwQ
zWp+7zU#qlE5OisXF?9ZHTSCqEbL2VV+rr{K6{HH$&!p&#-yOKZjPz92;yo4Q3el%D
zVtVL^hShHI^a={<(n+jbgZXYxo|Mm=@t9@=L5t!CTH2hpl5mZ`3xYtsD`z7i<Ik^H
zhn+XujvzqjvKXz+Y2$46ys?YY@Q6D(V%sV2YxCc|NkJuMX0)Z*?qsCdx3J5el0A(a
zKZQ!;JT{~F?vmVhde&@pcO)duzJ=fa_SrC3C)7CR<hjv&M{Attx7n!{ns{7y?fr9F
zu9dqGw1EIBbMDl>yCDx7XUb~73p&oz?+EIhmQC<UD<#xOv(t_)i^T~U^E{8<dOxpZ
z9?`aU<cO9W`f;{JV@|<RiEXF$bf6xVJ3XFlOQ<LCw%IOlZcXA`UhSUr_o32ztQd|8
zYcCfTjWhaU)C3u&v2%DMNO<O9Gg>_bPHLtY+w5a_=EMI6ib6^dQyL!5W@{%zqpjbz
zqY185h@R3AobPm`tt4Eq{+}#JC=JyZH78-MK^t3%cApf>5@K8>o_8A3YAcD=9ZgWI
z(#YXx`DD%L<A2?qqG%I{o)Rc*MqB5z*#wtrh%u$1jFHlErj_7z|J>0Ob%E%skgk7&
zotk7W(Iz`plm$wkal_S{zazNHW=-mZ#%@Z(Gp1mEX8sN&!RlAGj1SwXUoS|jG;(?<
z&wp9o{3Z)JDGg-|-)U`68}12v2D`j{y19Ay`uE}X)1RB?ANTinKff`%yuZ8s{mkgY
KugAwH2LAx@U(3q?

diff --git a/levels/level2.txt b/levels/level2.txt
deleted file mode 100755
index ce888f3..0000000
--- a/levels/level2.txt
+++ /dev/null
@@ -1,266 +0,0 @@
-room
-	triangle wall
-		vertices
-			-2 -2 -6
-			2 -2 -6
-			2 2 -6
-		texture green.png
-			0 1
-			1 1
-			1 0
-	end
-	triangle wall
-		vertices
-			-2 -2 -6
-			2 2 -6
-			-2 2 -6
-		texture green.png
-			0 1
-			1 0
-			0 0
-	end
-	triangle wall
-		vertices
-			-2 -2 2
-			-2 2 2
-			2 2 2
-		texture green.png
-			1 1
-			1 0
-			0 0
-	end
-	triangle wall
-		vertices
-			-2 -2 2
-			2 2 2
-			2 -2 2
-		texture green.png
-			1 1
-			0 0
-			0 1
-	end
-	triangle wall
-		vertices
-			-2 2 -6
-			2 2 -6
-			2 2 -2
-		texture metallic.png
-			0 1
-			0 0
-			2 0
-	end
-	triangle wall
-		vertices
-			-2 2 -6
-			2 2 -2
-			-2 2 -2
-		texture metallic.png
-			0 1
-			2 0
-			2 1
-	end
-	triangle wall
-		vertices
-			-2 2 -2
-			2 2 -2
-			2 2 2
-		texture metallic.png
-			0 1
-			0 0
-			2 0
-	end
-	triangle wall
-		vertices
-			-2 2 -2
-			2 2 2
-			-2 2 2
-		texture metallic.png
-			0 1
-			2 0
-			2 1
-	end
-	triangle floor
-		vertices
-			-2 -2 2
-			2 -2 2
-			2 -2 -6
-		texture light.png
-			0 0
-			0 1
-			2 1
-	end
-	triangle floor
-		vertices
-			-2 -2 2
-			2 -2 -6
-			-2 -2 -6
-		texture light.png
-			0 0
-			2 1
-			2 0
-	end
-	triangle wall
-		vertices
-			-2 -2 -6
-			-2 2 -6
-			-2 2 2
-		texture green.png
-			2 1
-			2 0
-			0 0
-	end
-	triangle wall
-		vertices
-			-2 -2 -6
-			-2 2 2
-			-2 -2 2
-		texture green.png
-			2 1
-			0 0
-			0 1
-	end
-	triangle wall
-		vertices
-			2 -2 2
-			2 2 2
-			2 2 -2
-		texture green.png
-			1 1
-			1 0
-			0 0
-	end
-	triangle wall
-		vertices
-			2 -2 2
-			2 2 -2
-			2 -2 -2
-		texture green.png
-			1 1
-			0 0
-			0 1
-	end
-	triangle floor
-		vertices
-			2 -2 -2
-			6 -2 -2
-			6 -2 -10
-		texture light.png
-			0 0
-			0 1
-			2 1
-	end
-	triangle floor
-		vertices
-			2 -2 -2
-			6 -2 -10
-			2 -2 -10
-		texture light.png
-			0 0
-			2 1
-			2 0
-	end
-	triangle wall
-		vertices
-			2 2 -2
-			2 2 -10
-			6 2 -10
-		texture metallic.png
-			2 1
-			0 1
-			0 0
-	end
-	triangle wall
-		vertices
-			2 2 -2
-			6 2 -10
-			6 2 -2
-		texture metallic.png
-			2 1
-			0 0
-			2 0
-	end
-	triangle wall
-		vertices
-			2 -2 -10
-			6 -2 -10
-			6 2 -10
-		texture green.png
-			0 1
-			1 1
-			1 0
-	end
-	triangle wall
-		vertices
-			2 -2 -10
-			6 2 -10
-			2 2 -10
-		texture green.png
-			0 1
-			1 0
-			0 0
-	end
-	triangle wall
-		vertices
-			2 -2 -10
-			2 2 -10
-			2 2 -6
-		texture green.png
-			1 1
-			1 0
-			0 0
-	end
-	triangle wall
-		vertices
-			2 -2 -10
-			2 2 -6
-			2 -2 -6
-		texture green.png
-			1 1
-			0 0
-			0 1
-	end
-	triangle wall
-		vertices
-			2 -2 -2
-			2 2 -2
-			6 2 -2
-		texture green.png
-			1 1
-			1 0
-			0 0
-	end
-	triangle wall
-		vertices
-			2 -2 -2
-			6 2 -2
-			6 -2 -2
-		texture green.png
-			1 1
-			0 0
-			0 1
-	end
-	triangle wall
-		vertices
-			6 -2 -2
-			6 2 -2
-			6 2 -10
-		texture green.png
-			2 1
-			2 0
-			0 0
-	end
-	triangle wall
-		vertices
-			6 -2 -2
-			6 2 -10
-			6 -2 -10
-		texture green.png
-			2 1
-			0 0
-			0 1
-	end
-	object medipak100
-		4 -1 -8
-	object medipak100
-		4 -1 -4
-end
diff --git a/levels/level2.xml b/levels/level2.xml
deleted file mode 100644
index 67a5f43..0000000
--- a/levels/level2.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE level PUBLIC "-//libzoom//DTD level 0.1//EN" "level.dtd">
-<level>
-  <info>
-    <name>Test Level</name>
-    <desc>Just a simple test level.</desc>
-    <start x="0.0" y="0.0" z="0.0"/>
-  </info>
-  <triangles>
-    <triangle type="wall" texture="t0">
-      <vertex x="-2.0" y="-2.0" z="-6.0"/><texcoords s="0.0" t="1.0"/>
-      <vertex x="2.0" y="-2.0" z="-6.0"/><texcoords s="1.0" t="1.0"/>
-      <vertex x="2.0" y="2.0" z="-6.0"/><texcoords s="1.0" t="0.0"/>
-    </triangle>
-    <triangle type="wall" texture="t0">
-      <vertex x="-2.0" y="-2.0" z="-6.0"/><texcoords s="0.0" t="1.0"/>
-      <vertex x="2.0" y="2.0" z="-6.0"/><texcoords s="1.0" t="0.0"/>
-      <vertex x="-2.0" y="2.0" z="-6.0"/><texcoords s="0.0" t="0.0"/>
-    </triangle>
-    <triangle type="wall" texture="t0">
-      <vertex x="-2.0" y="-2.0" z="2.0"/><texcoords s="1.0" t="1.0"/>
-      <vertex x="-2.0" y="2.0" z="2.0"/><texcoords s="1.0" t="0.0"/>
-      <vertex x="2.0" y="2.0" z="2.0"/><texcoords s="0.0" t="0.0"/>
-    </triangle>
-    <triangle type="wall" texture="t0">
-      <vertex x="-2.0" y="-2.0" z="2.0"/><texcoords s="1.0" t="1.0"/>
-      <vertex x="2.0" y="2.0" z="2.0"/><texcoords s="0.0" t="0.0"/>
-      <vertex x="2.0" y="-2.0" z="2.0"/><texcoords s="0.0" t="1.0"/>
-    </triangle>
-  </triangles>
-  <textures>
-    <texture id="t0" name="green.png"/>
-  </textures>
-</level>
-