Menu
▾
▴
opengate-svn — List for Subversion commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(11) |
Apr
(47) |
May
(14) |
Jun
|
Jul
(73) |
Aug
(4) |
Sep
(2) |
Oct
(60) |
Nov
(48) |
Dec
(66) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
(1) |
Mar
(27) |
Apr
(82) |
May
(89) |
Jun
(91) |
Jul
(44) |
Aug
(53) |
Sep
(113) |
Oct
(20) |
Nov
(37) |
Dec
(10) |
| 2008 |
Jan
|
Feb
(2) |
Mar
|
Apr
(2) |
May
(21) |
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2009 |
Jan
(76) |
Feb
(89) |
Mar
(52) |
Apr
(11) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
(27) |
| 2010 |
Jan
(11) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(9) |
Sep
|
Oct
|
Nov
|
Dec
(14) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(11) |
Oct
(3) |
Nov
|
Dec
|
| 2013 |
Jan
(4) |
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <eg...@us...> - 2007-04-08 10:18:19
|
Revision: 377
http://svn.sourceforge.net/opengate/?rev=377&view=rev
Author: egore
Date: 2007-04-08 03:18:12 -0700 (Sun, 08 Apr 2007)
Log Message:
-----------
Model of the jumpgate plus OGRE mesh
Added Paths:
-----------
trunk/data/misc/
trunk/data/misc/Scene.material
trunk/data/misc/jumpgate.blend
trunk/data/misc/jumpgate.mesh
trunk/data/misc/jumpgate.mesh.xml
Added: trunk/data/misc/Scene.material
===================================================================
--- trunk/data/misc/Scene.material (rev 0)
+++ trunk/data/misc/Scene.material 2007-04-08 10:18:12 UTC (rev 377)
@@ -0,0 +1,14 @@
+material jumpgate
+{
+ receive_shadows on
+ technique
+ {
+ pass
+ {
+ ambient 0.500000 0.500000 0.500000 1.000000
+ diffuse 0.640000 0.640000 0.640000 1.000000
+ specular 0.500000 0.500000 0.500000 1.000000 12.500000
+ emissive 0.000000 0.000000 0.000000 1.000000
+ }
+ }
+}
Added: trunk/data/misc/jumpgate.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/jumpgate.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/misc/jumpgate.mesh
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/jumpgate.mesh
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/misc/jumpgate.mesh.xml
===================================================================
--- trunk/data/misc/jumpgate.mesh.xml (rev 0)
+++ trunk/data/misc/jumpgate.mesh.xml 2007-04-08 10:18:12 UTC (rev 377)
@@ -0,0 +1,3648 @@
+<mesh>
+ <submeshes>
+ <submesh material="jumpgate" usesharedvertices="false">
+ <faces count="306">
+ <face v1="0" v2="1" v3="2"/>
+ <face v1="3" v2="4" v3="5"/>
+ <face v1="6" v2="7" v3="8"/>
+ <face v1="9" v2="10" v3="11"/>
+ <face v1="9" v2="11" v3="12"/>
+ <face v1="13" v2="14" v3="15"/>
+ <face v1="13" v2="15" v3="16"/>
+ <face v1="17" v2="18" v3="19"/>
+ <face v1="17" v2="19" v3="20"/>
+ <face v1="21" v2="22" v3="24"/>
+ <face v1="22" v2="23" v3="24"/>
+ <face v1="25" v2="26" v3="28"/>
+ <face v1="26" v2="27" v3="28"/>
+ <face v1="29" v2="30" v3="32"/>
+ <face v1="30" v2="31" v3="32"/>
+ <face v1="33" v2="34" v3="35"/>
+ <face v1="33" v2="35" v3="36"/>
+ <face v1="37" v2="38" v3="39"/>
+ <face v1="37" v2="39" v3="40"/>
+ <face v1="41" v2="42" v3="43"/>
+ <face v1="41" v2="43" v3="44"/>
+ <face v1="45" v2="46" v3="48"/>
+ <face v1="46" v2="47" v3="48"/>
+ <face v1="49" v2="50" v3="52"/>
+ <face v1="50" v2="51" v3="52"/>
+ <face v1="53" v2="54" v3="56"/>
+ <face v1="54" v2="55" v3="56"/>
+ <face v1="57" v2="58" v3="60"/>
+ <face v1="58" v2="59" v3="60"/>
+ <face v1="61" v2="62" v3="64"/>
+ <face v1="62" v2="63" v3="64"/>
+ <face v1="65" v2="66" v3="68"/>
+ <face v1="66" v2="67" v3="68"/>
+ <face v1="69" v2="70" v3="71"/>
+ <face v1="69" v2="71" v3="72"/>
+ <face v1="73" v2="74" v3="75"/>
+ <face v1="73" v2="75" v3="76"/>
+ <face v1="77" v2="78" v3="79"/>
+ <face v1="77" v2="79" v3="80"/>
+ <face v1="81" v2="82" v3="83"/>
+ <face v1="84" v2="85" v3="86"/>
+ <face v1="87" v2="88" v3="89"/>
+ <face v1="90" v2="91" v3="92"/>
+ <face v1="90" v2="92" v3="93"/>
+ <face v1="94" v2="95" v3="96"/>
+ <face v1="94" v2="96" v3="97"/>
+ <face v1="98" v2="99" v3="101"/>
+ <face v1="99" v2="100" v3="101"/>
+ <face v1="102" v2="103" v3="105"/>
+ <face v1="103" v2="104" v3="105"/>
+ <face v1="106" v2="107" v3="109"/>
+ <face v1="107" v2="108" v3="109"/>
+ <face v1="110" v2="111" v3="113"/>
+ <face v1="111" v2="112" v3="113"/>
+ <face v1="114" v2="115" v3="116"/>
+ <face v1="114" v2="116" v3="117"/>
+ <face v1="118" v2="119" v3="120"/>
+ <face v1="118" v2="120" v3="121"/>
+ <face v1="122" v2="123" v3="124"/>
+ <face v1="122" v2="124" v3="125"/>
+ <face v1="126" v2="127" v3="129"/>
+ <face v1="127" v2="128" v3="129"/>
+ <face v1="130" v2="131" v3="133"/>
+ <face v1="131" v2="132" v3="133"/>
+ <face v1="134" v2="135" v3="137"/>
+ <face v1="135" v2="136" v3="137"/>
+ <face v1="138" v2="139" v3="140"/>
+ <face v1="138" v2="140" v3="141"/>
+ <face v1="142" v2="143" v3="144"/>
+ <face v1="142" v2="144" v3="145"/>
+ <face v1="146" v2="147" v3="148"/>
+ <face v1="146" v2="148" v3="149"/>
+ <face v1="150" v2="151" v3="153"/>
+ <face v1="151" v2="152" v3="153"/>
+ <face v1="154" v2="155" v3="157"/>
+ <face v1="155" v2="156" v3="157"/>
+ <face v1="158" v2="159" v3="161"/>
+ <face v1="159" v2="160" v3="161"/>
+ <face v1="162" v2="163" v3="164"/>
+ <face v1="162" v2="164" v3="165"/>
+ <face v1="166" v2="167" v3="168"/>
+ <face v1="166" v2="168" v3="169"/>
+ <face v1="170" v2="171" v3="172"/>
+ <face v1="170" v2="172" v3="173"/>
+ <face v1="174" v2="175" v3="177"/>
+ <face v1="175" v2="176" v3="177"/>
+ <face v1="178" v2="179" v3="180"/>
+ <face v1="178" v2="180" v3="181"/>
+ <face v1="182" v2="183" v3="184"/>
+ <face v1="182" v2="184" v3="185"/>
+ <face v1="186" v2="187" v3="189"/>
+ <face v1="187" v2="188" v3="189"/>
+ <face v1="190" v2="191" v3="192"/>
+ <face v1="190" v2="192" v3="193"/>
+ <face v1="194" v2="195" v3="196"/>
+ <face v1="194" v2="196" v3="197"/>
+ <face v1="198" v2="199" v3="201"/>
+ <face v1="199" v2="200" v3="201"/>
+ <face v1="202" v2="203" v3="205"/>
+ <face v1="203" v2="204" v3="205"/>
+ <face v1="206" v2="207" v3="209"/>
+ <face v1="207" v2="208" v3="209"/>
+ <face v1="210" v2="211" v3="212"/>
+ <face v1="213" v2="214" v3="215"/>
+ <face v1="216" v2="217" v3="218"/>
+ <face v1="219" v2="220" v3="221"/>
+ <face v1="222" v2="223" v3="224"/>
+ <face v1="225" v2="226" v3="227"/>
+ <face v1="228" v2="229" v3="230"/>
+ <face v1="228" v2="230" v3="231"/>
+ <face v1="232" v2="233" v3="235"/>
+ <face v1="233" v2="234" v3="235"/>
+ <face v1="236" v2="237" v3="238"/>
+ <face v1="236" v2="238" v3="239"/>
+ <face v1="240" v2="241" v3="242"/>
+ <face v1="243" v2="244" v3="245"/>
+ <face v1="246" v2="247" v3="248"/>
+ <face v1="249" v2="250" v3="251"/>
+ <face v1="252" v2="253" v3="254"/>
+ <face v1="255" v2="256" v3="257"/>
+ <face v1="258" v2="259" v3="260"/>
+ <face v1="258" v2="260" v3="261"/>
+ <face v1="262" v2="263" v3="264"/>
+ <face v1="262" v2="264" v3="265"/>
+ <face v1="266" v2="267" v3="268"/>
+ <face v1="266" v2="268" v3="269"/>
+ <face v1="270" v2="271" v3="272"/>
+ <face v1="273" v2="274" v3="275"/>
+ <face v1="276" v2="277" v3="278"/>
+ <face v1="279" v2="280" v3="281"/>
+ <face v1="282" v2="283" v3="284"/>
+ <face v1="285" v2="286" v3="287"/>
+ <face v1="288" v2="289" v3="291"/>
+ <face v1="289" v2="290" v3="291"/>
+ <face v1="292" v2="293" v3="295"/>
+ <face v1="293" v2="294" v3="295"/>
+ <face v1="296" v2="297" v3="299"/>
+ <face v1="297" v2="298" v3="299"/>
+ <face v1="300" v2="301" v3="302"/>
+ <face v1="303" v2="304" v3="305"/>
+ <face v1="306" v2="307" v3="308"/>
+ <face v1="309" v2="310" v3="311"/>
+ <face v1="312" v2="313" v3="314"/>
+ <face v1="315" v2="316" v3="317"/>
+ <face v1="318" v2="319" v3="320"/>
+ <face v1="318" v2="320" v3="321"/>
+ <face v1="322" v2="323" v3="324"/>
+ <face v1="322" v2="324" v3="325"/>
+ <face v1="326" v2="327" v3="328"/>
+ <face v1="326" v2="328" v3="329"/>
+ <face v1="330" v2="331" v3="333"/>
+ <face v1="331" v2="332" v3="333"/>
+ <face v1="334" v2="335" v3="337"/>
+ <face v1="335" v2="336" v3="337"/>
+ <face v1="338" v2="339" v3="341"/>
+ <face v1="339" v2="340" v3="341"/>
+ <face v1="342" v2="343" v3="345"/>
+ <face v1="343" v2="344" v3="345"/>
+ <face v1="346" v2="347" v3="349"/>
+ <face v1="347" v2="348" v3="349"/>
+ <face v1="350" v2="351" v3="353"/>
+ <face v1="351" v2="352" v3="353"/>
+ <face v1="354" v2="355" v3="357"/>
+ <face v1="355" v2="356" v3="357"/>
+ <face v1="358" v2="359" v3="361"/>
+ <face v1="359" v2="360" v3="361"/>
+ <face v1="362" v2="363" v3="365"/>
+ <face v1="363" v2="364" v3="365"/>
+ <face v1="366" v2="367" v3="369"/>
+ <face v1="367" v2="368" v3="369"/>
+ <face v1="370" v2="371" v3="372"/>
+ <face v1="370" v2="372" v3="373"/>
+ <face v1="374" v2="375" v3="376"/>
+ <face v1="374" v2="376" v3="377"/>
+ <face v1="378" v2="379" v3="380"/>
+ <face v1="378" v2="380" v3="381"/>
+ <face v1="382" v2="383" v3="384"/>
+ <face v1="382" v2="384" v3="385"/>
+ <face v1="386" v2="387" v3="388"/>
+ <face v1="386" v2="388" v3="389"/>
+ <face v1="390" v2="391" v3="392"/>
+ <face v1="390" v2="392" v3="393"/>
+ <face v1="394" v2="395" v3="396"/>
+ <face v1="394" v2="396" v3="397"/>
+ <face v1="398" v2="399" v3="400"/>
+ <face v1="398" v2="400" v3="401"/>
+ <face v1="402" v2="403" v3="404"/>
+ <face v1="402" v2="404" v3="405"/>
+ <face v1="406" v2="407" v3="408"/>
+ <face v1="406" v2="408" v3="409"/>
+ <face v1="410" v2="411" v3="412"/>
+ <face v1="410" v2="412" v3="413"/>
+ <face v1="414" v2="415" v3="417"/>
+ <face v1="415" v2="416" v3="417"/>
+ <face v1="418" v2="419" v3="421"/>
+ <face v1="419" v2="420" v3="421"/>
+ <face v1="422" v2="423" v3="425"/>
+ <face v1="423" v2="424" v3="425"/>
+ <face v1="426" v2="427" v3="429"/>
+ <face v1="427" v2="428" v3="429"/>
+ <face v1="430" v2="431" v3="433"/>
+ <face v1="431" v2="432" v3="433"/>
+ <face v1="434" v2="435" v3="437"/>
+ <face v1="435" v2="436" v3="437"/>
+ <face v1="438" v2="439" v3="441"/>
+ <face v1="439" v2="440" v3="441"/>
+ <face v1="442" v2="443" v3="445"/>
+ <face v1="443" v2="444" v3="445"/>
+ <face v1="446" v2="447" v3="449"/>
+ <face v1="447" v2="448" v3="449"/>
+ <face v1="450" v2="451" v3="452"/>
+ <face v1="450" v2="452" v3="453"/>
+ <face v1="454" v2="455" v3="456"/>
+ <face v1="454" v2="456" v3="457"/>
+ <face v1="458" v2="459" v3="460"/>
+ <face v1="458" v2="460" v3="461"/>
+ <face v1="462" v2="463" v3="464"/>
+ <face v1="462" v2="464" v3="465"/>
+ <face v1="466" v2="467" v3="468"/>
+ <face v1="466" v2="468" v3="469"/>
+ <face v1="470" v2="471" v3="472"/>
+ <face v1="470" v2="472" v3="473"/>
+ <face v1="474" v2="475" v3="476"/>
+ <face v1="477" v2="478" v3="479"/>
+ <face v1="480" v2="481" v3="482"/>
+ <face v1="483" v2="484" v3="485"/>
+ <face v1="486" v2="487" v3="488"/>
+ <face v1="489" v2="490" v3="491"/>
+ <face v1="492" v2="493" v3="495"/>
+ <face v1="493" v2="494" v3="495"/>
+ <face v1="496" v2="497" v3="499"/>
+ <face v1="497" v2="498" v3="499"/>
+ <face v1="500" v2="501" v3="503"/>
+ <face v1="501" v2="502" v3="503"/>
+ <face v1="504" v2="505" v3="506"/>
+ <face v1="507" v2="508" v3="509"/>
+ <face v1="510" v2="511" v3="512"/>
+ <face v1="513" v2="514" v3="515"/>
+ <face v1="516" v2="517" v3="518"/>
+ <face v1="519" v2="520" v3="521"/>
+ <face v1="522" v2="523" v3="525"/>
+ <face v1="523" v2="524" v3="525"/>
+ <face v1="526" v2="527" v3="529"/>
+ <face v1="527" v2="528" v3="529"/>
+ <face v1="530" v2="531" v3="533"/>
+ <face v1="531" v2="532" v3="533"/>
+ <face v1="534" v2="535" v3="537"/>
+ <face v1="535" v2="536" v3="537"/>
+ <face v1="538" v2="539" v3="541"/>
+ <face v1="539" v2="540" v3="541"/>
+ <face v1="542" v2="543" v3="545"/>
+ <face v1="543" v2="544" v3="545"/>
+ <face v1="546" v2="547" v3="548"/>
+ <face v1="546" v2="548" v3="549"/>
+ <face v1="550" v2="551" v3="552"/>
+ <face v1="550" v2="552" v3="553"/>
+ <face v1="554" v2="555" v3="556"/>
+ <face v1="554" v2="556" v3="557"/>
+ <face v1="558" v2="559" v3="561"/>
+ <face v1="559" v2="560" v3="561"/>
+ <face v1="562" v2="563" v3="565"/>
+ <face v1="563" v2="564" v3="565"/>
+ <face v1="566" v2="567" v3="569"/>
+ <face v1="567" v2="568" v3="569"/>
+ <face v1="570" v2="571" v3="572"/>
+ <face v1="570" v2="572" v3="573"/>
+ <face v1="574" v2="575" v3="576"/>
+ <face v1="574" v2="576" v3="577"/>
+ <face v1="578" v2="579" v3="581"/>
+ <face v1="579" v2="580" v3="581"/>
+ <face v1="582" v2="583" v3="584"/>
+ <face v1="582" v2="584" v3="585"/>
+ <face v1="586" v2="587" v3="588"/>
+ <face v1="586" v2="588" v3="589"/>
+ <face v1="590" v2="591" v3="592"/>
+ <face v1="590" v2="592" v3="593"/>
+ <face v1="594" v2="595" v3="597"/>
+ <face v1="595" v2="596" v3="597"/>
+ <face v1="598" v2="599" v3="601"/>
+ <face v1="599" v2="600" v3="601"/>
+ <face v1="602" v2="603" v3="605"/>
+ <face v1="603" v2="604" v3="605"/>
+ <face v1="606" v2="607" v3="609"/>
+ <face v1="607" v2="608" v3="609"/>
+ <face v1="610" v2="611" v3="613"/>
+ <face v1="611" v2="612" v3="613"/>
+ <face v1="614" v2="615" v3="617"/>
+ <face v1="615" v2="616" v3="617"/>
+ <face v1="618" v2="619" v3="620"/>
+ <face v1="618" v2="620" v3="621"/>
+ <face v1="622" v2="623" v3="624"/>
+ <face v1="622" v2="624" v3="625"/>
+ <face v1="626" v2="627" v3="628"/>
+ <face v1="626" v2="628" v3="629"/>
+ <face v1="630" v2="631" v3="632"/>
+ <face v1="633" v2="634" v3="635"/>
+ <face v1="636" v2="637" v3="638"/>
+ <face v1="639" v2="640" v3="641"/>
+ <face v1="642" v2="643" v3="644"/>
+ <face v1="645" v2="646" v3="647"/>
+ <face v1="648" v2="649" v3="650"/>
+ <face v1="651" v2="652" v3="653"/>
+ <face v1="654" v2="655" v3="656"/>
+ <face v1="657" v2="658" v3="659"/>
+ <face v1="660" v2="661" v3="662"/>
+ <face v1="663" v2="664" v3="665"/>
+ </faces>
+ <geometry vertexcount="666">
+ <vertexbuffer positions="true" normals="true" texture_coords="1" texture_coord_dimensions_0="2">
+ <vertex>
+ <position x="0.290393" y="4.865298" z="0.192331"/>
+ <normal x="0.368612" y="0.904989" z="0.212414"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.275292" y="4.865274" z="0.192332"/>
+ <normal x="-0.368493" y="0.904966" z="0.212721"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.007551" y="4.865323" z="0.992331"/>
+ <normal x="0.000000" y="0.952400" z="0.304852"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.007550" y="4.865274" z="-0.297567"/>
+ <normal x="0.000305" y="0.904976" z="-0.425463"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.290393" y="4.865298" z="0.192331"/>
+ <normal x="0.368612" y="0.904989" z="0.212414"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.841792" y="4.865298" z="-0.452618"/>
+ <normal x="0.264024" y="0.952393" z="-0.152445"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.275292" y="4.865274" z="0.192332"/>
+ <normal x="-0.368493" y="0.904966" z="0.212721"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.007550" y="4.865274" z="-0.297567"/>
+ <normal x="0.000305" y="0.904976" z="-0.425463"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.826691" y="4.865274" z="-0.452618"/>
+ <normal x="-0.264053" y="0.952385" z="-0.152444"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.007551" y="4.865323" z="0.992331"/>
+ <normal x="0.000000" y="0.952400" z="0.304852"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.275292" y="4.865274" z="0.192332"/>
+ <normal x="-0.368493" y="0.904966" z="0.212721"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.512126" y="4.189327" z="0.867173"/>
+ <normal x="-0.726945" y="-0.493257" z="-0.477753"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.007551" y="4.457394" z="1.513854"/>
+ <normal x="0.000000" y="0.722724" z="0.691137"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.841792" y="4.865298" z="-0.452618"/>
+ <normal x="0.264024" y="0.952393" z="-0.152445"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.290393" y="4.865298" z="0.192331"/>
+ <normal x="0.368612" y="0.904989" z="0.212414"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.993240" y="4.189303" z="0.060014"/>
+ <normal x="-0.050266" y="-0.493255" z="0.868431"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="1.293444" y="4.457369" z="-0.713380"/>
+ <normal x="0.598542" y="0.722724" z="-0.345568"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.826691" y="4.865274" z="-0.452618"/>
+ <normal x="-0.264053" y="0.952385" z="-0.152444"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.007550" y="4.865274" z="-0.297567"/>
+ <normal x="0.000305" y="0.904976" z="-0.425463"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.458463" y="4.189279" z="-0.840092"/>
+ <normal x="0.777236" y="-0.493253" z="-0.390647"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-1.278344" y="4.457345" z="-0.713379"/>
+ <normal x="-0.598542" y="0.722724" z="-0.345568"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.290393" y="4.865298" z="0.192331"/>
+ <normal x="0.368612" y="0.904989" z="0.212414"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.007551" y="4.865323" z="0.992331"/>
+ <normal x="0.000000" y="0.952400" z="0.304852"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.007551" y="4.457394" z="1.513854"/>
+ <normal x="0.000000" y="0.722724" z="0.691137"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.527227" y="4.189327" z="0.867173"/>
+ <normal x="0.721163" y="-0.498405" z="-0.481162"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.007550" y="4.865274" z="-0.297567"/>
+ <normal x="0.000305" y="0.904976" z="-0.425463"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.841792" y="4.865298" z="-0.452618"/>
+ <normal x="0.264024" y="0.952393" z="-0.152445"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="1.293444" y="4.457369" z="-0.713380"/>
+ <normal x="0.598542" y="0.722724" z="-0.345568"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.473563" y="4.189303" z="-0.840092"/>
+ <normal x="-0.777293" y="-0.498409" z="-0.383931"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.275292" y="4.865274" z="0.192332"/>
+ <normal x="-0.368493" y="0.904966" z="0.212721"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.826691" y="4.865274" z="-0.452618"/>
+ <normal x="-0.264053" y="0.952385" z="-0.152444"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-1.278344" y="4.457345" z="-0.713379"/>
+ <normal x="-0.598542" y="0.722724" z="-0.345568"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.978139" y="4.189279" z="0.060015"/>
+ <normal x="0.056125" y="-0.498407" z="0.865124"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.007551" y="4.457394" z="1.513854"/>
+ <normal x="0.000000" y="0.722724" z="0.691137"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.512126" y="4.189327" z="0.867173"/>
+ <normal x="-0.726945" y="-0.493257" z="-0.477753"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.275292" y="-1.035226" z="4.112233"/>
+ <normal x="-0.574524" y="-0.500118" z="-0.647923"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.007551" y="-0.585102" z="4.773587"/>
+ <normal x="0.000000" y="0.353654" z="0.935376"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="1.293444" y="4.457369" z="-0.713380"/>
+ <normal x="0.598542" y="0.722724" z="-0.345568"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.993240" y="4.189303" z="0.060014"/>
+ <normal x="-0.050266" y="-0.493255" z="0.868431"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.685128" y="-1.035251" z="-1.767621"/>
+ <normal x="-0.273849" y="-0.500118" z="0.821516"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="4.116456" y="-0.585127" z="-2.343247"/>
+ <normal x="0.810067" y="0.353655" z="-0.467674"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-1.278344" y="4.457345" z="-0.713379"/>
+ <normal x="-0.598542" y="0.722724" z="-0.345568"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.458463" y="4.189279" z="-0.840092"/>
+ <normal x="0.777236" y="-0.493253" z="-0.390647"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.387185" y="-1.035276" z="-2.257518"/>
+ <normal x="0.848382" y="-0.500124" z="-0.173565"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-4.101356" y="-0.585152" z="-2.343246"/>
+ <normal x="-0.810067" y="0.353655" z="-0.467674"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.527227" y="4.189327" z="0.867173"/>
+ <normal x="0.721163" y="-0.498405" z="-0.481162"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.007551" y="4.457394" z="1.513854"/>
+ <normal x="0.000000" y="0.722724" z="0.691137"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.007551" y="-0.585102" z="4.773587"/>
+ <normal x="0.000000" y="0.353654" z="0.935376"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.290393" y="-1.035226" z="4.112233"/>
+ <normal x="0.563230" y="-0.504999" z="-0.654024"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.473563" y="4.189303" z="-0.840092"/>
+ <normal x="-0.777293" y="-0.498409" z="-0.383931"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="1.293444" y="4.457369" z="-0.713380"/>
+ <normal x="0.598542" y="0.722724" z="-0.345568"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="4.116456" y="-0.585127" z="-2.343247"/>
+ <normal x="0.810067" y="0.353655" z="-0.467674"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.402285" y="-1.035251" z="-2.257519"/>
+ <normal x="-0.848015" y="-0.505006" z="-0.160746"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.978139" y="4.189279" z="0.060015"/>
+ <normal x="0.056125" y="-0.498407" z="0.865124"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-1.278344" y="4.457345" z="-0.713379"/>
+ <normal x="-0.598542" y="0.722724" z="-0.345568"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-4.101356" y="-0.585152" z="-2.343246"/>
+ <normal x="-0.810067" y="0.353655" z="-0.467674"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.670028" y="-1.035276" z="-1.767620"/>
+ <normal x="0.284778" y="-0.505008" z="0.814781"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.007551" y="-0.585102" z="4.773587"/>
+ <normal x="0.000000" y="0.353654" z="0.935376"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.275292" y="-1.035226" z="4.112233"/>
+ <normal x="-0.574524" y="-0.500118" z="-0.647923"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.138944" y="-1.536729" z="4.535623"/>
+ <normal x="-0.545955" y="-0.832497" z="0.094243"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.007551" y="-1.303594" z="4.878161"/>
+ <normal x="0.000000" y="-0.488917" z="0.872330"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="4.116456" y="-0.585127" z="-2.343247"/>
+ <normal x="0.810067" y="0.353655" z="-0.467674"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.685128" y="-1.035251" z="-1.767621"/>
+ <normal x="-0.273849" y="-0.500118" z="0.821516"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.983620" y="-1.536754" z="-2.097397"/>
+ <normal x="0.354601" y="-0.832499" z="0.425680"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="4.207020" y="-1.303618" z="-2.395534"/>
+ <normal x="0.755470" y="-0.488916" z="-0.436149"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-4.101356" y="-0.585152" z="-2.343246"/>
+ <normal x="-0.810067" y="0.353655" z="-0.467674"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.387185" y="-1.035276" z="-2.257518"/>
+ <normal x="0.848382" y="-0.500124" z="-0.173565"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.822026" y="-1.536779" z="-2.351131"/>
+ <normal x="0.191326" y="-0.832508" z="-0.519928"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-4.191920" y="-1.303644" z="-2.395533"/>
+ <normal x="-0.755470" y="-0.488916" z="-0.436149"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.290393" y="-1.035226" z="4.112233"/>
+ <normal x="0.563230" y="-0.504999" z="-0.654024"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.007551" y="-0.585102" z="4.773587"/>
+ <normal x="0.000000" y="0.353654" z="0.935376"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.007551" y="-1.303594" z="4.878161"/>
+ <normal x="0.000000" y="-0.488917" z="0.872330"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.154045" y="-1.536729" z="4.535623"/>
+ <normal x="0.545955" y="-0.832497" z="0.094243"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.402285" y="-1.035251" z="-2.257519"/>
+ <normal x="-0.848015" y="-0.505006" z="-0.160746"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="4.116456" y="-0.585127" z="-2.343247"/>
+ <normal x="0.810067" y="0.353655" z="-0.467674"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="4.207020" y="-1.303618" z="-2.395534"/>
+ <normal x="0.755470" y="-0.488916" z="-0.436149"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.837125" y="-1.536754" z="-2.351133"/>
+ <normal x="-0.191326" y="-0.832508" z="-0.519928"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.670028" y="-1.035276" z="-1.767620"/>
+ <normal x="0.284778" y="-0.505008" z="0.814781"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-4.101356" y="-0.585152" z="-2.343246"/>
+ <normal x="-0.810067" y="0.353655" z="-0.467674"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-4.191920" y="-1.303644" z="-2.395533"/>
+ <normal x="-0.755470" y="-0.488916" z="-0.436149"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.968520" y="-1.536779" z="-2.097395"/>
+ <normal x="-0.354601" y="-0.832499" z="0.425680"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.138944" y="-1.536729" z="4.535623"/>
+ <normal x="-0.545955" y="-0.832497" z="0.094243"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.154045" y="-1.536729" z="4.535623"/>
+ <normal x="0.545955" y="-0.832497" z="0.094243"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.007551" y="-1.303594" z="4.878161"/>
+ <normal x="0.000000" y="-0.488917" z="0.872330"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.983620" y="-1.536754" z="-2.097397"/>
+ <normal x="0.354601" y="-0.832499" z="0.425680"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.837125" y="-1.536754" z="-2.351133"/>
+ <normal x="-0.191326" y="-0.832508" z="-0.519928"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="4.207020" y="-1.303618" z="-2.395534"/>
+ <normal x="0.755470" y="-0.488916" z="-0.436149"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.822026" y="-1.536779" z="-2.351131"/>
+ <normal x="0.191326" y="-0.832508" z="-0.519928"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.968520" y="-1.536779" z="-2.097395"/>
+ <normal x="-0.354601" y="-0.832499" z="0.425680"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-4.191920" y="-1.303644" z="-2.395533"/>
+ <normal x="-0.755470" y="-0.488916" z="-0.436149"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.275292" y="-1.035226" z="4.112233"/>
+ <normal x="-0.574524" y="-0.500118" z="-0.647923"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.290393" y="-1.035226" z="4.112233"/>
+ <normal x="0.563230" y="-0.504999" z="-0.654024"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.154045" y="-1.536729" z="4.535623"/>
+ <normal x="0.545955" y="-0.832497" z="0.094243"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.138944" y="-1.536729" z="4.535623"/>
+ <normal x="-0.545955" y="-0.832497" z="0.094243"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.685128" y="-1.035251" z="-1.767621"/>
+ <normal x="-0.273849" y="-0.500118" z="0.821516"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.402285" y="-1.035251" z="-2.257519"/>
+ <normal x="-0.848015" y="-0.505006" z="-0.160746"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.837125" y="-1.536754" z="-2.351133"/>
+ <normal x="-0.191326" y="-0.832508" z="-0.519928"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.983620" y="-1.536754" z="-2.097397"/>
+ <normal x="0.354601" y="-0.832499" z="0.425680"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.387185" y="-1.035276" z="-2.257518"/>
+ <normal x="0.848382" y="-0.500124" z="-0.173565"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.670028" y="-1.035276" z="-1.767620"/>
+ <normal x="0.284778" y="-0.505008" z="0.814781"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.968520" y="-1.536779" z="-2.097395"/>
+ <normal x="-0.354601" y="-0.832499" z="0.425680"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.822026" y="-1.536779" z="-2.351131"/>
+ <normal x="0.191326" y="-0.832508" z="-0.519928"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.512126" y="4.189327" z="0.867173"/>
+ <normal x="-0.726945" y="-0.493257" z="-0.477753"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.527227" y="4.189327" z="0.867173"/>
+ <normal x="0.721163" y="-0.498405" z="-0.481162"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.201696" y="0.399338" z="3.297190"/>
+ <normal x="0.282758" y="-0.068546" z="-0.956739"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.156395" y="0.399338" z="3.297190"/>
+ <normal x="-0.303944" y="-0.073003" z="-0.949889"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.993240" y="4.189303" z="0.060014"/>
+ <normal x="-0.050266" y="-0.493255" z="0.868431"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.473563" y="4.189303" z="-0.840092"/>
+ <normal x="-0.777293" y="-0.498409" z="-0.383931"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="2.740785" y="0.399313" z="-1.773183"/>
+ <normal x="-0.969945" y="-0.068545" z="0.233468"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="2.919831" y="0.399313" z="-1.463067"/>
+ <normal x="-0.670641" y="-0.073003" z="0.738181"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.458463" y="4.189279" z="-0.840092"/>
+ <normal x="0.777236" y="-0.493253" z="-0.390647"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.978139" y="4.189279" z="0.060015"/>
+ <normal x="0.056125" y="-0.498407" z="0.865124"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-2.919831" y="0.399288" z="-1.436912"/>
+ <normal x="0.687176" y="-0.068547" z="0.723250"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-2.740785" y="0.399288" z="-1.747028"/>
+ <normal x="0.974608" y="-0.073003" z="0.211683"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.290393" y="-1.035226" z="4.112233"/>
+ <normal x="0.563230" y="-0.504999" z="-0.654024"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.275292" y="-1.035226" z="4.112233"/>
+ <normal x="-0.574524" y="-0.500118" z="-0.647923"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.153327" y="-0.717956" z="3.945640"/>
+ <normal x="-0.302049" y="-0.796431" z="-0.523894"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.198628" y="-0.717956" z="3.945640"/>
+ <normal x="0.281202" y="-0.803473" z="-0.524744"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.402285" y="-1.035251" z="-2.257519"/>
+ <normal x="-0.848015" y="-0.505006" z="-0.160746"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.685128" y="-1.035251" z="-1.767621"/>
+ <normal x="-0.273849" y="-0.500118" z="0.821516"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.479871" y="-0.717981" z="-1.789949"/>
+ <normal x="-0.302657" y="-0.796424" z="0.523553"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.303894" y="-0.717981" z="-2.094751"/>
+ <normal x="-0.595034" y="-0.803480" z="0.018830"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.670028" y="-1.035276" z="-1.767620"/>
+ <normal x="0.284778" y="-0.505008" z="0.814781"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.387185" y="-1.035276" z="-2.257518"/>
+ <normal x="0.848382" y="-0.500124" z="-0.173565"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.303894" y="-0.718006" z="-2.068596"/>
+ <normal x="0.604736" y="-0.796426" z="0.000336"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.479871" y="-0.718006" z="-1.763794"/>
+ <normal x="0.313826" y="-0.803471" z="0.505912"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.527227" y="4.189327" z="0.867173"/>
+ <normal x="0.721163" y="-0.498405" z="-0.481162"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.290393" y="-1.035226" z="4.112233"/>
+ <normal x="0.563230" y="-0.504999" z="-0.654024"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.198628" y="-0.717956" z="3.945640"/>
+ <normal x="0.281202" y="-0.803473" z="-0.524744"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.201696" y="0.399338" z="3.297190"/>
+ <normal x="0.282758" y="-0.068546" z="-0.956739"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.473563" y="4.189303" z="-0.840092"/>
+ <normal x="-0.777293" y="-0.498409" z="-0.383931"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.402285" y="-1.035251" z="-2.257519"/>
+ <normal x="-0.848015" y="-0.505006" z="-0.160746"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.303894" y="-0.717981" z="-2.094751"/>
+ <normal x="-0.595034" y="-0.803480" z="0.018830"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="2.740785" y="0.399313" z="-1.773183"/>
+ <normal x="-0.969945" y="-0.068545" z="0.233468"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.978139" y="4.189279" z="0.060015"/>
+ <normal x="0.056125" y="-0.498407" z="0.865124"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.670028" y="-1.035276" z="-1.767620"/>
+ <normal x="0.284778" y="-0.505008" z="0.814781"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.479871" y="-0.718006" z="-1.763794"/>
+ <normal x="0.313826" y="-0.803471" z="0.505912"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-2.919831" y="0.399288" z="-1.436912"/>
+ <normal x="0.687176" y="-0.068547" z="0.723250"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.275292" y="-1.035226" z="4.112233"/>
+ <normal x="-0.574524" y="-0.500118" z="-0.647923"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.512126" y="4.189327" z="0.867173"/>
+ <normal x="-0.726945" y="-0.493257" z="-0.477753"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.156395" y="0.399338" z="3.297190"/>
+ <normal x="-0.303944" y="-0.073003" z="-0.949889"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.153327" y="-0.717956" z="3.945640"/>
+ <normal x="-0.302049" y="-0.796431" z="-0.523894"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.685128" y="-1.035251" z="-1.767621"/>
+ <normal x="-0.273849" y="-0.500118" z="0.821516"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.993240" y="4.189303" z="0.060014"/>
+ <normal x="-0.050266" y="-0.493255" z="0.868431"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="2.919831" y="0.399313" z="-1.463067"/>
+ <normal x="-0.670641" y="-0.073003" z="0.738181"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.479871" y="-0.717981" z="-1.789949"/>
+ <normal x="-0.302657" y="-0.796424" z="0.523553"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.387185" y="-1.035276" z="-2.257518"/>
+ <normal x="0.848382" y="-0.500124" z="-0.173565"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.458463" y="4.189279" z="-0.840092"/>
+ <normal x="0.777236" y="-0.493253" z="-0.390647"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-2.740785" y="0.399288" z="-1.747028"/>
+ <normal x="0.974608" y="-0.073003" z="0.211683"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.303894" y="-0.718006" z="-2.068596"/>
+ <normal x="0.604736" y="-0.796426" z="0.000336"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.153327" y="-0.717956" z="3.945640"/>
+ <normal x="-0.302049" y="-0.796431" z="-0.523894"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.156395" y="0.399338" z="3.297190"/>
+ <normal x="-0.303944" y="-0.073003" z="-0.949889"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.156395" y="0.218766" z="2.986061"/>
+ <normal x="-0.497283" y="0.646706" z="0.578343"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.153327" y="-0.898527" z="3.634511"/>
+ <normal x="-0.503300" y="0.197218" z="0.841305"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.479871" y="-0.717981" z="-1.789949"/>
+ <normal x="-0.302657" y="-0.796424" z="0.523553"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="2.919831" y="0.399313" z="-1.463067"/>
+ <normal x="-0.670641" y="-0.073003" z="0.738181"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="2.650386" y="0.218742" z="-1.307503"/>
+ <normal x="0.749512" y="0.646694" z="0.141485"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.210426" y="-0.898552" z="-1.634385"/>
+ <normal x="0.980243" y="0.197214" z="0.015199"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.303894" y="-0.718006" z="-2.068596"/>
+ <normal x="0.604736" y="-0.796426" z="0.000336"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-2.740785" y="0.399288" z="-1.747028"/>
+ <normal x="0.974608" y="-0.073003" z="0.211683"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-2.471340" y="0.218717" z="-1.591464"/>
+ <normal x="-0.252213" y="0.646707" z="-0.719832"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.034449" y="-0.898577" z="-1.913032"/>
+ <normal x="-0.476929" y="0.197217" z="-0.856530"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.201696" y="0.399338" z="3.297190"/>
+ <normal x="0.282758" y="-0.068546" z="-0.956739"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.198628" y="-0.717956" z="3.945640"/>
+ <normal x="0.281202" y="-0.803473" z="-0.524744"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.198628" y="-0.898527" z="3.634511"/>
+ <normal x="0.503300" y="0.197218" z="0.841305"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.201696" y="0.218766" z="2.986061"/>
+ <normal x="0.497283" y="0.646706" z="0.578343"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="2.740785" y="0.399313" z="-1.773183"/>
+ <normal x="-0.969945" y="-0.068545" z="0.233468"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.303894" y="-0.717981" z="-2.094751"/>
+ <normal x="-0.595034" y="-0.803480" z="0.018830"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.034448" y="-0.898552" z="-1.939187"/>
+ <normal x="0.476929" y="0.197217" z="-0.856530"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="2.471340" y="0.218742" z="-1.617619"/>
+ <normal x="0.252213" y="0.646707" z="-0.719832"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-2.919831" y="0.399288" z="-1.436912"/>
+ <normal x="0.687176" y="-0.068547" z="0.723250"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.479871" y="-0.718006" z="-1.763794"/>
+ <normal x="0.313826" y="-0.803471" z="0.505912"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.210426" y="-0.898577" z="-1.608230"/>
+ <normal x="-0.980243" y="0.197214" z="0.015199"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-2.650385" y="0.218717" z="-1.281348"/>
+ <normal x="-0.749512" y="0.646694" z="0.141485"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.198628" y="-0.717956" z="3.945640"/>
+ <normal x="0.281202" y="-0.803473" z="-0.524744"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.153327" y="-0.717956" z="3.945640"/>
+ <normal x="-0.302049" y="-0.796431" z="-0.523894"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.153327" y="-0.898527" z="3.634511"/>
+ <normal x="-0.503300" y="0.197218" z="0.841305"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.198628" y="-0.898527" z="3.634511"/>
+ <normal x="0.503300" y="0.197218" z="0.841305"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.303894" y="-0.717981" z="-2.094751"/>
+ <normal x="-0.595034" y="-0.803480" z="0.018830"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.479871" y="-0.717981" z="-1.789949"/>
+ <normal x="-0.302657" y="-0.796424" z="0.523553"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.210426" y="-0.898552" z="-1.634385"/>
+ <normal x="0.980243" y="0.197214" z="0.015199"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.034448" y="-0.898552" z="-1.939187"/>
+ <normal x="0.476929" y="0.197217" z="-0.856530"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.479871" y="-0.718006" z="-1.763794"/>
+ <normal x="0.313826" y="-0.803471" z="0.505912"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.303894" y="-0.718006" z="-2.068596"/>
+ <normal x="0.604736" y="-0.796426" z="0.000336"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.034449" y="-0.898577" z="-1.913032"/>
+ <normal x="-0.476929" y="0.197217" z="-0.856530"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.210426" y="-0.898577" z="-1.608230"/>
+ <normal x="-0.980243" y="0.197214" z="0.015199"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.156395" y="0.399338" z="3.297190"/>
+ <normal x="-0.303944" y="-0.073003" z="-0.949889"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.201696" y="0.399338" z="3.297190"/>
+ <normal x="0.282758" y="-0.068546" z="-0.956739"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.201696" y="0.218766" z="2.986061"/>
+ <normal x="0.497283" y="0.646706" z="0.578343"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.156395" y="0.218766" z="2.986061"/>
+ <normal x="-0.497283" y="0.646706" z="0.578343"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="2.919831" y="0.399313" z="-1.463067"/>
+ <normal x="-0.670641" y="-0.073003" z="0.738181"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="2.740785" y="0.399313" z="-1.773183"/>
+ <normal x="-0.969945" y="-0.068545" z="0.233468"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="2.471340" y="0.218742" z="-1.617619"/>
+ <normal x="0.252213" y="0.646707" z="-0.719832"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="2.650386" y="0.218742" z="-1.307503"/>
+ <normal x="0.749512" y="0.646694" z="0.141485"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-2.740785" y="0.399288" z="-1.747028"/>
+ <normal x="0.974608" y="-0.073003" z="0.211683"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-2.919831" y="0.399288" z="-1.436912"/>
+ <normal x="0.687176" y="-0.068547" z="0.723250"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-2.650385" y="0.218717" z="-1.281348"/>
+ <normal x="-0.749512" y="0.646694" z="0.141485"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-2.471340" y="0.218717" z="-1.591464"/>
+ <normal x="-0.252213" y="0.646707" z="-0.719832"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.517881" y="1.663080" z="1.779412"/>
+ <normal x="0.318924" y="0.923720" z="0.212199"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.472579" y="1.663080" z="1.779412"/>
+ <normal x="-0.318924" y="0.923720" z="0.212199"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.156395" y="0.218766" z="2.986061"/>
+ <normal x="-0.497283" y="0.646706" z="0.578343"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.201696" y="0.218766" z="2.986061"/>
+ <normal x="0.497283" y="0.646706" z="0.578343"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="1.268259" y="1.663055" z="-1.288117"/>
+ <normal x="0.024293" y="0.923715" z="-0.382310"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="1.763489" y="1.663055" z="-0.430354"/>
+ <normal x="0.343247" y="0.923717" z="0.170082"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="2.650386" y="0.218742" z="-1.307503"/>
+ <normal x="0.749512" y="0.646694" z="0.141485"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="2.471340" y="0.218742" z="-1.617619"/>
+ <normal x="0.252213" y="0.646707" z="-0.719832"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-1.763489" y="1.663030" z="-0.404199"/>
+ <normal x="-0.343247" y="0.923717" z="0.170082"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-1.268259" y="1.663030" z="-1.261963"/>
+ <normal x="-0.024293" y="0.923715" z="-0.382310"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-2.471340" y="0.218717" z="-1.591464"/>
+ <normal x="-0.252213" y="0.646707" z="-0.719832"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-2.650385" y="0.218717" z="-1.281348"/>
+ <normal x="-0.749512" y="0.646694" z="0.141485"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="1.508340" y="0.859940" z="1.937498"/>
+ <normal x="0.737692" y="0.595287" z="0.318504"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.517881" y="1.663080" z="1.779412"/>
+ <normal x="0.318924" y="0.923720" z="0.212199"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.201696" y="0.218766" z="2.986061"/>
+ <normal x="0.497283" y="0.646706" z="0.578343"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.909935" y="0.859915" z="-2.224924"/>
+ <normal x="-0.092993" y="0.595284" z="-0.798116"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="1.268259" y="1.663055" z="-1.288117"/>
+ <normal x="0.024293" y="0.923715" z="-0.382310"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="2.471340" y="0.218742" z="-1.617619"/>
+ <normal x="0.252213" y="0.646707" z="-0.719832"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-2.395625" y="0.859890" z="0.374521"/>
+ <normal x="-0.644696" y="0.595285" z="0.479585"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-1.763489" y="1.663030" z="-0.404199"/>
+ <normal x="-0.343247" y="0.923717" z="0.170082"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-2.650385" y="0.218717" z="-1.281348"/>
+ <normal x="-0.749512" y="0.646694" z="0.141485"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.472579" y="1.663080" z="1.779412"/>
+ <normal x="-0.318924" y="0.923720" z="0.212199"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-1.463039" y="0.859940" z="1.937498"/>
+ <normal x="-0.737692" y="0.595287" z="0.318504"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.156395" y="0.218766" z="2.986061"/>
+ <normal x="-0.497283" y="0.646706" z="0.578343"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="1.763489" y="1.663055" z="-0.430354"/>
+ <normal x="0.343247" y="0.923717" z="0.170082"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="2.395625" y="0.859915" z="0.348366"/>
+ <normal x="0.644696" y="0.595285" z="0.479585"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="2.650386" y="0.218742" z="-1.307503"/>
+ <normal x="0.749512" y="0.646694" z="0.141485"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-1.268259" y="1.663030" z="-1.261963"/>
+ <normal x="-0.024293" y="0.923715" z="-0.382310"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.909936" y="0.859890" z="-2.198769"/>
+ <normal x="0.092993" y="0.595284" z="-0.798116"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-2.471340" y="0.218717" z="-1.591464"/>
+ <normal x="-0.252213" y="0.646707" z="-0.719832"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.464093" y="-4.509093" z="5.370379"/>
+ <normal x="-0.407309" y="-0.185404" z="0.894273"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.509395" y="-4.509093" z="5.370379"/>
+ <normal x="0.407309" y="-0.185404" z="0.894273"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="0.198628" y="-0.898527" z="3.634511"/>
+ <normal x="0.503300" y="0.197218" z="0.841305"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-0.153327" y="-0.898527" z="3.634511"/>
+ <normal x="-0.503300" y="0.197218" z="0.841305"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="4.869115" y="-4.509119" z="-2.233188"/>
+ <normal x="0.978120" y="-0.185406" z="-0.094366"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="4.382371" y="-4.509119" z="-3.076253"/>
+ <normal x="0.570803" y="-0.185405" z="-0.799881"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.034448" y="-0.898552" z="-1.939187"/>
+ <normal x="0.476929" y="0.197217" z="-0.856530"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="3.210426" y="-0.898552" z="-1.634385"/>
+ <normal x="0.980243" y="0.197214" z="0.015199"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-4.382371" y="-4.509144" z="-3.050097"/>
+ <normal x="-0.570803" y="-0.185405" z="-0.799881"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-4.869115" y="-4.509144" z="-2.207032"/>
+ <normal x="-0.978120" y="-0.185406" z="-0.094366"/>
+ <texcoord u="0.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.210426" y="-0.898577" z="-1.608230"/>
+ <normal x="-0.980243" y="0.197214" z="0.015199"/>
+ <texcoord u="1.000000" v="1.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-3.034449" y="-0.898577" z="-1.913032"/>
+ <normal x="-0.476929" y="0.197217" z="-0.856530"/>
+ <texcoord u="1.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position x="-1.205879" y="-3.777522" z="4.673820"/>
+ <normal x="-0.789880" y="0.056339" z="0.610668"/>
+ <texcoord u="0.000000" v="0.000000"/>
+ </vertex>
+ <vertex>
+ <position ...
[truncated message content] |
|
From: <ult...@us...> - 2007-04-08 00:50:09
|
Revision: 376
http://svn.sourceforge.net/opengate/?rev=376&view=rev
Author: ultrasick
Date: 2007-04-07 17:50:10 -0700 (Sat, 07 Apr 2007)
Log Message:
-----------
uploading the c-1 for backup purpose. Not finished jet. No textures, no light bubble at the engine jet.
Changes:
The model is 3 times as smooth than the one I mailed you screenshots of. It has 10% less faces and the bugs (holes) are fixed.
Looks perfectly smooth with 3000 faces (2x subsurf.).
Added Paths:
-----------
trunk/data/ships/conflux/c-1/
trunk/data/ships/conflux/c-1/c-1.blend
Added: trunk/data/ships/conflux/c-1/c-1.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/conflux/c-1/c-1.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-07 20:40:55
|
Revision: 375
http://svn.sourceforge.net/opengate/?rev=375&view=rev
Author: ultrasick
Date: 2007-04-07 13:40:55 -0700 (Sat, 07 Apr 2007)
Log Message:
-----------
added some more parts of the primrose model
+ made the gold model a little brighter by increasing the energy value of the ambient occlusion effect
Modified Paths:
--------------
trunk/data/commodities/gold.blend
Added Paths:
-----------
trunk/templates/data/ships/solrain/primrose/parts/51 + 52 + 53 + 54.pspimage
Modified: trunk/data/commodities/gold.blend
===================================================================
(Binary files differ)
Added: trunk/templates/data/ships/solrain/primrose/parts/51 + 52 + 53 + 54.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/primrose/parts/51 + 52 + 53 + 54.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-07 11:51:45
|
Revision: 374
http://svn.sourceforge.net/opengate/?rev=374&view=rev
Author: ultrasick
Date: 2007-04-07 04:51:43 -0700 (Sat, 07 Apr 2007)
Log Message:
-----------
uploading the Solrain FlashBack model. It's the Solrain Stout drink but renamed
Added Paths:
-----------
trunk/data/commodities/solrain_flashback.blend
trunk/templates/data/commodities/solrain_flashback/
trunk/templates/data/commodities/solrain_flashback/glass.png
trunk/templates/data/commodities/solrain_flashback/lable_-_bottom.pspimage
trunk/templates/data/commodities/solrain_flashback/lable_-_top.pspimage
Added: trunk/data/commodities/solrain_flashback.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/solrain_flashback.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/commodities/solrain_flashback/glass.png
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/commodities/solrain_flashback/glass.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/commodities/solrain_flashback/lable_-_bottom.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/commodities/solrain_flashback/lable_-_bottom.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/commodities/solrain_flashback/lable_-_top.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/commodities/solrain_flashback/lable_-_top.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-06 19:24:52
|
Revision: 373
http://svn.sourceforge.net/opengate/?rev=373&view=rev
Author: ultrasick
Date: 2007-04-06 12:24:52 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
uploading required dlls and exe file
Added Paths:
-----------
branches/ogsector/win32/ogsectorclient/OgreGUIRenderer.dll
branches/ogsector/win32/ogsectorclient/OgreMain.dll
branches/ogsector/win32/ogsectorclient/OgreOpcode.dll
branches/ogsector/win32/ogsectorclient/Opcode.dll
branches/ogsector/win32/ogsectorclient/Plugin_BSPSceneManager.dll
branches/ogsector/win32/ogsectorclient/Plugin_CgProgramManager.dll
branches/ogsector/win32/ogsectorclient/Plugin_OctreeSceneManager.dll
branches/ogsector/win32/ogsectorclient/Plugin_ParticleFX.dll
branches/ogsector/win32/ogsectorclient/RenderSystem_Direct3D9.dll
branches/ogsector/win32/ogsectorclient/RenderSystem_GL.dll
branches/ogsector/win32/ogsectorclient/cg.dll
branches/ogsector/win32/ogsectorclient/d3dx9_30.dll
branches/ogsector/win32/ogsectorclient/ogsectorclient.depend
branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
branches/ogsector/win32/ogsectorclient/ogsectorclient.layout
branches/ogsector/win32/ogsectorclient/ois.dll
Added: branches/ogsector/win32/ogsectorclient/OgreGUIRenderer.dll
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/win32/ogsectorclient/OgreGUIRenderer.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/win32/ogsectorclient/OgreMain.dll
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/win32/ogsectorclient/OgreMain.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/win32/ogsectorclient/OgreOpcode.dll
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/win32/ogsectorclient/OgreOpcode.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/win32/ogsectorclient/Opcode.dll
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/win32/ogsectorclient/Opcode.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/win32/ogsectorclient/Plugin_BSPSceneManager.dll
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/win32/ogsectorclient/Plugin_BSPSceneManager.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/win32/ogsectorclient/Plugin_CgProgramManager.dll
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/win32/ogsectorclient/Plugin_CgProgramManager.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/win32/ogsectorclient/Plugin_OctreeSceneManager.dll
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/win32/ogsectorclient/Plugin_OctreeSceneManager.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/win32/ogsectorclient/Plugin_ParticleFX.dll
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/win32/ogsectorclient/Plugin_ParticleFX.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/win32/ogsectorclient/RenderSystem_Direct3D9.dll
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/win32/ogsectorclient/RenderSystem_Direct3D9.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/win32/ogsectorclient/RenderSystem_GL.dll
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/win32/ogsectorclient/RenderSystem_GL.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/win32/ogsectorclient/cg.dll
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/win32/ogsectorclient/cg.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/win32/ogsectorclient/d3dx9_30.dll
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/win32/ogsectorclient/d3dx9_30.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/win32/ogsectorclient/ogsectorclient.depend
===================================================================
--- branches/ogsector/win32/ogsectorclient/ogsectorclient.depend (rev 0)
+++ branches/ogsector/win32/ogsectorclient/ogsectorclient.depend 2007-04-06 19:24:52 UTC (rev 373)
@@ -0,0 +1,1538 @@
+# depslib dependency file v1.0
+1175879798 source:c:\home\src\opengate\branches\ogsector\src\sector.cpp
+ "Sector.h"
+
+1175778098 c:\home\src\opengate\branches\ogsector\src\sector.h
+ <Ogre.h>
+ <OgreOpcode.h>
+ "SectorClientFrameListener.h"
+ "SectorObjects.h"
+
+1165510934 c:\ogresdk\include\ogre.h
+ "OgrePrerequisites.h"
+ "OgreAnimation.h"
+ "OgreAnimationState.h"
+ "OgreAnimationTrack.h"
+ "OgreAny.h"
+ "OgreArchive.h"
+ "OgreArchiveManager.h"
+ "OgreAxisAlignedBox.h"
+ "OgreBillboardChain.h"
+ "OgreBillboardSet.h"
+ "OgreBone.h"
+ "OgreCamera.h"
+ "OgreConfigFile.h"
+ "OgreControllerManager.h"
+ "OgreDataStream.h"
+ "OgreEntity.h"
+ "OgreException.h"
+ "OgreFrustum.h"
+ "OgreGpuProgram.h"
+ "OgreGpuProgramManager.h"
+ "OgreHardwareBufferManager.h"
+ "OgreHardwareIndexBuffer.h"
+ "OgreHardwarePixelBuffer.h"
+ "OgreHardwareOcclusionQuery.h"
+ "OgreHardwareVertexBuffer.h"
+ "OgreHardwarePixelBuffer.h"
+ "OgreHighLevelGpuProgram.h"
+ "OgreHighLevelGpuProgramManager.h"
+ "OgreKeyFrame.h"
+ "OgreLight.h"
+ "OgreLogManager.h"
+ "OgreManualObject.h"
+ "OgreMaterial.h"
+ "OgreMaterialManager.h"
+ "OgreMaterialSerializer.h"
+ "OgreMath.h"
+ "OgreMatrix3.h"
+ "OgreMatrix4.h"
+ "OgreMesh.h"
+ "OgreMeshManager.h"
+ "OgreMeshSerializer.h"
+ "OgreOverlay.h"
+ "OgreOverlayContainer.h"
+ "OgreOverlayElement.h"
+ "OgreOverlayManager.h"
+ "OgreParticleAffector.h"
+ "OgreParticleEmitter.h"
+ "OgreParticleSystemManager.h"
+ "OgrePass.h"
+ "OgrePatchMesh.h"
+ "OgrePatchSurface.h"
+ "OgreProfiler.h"
+ "OgreRadixSort.h"
+ "OgreRenderQueueInvocation.h"
+ "OgreRenderQueueListener.h"
+ "OgreRenderSystem.h"
+ "OgreRenderTargetListener.h"
+ "OgreRenderTexture.h"
+ "OgreRenderWindow.h"
+ "OgreResourceBackgroundQueue.h"
+ "OgreResourceGroupManager.h"
+ "OgreRibbonTrail.h"
+ "OgreRoot.h"
+ "OgreSceneManager.h"
+ "OgreSceneManagerEnumerator.h"
+ "OgreSceneNode.h"
+ "OgreSimpleRenderable.h"
+ "OgreSkeleton.h"
+ "OgreSkeletonInstance.h"
+ "OgreSkeletonManager.h"
+ "OgreSkeletonSerializer.h"
+ "OgreStaticGeometry.h"
+ "OgreString.h"
+ "OgreStringConverter.h"
+ "OgreStringVector.h"
+ "OgreSubEntity.h"
+ "OgreSubMesh.h"
+ "OgreTechnique.h"
+ "OgreTextureManager.h"
+ "OgreTextureUnitState.h"
+ "OgreUserDefinedObject.h"
+ "OgreVector2.h"
+ "OgreViewport.h"
+ "OgreCompositor.h"
+ "OgreCompositorManager.h"
+ "OgreCompositorChain.h"
+ "OgreCompositorInstance.h"
+ "OgreCompositionTechnique.h"
+ "OgreCompositionPass.h"
+ "OgreCompositionTargetPass.h"
+ "OgreWindowEventUtilities.h"
+ "OgreShadowCameraSetup.h"
+ "OgreShadowCameraSetupFocused.h"
+ "OgreShadowCameraSetupLiSPSM.h"
+ "OgreShadowCameraSetupPlaneOptimal.h"
+
+1172953494 c:\ogresdk\include\ogreprerequisites.h
+ "OgrePlatform.h"
+ "OgreMemoryManager.h"
+
+1172537114 c:\ogresdk\include\ogreplatform.h
+ "OgreConfig.h"
+ <_mingw.h>
+ "config.h"
+
+1172941426 c:\ogresdk\include\ogreconfig.h
+ "config.h"
+
+1156321112 c:\ogresdk\include\ogrememorymanager.h
+ "OgrePlatform.h"
+ "OgreStdHeaders.h"
+ "OgreMemoryMacros.h"
+
+1172524826 c:\ogresdk\include\ogrestdheaders.h
+ <cassert>
+ <cstdio>
+ <cstdlib>
+ <ctime>
+ <cstring>
+ <cstdarg>
+ <cmath>
+ <vector>
+ <map>
+ <string>
+ <set>
+ <list>
+ <deque>
+ <queue>
+ <bitset>
+ <ext/hash_map>
+ <ext/hash_set>
+ <hash_set>
+ <hash_map>
+ <algorithm>
+ <functional>
+ <limits>
+ <fstream>
+ <iostream>
+ <iomanip>
+ <sstream>
+ <sys/types.h>
+ <sys/stat.h>
+ <unistd.h>
+ <unistd.h>
+ <dlfcn.h>
+ <unistd.h>
+ <sys/param.h>
+ <CoreFoundation/CoreFoundation.h>
+ <boost/thread/recursive_mutex.hpp>
+
+1156321112 c:\ogresdk\include\ogrememorymacros.h
+
+1171960516 c:\ogresdk\include\ogreanimation.h
+ "OgrePrerequisites.h"
+ "OgreString.h"
+ "OgreIteratorWrappers.h"
+ "OgreAnimable.h"
+ "OgreAnimationTrack.h"
+
+1156321116 c:\ogresdk\include\ogrestring.h
+ "OgrePrerequisites.h"
+ <ext/hash_map>
+
+1158007782 c:\ogresdk\include\ogreiteratorwrappers.h
+ "OgrePrerequisites.h"
+
+1166587762 c:\ogresdk\include\ogreanimable.h
+ "OgrePrerequisites.h"
+ "OgreVector2.h"
+ "OgreVector3.h"
+ "OgreVector4.h"
+ "OgreQuaternion.h"
+ "OgreColourValue.h"
+ "OgreSharedPtr.h"
+ "OgreStringVector.h"
+ "OgreException.h"
+ "OgreAny.h"
+
+1166587762 c:\ogresdk\include\ogrevector2.h
+ "OgrePrerequisites.h"
+ "OgreMath.h"
+
+1168638894 c:\ogresdk\include\ogremath.h
+ "OgrePrerequisites.h"
+
+1171161004 c:\ogresdk\include\ogrevector3.h
+ "OgrePrerequisites.h"
+ "OgreMath.h"
+ "OgreQuaternion.h"
+
+1166587762 c:\ogresdk\include\ogrequaternion.h
+ "OgrePrerequisites.h"
+ "OgreMath.h"
+
+1166587764 c:\ogresdk\include\ogrevector4.h
+ "OgrePrerequisites.h"
+ "OgreVector3.h"
+
+1171161004 c:\ogresdk\include\ogrecolourvalue.h
+ "OgrePrerequisites.h"
+
+1168440044 c:\ogresdk\include\ogresharedptr.h
+ "OgrePrerequisites.h"
+
+1156321116 c:\ogresdk\include\ogrestringvector.h
+ "OgrePrerequisites.h"
+ "OgreString.h"
+ "OgreSharedPtr.h"
+
+1169876010 c:\ogresdk\include\ogreexception.h
+ "OgrePrerequisites.h"
+ "OgreString.h"
+ <exception>
+
+1156321112 c:\ogresdk\include\ogreany.h
+ "OgrePrerequisites.h"
+ "OgreException.h"
+ "OgreString.h"
+ <algorithm>
+ <typeinfo>
+
+1166587762 c:\ogresdk\include\ogreanimationtrack.h
+ "OgrePrerequisites.h"
+ "OgreSimpleSpline.h"
+ "OgreRotationalSpline.h"
+ "OgreKeyFrame.h"
+ "OgreAnimable.h"
+ "OgrePose.h"
+
+1156321116 c:\ogresdk\include\ogresimplespline.h
+ "OgrePrerequisites.h"
+ "OgreVector3.h"
+ "OgreMatrix4.h"
+
+1172506520 c:\ogresdk\include\ogrematrix4.h
+ "OgrePrerequisites.h"
+ "OgreVector3.h"
+ "OgreMatrix3.h"
+ "OgreVector4.h"
+ "OgrePlane.h"
+
+1156321112 c:\ogresdk\include\ogrematrix3.h
+ "OgrePrerequisites.h"
+ "OgreVector3.h"
+
+1171161004 c:\ogresdk\include\ogreplane.h
+ "OgrePrerequisites.h"
+ "OgreVector3.h"
+
+1156321116 c:\ogresdk\include\ogrerotationalspline.h
+ "OgrePrerequisites.h"
+ "OgreQuaternion.h"
+
+1158532582 c:\ogresdk\include\ogrekeyframe.h
+ "OgrePrerequisites.h"
+ "OgreVector3.h"
+ "OgreQuaternion.h"
+ "OgreAny.h"
+ "OgreHardwareVertexBuffer.h"
+ "OgreIteratorWrappers.h"
+
+1171161004 c:\ogresdk\include\ogrehardwarevertexbuffer.h
+ "OgrePrerequisites.h"
+ "OgreHardwareBuffer.h"
+ "OgreSharedPtr.h"
+ "OgreColourValue.h"
+
+1156321112 c:\ogresdk\include\ogrehardwarebuffer.h
+ "OgrePrerequisites.h"
+
+1173005240 c:\ogresdk\include\ogrepose.h
+ "OgrePrerequisites.h"
+ "OgreString.h"
+ "OgreHardwareVertexBuffer.h"
+ "OgreVector3.h"
+ "OgreIteratorWrappers.h"
+
+1171161002 c:\ogresdk\include\ogreanimationstate.h
+ "OgrePrerequisites.h"
+ "OgreString.h"
+ "OgreController.h"
+ "OgreIteratorWrappers.h"
+
+1156321112 c:\ogresdk\include\ogrecontroller.h
+ "OgrePrerequisites.h"
+ "OgreSharedPtr.h"
+
+1168440042 c:\ogresdk\include\ogrearchive.h
+ "OgrePrerequisites.h"
+ "OgreString.h"
+ "OgreDataStream.h"
+ "OgreSharedPtr.h"
+ "OgreStringVector.h"
+
+1156321112 c:\ogresdk\include\ogredatastream.h
+ "OgrePrerequisites.h"
+ "OgreString.h"
+ "OgreSharedPtr.h"
+ <istream>
+
+1156321112 c:\ogresdk\include\ogrearchivemanager.h
+ "OgrePrerequisites.h"
+ "OgreResourceManager.h"
+ "OgreSingleton.h"
+
+1172769892 c:\ogresdk\include\ogreresourcemanager.h
+ "OgrePrerequisites.h"
+ "OgreResource.h"
+ "OgreResourceGroupManager.h"
+ "OgreIteratorWrappers.h"
+ "OgreCommon.h"
+ "OgreDataStream.h"
+ "OgreStringVector.h"
+ "OgreScriptLoader.h"
+
+1172615020 c:\ogresdk\include\ogreresource.h
+ "OgrePrerequisites.h"
+ "OgreString.h"
+ "OgreSharedPtr.h"
+ "OgreStringInterface.h"
+
+1156321116 c:\ogresdk\include\ogrestringinterface.h
+ "OgrePrerequisites.h"
+ "OgreString.h"
+ "OgreCommon.h"
+
+1172524824 c:\ogresdk\include\ogrecommon.h
+ "OgreString.h"
+ <utility>
+ <vector>
+ <map>
+
+1168440044 c:\ogresdk\include\ogreresourcegroupmanager.h
+ "OgrePrerequisites.h"
+ "OgreSingleton.h"
+ "OgreCommon.h"
+ "OgreDataStream.h"
+ "OgreResource.h"
+ "OgreArchive.h"
+ "OgreIteratorWrappers.h"
+
+1156321116 c:\ogresdk\include\ogresingleton.h
+ "OgrePrerequisites.h"
+
+1156321116 c:\ogresdk\include\ogrescriptloader.h
+ "OgrePrerequisites.h"
+ "OgreDataStream.h"
+ "OgreStringVector.h"
+
+1172848582 c:\ogresdk\include\ogreaxisalignedbox.h
+ "OgrePrerequisites.h"
+ "OgreVector3.h"
+ "OgreMatrix4.h"
+
+1156321112 c:\ogresdk\include\ogrebillboardchain.h
+ "OgrePrerequisites.h"
+ "OgreMovableObject.h"
+ "OgreRenderable.h"
+
+1169876010 c:\ogresdk\include\ogremovableobject.h
+ "OgrePrerequisites.h"
+ "OgreRenderQueue.h"
+ "OgreAxisAlignedBox.h"
+ "OgreSphere.h"
+ "OgreShadowCaster.h"
+ "OgreFactoryObj.h"
+ "OgreAnimable.h"
+ "OgreAny.h"
+ "OgreUserDefinedObject.h"
+
+1156321114 c:\ogresdk\include\ogrerenderqueue.h
+ "OgrePrerequisites.h"
+ "OgreIteratorWrappers.h"
+
+1156321116 c:\ogresdk\include\ogresphere.h
+ "OgrePrerequisites.h"
+ "OgreVector3.h"
+
+1169876012 c:\ogresdk\include\ogreshadowcaster.h
+ "OgrePrerequisites.h"
+ "OgreRenderable.h"
+
+1172769892 c:\ogresdk\include\ogrerenderable.h
+ "OgrePrerequisites.h"
+ "OgreCommon.h"
+ "OgreRenderOperation.h"
+ "OgreMatrix4.h"
+ "OgreMaterial.h"
+ "OgrePlane.h"
+ "OgreGpuProgram.h"
+ "OgreVector4.h"
+ "OgreException.h"
+
+1156321114 c:\ogresdk\include\ogrerenderoperation.h
+ "OgrePrerequisites.h"
+ "OgreVertexIndexData.h"
+
+1171161004 c:\ogresdk\include\ogrevertexindexdata.h
+ "OgrePrerequisites.h"
+ "OgreHardwareVertexBuffer.h"
+ "OgreHardwareIndexBuffer.h"
+
+1156321112 c:\ogresdk\include\ogrehardwareindexbuffer.h
+ "OgrePrerequisites.h"
+ "OgreHardwareBuffer.h"
+ "OgreSharedPtr.h"
+
+1168797388 c:\ogresdk\include\ogrematerial.h
+ "OgrePrerequisites.h"
+ "OgreResource.h"
+ "OgreIteratorWrappers.h"
+ "OgreCommon.h"
+ "OgreColourValue.h"
+ "OgreBlendMode.h"
+
+1156321112 c:\ogresdk\include\ogreblendmode.h
+ "OgrePrerequisites.h"
+ "OgreColourValue.h"
+
+1172848582 c:\ogresdk\include\ogregpuprogram.h
+ "OgrePrerequisites.h"
+ "OgreResource.h"
+ "OgreSharedPtr.h"
+ "OgreIteratorWrappers.h"
+
+1156321112 c:\ogresdk\include\ogrefactoryobj.h
+ "OgrePrerequisites.h"
+
+1156321116 c:\ogresdk\include\ogreuserdefinedobject.h
+ "OgrePrerequisites.h"
+
+1166587762 c:\ogresdk\include\ogrebillboardset.h
+ "OgrePrerequisites.h"
+ "OgreMovableObject.h"
+ "OgreRenderable.h"
+ "OgreRadixSort.h"
+ "OgreCommon.h"
+
+1156321114 c:\ogresdk\include\ogreradixsort.h
+ "OgrePrerequisites.h"
+
+1156321112 c:\ogresdk\include\ogrebone.h
+ "OgrePrerequisites.h"
+ "OgreNode.h"
+
+1166587762 c:\ogresdk\include\ogrenode.h
+ "OgrePrerequisites.h"
+ "OgreMatrix3.h"
+ "OgreMatrix4.h"
+ "OgreQuaternion.h"
+ "OgreString.h"
+ "OgreRenderable.h"
+ "OgreIteratorWrappers.h"
+
+1172506520 c:\ogresdk\include\ogrecamera.h
+ "OgrePrerequisites.h"
+ "OgreString.h"
+ "OgreMovableObject.h"
+ "OgreMatrix4.h"
+ "OgreVector3.h"
+ "OgrePlane.h"
+ "OgreQuaternion.h"
+ "OgreCommon.h"
+ "OgreFrustum.h"
+ "OgreRay.h"
+
+1165678642 c:\ogresdk\include\ogrefrustum.h
+ "OgrePrerequisites.h"
+ "OgreMovableObject.h"
+ "OgreRenderable.h"
+ "OgreAxisAlignedBox.h"
+ "OgreVertexIndexData.h"
+ "OgreMovablePlane.h"
+
+1166587762 c:\ogresdk\include\ogremovableplane.h
+ "OgrePrerequisites.h"
+ "OgrePlane.h"
+ "OgreMovableObject.h"
+
+1156321114 c:\ogresdk\include\ogreray.h
+ "OgrePrerequisites.h"
+ "OgreVector3.h"
+ "OgrePlaneBoundedVolume.h"
+
+1171161004 c:\ogresdk\include\ogreplaneboundedvolume.h
+ "OgrePrerequisites.h"
+ "OgreAxisAlignedBox.h"
+ "OgreSphere.h"
+ "OgreMath.h"
+ "OgrePlane.h"
+
+1156321112 c:\ogresdk\include\ogreconfigfile.h
+ "OgrePrerequisites.h"
+ "OgreString.h"
+ "OgreStringVector.h"
+ "OgreIteratorWrappers.h"
+ "OgreDataStream.h"
+
+1156321112 c:\ogresdk\include\ogrecontrollermanager.h
+ "OgrePrerequisites.h"
+ "OgreCommon.h"
+ "OgreSingleton.h"
+ "OgreController.h"
+ "OgrePredefinedControllers.h"
+ "OgreTextureUnitState.h"
+ "OgreSharedPtr.h"
+
+1156321114 c:\ogresdk\include\ogrepredefinedcontrollers.h
+ "OgrePrerequisites.h"
+ "OgreCommon.h"
+ "OgreController.h"
+ "OgreFrameListener.h"
+ "OgreGpuProgram.h"
+
+1156321112 c:\ogresdk\include\ogreframelistener.h
+ "OgrePrerequisites.h"
+
+1171960516 c:\ogresdk\include\ogretextureunitstate.h
+ "OgrePrerequisites.h"
+ "OgreCommon.h"
+ "OgreBlendMode.h"
+ "OgreMatrix4.h"
+ "OgreIteratorWrappers.h"
+ "OgreString.h"
+ "OgreTexture.h"
+
+1166587762 c:\ogresdk\include\ogretexture.h
+ "OgrePrerequisites.h"
+ "OgreHardwareBuffer.h"
+ "OgreResource.h"
+ "OgreImage.h"
+
+1157064472 c:\ogresdk\include\ogreimage.h
+ "OgrePrerequisites.h"
+ "OgreCommon.h"
+ "OgrePixelFormat.h"
+ "OgreDataStream.h"
+
+1171960516 c:\ogresdk\include\ogrepixelformat.h
+ "OgrePrerequisites.h"
+ "OgreCommon.h"
+
+1172687706 c:\ogresdk\include\ogreentity.h
+ "OgrePrerequisites.h"
+ "OgreCommon.h"
+ "OgreString.h"
+ "OgreMovableObject.h"
+ "OgreQuaternion.h"
+ "OgreVector3.h"
+ "OgreHardwareBufferManager.h"
+ "OgreMesh.h"
+
+1159139400 c:\ogresdk\include\ogrehardwarebuffermanager.h
+ "OgrePrerequisites.h"
+ "OgreSingleton.h"
+ "OgreHardwareVertexBuffer.h"
+ "OgreHardwareIndexBuffer.h"
+
+1159031360 c:\ogresdk\include\ogremesh.h
+ "OgrePrerequisites.h"
+ "OgreResource.h"
+ "OgreVertexIndexData.h"
+ "OgreAxisAlignedBox.h"
+ "OgreVertexBoneAssignment.h"
+ "OgreIteratorWrappers.h"
+ "OgreProgressiveMesh.h"
+ "OgreHardwareVertexBuffer.h"
+ "OgreSkeleton.h"
+ "OgreAnimationTrack.h"
+ "OgrePose.h"
+
+1156321116 c:\ogresdk\include\ogrevertexboneassignment.h
+ "OgrePrerequisites.h"
+
+1156321114 c:\ogresdk\include\ogreprogressivemesh.h
+ "OgrePrerequisites.h"
+ "OgreVector3.h"
+ "OgreHardwareVertexBuffer.h"
+ "OgreHardwareIndexBuffer.h"
+ "OgreRenderOperation.h"
+
+1163781926 c:\ogresdk\include\ogreskeleton.h
+ "OgrePrerequisites.h"
+ "OgreResource.h"
+ "OgreQuaternion.h"
+ "OgreVector3.h"
+ "OgreIteratorWrappers.h"
+ "OgreStringVector.h"
+
+1160325242 c:\ogresdk\include\ogregpuprogrammanager.h
+ "OgrePrerequisites.h"
+ "OgreResourceManager.h"
+ "OgreException.h"
+ "OgreGpuProgram.h"
+ "OgreSingleton.h"
+
+1156321112 c:\ogresdk\include\ogrehardwarepixelbuffer.h
+ "OgrePrerequisites.h"
+ "OgreHardwareBuffer.h"
+ "OgreSharedPtr.h"
+ "OgrePixelFormat.h"
+ "OgreImage.h"
+
+1164560838 c:\ogresdk\include\ogrehardwareocclusionquery.h
+ "OgrePrerequisites.h"
+
+1168638894 c:\ogresdk\include\ogrehighlevelgpuprogram.h
+ "OgrePrerequisites.h"
+ "OgreGpuProgram.h"
+
+1168440042 c:\ogresdk\include\ogrehighlevelgpuprogrammanager.h
+ "OgrePrerequisites.h"
+ "OgreResourceManager.h"
+ "OgreSingleton.h"
+ "OgreException.h"
+ "OgreHighLevelGpuProgram.h"
+
+1165529990 c:\ogresdk\include\ogrelight.h
+ "OgrePrerequisites.h"
+ "OgreColourValue.h"
+ "OgreVector3.h"
+ "OgreVector4.h"
+ "OgreString.h"
+ "OgreMovableObject.h"
+ "OgrePlaneBoundedVolume.h"
+ "OgreShadowCameraSetup.h"
+
+1165529990 c:\ogresdk\include\ogreshadowcamerasetup.h
+ "OgrePrerequisites.h"
+ "OgreMovablePlane.h"
+ "OgreSharedPtr.h"
+
+1163446424 c:\ogresdk\include\ogrelogmanager.h
+ "OgrePrerequisites.h"
+ "OgreLog.h"
+ "OgreSingleton.h"
+ "OgreString.h"
+
+1163446424 c:\ogresdk\include\ogrelog.h
+ "OgrePrerequisites.h"
+
+1171960516 c:\ogresdk\include\ogremanualobject.h
+ "OgrePrerequisites.h"
+ "OgreMovableObject.h"
+ "OgreRenderable.h"
+ "OgreResourceGroupManager.h"
+
+1161122428 c:\ogresdk\include\ogrematerialmanager.h
+ "OgrePrerequisites.h"
+ "OgreSingleton.h"
+ "OgreResourceManager.h"
+ "OgreMaterial.h"
+ "OgreStringVector.h"
+ "OgreMaterialSerializer.h"
+ "OgreNoMemoryMacros.h"
+ <boost/thread/tss.hpp>
+ "OgreMemoryMacros.h"
+
+1168638894 c:\ogresdk\include\ogrematerialserializer.h
+ "OgrePrerequisites.h"
+ "OgreMaterial.h"
+ "OgreBlendMode.h"
+ "OgreTextureUnitState.h"
+ "OgreGpuProgram.h"
+ "OgreStringVector.h"
+
+1156321112 c:\ogresdk\include\ogrenomemorymacros.h
+
+1168440042 c:\ogresdk\include\ogremeshmanager.h
+ "OgrePrerequisites.h"
+ "OgreResourceManager.h"
+ "OgreSingleton.h"
+ "OgreVector3.h"
+ "OgreHardwareBuffer.h"
+ "OgreMesh.h"
+ "OgrePatchMesh.h"
+
+1159139400 c:\ogresdk\include\ogrepatchmesh.h
+ "OgrePrerequisites.h"
+ "OgreMesh.h"
+ "OgrePatchSurface.h"
+
+1156321114 c:\ogresdk\include\ogrepatchsurface.h
+ "OgrePrerequisites.h"
+ "OgreVector3.h"
+ "OgreString.h"
+ "OgreRenderOperation.h"
+ "OgreAxisAlignedBox.h"
+
+1156321112 c:\ogresdk\include\ogremeshserializer.h
+ "OgrePrerequisites.h"
+ "OgreMeshSerializerImpl.h"
+ "OgreSerializer.h"
+
+1168440044 c:\ogresdk\include\ogremeshserializerimpl.h
+ "OgrePrerequisites.h"
+ "OgreString.h"
+ "OgreSerializer.h"
+ "OgreMaterial.h"
+ "OgreMesh.h"
+ "OgreEdgeListBuilder.h"
+
+1166587762 c:\ogresdk\include\ogreserializer.h
+ "OgrePrerequisites.h"
+ "OgreString.h"
+ "OgreDataStream.h"
+
+1156321112 c:\ogresdk\include\ogreedgelistbuilder.h
+ "OgrePrerequisites.h"
+ "OgreVector4.h"
+ "OgreHardwareVertexBuffer.h"
+ "OgreRenderOperation.h"
+ "OgreAlignedAllocator.h"
+
+1158965048 c:\ogresdk\include\ogrealignedallocator.h
+ "OgrePrerequisites.h"
+
+1156321112 c:\ogresdk\include\ogreoverlay.h
+ "OgrePrerequisites.h"
+ "OgreSceneNode.h"
+ "OgreIteratorWrappers.h"
+ "OgreMatrix4.h"
+
+1166893324 c:\ogresdk\include\ogrescenenode.h
+ "OgrePrerequisites.h"
+ "OgreNode.h"
+ "OgreIteratorWrappers.h"
+ "OgreAxisAlignedBox.h"
+
+1156321112 c:\ogresdk\include\ogreoverlaycontainer.h
+ "OgrePrerequisites.h"
+ "OgreOverlayElement.h"
+ "OgreIteratorWrappers.h"
+
+1172506520 c:\ogresdk\include\ogreoverlayelement.h
+ "OgrePrerequisites.h"
+ "OgreString.h"
+ "OgreRenderable.h"
+ "OgreUTFString.h"
+ "OgreStringInterface.h"
+ "OgreOverlayElementCommands.h"
+ "OgreColourValue.h"
+ "OgreRectangle.h"
+
+1172506520 c:\ogresdk\include\ogreutfstring.h
+ "OgrePrerequisites.h"
+ <iterator>
+ <string>
+ <stdexcept>
+
+1156321112 c:\ogresdk\include\ogreoverlayelementcommands.h
+ "OgrePrerequisites.h"
+ "OgreStringInterface.h"
+
+1164560840 c:\ogresdk\include\ogrerectangle.h
+ "OgrePrerequisites.h"
+
+1156321114 c:\ogresdk\include\ogreoverlaymanager.h
+ "OgrePrerequisites.h"
+ "OgreSingleton.h"
+ "OgreStringVector.h"
+ "OgreOverlay.h"
+ "OgreScriptLoader.h"
+
+1156321114 c:\ogresdk\include\ogreparticleaffector.h
+ "OgrePrerequisites.h"
+ "OgreString.h"
+ "OgreStringInterface.h"
+
+1160867994 c:\ogresdk\include\ogreparticleemitter.h
+ "OgrePrerequisites.h"
+ "OgreString.h"
+ "OgreVector3.h"
+ "OgreColourValue.h"
+ "OgreStringInterface.h"
+ "OgreParticleEmitterCommands.h"
+ "OgreParticle.h"
+
+1159468430 c:\ogresdk\include\ogreparticleemittercommands.h
+ "OgrePrerequisites.h"
+ "OgreStringInterface.h"
+
+1160867994 c:\ogresdk\include\ogreparticle.h
+ "OgrePrerequisites.h"
+ "OgreBillboard.h"
+
+1156321112 c:\ogresdk\include\ogrebillboard.h
+ "OgrePrerequisites.h"
+ "OgreVector3.h"
+ "OgreColourValue.h"
+ "OgreCommon.h"
+
+1168440044 c:\ogresdk\include\ogreparticlesystemmanager.h
+ "OgrePrerequisites.h"
+ "OgreParticleSystem.h"
+ "OgreFrameListener.h"
+ "OgreSingleton.h"
+ "OgreIteratorWrappers.h"
+ "OgreScriptLoader.h"
+ "OgreResourceGroupManager.h"
+
+1159468430 c:\ogresdk\include\ogreparticlesystem.h
+ "OgrePrerequisites.h"
+ "OgreVector3.h"
+ "OgreString.h"
+ "OgreParticleIterator.h"
+ "OgreStringInterface.h"
+ "OgreMovableObject.h"
+ "OgreRadixSort.h"
+ "OgreController.h"
+
+1156321114 c:\ogresdk\include\ogreparticleiterator.h
+ "OgrePrerequisites.h"
+
+1171960516 c:\ogresdk\include\ogrepass.h
+ "OgrePrerequisites.h"
+ "OgreGpuProgram.h"
+ "OgreColourValue.h"
+ "OgreBlendMode.h"
+ "OgreCommon.h"
+ "OgreLight.h"
+ "OgreTextureUnitState.h"
+
+1156321114 c:\ogresdk\include\ogreprofiler.h
+ "OgrePrerequisites.h"
+ "OgreSingleton.h"
+ "OgreString.h"
+ "OgreOverlay.h"
+
+1173005240 c:\ogresdk\include\ogrerenderqueueinvocation.h
+ "OgrePrerequisites.h"
+ "OgreRenderQueueSortingGrouping.h"
+ "OgreIteratorWrappers.h"
+
+1156321114 c:\ogresdk\include\ogrerenderqueuesortinggrouping.h
+ "OgrePrerequisites.h"
+ "OgreIteratorWrappers.h"
+ "OgreMaterial.h"
+ "OgreTechnique.h"
+ "OgrePass.h"
+ "OgreRadixSort.h"
+
+1168797388 c:\ogresdk\include\ogretechnique.h
+ "OgrePrerequisites.h"
+ "OgreIteratorWrappers.h"
+ "OgreBlendMode.h"
+ "OgreCommon.h"
+ "OgrePass.h"
+
+1156321114 c:\ogresdk\include\ogrerenderqueuelistener.h
+ "OgrePrerequisites.h"
+ "OgreRenderQueue.h"
+
+1172615020 c:\ogresdk\include\ogrerendersystem.h
+ "OgrePrerequisites.h"
+ "OgreString.h"
+ "OgreTextureUnitState.h"
+ "OgreCommon.h"
+ "OgreRenderOperation.h"
+ "OgreRenderSystemCapabilities.h"
+ "OgreRenderTarget.h"
+ "OgreRenderTexture.h"
+ "OgreFrameListener.h"
+ "OgreConfigOptionMap.h"
+ "OgreGpuProgram.h"
+ "OgrePlane.h"
+ "OgreIteratorWrappers.h"
+
+1163353544 c:\ogresdk\include\ogrerendersystemcapabilities.h
+ "OgrePrerequisites.h"
+ "OgreString.h"
+
+1172506520 c:\ogresdk\include\ogrerendertarget.h
+ "OgrePrerequisites.h"
+ "OgreString.h"
+ "OgreTextureManager.h"
+ "OgreViewport.h"
+ "OgreTimer.h"
+
+1171960516 c:\ogresdk\include\ogretexturemanager.h
+ "OgrePrerequisites.h"
+ "OgreResourceManager.h"
+ "OgreTexture.h"
+ "OgreSingleton.h"
+
+1172506520 c:\ogresdk\include\ogreviewport.h
+ "OgrePrerequisites.h"
+ "OgreCommon.h"
+ "OgreColourValue.h"
+
+1164282732 c:\ogresdk\include\ogretimer.h
+ "OgrePrerequisites.h"
+ "OgrePlatform.h"
+ "WIN32/OgreTimerImp.h"
+ "GLX/OgreTimerImp.h"
+ "OSX/OgreTimerImp.h"
+
+1160336896 c:\ogresdk\include\win32\ogretimerimp.h
+ "windows.h"
+
+1156321114 c:\ogresdk\include\ogrerendertexture.h
+ "OgrePrerequisites.h"
+ "OgreRenderTarget.h"
+
+1156321112 c:\ogresdk\include\ogreconfigoptionmap.h
+ "OgrePrerequisites.h"
+ "OgreStringVector.h"
+ "OgreString.h"
+
+1156321114 c:\ogresdk\include\ogrerendertargetlistener.h
+ "OgrePrerequisites.h"
+
+1155988494 c:\ogresdk\include\ogrerenderwindow.h
+ "OgrePrerequisites.h"
+ "OgreRenderTarget.h"
+
+1172615020 c:\ogresdk\include\ogreresourcebackgroundqueue.h
+ "OgrePrerequisites.h"
+ "OgreCommon.h"
+ "OgreSingleton.h"
+ "OgreResource.h"
+ <boost/thread/thread.hpp>
+ <boost/thread/condition.hpp>
+
+1160238392 c:\ogresdk\include\ogreribbontrail.h
+ "OgrePrerequisites.h"
+ "OgreBillboardChain.h"
+ "OgreNode.h"
+ "OgreIteratorWrappers.h"
+ "OgreFrameListener.h"
+ "OgreControllerManager.h"
+
+1169876012 c:\ogresdk\include\ogreroot.h
+ "OgrePrerequisites.h"
+ "OgreSingleton.h"
+ "OgreString.h"
+ "OgreSceneManagerEnumerator.h"
+ "OgreResourceGroupManager.h"
+ <exception>
+
+1156321116 c:\ogresdk\include\ogrescenemanagerenumerator.h
+ "OgrePrerequisites.h"
+ "OgreSceneManager.h"
+ "OgreSingleton.h"
+ "OgreIteratorWrappers.h"
+
+1172953494 c:\ogresdk\include\ogrescenemanager.h
+ "OgrePrerequisites.h"
+ "OgreString.h"
+ "OgreSceneNode.h"
+ "OgrePlane.h"
+ "OgreQuaternion.h"
+ "OgreColourValue.h"
+ "OgreCommon.h"
+ "OgreSceneQuery.h"
+ "OgreAutoParamDataSource.h"
+ "OgreAnimationState.h"
+ "OgreRenderQueue.h"
+ "OgreRenderQueueSortingGrouping.h"
+ "OgreRectangle2D.h"
+ "OgrePixelFormat.h"
+ "OgreResourceGroupManager.h"
+ "OgreTexture.h"
+ "OgreShadowCameraSetup.h"
+ "OgreShadowTextureManager.h"
+ "OgreCamera.h"
+ "OgreInstancedGeometry.h"
+
+1156321116 c:\ogresdk\include\ogrescenequery.h
+ "OgrePrerequisites.h"
+ "OgreAxisAlignedBox.h"
+ "OgreSphere.h"
+ "OgreRay.h"
+ "OgreRenderOperation.h"
+ "OgrePlaneBoundedVolume.h"
+
+1171161004 c:\ogresdk\include\ogreautoparamdatasource.h
+ "OgrePrerequisites.h"
+ "OgreCommon.h"
+ "OgreMatrix4.h"
+ "OgreVector4.h"
+ "OgreLight.h"
+ "OgreColourValue.h"
+
+1156321114 c:\ogresdk\include\ogrerectangle2d.h
+ "OgrePrerequisites.h"
+ "OgreSimpleRenderable.h"
+
+1156321116 c:\ogresdk\include\ogresimplerenderable.h
+ "OgrePrerequisites.h"
+ "OgreMovableObject.h"
+ "OgreRenderable.h"
+ "OgreAxisAlignedBox.h"
+ "OgreMaterial.h"
+
+1169349958 c:\ogresdk\include\ogreshadowtexturemanager.h
+ "OgrePrerequisites.h"
+ "OgreSingleton.h"
+ "OgrePixelFormat.h"
+ "OgreTexture.h"
+ "OgreIteratorWrappers.h"
+
+1170376278 c:\ogresdk\include\ogreinstancedgeometry.h
+ "OgrePrerequisites.h"
+ "OgreMovableObject.h"
+ "OgreSimpleRenderable.h"
+ "OgreSkeleton.h"
+ "OgreSkeletonInstance.h"
+ "OgreAnimationTrack.h"
+ "OgreBone.h"
+
+1168440044 c:\ogresdk\include\ogreskeletoninstance.h
+ "OgrePrerequisites.h"
+ "OgreSkeleton.h"
+
+1156321116 c:\ogresdk\include\ogreskeletonmanager.h
+ "OgrePrerequisites.h"
+ "OgreResourceManager.h"
+ "OgreSingleton.h"
+
+1156321116 c:\ogresdk\include\ogreskeletonserializer.h
+ "OgrePrerequisites.h"
+ "OgreSkeleton.h"
+ "OgreSerializer.h"
+
+1171960516 c:\ogresdk\include\ogrestaticgeometry.h
+ "OgrePrerequisites.h"
+ "OgreMovableObject.h"
+ "OgreRenderable.h"
+
+1168440044 c:\ogresdk\include\ogrestringconverter.h
+ "OgrePrerequisites.h"
+ "OgreMath.h"
+ "OgreString.h"
+ "OgreStringVector.h"
+
+1168440044 c:\ogresdk\include\ogresubentity.h
+ "OgrePrerequisites.h"
+ "OgreString.h"
+ "OgreRenderable.h"
+ "OgreHardwareBufferManager.h"
+
+1168440044 c:\ogresdk\include\ogresubmesh.h
+ "OgrePrerequisites.h"
+ "OgreVertexIndexData.h"
+ "OgreMaterial.h"
+ "OgreRenderOperation.h"
+ "OgreVertexBoneAssignment.h"
+ "OgreProgressiveMesh.h"
+ "OgreAnimationTrack.h"
+
+1159139400 c:\ogresdk\include\ogrecompositor.h
+ "OgrePrerequisites.h"
+ "OgreIteratorWrappers.h"
+ "OgreResource.h"
+
+1161122428 c:\ogresdk\include\ogrecompositormanager.h
+ "OgrePrerequisites.h"
+ "OgreResourceManager.h"
+ "OgreCompositor.h"
+ "OgreRectangle2D.h"
+ "OgreCompositorSerializer.h"
+ "OgreNoMemoryMacros.h"
+ <boost/thread/tss.hpp>
+ "OgreMemoryMacros.h"
+
+1156321112 c:\ogresdk\include\ogrecompositorserializer.h
+ "OgrePrerequisites.h"
+ "OgreDataStream.h"
+
+1165678642 c:\ogresdk\include\ogrecompositorchain.h
+ "OgrePrerequisites.h"
+ "OgreRenderTargetListener.h"
+ "OgreRenderQueueListener.h"
+ "OgreCompositorInstance.h"
+ "OgreCompositor.h"
+
+1157386276 c:\ogresdk\include\ogrecompositorinstance.h
+ "OgrePrerequisites.h"
+ "OgreMaterial.h"
+ "OgreTexture.h"
+ "OgreRenderQueue.h"
+
+1156321112 c:\ogresdk\include\ogrecompositiontechnique.h
+ "OgrePrerequisites.h"
+ "OgrePixelFormat.h"
+ "OgreIteratorWrappers.h"
+
+1156321112 c:\ogresdk\include\ogrecompositionpass.h
+ "OgrePrerequisites.h"
+ "OgreMaterial.h"
+ "OgreRenderSystem.h"
+ "OgreRenderQueue.h"
+
+1156321112 c:\ogresdk\include\ogrecompositiontargetpass.h
+ "OgrePrerequisites.h"
+ "OgreIteratorWrappers.h"
+
+1156321116 c:\ogresdk\include\ogrewindoweventutilities.h
+ "OgrePrerequisites.h"
+ "OgrePlatform.h"
+ <windows.h>
+
+1166161408 c:\ogresdk\include\ogreshadowcamerasetupfocused.h
+ "OgrePrerequisites.h"
+ "OgreShadowCameraSetup.h"
+ "OgrePolygon.h"
+ "OgreConvexBody.h"
+
+1165247958 c:\ogresdk\include\ogrepolygon.h
+ "OgrePrerequisites.h"
+ "OgreVector3.h"
+
+1168440042 c:\ogresdk\include\ogreconvexbody.h
+ "OgrePrerequisites.h"
+ "OgrePolygon.h"
+
+1166161408 c:\ogresdk\include\ogreshadowcamerasetuplispsm.h
+ "OgrePrerequisites.h"
+ "OgreShadowCameraSetupFocused.h"
+
+1166222272 c:\ogresdk\include\ogreshadowcamerasetupplaneoptimal.h
+ "OgrePrerequisites.h"
+ "OgreShadowCameraSetup.h"
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\include\ogreopcode.h
+ "OgreOpcodeExports.h"
+ "OgreCollisionManager.h"
+ "OgreCollisionContext.h"
+ "OgreCollisionObject.h"
+ "OgreCollisionTypes.h"
+ "OgreMeshCollisionShape.h"
+ "OgreEntityCollisionShape.h"
+ "OgrePtrCollisionShape.h"
+ "OgreBoxCollisionShape.h"
+ "OgreSphereMeshCollisionShape.h"
+ "OgreTerrainCollisionShape.h"
+ "OgreCollisionReporter.h"
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\include\ogreopcodeexports.h
+ "Ogre.h"
+ "OgrePrerequisites.h"
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\include\ogrecollisionmanager.h
+ "OgreOpcodeExports.h"
+ <Ogre.h>
+ "OgreCollisionTypes.h"
+ "OgreNodes.h"
+ "OgreCollisionContext.h"
+ "Opcode.h"
+ "IOgreCollisionShape.h"
+ <list>
+ <map>
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\include\ogrecollisiontypes.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\include\ogrenodes.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\include\ogrecollisioncontext.h
+ <Ogre.h>
+ "OgreNodes.h"
+ "OgreCollisionReporter.h"
+ "OgreCollisionTypes.h"
+ "OgreOpcodeDebugObject.h"
+ <Opcode.h>
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\include\ogrecollisionreporter.h
+ <Ogre.h>
+ "OgreOpcodeExports.h"
+ <set>
+ <map>
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\include\ogreopcodedebugobject.h
+ "OgreOpcodeExports.h"
+ "Ogre.h"
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opcode.h
+ "OPC_IceHook.h"
+ "OPC_Settings.h"
+ "OPC_Common.h"
+ "OPC_MeshInterface.h"
+ "OPC_TreeBuilders.h"
+ "OPC_AABBTree.h"
+ "OPC_OptimizedTree.h"
+ "OPC_BaseModel.h"
+ "OPC_Model.h"
+ "OPC_HybridModel.h"
+ "OPC_Collider.h"
+ "OPC_VolumeCollider.h"
+ "OPC_TreeCollider.h"
+ "OPC_RayCollider.h"
+ "OPC_SphereCollider.h"
+ "OPC_OBBCollider.h"
+ "OPC_AABBCollider.h"
+ "OPC_LSSCollider.h"
+ "OPC_PlanesCollider.h"
+ "OPC_Picking.h"
+ "OPC_BoxPruning.h"
+ "OPC_SweepAndPrune.h"
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opc_icehook.h
+ <stdio.h>
+ <stdlib.h>
+ <assert.h>
+ <string.h>
+ <float.h>
+ <math.h>
+ "Ice/IcePreprocessor.h"
+ "Ice/IceTypes.h"
+ "Ice/IceFPU.h"
+ "Ice/IceMemoryMacros.h"
+ "Ice/IceUtils.h"
+ "Ice/IceContainer.h"
+ "Ice/IcePairs.h"
+ "Ice/IceRevisitedRadix.h"
+ "Ice/IceRandom.h"
+ "Ice/IceAxes.h"
+ "Ice/IcePoint.h"
+ "Ice/IceHPoint.h"
+ "Ice/IceMatrix3x3.h"
+ "Ice/IceMatrix4x4.h"
+ "Ice/IcePlane.h"
+ "Ice/IceRay.h"
+ "Ice/IceIndexedTriangle.h"
+ "Ice/IceTriangle.h"
+ "Ice/IceTriList.h"
+ "Ice/IceAABB.h"
+ "Ice/IceOBB.h"
+ "Ice/IceBoundingSphere.h"
+ "Ice/IceSegment.h"
+ "Ice/IceLSS.h"
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\icepreprocessor.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\icetypes.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\icefpu.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\icememorymacros.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\iceutils.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\icecontainer.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\icepairs.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\icerevisitedradix.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\icerandom.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\iceaxes.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\icepoint.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\icehpoint.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\icematrix3x3.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\icematrix4x4.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\iceplane.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\iceray.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\iceindexedtriangle.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\icetriangle.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\icetrilist.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\iceaabb.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\iceobb.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\iceboundingsphere.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\icesegment.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\ice\icelss.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opc_settings.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opc_common.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opc_meshinterface.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opc_treebuilders.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opc_aabbtree.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opc_optimizedtree.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opc_basemodel.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opc_model.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opc_hybridmodel.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opc_collider.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opc_volumecollider.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opc_treecollider.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opc_raycollider.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opc_spherecollider.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opc_obbcollider.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opc_aabbcollider.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opc_lsscollider.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opc_planescollider.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opc_picking.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opc_boxpruning.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\opcode132\opc_sweepandprune.h
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\include\iogrecollisionshape.h
+ "OgreOpcodeExports.h"
+ <Ogre.h>
+ "OgreCollisionTypes.h"
+ "OgreOpcodeDebugObject.h"
+ "Opcode.h"
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\include\ogrecollisionobject.h
+ <Ogre.h>
+ "OgreNodes.h"
+ "OgreCollisionManager.h"
+ "OgreCollisionContext.h"
+ "OgreOpcodeMath.h"
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\include\ogreopcodemath.h
+ <Ogre.h>
+ "OgreOpcodeExports.h"
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\include\ogremeshcollisionshape.h
+ "OgreOpcodeExports.h"
+ <Ogre.h>
+ "IOgreCollisionShape.h"
+ "OgreCollisionTypes.h"
+ "OgreOpcodeDebugObject.h"
+ "Opcode.h"
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\include\ogreentitycollisionshape.h
+ "OgreOpcodeExports.h"
+ <Ogre.h>
+ "IOgreCollisionShape.h"
+ "OgreCollisionTypes.h"
+ "OgreOpcodeDebugObject.h"
+ "Opcode.h"
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\include\ogreptrcollisionshape.h
+ "OgreOpcodeExports.h"
+ <Ogre.h>
+ "IOgreCollisionShape.h"
+ "OgreCollisionTypes.h"
+ "OgreOpcodeDebugObject.h"
+ "Opcode.h"
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\include\ogreboxcollisionshape.h
+ "OgreOpcodeExports.h"
+ <Ogre.h>
+ "IOgreCollisionShape.h"
+ "OgreCollisionTypes.h"
+ "OgreOpcodeDebugObject.h"
+ "Opcode.h"
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\include\ogrespheremeshcollisionshape.h
+ "OgreOpcodeExports.h"
+ <Ogre.h>
+ "IOgreCollisionShape.h"
+ "OgreCollisionTypes.h"
+ "OgreOpcodeDebugObject.h"
+ "Opcode.h"
+
+1174165722 c:\home\src\opengate\branches\ogsector\externals\ogreopcode\include\ogreterraincollisionshape.h
+ "OgreOpcodeExports.h"
+ <Ogre.h>
+ "IOgreCollisionShape.h"
+ "OgreCollisionTypes.h"
+ "OgreOpcodeDebugObject.h"
+ "Opcode.h"
+
+1175879502 c:\home\src\opengate\branches\ogsector\src\sectorclientframelistener.h
+ <Ogre.h>
+ "InputManager.h"
+ "networkClient.h"
+ "SectorObjects.h"
+
+1175876378 c:\home\src\opengate\branches\ogsector\src\inputmanager.h
+ <OIS/OISEvents.h>
+ <OIS/OISInputManager.h>
+ <OIS/OISMouse.h>
+ <OIS/OISKeyboard.h>
+ <OIS/OISJoyStick.h>
+ "windows.h"
+
+1171217122 c:\ogresdk\include\ois\oismouse.h
+ "OISObject.h"
+ "OISEvents.h"
+
+1171217122 c:\ogresdk\include\ois\oisobject.h
+ "OISPrereqs.h"
+ "OISInterface.h"
+
+1171976394 c:\ogresdk\include\ois\oisprereqs.h
+ <vector>
+ <string>
+ <map>
+ "OISConfig.h"
+
+1171217122 c:\ogresdk\include\ois\oisconfig.h
+
+1171217122 c:\ogresdk\include\ois\oisinterface.h
+ "OISPrereqs.h"
+
+1171217122 c:\ogresdk\include\ois\oisevents.h
+ "OISPrereqs.h"
+
+1171217122 c:\ogresdk\include\ois\oiskeyboard.h
+ "OISObject.h"
+ "OISEvents.h"
+
+1171217122 c:\ogresdk\include\ois\oisjoystick.h
+ "OISObject.h"
+ "OISEvents.h"
+
+1171217122 c:\ogresdk\include\ois\oisinputmanager.h
+ "OISPrereqs.h"
+
+1175879122 c:\home\src\opengate\branches\ogsector\src\networkclient.h
+ "common.h"
+ <grapple/grapple.h>
+ <string>
+ <vector>
+ <map>
+ "networkProtocol.h"
+
+1175876378 c:\home\src\opengate\branches\ogsector\src\common.h
+ <config.h>
+ <sstream>
+ <iostream>
+ <cmath>
+
+1175879018 c:\home\src\opengate\branches\ogsector\src\networkprotocol.h
+ <iostream>
+ <sstream>
+ <string>
+ <Ogre.h>
+
+1175879394 c:\home\src\opengate\branches\ogsector\src\sectorobjects.h
+ <Ogre.h>
+ <OgreOpcode.h>
+ "common.h"
+ "networkProtocol.h"
+
+1175778098 source:c:\home\src\opengate\branches\ogsector\src\sectorclient.cpp
+ "SectorClient.h"
+
+1175778098 c:\home\src\opengate\branches\ogsector\src\sectorclient.h
+ <Ogre.h>
+ <OgreConfigFile.h>
+ "common.h"
+ "Sector.h"
+ "SectorClientFrameListener.h"
+ "networkClient.h"
+ <list>
+
+1175879610 source:c:\home\src\opengate\branches\ogsector\src\sectorclientframelistener.cpp
+ "SectorClientFrameListener.h"
+ "SectorClient.h"
+ "networkProtocol.h"
+ <iostream>
+ <OgreTextAreaOverlayElement.h>
+ <OgreFontManager.h>
+
+1172506520 c:\ogresdk\include\ogretextareaoverlayelement.h
+ "OgreOverlayElement.h"
+ "OgreFont.h"
+
+1172524824 c:\ogresdk\include\ogrefont.h
+ "OgrePrerequisites.h"
+ "OgreResource.h"
+ "OgreTexture.h"
+ "OgreMaterial.h"
+ "OgreCommon.h"
+
+1155988492 c:\ogresdk\include\ogrefontmanager.h
+ "OgrePrerequisites.h"
+ "OgreSingleton.h"
+ "OgreResourceManager.h"
+ "OgreFont.h"
+
+1175879306 source:c:\home\src\opengate\branches\ogsector\src\sectorobjects.cpp
+ "Sector.h"
+ "SectorObjects.h"
+ "common.h"
+
+1175876378 source:c:\home\src\opengate\branches\ogsector\src\common.cpp
+ "common.h"
+
+1175876378 source:c:\home\src\opengate\branches\ogsector\src\networkclient.cpp
+ <config.h>
+ "networkClient.h"
+ <iostream>
+ <sstream>
+
+1175878712 source:c:\home\src\opengate\branches\ogsector\src\ogsectorclient.cpp
+ "SectorClient.h"
+ "networkProtocol.h"
+ "networkClient.h"
+ "windows.h"
+ <iostream>
+ <sstream>
+ <fstream>
+ <string>
+ <vector>
+
+1175878648 source:c:\home\src\opengate\branches\ogsector\src\inputmanager.cpp
+ "InputManager.h"
+ "OgreStringConverter.h"
+
Property changes on: branches/ogsector/win32/ogsectorclient/ogsectorclient.depend
___________________________________________________________________
Name: svn:eol-style
+ native
Added: branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/win32/ogsectorclient/ogsectorclient.layout
===================================================================
--- branches/ogsector/win32/ogsectorclient/ogsectorclient.layout (rev 0)
+++ branches/ogsector/win32/ogsectorclient/ogsectorclient.layout 2007-04-06 19:24:52 UTC (rev 373)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_layout_file>
+ <ActiveTarget name="Release" />
+ <File name="..\..\src\InputManager.cpp" open="1" top="0" tabpos="3">
+ <Cursor position="1325" topLine="2" />
+ </File>
+ <File name="..\..\src\InputManager.h" open="1" top="0" tabpos="2">
+ <Cursor position="241" topLine="3" />
+ </File>
+ <File name="..\..\src\Sector.cpp" open="1" top="0" tabpos="4">
+ <Cursor position="8310" topLine="0" />
+ </File>
+ <File name="..\..\src\Sector.h" open="1" top="0" tabpos="1">
+ <Cursor position="55" topLine="0" />
+ </File>
+ <File name="..\..\src\SectorClient.cpp" open="1" top="1" tabpos="15">
+ <Cursor position="132" topLine="3" />
+ </File>
+ <File name="..\..\src\SectorClientFrameListener.cpp" open="1" top="0" tabpos="14">
+ <Cursor position="6375" topLine="167" />
+ </File>
+ <File name="..\..\src\SectorClientFrameListener.h" open="1" top="0" tabpos="13">
+ <Cursor position="1665" topLine="43" />
+ </File>
+ <File name="..\..\src\SectorObjects.cpp" open="1" top="0" tabpos="8">
+ <Cursor position="7341" topLine="189" />
+ </File>
+ <File name="..\..\src\SectorObjects.h" open="1" top="0" tabpos="11">
+ <Cursor position="2493" topLine="89" />
+ </File>
+ <File name="..\..\src\networkClient.h" open="1" top="0" tabpos="10">
+ <Cursor position="3405" topLine="102" />
+ </File>
+ <File name="..\..\src\networkProtocol.h" open="1" top="0" tabpos="5">
+ <Cursor position="9305" topLine="326" />
+ </File>
+ <File name="..\..\src\ogsectorclient.cpp" open="1" top="0" tabpos="7">
+ <Cursor position="783" topLine="35" />
+ </File>
+</CodeBlocks_layout_file>
Property changes on: branches/ogsector/win32/ogsectorclient/ogsectorclient.layout
___________________________________________________________________
Name: svn:eol-style
+ native
Added: branches/ogsector/win32/ogsectorclient/ois.dll
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/win32/ogsectorclient/ois.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-06 18:45:45
|
Revision: 372
http://svn.sourceforge.net/opengate/?rev=372&view=rev
Author: ultrasick
Date: 2007-04-06 11:45:45 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
activated file compression, removed unused image
Added Paths:
-----------
trunk/data/commodities/chromium.blend
Added: trunk/data/commodities/chromium.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/chromium.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-06 18:21:08
|
Revision: 371
http://svn.sourceforge.net/opengate/?rev=371&view=rev
Author: ultrasick
Date: 2007-04-06 11:14:02 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
I am trying to upload a new chromium file but svn just makes trouble to I will delete the old one first
Removed Paths:
-------------
trunk/data/commodities/chromium.blend
Deleted: trunk/data/commodities/chromium.blend
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-04-06 18:18:49
|
Revision: 370
http://svn.sourceforge.net/opengate/?rev=370&view=rev
Author: spom_spom
Date: 2007-04-06 11:13:57 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
Ported to offline mode win32. libgrapple will not compile
Modified Paths:
--------------
branches/ogsector/ogre.cfg
branches/ogsector/src/InputManager.cpp
branches/ogsector/src/Sector.cpp
branches/ogsector/src/SectorClient.cpp
branches/ogsector/src/SectorClientFrameListener.cpp
branches/ogsector/src/SectorClientFrameListener.h
branches/ogsector/src/SectorObjects.cpp
branches/ogsector/src/SectorObjects.h
branches/ogsector/src/common.h
branches/ogsector/src/networkClient.cpp
branches/ogsector/src/networkClient.h
branches/ogsector/src/networkProtocol.h
branches/ogsector/src/networkServer.cpp
branches/ogsector/src/networkServer.h
branches/ogsector/src/ogsectorclient.cpp
branches/ogsector/src/ogsectorserver.cpp
Added Paths:
-----------
branches/ogsector/win32/
branches/ogsector/win32/ogsectorclient/
branches/ogsector/win32/ogsectorclient/Plugins.cfg
branches/ogsector/win32/ogsectorclient/ogre.cfg
branches/ogsector/win32/ogsectorclient/ogsectorclient.cbp
branches/ogsector/win32/ogsectorclient/resources.cfg
Modified: branches/ogsector/ogre.cfg
===================================================================
--- branches/ogsector/ogre.cfg 2007-04-06 18:07:28 UTC (rev 369)
+++ branches/ogsector/ogre.cfg 2007-04-06 18:13:57 UTC (rev 370)
@@ -4,4 +4,5 @@
FSAA=0
Full Screen=No
RTT Preferred Mode=FBO
+Refresh Rate=Not applicable
Video Mode=1024 x 768
Modified: branches/ogsector/src/InputManager.cpp
===================================================================
--- branches/ogsector/src/InputManager.cpp 2007-04-06 18:07:28 UTC (rev 369)
+++ branches/ogsector/src/InputManager.cpp 2007-04-06 18:13:57 UTC (rev 370)
@@ -9,21 +9,22 @@
OIS::ParamList pl;
pl.insert( OIS::ParamList::value_type( "WINDOW", Ogre::StringConverter::toString( hWnd ) ) );
-
+
m_hWnd = hWnd;
mInputSystem = OIS::InputManager::createInputSystem( pl );
- if ( mInputSystem ){
+ if ( mInputSystem ){
mMouse = static_cast<OIS::Mouse*>(mInputSystem->createInputObject( OIS::OISMouse, true ));
mMouse->setEventCallback( this );
mKeyboard = static_cast<OIS::Keyboard*>(mInputSystem->createInputObject( OIS::OISKeyboard, true));
mKeyboard->setEventCallback( this );
+#ifndef WIN32
if ( mInputSystem->numJoysticks() > 0 ) {
// mJoysticks.resize( mInputSystem->numJoysticks() );
-
+
// itJoystick = mJoysticks.begin();
// itJoystickEnd = mJoysticks.end();
// for(; itJoystick != itJoystickEnd; ++itJoystick ) {
@@ -32,7 +33,8 @@
// }
mJoyStick = static_cast<OIS::JoyStick*>(mInputSystem->createInputObject( OIS::OISJoyStick, true));
mJoyStick->setEventCallback( this );
- }
+ }
+#endif
}
}
@@ -47,7 +49,7 @@
mInputSystem->destroyInputObject( mKeyboard );
mKeyboard = NULL;
}
-
+
if( mJoyStick ) {
mInputSystem->destroyInputObject( mJoyStick );
mJoyStick = NULL;
@@ -55,9 +57,9 @@
}
OIS::InputManager::destroyInputSystem( mInputSystem );
-
+
mInputSystem = NULL;
-
+
// Clear Listeners
mKeyListeners.clear();
mMouseListeners.clear();
@@ -261,7 +263,7 @@
bool InputManager::axisMoved( const OIS::JoyStickEvent &e, int axis ) {
itJoystickListener = mJoystickListeners.begin();
itJoystickListenerEnd = mJoystickListeners.end();
-
+
for(; itJoystickListener != itJoystickListenerEnd; ++itJoystickListener ) {
itJoystickListener->second->axisMoved( e, axis );
}
Modified: branches/ogsector/src/Sector.cpp
===================================================================
--- branches/ogsector/src/Sector.cpp 2007-04-06 18:07:28 UTC (rev 369)
+++ branches/ogsector/src/Sector.cpp 2007-04-06 18:13:57 UTC (rev 370)
@@ -20,46 +20,44 @@
// // NB I could attach the light to a SceneNode if I wanted it to move automatically with
// // other objects, but I don't
// l->setPosition( 0, 0, 200 );
-
new OgreOpcode::CollisionManager( sceneMgr_ );
OgreOpcode::CollisionManager::getSingletonPtr()->addCollClass( "SectorObject" );
OgreOpcode::CollisionManager::getSingletonPtr()->addCollClass( "Bullet" );
-
+
OgreOpcode::CollisionManager::getSingletonPtr()->addCollType( "Bullet", "Bullet", OgreOpcode::COLLTYPE_IGNORE );
OgreOpcode::CollisionManager::getSingletonPtr()->addCollType( "SectorObject", "Bullet", OgreOpcode::COLLTYPE_EXACT );
// OgreOpcode::CollisionManager::getSingletonPtr()->addCollType( "SectorObject", "SectorObject", OgreOpcode::COLLTYPE_QUICK );
OgreOpcode::CollisionManager::getSingletonPtr()->addCollType( "SectorObject", "SectorObject", OgreOpcode::COLLTYPE_CONTACT );
-
+
collideInSectorContext_ = OgreOpcode::CollisionManager::getSingletonPtr()->getDefaultContext();
- createStaticObject( Ogre::String("ships/Quantar/Storm/quantar_storm.mesh"),
+ createStaticObject( Ogre::String("ships/quantar/storm/storm.mesh"),
"StormShape",
Ogre::Vector3( 10, 17, -129.0 ),
- Ogre::Real( 9.6 ),
+ Ogre::Real( 9.6 ),
Ogre::Degree( -90 ) );
- createStaticObject( Ogre::String("ogrehead.mesh"),
+ createStaticObject( Ogre::String("ogrehead.mesh"),
"ogreheadStation",
Ogre::Vector3( 5000, 0, 0 ),
- Ogre::Real( 500.0 ),
+ Ogre::Real( 500.0 ),
Ogre::Degree( 0.0 ) );
// createCircle();
-
- createStaticObject( Ogre::String("ogrehead.mesh"),
+ createStaticObject( Ogre::String("ogrehead.mesh"),
"-100 0 0",
Ogre::Vector3( -100, 0, 0 ),
- Ogre::Real( 10.0 ),
+ Ogre::Real( 10.0 ),
Ogre::Degree( 0.0 ) );
- createStaticObject( Ogre::String("ogrehead.mesh"),
+ createStaticObject( Ogre::String("ogrehead.mesh"),
"100 0 0",
Ogre::Vector3( 100, 0, 0 ),
- Ogre::Real( 10.0 ),
+ Ogre::Real( 10.0 ),
Ogre::Degree( 0.0 ) );
itTarget_ = sectorObjects_.begin();
@@ -84,7 +82,7 @@
if ( nCollids > 0 ){
std::cout << "Collisions: " << nCollids << std::endl;
- OgreOpcode::CollisionPair **collisionReport;
+ OgreOpcode::CollisionPair **collisionReport;
report.getAllCollisions( collisionReport );
for ( int i = 0; i < nCollids; i ++ ){
@@ -94,11 +92,11 @@
static_cast< BaseObject * >( col1->getClientData() )->collide( static_cast< BaseObject * >( col2->getClientData() ) );
static_cast< BaseObject * >( col2->getClientData() )->collide( static_cast< BaseObject * >( col1->getClientData() ) );
}
-
+
std::cout << "CollisionContext attached objects: " + Ogre::StringConverter::toString(collideInSectorContext_->getAttachedObjectCount()) << std::endl;
std::cout << "CollisionContext owned objects: " + Ogre::StringConverter::toString(collideInSectorContext_->getOwnedObjectCount()) << std::endl;
std::cout << "CollisionManager shapes: " + Ogre::StringConverter::toString(OgreOpcode::CollisionManager::getSingletonPtr()->getShapeCount())<< std::endl;
-
+
}
bool tmpsegfaultDebug = false;
@@ -116,13 +114,13 @@
std::cout << "tmpsegfaultDebug done." << std::endl;
tmpsegfaultDebug = false;
}
-
+
if ( avatarDeathSequenceTime_ > 0 ){
avatarDeathSequenceTime_ -= elapsedTime;
} else if ( avatarDeathSequenceTime_ > -1 ) {
spawnAvatar();
}
-
+
}
SectorObjectMoveable * Sector::createMoveableObject( const Ogre::String & name, int userID, int childID ){
@@ -138,21 +136,21 @@
if ( listener_->target() == obj ) listener_->setTarget( nextTarget() );
switch ( obj->getTypeID() ){
- case SECTOROBJECTMOVABLE_RTTI:
+ case SECTOROBJECTMOVABLE_RTTI:
movableObjects_.erase( obj->globalID() );
- delete obj;
+ delete obj;
break;
case SECTOROBJECTMOVABLE_AI_RTTI: {
localAiObjects_.erase( dynamic_cast< SectorObjectMoveableAi *>(obj)->childID() );
movableObjects_.erase( obj->globalID() );
- delete obj;
+ delete obj;
} break;
default:
std::cerr << "object type unknown. this should not happen." << obj->getTypeID() << std::endl;
}
}
-void Sector::createStaticObject( const Ogre::String & meshname, const Ogre::String & objectname,
+void Sector::createStaticObject( const Ogre::String & meshname, const Ogre::String & objectname,
const Ogre::Vector3 & pos, Ogre::Real targetSize, Ogre::Degree yaw ){
SectorObject * obj = new SectorObject( objectname, this );
@@ -178,20 +176,20 @@
}
void Sector::spawnAiObject( ){
-
+
int childID = 1;
while ( localAiObjects_.find( childID ) != localAiObjects_.end() ){ childID ++; }
SectorObjectMoveableAi *obj = createAiMoveableObject( avatar_->name() + "_Spawn" + Ogre::StringConverter::toString( childID ), childID );
obj->setTarget( avatar_ );
-
+
Ogre::Real xmin = -1000.0, xmax = -500.0;
Ogre::Real ymin = -1000.0, ymax = -500.0;
Ogre::Real zmin = -1000.0, zmax = -500.0;
- obj->mainNode()->setPosition( Ogre::Math::RangeRandom( xmin, xmax ),
- Ogre::Math::RangeRandom( ymin, ymax ),
+ obj->mainNode()->setPosition( Ogre::Math::RangeRandom( xmin, xmax ),
+ Ogre::Math::RangeRandom( ymin, ymax ),
Ogre::Math::RangeRandom( zmin, zmax ) );
//obj->mainNode()->setPosition( 0.0f, 0.0f, -200.0f);
@@ -226,15 +224,15 @@
void Sector::spawnAvatar( ){
if ( avatar_ != NULL ){
avatarDeathSequenceTime_ = -1.0;
-
+
avatar_->mainNode()->setPosition( 0.0, 0.0, 500.0 );
avatar_->mainNode()->setOrientation( Ogre::Quaternion( 1.0, 0.0, 0.0, 0.0 ) );
avatar_->setVelocity( Ogre::Vector3( 0.0, 0.0, -20.0 ) );
avatar_->reset();
-
+
MessageShipRegister msg( 0, 0, avatar_->name(), avatar_->mainNode()->getPosition(), true );
network_->send( msg );
-
+
avatar_->setVisible( false );
listener_->avatarDeathSequence( false );
}
@@ -246,33 +244,33 @@
if ( avatar_ != NULL ){
if ( (*itTarget_) == avatar_ ) return nextTarget();
}
-
+
if ( itTarget_ == sectorObjects_.end() ) itTarget_ = sectorObjects_.begin();
return (*itTarget_);
}
return NULL;
}
-
+
SectorObject * Sector::prevTarget( ){
if ( sectorObjects_.size() != 0 ){
if ( itTarget_ == sectorObjects_.begin() ) itTarget_ = sectorObjects_.end();
itTarget_ --;
-
+
if ( avatar_ != NULL ){
if ( (*itTarget_) == avatar_ ) return prevTarget();
}
return (*itTarget_);
- }
+ }
return NULL;
}
void Sector::createCircle(){
-
+
Ogre::String name = "testcircle";
Ogre::SceneNode * object = sceneMgr_->getRootSceneNode()->createChildSceneNode( name );
Ogre::ManualObject * circle = sceneMgr_->createManualObject( name + "shape" );
-
+
float const radius = 50;
float const thickness = 3; // Of course this must be less than the radius value.
float const accuracy = 5;
@@ -280,7 +278,7 @@
circle->begin("BaseWhiteNoLighting", Ogre::RenderOperation::OT_TRIANGLE_LIST);
unsigned point_index = 0;
- for( float theta = 0;
+ for( float theta = 0;
theta <= 2.0 * 3.141592; // Ogre::Math::PI collide ;) with some stuff from opcode
theta += 3.141592 / (radius * accuracy) ) {
circle->position(radius * cos(theta), radius * sin(theta), -50 );
@@ -316,8 +314,8 @@
}
} else {
if ( msg.status() == true ){
- std::cout << "Create object " << msg.name()
- << " " << msg.senderID() << " " << (int)msg.childID()
+ std::cout << "Create object " << msg.name()
+ << " " << msg.senderID() << " " << (int)msg.childID()
<< " " << msg.position() << std::endl;
SectorObjectMoveable * obj = createMoveableObject( msg.name(), msg.senderID(), msg.childID() );
@@ -326,18 +324,18 @@
}
}
}
-}
+}
-void Sector::sendAllVesselMovements( ){
+void Sector::sendAllVesselMovements( ){
if ( avatar_ != NULL ){
- MessageShipMovement msg( 0,
+ MessageShipMovement msg( 0,
avatar_->mainNode()->getPosition(),
avatar_->velDirection(),
- avatar_->mainNode()->getOrientation(),
- avatar_->thrustPercent(),
- avatar_->scaledYaw(),
- avatar_->scaledPitch(),
- avatar_->scaledRoll(),
+ avatar_->mainNode()->getOrientation(),
+ avatar_->thrustPercent(),
+ avatar_->scaledYaw(),
+ avatar_->scaledPitch(),
+ avatar_->scaledRoll(),
avatar_->incNetSequence() );
network_->send( msg, false );
@@ -348,41 +346,41 @@
it->second->mainNode()->getPosition(),
it->second->velDirection(),
it->second->mainNode()->getOrientation(),
- it->second->thrustPercent(),
- it->second->scaledYaw(),
- it->second->scaledPitch(),
- it->second->scaledRoll(),
+ it->second->thrustPercent(),
+ it->second->scaledYaw(),
+ it->second->scaledPitch(),
+ it->second->scaledRoll(),
it->second->incNetSequence() );
-
+
network_->send( msgObj, false );
}
}
-void Sector::receiveVesselMovement( const std::vector < MessageShipMovement * > & movements ){
-
+void Sector::receiveVesselMovement( const std::vector < MessageShipMovement * > & movements ){
+
std::map < long, const MessageShipMovement * > singleMsg;
//** we sort the movement messaged
- for ( int i = 0; i < movements.size(); i ++ ){
+ for ( size_t i = 0; i < movements.size(); i ++ ){
if ( movements[ i ]->senderID() != network_->userID() ){
//** apply only foreign movements, and take just the actual movement
singleMsg[ createGlobalID( movements[ i ]->senderID(), movements[ i ]->childID() ) ] = movements[ i ];
}
}
-
+
std::map< long, SectorObjectMoveable * >::iterator it;
-
+
for ( std::map < long, const MessageShipMovement * >::iterator i = singleMsg.begin(); i != singleMsg.end(); i++ ){
if ( ( it = movableObjects_.find( i->first ) ) != movableObjects_.end() ){
it->second->setFlightProperties( (*i->second) );
} else {
- std::cerr << "Requested non existant object for shipmovement: "
+ std::cerr << "Requested non existant object for shipmovement: "
<< network_->username( i->second->senderID() ) << " this should not happen." << std::endl;
- }
+ }
}
}
-void Sector::sendAllVesselStatus( ){
+void Sector::sendAllVesselStatus( ){
if ( avatar_ != NULL ){
sendVesselStatus( *avatar_ );
}
@@ -406,7 +404,6 @@
std::map< long, SectorObjectMoveable * >::iterator it;
- SectorObjectMoveable *obj;
if ( ( it = movableObjects_.find( createGlobalID( msg.senderID(), msg.childID() ) ) ) != movableObjects_.end() ){
std::cout << "ReceiveVesselStatus for " << it->second->name( ) << std::endl;
it->second->setStatus( msg );
@@ -420,9 +417,9 @@
void Sector::sendVesselAmmoHit( const Projectile & projectile, BaseObject * victim ){
if ( projectile.parent().userID() == network_->userID() ){
- std::cout << "Send: Projectile from " << projectile.name() << " collide with: " << victim->name()
+ std::cout << "Send: Projectile from " << projectile.name() << " collide with: " << victim->name()
<< " " << victim->userID() << " " << victim->childID() << std::endl;
-
+
if ( network_->online() ){
MessageShipAmmoHit msg( projectile.parent().childID(), victim->userID(), victim->childID(), projectile.damage() );
network_->send( msg );
@@ -435,14 +432,14 @@
if ( msg.senderID() != network_->userID() ){
std::map< long, SectorObjectMoveable * >::iterator it;
-
+
if ( ( it = movableObjects_.find( createGlobalID( msg.targetID(), msg.targetChildID() ) ) ) != movableObjects_.end() ){
std::cout << "ReceiveVesselAmmoHit for " << network_->username( msg.targetID() ) << std::endl;
it->second->hitByAmmo( msg.damage() );
} else {
std::cerr << "Requested non existant object for VesselAmmoHit "
<< "shooter: " << network_->username( msg.senderID() )
- << " victim: " << network_->username( msg.targetID() )
+ << " victim: " << network_->username( msg.targetID() )
<< " child: " << msg.targetChildID()
<< " damage: " << msg.damage() << " this should not happen." << std::endl;
@@ -450,7 +447,7 @@
for ( std::map< long, SectorObjectMoveable * >::iterator i = movableObjects_.begin(); i != movableObjects_.end(); i++){
std::cerr << "\t" << i->first << " " << i->second->name() << " " << std::endl;
}
-
+
}
}
}
Modified: branches/ogsector/src/SectorClient.cpp
===================================================================
--- branches/ogsector/src/SectorClient.cpp 2007-04-06 18:07:28 UTC (rev 369)
+++ branches/ogsector/src/SectorClient.cpp 2007-04-06 18:13:57 UTC (rev 370)
@@ -15,9 +15,9 @@
root_ = new Ogre::Root;
setupResources();
-
+
if ( !configure( dialog ) ) return false;
-
+
//** load ressources
Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
@@ -25,19 +25,19 @@
sceneMgr_ = root_->createSceneManager( Ogre::ST_GENERIC, "BaseSMInstance" );
createCameras();
-
+
createViewports();
-
+
//** spom dont what for
// Set default mipmap level (NB some APIs ignore this)
// Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(5);
// Create any resource listeners (for loading screens)
// createResourceListener();
//** spom dont what for
-
+
// Create the scene
createScene();
-
+
createFrameListener();
sector_->spawnAvatar();
@@ -48,10 +48,10 @@
void SectorClient::setupResources( ) {
// Load resource paths from config file
Ogre::ConfigFile cf; cf.load( "resources.cfg" );
-
+
// Go through all sections & settings in the file
Ogre::ConfigFile::SectionIterator seci = cf.getSectionIterator();
-
+
Ogre::String secName, typeName, archName;
while ( seci.hasMoreElements() ) {
@@ -65,7 +65,7 @@
}
}
}
-
+
bool SectorClient::configure( bool dialog ){
if ( !dialog ){
root_->restoreConfig();
@@ -93,7 +93,7 @@
camera_->lookAt( Ogre::Vector3( 0, 0, 0 ) );
camera_->setNearClipDistance( 1 );
// camera_->setAspectRatio( Real(vp->getActualWidth()) / Real(vp->getActualHeight()));
-
+
Ogre::Camera * camera1 = sceneMgr_->createCamera("Camera1");
camera1->setPosition( Ogre::Vector3( 0, 0, 500 ) );
camera1->lookAt( Ogre::Vector3( 0, 0, 0 ) );
@@ -123,7 +123,7 @@
// window_->removeViewport( 2 );
}
-void SectorClient::createFrameListener( ) {
+void SectorClient::createFrameListener( ) {
frameListener_ = new SectorClientFrameListener( window_, camera_, sector_, network_ );
root_->addFrameListener( frameListener_ );
}
Modified: branches/ogsector/src/SectorClientFrameListener.cpp
===================================================================
--- branches/ogsector/src/SectorClientFrameListener.cpp 2007-04-06 18:07:28 UTC (rev 369)
+++ branches/ogsector/src/SectorClientFrameListener.cpp 2007-04-06 18:13:57 UTC (rev 370)
@@ -8,11 +8,11 @@
namespace OpenGate{
-SectorClientFrameListener::SectorClientFrameListener( Ogre::RenderWindow * win, Ogre::Camera * cam,
+SectorClientFrameListener::SectorClientFrameListener( Ogre::RenderWindow * win, Ogre::Camera * cam,
Sector * sector, Network * nw,
- bool useBufferedInputKeys,
- bool useBufferedInputMouse )
- : camera_( cam ), window_( win ), sector_( sector ), network_( nw ){
+ bool useBufferedInputKeys,
+ bool useBufferedInputMouse )
+ : window_( win ), camera_( cam ), sector_( sector ), network_( nw ){
shutDownRequest_ = false;
deathSequence_ = false;
@@ -36,7 +36,7 @@
inputManager_->addKeyListener( this, "SectorClientKeyListener" );
inputManager_->addMouseListener( this, "SectorClientMouseListener" );
inputManager_->addJoystickListener( this, "SectorClientJoystickListener" );
-
+
timeSinceLastSectorUpdate_ = 0.0;
timeSinceLastNetworkUpdate_ = 0.0;
inputInitialState_ = true;
@@ -73,7 +73,7 @@
// targetPointerBB_ = mySet->createBillboard( Vector3(0, 0, 0) );
// mySet->setMaterialName( "TargetPointer" );
// targetPointerBB_->setDimensions( 32.0, 32.0 );
-
+
// targetPointer_->attachObject( mySet );
// targetPointer_->scale( 0.05, 0.05, 0.05 );
@@ -83,18 +83,18 @@
// Billboard * hudTargetPointer = targetPointerBillboard->createBillboard( Ogre::Vector3( 0.0, 0.0, -100 ) );
// hudTargetPointer->
-// spaceDustParticleSystem_ = camera_->getSceneManager()->createParticleSystem( "SpaceDust", "Space/Dust" );
-// Ogre::SceneNode * spaceDustNode = sector_->avatar()->mainNode()->createChildSceneNode( "DustParticles", camera_->getRealPosition() );
-
-// spaceDustNode_->attachObject( spaceDustParticleSystem_ );
+// spaceDustParticleSystem_ = camera_->getSceneManager()->createParticleSystem( "SpaceDust", "Space/Dust" );
+// Ogre::SceneNode * spaceDustNode = sector_->avatar()->mainNode()->createChildSceneNode( "DustParticles", camera_->getRealPosition() );
+
+// spaceDustNode_->attachObject( spaceDustParticleSystem_ );
// camera_->getParentSceneNode()
-// listener for the space dust
-// SpaceDust* psd = new SpaceDust(mCamera, ps);
+// listener for the space dust
+// SpaceDust* psd = new SpaceDust(mCamera, ps);
// mRoot->addFrameListener(psd);
-// spaceDustParticle_ = camera_->getSceneManager()->createParticleSystem("Stardust");
-// particleNode_ = camera_->getSceneManager()->getRootSceneNode()->createChildSceneNode("SpaceDustParticle");
+// spaceDustParticle_ = camera_->getSceneManager()->createParticleSystem("Stardust");
+// particleNode_ = camera_->getSceneManager()->getRootSceneNode()->createChildSceneNode("SpaceDustParticle");
// particleNode_->attachObject( spaceDustParticle_ );
// statsOn_ = true;
@@ -107,42 +107,42 @@
inputManager_->removeKeyListener( "SectorClientKeyListener" );
inputManager_->removeMouseListener( "SectorClientMouseListener" );
inputManager_->removeJoystickListener( "SectorClientJoystickListener" );
-
+
//** neccesary because of new operator in inputmanager;
if ( inputManager_ != NULL ) delete inputManager_;
}
-
+
bool SectorClientFrameListener::frameStarted( const Ogre::FrameEvent & evt ) {
if ( window_->isClosed() ) return false;
timeSinceLastSectorUpdate_ += evt.timeSinceLastFrame;
timeSinceLastNetworkUpdate_ += evt.timeSinceLastFrame;
-
+
if ( deathSequence_ ){
} else {
//** capture my input
inputManager_->capture();
- }
-
+ }
+
//** start capture network;
std::vector < std::vector < Uint8 > > msgs;
std::vector < MessageShipMovement * > movements;
network_->pull( msgs );
-
- for ( int i = 0; i < msgs.size(); i ++ ){
+
+ for ( size_t i = 0; i < msgs.size(); i ++ ){
switch ( msgs[ i ][ 0 ] ){
case PROTO_CHAT:{
network_->ping();
MessageChat msg( &msgs[ i ][ 0 ] );
std::cout << network_->username( msg.senderID() ) + ": " + msg.message() << std::endl;
-
+
Ogre::OverlayElement* hudChatIn = Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDTextChatIn");
hudChatIn->setCaption( network_->username( msg.senderID() ) + ": " + msg.message() );
} break;
- case PROTO_SHIPREGISTER:
+ case PROTO_SHIPREGISTER:
sector_->receiveVesselRegister( &msgs[ i ][ 0 ] ); break;
- case PROTO_SHIPSTATUS:
+ case PROTO_SHIPSTATUS:
sector_->receiveVesselStatus( &msgs[ i ][ 0 ] ); break;
case PROTO_SHIPMOVEMENT:{
//** we handle that in sum, so we can ignore dups because of packet loss
@@ -160,24 +160,24 @@
//** end capture network;
- // max 1000 sector-updates/second
- if ( timeSinceLastSectorUpdate_ > 0.001 ){
+ // max 1000 sector-updates/second
+ if ( timeSinceLastSectorUpdate_ > 0.001 ){
sector_->update( timeSinceLastSectorUpdate_ );
timeSinceLastSectorUpdate_ = 0.0;
updateHUD_();
- }
-
+ }
+
//** send movement data, max 10 net-updates/second
if ( timeSinceLastNetworkUpdate_ > 0.1 ){
sector_->sendAllVesselMovements( );
timeSinceLastNetworkUpdate_ = 0.0;
- }
-
+ }
+
//** update my camera;
updateCamera_();
// renderSpaceDust();
-
+
return true;
}
@@ -189,48 +189,48 @@
//** ESCAPE leads to shutdown;
if ( e.key == OIS::KC_ESCAPE) { shutDownRequest_ = true; }
-
+
if ( !chatMode_ ){
- if ( e.key == OIS::KC_RETURN) {
- chatMode_ = true;
+ if ( e.key == OIS::KC_RETURN) {
+ chatMode_ = true;
}
-
+
if ( sector_->avatar() != NULL ){
//** Avatar yaw LEFT;
if ( e.key == OIS::KC_A || e.key == OIS::KC_NUMPAD4 ) { sector_->avatar()->setScaledYaw( 1.0 ); }
-
+
//** Avatar yaw RIGHT;
if ( e.key == OIS::KC_D || e.key == OIS::KC_NUMPAD6 ) { sector_->avatar()->setScaledYaw( -1.0 ); }
-
+
//** Avatar pitch DOWN;
if ( e.key == OIS::KC_W || e.key == OIS::KC_NUMPAD8 ) { sector_->avatar()->setScaledPitch( -1.0 ); }
-
+
//** Avatar pitch UP;
if ( e.key == OIS::KC_S || e.key == OIS::KC_NUMPAD2 ) { sector_->avatar()->setScaledPitch( 1.0 ); }
-
+
//** Avatar roll (181 == NUM/);
if ( e.key == OIS::KC_NUMPAD0 || e.key == 181 ) { sector_->avatar()->setScaledRoll( 1.0 ); }
-
+
//** Avatar roll (55 == NUM*);
if ( e.key == OIS::KC_NUMPADCOMMA || e.key == 55 ) { sector_->avatar()->setScaledRoll( -1.0 ); }
-
+
//** Avatar increase thrust by 10%;
if ( e.key == OIS::KC_NUMPAD7 ) { sector_->avatar()->incrementThrust(); }
-
+
//** Avatar increase thrust by 10%;
if ( e.key == OIS::KC_NUMPAD1 ) { sector_->avatar()->decrementThrust(); }
-
+
//** Avatar press break;
if ( e.key == OIS::KC_NUMPAD3 ) { sector_->avatar()->setBreakPressed( true ); }
-
+
//** Avatar press afterburner;
if ( e.key == OIS::KC_NUMPAD9 ) { sector_->avatar()->setAfterburnerPressed( true ); }
-
+
//** Avatar centering;
- if ( e.key == OIS::KC_NUMPAD5 ) {
- sector_->avatar()->setScaledYaw( 0.0 );
- sector_->avatar()->setScaledPitch( 0.0 );
- sector_->avatar()->setScaledRoll( 0.0 );
+ if ( e.key == OIS::KC_NUMPAD5 ) {
+ sector_->avatar()->setScaledYaw( 0.0 );
+ sector_->avatar()->setScaledPitch( 0.0 );
+ sector_->avatar()->setScaledRoll( 0.0 );
}
//** selfdestruct and eject;
if ( e.key == OIS::KC_F11 ) { sector_->avatarDied(); }
@@ -238,24 +238,24 @@
//** next Target;
if ( e.key == OIS::KC_N ) { setTarget( sector_->nextTarget() ); }
-
+
//** prev Target;
if ( e.key == OIS::KC_P ) { setTarget( sector_->prevTarget() ); }
-
+
//** spawn;
if ( e.key == OIS::KC_F12 ) { sector_->spawnAiObject(); }
//** Toggle through camera modes;
if ( e.key == OIS::KC_6 ) { toggleNextCamera_(); }
-
+
//** Create one screenshot;
- if ( e.key == OIS::KC_SYSRQ ) {
+ if ( e.key == OIS::KC_SYSRQ ) {
char tmp[ 20 ];
sprintf(tmp, "screenshot.png" );
window_->writeContentsToFile(tmp);
// window_->setDebugText(String("Wrote ") + tmp);
}
- if ( e.key == OIS::KC_R ) {
+ if ( e.key == OIS::KC_R ) {
sceneDetailIndex_ = ( sceneDetailIndex_ + 1) % 3;
switch( sceneDetailIndex_ ) {
case 0: camera_->setPolygonMode( Ogre::PM_SOLID ); break;
@@ -265,28 +265,28 @@
}
} else { // ** chatmode
- if ( e.key != OIS::KC_BACK ) {
+ if ( e.key != OIS::KC_BACK ) {
chatString_ += e.text;
} else if ( chatString_.length() > 1 ) {
- chatString_ = chatString_.substr( 0, chatString_.length() - 1 );
+ chatString_ = chatString_.substr( 0, chatString_.length() - 1 );
}
Ogre::OverlayElement* hudChatIn = Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDTextChatOut");
hudChatIn->setCaption( chatString_ );
-
- if ( e.key == OIS::KC_RETURN) {
-
+
+ if ( e.key == OIS::KC_RETURN) {
+
MessageChat chat( chatString_ );
network_->send( chat );
chatString_.clear();
Ogre::OverlayElement* hudChatIn = Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDTextChatOut");
hudChatIn->setCaption( chatString_ );
- chatMode_ = false;
+ chatMode_ = false;
}
}
-// if ( e.key == OIS::KC_T ) {
+// if ( e.key == OIS::KC_T ) {
// switch( filtering_ ) {
// case TFO_BILINEAR:
// filtering_ = TFO_TRILINEAR;
@@ -306,60 +306,61 @@
// MaterialManager::getSingleton().setDefaultTextureFiltering( filtering_ );
// MaterialManager::getSingleton().setDefaultAnisotropy( aniso_ );
// }
-
+return true;
}
bool SectorClientFrameListener::keyReleased( const OIS::KeyEvent & e ){
if ( sector_->avatar() != NULL ){
// Avatar release break
if ( e.key == OIS::KC_NUMPAD3 ) { sector_->avatar()->setBreakPressed( false ); }
-
+
// Avatar release afterburner
if ( e.key == OIS::KC_NUMPAD9 ) { sector_->avatar()->setAfterburnerPressed( false ); }
}
+ return true;
}
bool SectorClientFrameListener::mouseMoved( const OIS::MouseEvent & e ){
mousePointer_->setLeft( e.state.X.abs - 16);
mousePointer_->setTop( e.state.Y.abs - 16);
-
+
if ( sector_->avatar() != NULL ){
// std::cout << "X" << e.state.X.abs << " " << e.state.X.rel<< std::endl;
// std::cout << "Y" << e.state.Y.abs << " " << e.state.Y.rel<< std::endl;
// std::cout << "Z" << e.state.Z.abs << " " << e.state.Z.rel<< std::endl;
-
+
int relativToMidPointX = (int)rint( e.state.X.abs - windowsHalfWidth_ );
int relativToMidPointY = (int)rint( e.state.Y.abs - windowsHalfHeight_ );
int minActiveZonePercent = 5;
int maxActiveZonePercent = 90;
-
+
double minRadius = ( windowsHeight_ / 2.0 ) * minActiveZonePercent / 100;
double maxRadius = ( windowsHeight_ / 2.0 ) * maxActiveZonePercent / 100;
-
- Ogre::Real yaw = 0, pitch = 0;
+
+ Ogre::Real yaw = 0, pitch = 0;
if ( relativToMidPointX < 0 ) {
yaw = (relativToMidPointX+minRadius) / (maxRadius - minRadius);
} else {
yaw = (relativToMidPointX-minRadius) / (maxRadius - minRadius);
- }
+ }
if ( relativToMidPointY < 0 ) {
pitch = (relativToMidPointY + minRadius) / (maxRadius - minRadius);
} else {
pitch = (relativToMidPointY - minRadius) / (maxRadius - minRadius);
}
-
+
if ( fabs( relativToMidPointX ) < minRadius ) yaw = 0.0;
if ( fabs( relativToMidPointY ) < minRadius ) pitch = 0.0;
-
+
if ( inputInitialState_ == true ){
if ( yaw == 0.0 && pitch == 0.0 ){
inputInitialState_ = false;
}
} else{
-
+
yaw = min( yaw, 1.0f ); yaw = max( yaw, -1.0f );
pitch = min( pitch, 1.0f ); pitch = max( pitch, -1.0f );
-
+
// std::cout << ( String("Mouse rel: ") + StringConverter::toString( e.state.X.rel ) +
// String(" ") + StringConverter::toString( e.state.Y.rel ) +
// String(" abs: ") + StringConverter::toString( e.state.X.abs ) +
@@ -368,7 +369,7 @@
// String(" ") + StringConverter::toString( relativToMidPointY ) +
// String(" yaw: ") + StringConverter::toString( yaw ) +
// String(" pitch ") + StringConverter::toString( pitch ) ) << std::endl;
-
+
sector_->avatar()->setScaledYaw( -yaw );
sector_->avatar()->setScaledPitch( -pitch );
}
@@ -377,11 +378,12 @@
if ( e.state.Z.abs-10 > lastInputWheelState_ ){ // mouse wheel up
setTarget( sector_->nextTarget() );
lastInputWheelState_ = e.state.Z.abs;
-
+
} else if( lastInputWheelState_ > e.state.Z.abs+10 ) { // mouse wheel down
setTarget( sector_->prevTarget() );
lastInputWheelState_ = e.state.Z.abs;
- }
+ }
+ return true;
}
bool SectorClientFrameListener::mousePressed( const OIS::MouseEvent &e , OIS::MouseButtonID button ){
@@ -390,7 +392,8 @@
if ( button == 0){
sector_->avatar()->setFirePressed( true );
}
- }
+ }
+ return true;
}
bool SectorClientFrameListener::mouseReleased( const OIS::MouseEvent &e , OIS::MouseButtonID button ){
@@ -399,7 +402,8 @@
if ( button == 0){
sector_->avatar()->setFirePressed( false);
}
- }
+ }
+ return true;
}
bool SectorClientFrameListener::axisMoved( const OIS::JoyStickEvent & e, int axis ){
@@ -408,32 +412,32 @@
int joyStickAxisX = 0;
int joyStickAxisY = 1;
int joyStickAxisZ = 5;
- int throwSliderAxis = 6;
+ int throwSliderAxis = 6;
double axisScale = 32768;
-
+
//** deadzone
int minActiveZonePercent = 10;
int maxActiveZonePercent = 95;
-
+
double minRadius = ( axisScale ) * minActiveZonePercent / 100;
double maxRadius = ( axisScale ) * maxActiveZonePercent / 100;
-
+
Ogre::Real yaw = (e.state.mAxes[ joyStickAxisX ].abs) / (maxRadius);
Ogre::Real pitch = (e.state.mAxes[ joyStickAxisY ].abs) / (maxRadius);
Ogre::Real roll = (e.state.mAxes[ joyStickAxisZ ].abs) / (maxRadius);
Ogre::Real thrust = ( -e.state.mAxes[ throwSliderAxis ].abs + axisScale ) / (maxRadius*2);
-
+
yaw = min( yaw, 1.0f ); yaw = max( yaw, -1.0f );
pitch = min( pitch, 1.0f ); pitch = max( pitch, -1.0f );
roll = min( roll, 1.0f ); roll = max( roll, -1.0f );
thrust = min( thrust, 1.0f ); thrust = max( thrust, 0.0f );
-
-
+
+
if ( fabs( e.state.mAxes[ joyStickAxisX ].abs ) < minRadius ) yaw = 0.0;
if ( fabs( e.state.mAxes[ joyStickAxisY ].abs ) < minRadius ) pitch = 0.0;
if ( fabs( e.state.mAxes[ joyStickAxisZ ].abs ) < minRadius ) roll = 0.0;
if ( fabs( -e.state.mAxes[ throwSliderAxis ].abs + axisScale ) < minRadius ) thrust = 0.0;
-
+
//** little deadzone ;
// window_->setDebugText( "Joy Axis: X: " + StringConverter::toString( e.state.mAxes[ joyStickAxisX ].abs ) +
// " Y: " + StringConverter::toString( e.state.mAxes[ joyStickAxisY ].abs ) +
@@ -443,12 +447,13 @@
// " pitch: " + StringConverter::toString(pitch) +
// " roll: " + StringConverter::toString(roll) +
// " thrust: " + StringConverter::toString(thrust) );
-
- sector_->avatar()->setScaledYaw( -yaw );
- sector_->avatar()->setScaledPitch( pitch );
- sector_->avatar()->setScaledRoll( -roll );
+
+ sector_->avatar()->setScaledYaw( -yaw );
+ sector_->avatar()->setScaledPitch( pitch );
+ sector_->avatar()->setScaledRoll( -roll );
sector_->avatar()->setThrustPercent( thrust * 100. );
- } // if avatar
+ } // if avatar
+ return true;
}
bool SectorClientFrameListener::buttonPressed( const OIS::JoyStickEvent & e , int button){
@@ -458,7 +463,8 @@
if ( button == 0){
sector_->avatar()->setFirePressed( true );
}
- } // if avatar_
+ } // if avatar_
+ return true;
}
bool SectorClientFrameListener::buttonReleased( const OIS::JoyStickEvent & e , int button){
@@ -469,7 +475,7 @@
sector_->avatar()->setFirePressed( false );
}
} // if avatar_
-
+return true;
}
void SectorClientFrameListener::toggleNextCamera_(){
@@ -486,7 +492,7 @@
sector_->avatar()->setVisible( true );
}
break;
- case 1: //** first person avatar camera
+ case 1: //** first person avatar camera
if ( sector_->avatar() != NULL ){
sector_->avatar()->setVisible( false );
break;
@@ -496,13 +502,13 @@
sector_->avatar()->setVisible( true );
break;
}
- case 3: //** free avatar tracking-camera at orign
+ case 3: //** free avatar tracking-camera at orign
camera_->setPosition( Ogre::Vector3( 0, 0, 500 ) );
camera_->lookAt( Ogre::Vector3( 0, 0, -300 ) );
if ( sector_->avatar() != NULL ){
camera_->setAutoTracking( true, sector_->avatar()->mainNode() );
sector_->avatar()->setVisible( true );
- }
+ }
break;
}
}
@@ -511,34 +517,34 @@
if ( sector_->avatar() != NULL ){
Ogre::Vector3 avatarPos( sector_->avatar()->mainNode()->getPosition() );
-
+
Ogre::Vector3 targetPos;
if ( target_ != NULL ){
targetPos = target_->mainNode()->getPosition() ;
}
-
+
Ogre::Vector3 dist( targetPos - avatarPos );
Ogre::Vector3 distNorm( dist.normalisedCopy() );
Ogre::Quaternion avatarOrient( sector_->avatar()->mainNode()->getOrientation() );
-
+
Ogre::Camera * cam1 = camera_->getSceneManager()->getCamera( "Camera1" );
-
+
cam1->setOrientation( avatarOrient );
-
+
// if ( ( 1.0f + cam1->getDirection( ).normalisedCopy().dotProduct( distNorm ) ) < 0.0001f ) {
// cam1->yaw( Degree( 180 ) );
// } else {
Ogre::Quaternion rot( cam1->getDirection( ).normalisedCopy().getRotationTo( distNorm ) );
cam1->rotate( rot );
// }
-
+
if ( target_ != NULL ) cam1->setPosition( avatarPos + distNorm * ( dist.length() - 2.0 * target_->baseSize() ) );
-
+
switch ( cameraMode_ ){
case 0: //** free camera at orign
camera_->lookAt( sector_->avatar()->mainNode()->getPosition( ) );
break;
- case 1: //** first person avatar camera
+ case 1: //** first person avatar camera
camera_->setPosition( avatarPos );
camera_->setOrientation( avatarOrient );
sector_->avatar()->setVisible( false );
@@ -548,7 +554,7 @@
camera_->setOrientation( avatarOrient );
camera_->yaw( Ogre::Degree(-90) );
break;
- case 3: //** free avatar tracking-camera at orign
+ case 3: //** free avatar tracking-camera at orign
break;
}
}// if avatar
@@ -558,86 +564,86 @@
target_ = target;
if ( target_ != NULL ){
- std::cout << target_->name()<< std::endl;
+ std::cout << target_->name()<< std::endl;
Ogre::OverlayElement* targetName = Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDTextTargetName");
- targetName->setCaption( target_->name() );
-
+ targetName->setCaption( target_->name() );
+
// if ( hudTarget_->numChildren() > 0 ){
// hudTarget_->removeAllChildren( );// hudTarget_->getChild( "TargetTrans" ) );
// camera_->getSceneManager()->destroyEntity( "TargetShape" );
-// }
+// }
// Ogre::SceneNode * hudTargetTrans = new Ogre::SceneNode( NULL, "TargetTrans" );
-
+
// Ogre::Entity *targetShape = target_->shape()->clone( "TargetShape" );
-
+
// hudTargetTrans->attachObject( targetShape );
-// Ogre::Real scale = 0.5 / ( targetShape->getBoundingBox().getMaximum()[ 0 ]
+// Ogre::Real scale = 0.5 / ( targetShape->getBoundingBox().getMaximum()[ 0 ]
// - targetShape->getBoundingBox().getMinimum()[ 0 ] );
// hudTargetTrans->yaw( Ogre::Degree( -90 ) );
// hudTargetTrans->scale( scale, scale, scale );
-
+
// hudTarget_->addChild( hudTargetTrans );
}
}
void SectorClientFrameListener::updateHUD_( void ) {
const Ogre::RenderTarget::FrameStats & stats = window_->getStatistics();
- Ogre::OverlayElement* hudStat =
+ Ogre::OverlayElement* hudStat =
Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDTextStats");
hudStat->setCaption( "fps: " + toStr( stats.lastFPS ) + " ping: " + toStr( network_->pingTime() ) + " ms" );
-
+
if ( sector_->avatar() != NULL ){
if ( fabs( sector_->avatar()->velocity() ) > 1e-1 ){
sector_->avatar()->flightArrow()->setVisible( true );
sector_->avatar()->flightArrow()->setOrientation( sector_->avatar()->mainNode()->getOrientation() );
- sector_->avatar()->flightArrow()->setDirection( sector_->avatar()->flightDirection().normalisedCopy(),
+ sector_->avatar()->flightArrow()->setDirection( sector_->avatar()->flightDirection().normalisedCopy(),
Ogre::Node::TS_WORLD );
} else {
sector_->avatar()->flightArrow()->setVisible( false );
}
-
+
if ( target_ != NULL ) {
sector_->avatar()->targetArrow()->setVisible( true );
Ogre::Vector3 distToTarget = target_->mainNode()->getPosition() - sector_->avatar()->mainNode()->getPosition();
-
+
sector_->avatar()->targetArrow()->setOrientation( sector_->avatar()->mainNode()->getOrientation() );
-
- sector_->avatar()->targetArrow()->setDirection( distToTarget.normalisedCopy(),
+
+ sector_->avatar()->targetArrow()->setDirection( distToTarget.normalisedCopy(),
Ogre::Node::TS_WORLD );
hudTarget_->setOrientation( target_->mainNode()->getOrientation() );
-
+
// Ogre::Vector3 targetPos;
// Ogre::Quaternion targetOrient; targetOri = target_->mainNode().getOrientation();
// targetPos = target_->mainNode().getPosition();
-
+
//** targeting pointer
- Ogre::Vector3 poss = camera_->getProjectionMatrix() * (camera_->getViewMatrix() * target_->mainNode()->getPosition() );
+ Ogre::Vector3 poss = camera_->getProjectionMatrix() * (camera_->getViewMatrix() * target_->mainNode()->getPosition() );
poss.x = max( -1.0f, poss.x ); poss.x = min( 1.0f, poss.x );
poss.y = max( -1.0f, poss.y ); poss.y = min( 1.0f, poss.y );
-
+
Ogre::OverlayElement* hudTargetPointer = Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/TargetPointer");
hudTargetPointer->show();
-
- Ogre::OverlayElement* hudTargetDist =
+
+ Ogre::OverlayElement* hudTargetDist =
Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDTextTargetDistance");
-
- Ogre::OverlayElement* hudTargetShield =
+
+ Ogre::OverlayElement* hudTargetShield =
Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDTextTargetShield");
-
- Ogre::OverlayElement* hudTargetArmor =
+
+ Ogre::OverlayElement* hudTargetArmor =
Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDTextTargetArmor");
-
- Ogre::OverlayElement* hudTargetVel =
+
+ Ogre::OverlayElement* hudTargetVel =
Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDTextTargetVelocity");
-
+
hudTargetDist->setCaption( "D " + Ogre::StringConverter::toString( round( distToTarget.length(), 0 ) ) );
-
+
if ( poss.z < 1 ){
- hudTargetPointer->setPosition( windowsHalfWidth_ + (windowsHalfWidth_ * poss.x)-16,
+ hudTargetPointer->setPosition( windowsHalfWidth_ + (windowsHalfWidth_ * poss.x)-16,
windowsHalfHeight_ + (windowsHalfHeight_ * -poss.y)-16 );
}
-
+
if ( target_->getTypeID() == SECTOROBJECTMOVABLE_RTTI ||
target_->getTypeID() == SECTOROBJECTMOVABLE_AI_RTTI ){
hudTargetVel->setCaption( "V " + Ogre::StringConverter::toString( dynamic_cast< SectorObjectMoveable *>( target_ )->velocity(), 6 ) );
@@ -652,41 +658,41 @@
sector_->avatar()->targetArrow()->setVisible( false );
Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/TargetPointer")->hide( );
}
-
- Ogre::OverlayElement* hudVel =
+
+ Ogre::OverlayElement* hudVel =
Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDTextVelocity");
-
- Ogre::OverlayElement* hudVelMax =
+
+ Ogre::OverlayElement* hudVelMax =
Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDTextVelocityMax");
-
- Ogre::OverlayElement* hudThr =
+
+ Ogre::OverlayElement* hudThr =
Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDTextThr");
-
- Ogre::OverlayElement* hudAcc =
+
+ Ogre::OverlayElement* hudAcc =
Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDTextAcc");
-
- Ogre::OverlayElement* hudPos =
+
+ Ogre::OverlayElement* hudPos =
Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDTextPosition");
-
- Ogre::OverlayElement* hudShield =
+
+ Ogre::OverlayElement* hudShield =
Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDTextShield");
-
- Ogre::OverlayElement* hudArmor =
+
+ Ogre::OverlayElement* hudArmor =
Ogre::OverlayManager::getSingleton().getOverlayElement("OpenGate/SimpleHUDTextArmor");
-
+
hudVel->setCaption( "Vel: " + Ogre::StringConverter::toString( round( sector_->avatar()->velocity(), 2 ), 6 ) );
hudVelMax->setCaption( " / " + Ogre::StringConverter::toString( round( sector_->avatar()->velocityMax(), 2), 6 ) );
hudThr->setCaption( "Thr: " + Ogre::StringConverter::toString( sector_->avatar()->thrustPercent(), 4 ) + "%" );
hudAcc->setCaption( "Acc: " + Ogre::StringConverter::toString( sector_->avatar()->acceleration(), 2 ) );
hudShield->setCaption( "S " + Ogre::StringConverter::toString( sector_->avatar()->shieldPercent(), 4 ) );
hudArmor->setCaption( "A " + Ogre::StringConverter::toString( sector_->avatar()->armorPercent(), 4 ) );
-
+
Ogre::Vector3 pos( sector_->avatar()->mainNode()->getPosition() );
- hudPos->setCaption( "Pos: " +
- Ogre::StringConverter::toString( Ogre::Real( rint( pos[ 0 ] ) ), 5, 5 ) + " " +
- Ogre::StringConverter::toString( Ogre::Real( rint( pos[ 1 ] ) ), 5, 5 ) + " " +
+ hudPos->setCaption( "Pos: " +
+ Ogre::StringConverter::toString( Ogre::Real( rint( pos[ 0 ] ) ), 5, 5 ) + " " +
+ Ogre::StringConverter::toString( Ogre::Real( rint( pos[ 1 ] ) ), 5, 5 ) + " " +
Ogre::StringConverter::toString( Ogre::Real( rint( pos[ 2 ] ) ), 5, 5 ) );
-
+
// OverlayElement* guiAvg = OverlayManager::getSingleton().getOverlayElement("Core/AverageFps");
// OverlayElement* guiCurr = OverlayManager::getSingleton().getOverlayElement("Core/CurrFps");
// OverlayElement* guiBest = OverlayManager::getSingleton().getOverlayElement("Core/BestFps");
@@ -696,10 +702,10 @@
// +" "+StringConverter::toString(stats.bestFrameTime)+" ms");
// guiWorst->setCaption(worstFps + StringConverter::toString(stats.worstFPS)
// +" "+StringConverter::toString(stats.worstFrameTime)+" ms");
-
+
// OverlayElement* guiTris = OverlayManager::getSingleton().getOverlayElement("Core/NumTris");
// guiTris->setCaption(tris + StringConverter::toString(stats.triangleCount));
-
+
// OverlayElement* guiDbg = OverlayManager::getSingleton().getOverlayElement("Core/DebugText");
// guiDbg->setCaption( window_->getDebugText() );
// }
@@ -727,46 +733,46 @@
bool SectorClientFrameListener::renderSpaceDust(){
// if ( sector_->avatar() != NULL ){
-// const Ogre::Real maxDist = 250.0;
-// const Ogre::Real mirrorDist = maxDist*0.99;
-// const Ogre::Real dimFactor = 0.8*0.005*0.005;
-// const Ogre::Real maxDist2 = maxDist*maxDist;
-
+// const Ogre::Real maxDist = 250.0;
+// const Ogre::Real mirrorDist = maxDist*0.99;
+// const Ogre::Real dimFactor = 0.8*0.005*0.005;
+// const Ogre::Real maxDist2 = maxDist*maxDist;
+
// const Ogre::Vector3 camPos( camera_->getWorldPosition() );
-// const Ogre::Real twiceMaxDist = 2 * maxDist;
-
-// Ogre::ParticleIterator pit = spaceDustParticleSystem_->_getIterator();
-
-// while ( !pit.end() ){
-// Ogre::Particle * particle = pit.getNext();
-// Ogre::Vector3 & pos = particle->position;
-// particle->timeToLive = 999999.0f;
-
-// // position particles near camera
-// // (keep moving them toward camera until within range)
-// while (pos.x - camPos.x > maxDist)
-// pos.x -= twiceMaxDist;
-// while (pos.x - camPos.x < -maxDist)
-// pos.x += twiceMaxDist;
-// while (pos.y - camPos.y > maxDist)
-// pos.y -= twiceMaxDist;
-// while (pos.y - camPos.y < -maxDist)
-// pos.y += twiceMaxDist;
-// while (pos.z - camPos.z > maxDist)
-// pos.z -= twiceMaxDist;
-// while (pos.z - camPos.z < -maxDist)
-// pos.z += twiceMaxDist;
-
-// Ogre::Vector3 pDir = pos-camPos;
-// Ogre::Real dist = pDir.squaredLength();
-// Ogre::Real dim = dist*dimFactor;
-// particle->setDimensions(dim, dim);
-
-// }
-// } // if avatar
- return true;
+// const Ogre::Real twiceMaxDist = 2 * maxDist;
+
+// Ogre::ParticleIterator pit = spaceDustParticleSystem_->_getIterator();
+
+// while ( !pit.end() ){
+// Ogre::Particle * particle = pit.getNext();
+// Ogre::Vector3 & pos = particle->position;
+// particle->timeToLive = 999999.0f;
+
+// // position particles near camera
+// // (keep moving them toward camera until within range)
+// while (pos.x - camPos.x > maxDist)
+// pos.x -= twiceMaxDist;
+// while (pos.x - camPos.x < -maxDist)
+// pos.x += twiceMaxDist;
+// while (pos.y - camPos.y > maxDist)
+// pos.y -= twiceMaxDist;
+// while (pos.y - camPos.y < -maxDist)
+// pos.y += twiceMaxDist;
+// while (pos.z - camPos.z > maxDist)
+// pos.z -= twiceMaxDist;
+// while (pos.z - camPos.z < -maxDist)
+// pos.z += twiceMaxDist;
+
+// Ogre::Vector3 pDir = pos-camPos;
+// Ogre::Real dist = pDir.squaredLength();
+// Ogre::Real dim = dist*dimFactor;
+// particle->setDimensions(dim, dim);
+
+// }
+// } // if avatar
+ return true;
}
} // namespace OpenGate{
-
+
Modified: branches/ogsector/src/SectorClientFrameListener.h
===================================================================
--- branches/ogsector/src/SectorClientFrameListener.h 2007-04-06 18:07:28 UTC (rev 369)
+++ branches/ogsector/src/SectorClientFrameListener.h 2007-04-06 18:13:57 UTC (rev 370)
@@ -15,14 +15,14 @@
class Sector;
-class SectorClientFrameListener: public Ogre::FrameListener,
- public OIS::KeyListener,
- public OIS::MouseListener,
+class SectorClientFrameListener: public Ogre::FrameListener,
+ public OIS::KeyListener,
+ public OIS::MouseListener,
public OIS::JoyStickListener {
public:
SectorClientFrameListener( Ogre::RenderWindow * win, Ogre::Camera * cam, Sector * sector, Network * nw,
- bool useBufferedInputKeys = false,
+ bool useBufferedInputKeys = false,
bool useBufferedInputMouse = false );
virtual ~SectorClientFrameListener( );
@@ -58,9 +58,10 @@
Ogre::RenderWindow * window_;
Ogre::Camera * camera_;
Sector * sector_;
- InputManager * inputManager_;
Network * network_;
+ InputManager * inputManager_;
+
Ogre::Overlay * hudOverlay_;
Ogre::Overlay * mouseOverlay_;
Ogre::OverlayElement * mousePointer_;
@@ -90,7 +91,7 @@
int windowsHeight_;
int windowsHalfWidth_;
int windowsHalfHeight_;
-
+
bool chatMode_;
std::string chatString_;
Modified: branches/ogsector/src/SectorObjects.cpp
===================================================================
--- branches/ogsector/src/SectorObjects.cpp 2007-04-06 18:07:28 UTC (rev 369)
+++ branches/ogsector/src/SectorObjects.cpp 2007-04-06 18:13:57 UTC (rev 370)
@@ -4,8 +4,8 @@
namespace OpenGate{
-BaseObject::BaseObject( const Ogre::String & name, Sector * sector, int userID, int childID )
- : sector_( sector ), name_( name ), mainNode_( NULL ), userID_( userID ), childID_( childID ) {
+BaseObject::BaseObject( const Ogre::String & name, Sector * sector, int userID, int childID )
+ : name_( name ), sector_( sector ), userID_( userID ), childID_( childID ), mainNode_( NULL ){
globalID_ = createGlobalID( userID, childID );
sceneMgr_ = sector_->sceneManager();
@@ -18,7 +18,7 @@
sceneMgr_->getRootSceneNode()->removeAndDestroyChild( mainNode_->getName() );
}
-Projectile::Projectile( BaseObject * parent, long shotCounter )
+Projectile::Projectile( BaseObject * parent, long shotCounter )
: BaseObject( parent->name(), parent->sector() ), parent_( parent ) {
Ogre::String bulletName( name_ + "_" + toStr( shotCounter ) );
@@ -26,19 +26,19 @@
// chain_ = sceneMgr_->createBillboardChain( name_ + "_" + toStr( shotCounter ) + "_ProjectileBBC" );
// chain_->setMaxChainElements( 10 );
// chain_->setMaterialName("BulletWhite");
-
+
// for ( int i = 0; i < 10; i ++ ){
-// chain_->addChainElement(0, Ogre::BillboardChain::Element( Ogre::Vector3( 0.0, 0.0, Ogre::Real( i * 0.01 ) ),
+// chain_->addChainElement(0, Ogre::BillboardChain::Element( Ogre::Vector3( 0.0, 0.0, Ogre::Real( i * 0.01 ) ),
// 0.2, 0.1, Ogre::ColourValue(0.0f, 0.0f, 0.0f) ) );
-// // chain_->addChainElement(0, Ogre::BillboardChain::Element( Ogre::Vector3( 0.0, -0.1, Ogre::Real( i * 0.01 ) ),
+// // chain_->addChainElement(0, Ogre::BillboardChain::Element( Ogre::Vector3( 0.0, -0.1, Ogre::Real( i * 0.01 ) ),
// // 0.2, 0.1, Ogre::ColourValue(1.0f, 1.0f, 1.0f) ) );
// }
// mainNode_->attachObject( chain_ );
// chain_->setVisible( true );
Ogre::Vector3 position( parent_->mainNode()->getPosition() );
- Ogre::Quaternion direction( parent_->mainNode()->getOrientation() );
-
+ Ogre::Quaternion direction( parent_->mainNode()->getOrientation() );
+
int maxBB = 20;
bbs_ = sceneMgr_->createBillboardSet( bulletName + "_BBS", maxBB );
bbs_->setMaterialName("Bullet");
@@ -79,9 +79,9 @@
mainNode_->setPosition( position );
mainNode_->setPosition( position +
direction.zAxis().normalisedCopy() * -6.2 +
- direction.xAxis().normalisedCopy() * 1.5 +
+ direction.xAxis().normalisedCopy() * 1.5 +
direction.yAxis().normalisedCopy() * -0.2 );
-
+
// mainNode_->setOrientation( direction );
maxLiveTime_ = 1.4;
@@ -113,7 +113,7 @@
bbs_->getBillboard( 0 )->setDimensions( 10, 10 );
lifeTime_ = max( lifeTime_, maxLiveTime_ - 0.1f );
-// sector_->collisionContext()->removeObject( collObj_ );
+// sector_->collisionContext()->removeObject( collObj_ );
// OgreOpcode::CollisionManager::getSingletonPtr()->detachShape( collObj_->getShape() );
}
@@ -130,17 +130,17 @@
OgreOpcode::CollisionPair ** rayPickReport;
Ogre::Ray bulletRay( mainNode_->getPosition(), vel_.normalisedCopy() );
-
- int nColl = sector_->collisionContext()->rayCheck( bulletRay, (vel_ * elapsedTime).length(),
- OgreOpcode::COLLTYPE_EXACT,
+
+ int nColl = sector_->collisionContext()->rayCheck( bulletRay, (vel_ * elapsedTime).length(),
+ OgreOpcode::COLLTYPE_EXACT,
OgreOpcode::COLLTYPE_ALWAYS_EXACT, rayPickReport );
-
+
if ( nColl > 0 ){
OgreOpcode::CollisionObject* col1 = rayPickReport[ 0 ]->this_object;
OgreOpcode::CollisionObject* col2 = rayPickReport[ 0 ]->other_object;
-
+
if ( this->name() != static_cast< BaseObject * >( col1->getClientData() )->name() ){
-
+
mainNode_->setPosition( rayPickReport[ 0 ]->contact );
this->collide( static_cast< BaseObject * >( col2->getClientData() ) );
@@ -152,8 +152,8 @@
}
return true;
}
-
+
SectorObject::SectorObject( const Ogre::String & name, Sector * sector, int userID, int childID )
: BaseObject( name, sector, userID, childID ) {
@@ -165,12 +165,12 @@
mainNodeShape_->detachObject( shape_ );
sceneMgr_->destroyEntity( shape_ );
- sector_->collisionContext()->destroyObject( collObj_ );
+ sector_->collisionContext()->destroyObject( collObj_ );
OgreOpcode::CollisionManager::getSingletonPtr()->destroyShape( collObj_->getShape() );
// mainNode_->detachObject( mainNodeShape_->getName() );
mainNode_->removeAndDestroyChild( mainNodeShape_->getName() );
-
+
}
void SectorObject::setShape( const Ogre::String & meshname ){
@@ -189,7 +189,7 @@
}
void SectorObject::setBaseSize( Ogre::Real targetSize ){
- Ogre::Real scale = targetSize / ( shape_->getBoundingBox().getMaximum()[ 0 ]
+ Ogre::Real scale = targetSize / ( shape_->getBoundingBox().getMaximum()[ 0 ]
- shape_->getBoundingBox().getMinimum()[ 0 ] );
mainNodeShape_->scale( scale, scale, scale );
baseSize_ = targetSize;
@@ -199,7 +199,7 @@
: SectorObject( name, sector, userID, childID ) {
inititializeVesselStats_();
- setShape( "ships/Octavius/Apteryx/octavius_apteryx.mesh" );
+ setShape( "ships/octavius/apteryx/apteryx.mesh" );
//setShape( "ogrehead.mesh" );
baseYaw( Ogre::Degree( -90 ) );
@@ -212,14 +212,14 @@
Ogre::ParticleEmitter *pEmit1 = thrusterParticles_->addEmitter( "Point" );
pEmit1->setDirection( mainNode_->getOrientation().zAxis() );
pEmit1->setPosition( Ogre::Vector3( 0.0f, 0.5f, 5.0f ) );
- pEmit1->setColour( Ogre::ColourValue::Blue, Ogre::ColourValue::Green);
+ pEmit1->setColour( Ogre::ColourValue::Blue, Ogre::ColourValue::Green);
mainNode_->attachObject( thrusterParticles_ );
setThrustPercent( 0.0 );
updateThruster();
}
-
+
SectorObjectMoveable::~SectorObjectMoveable() {
mainNode_->detachObject( thrusterParticles_ );
sceneMgr_->destroyParticleSystem( thrusterParticles_ );
@@ -255,7 +255,7 @@
// } else {
// setScaledRoll( 0.0 );
// }
-
+
setScaledYaw( msg.yaw() );
setScaledRoll( msg.roll() );
setScaledPitch( msg.pitch() );
@@ -274,30 +274,30 @@
if ( !1 ){
std::cout << std::endl;
- std::cout << msg.sequenceNr() << "LastFrameCount: " << lastFrameCount_
- << " life: " << lifeTime_ << " last: " << lastLifeTime_
+ std::cout << msg.sequenceNr() << "LastFrameCount: " << lastFrameCount_
+ << " life: " << lifeTime_ << " last: " << lastLifeTime_
<< " diff: "<< lifeTime_ - lastLifeTime_ << std::endl;
-
- // std::cout << "Ist: " << mainNode_->getOrientation( )
+
+ // std::cout << "Ist: " << mainNode_->getOrientation( )
// << " " << mainNode_->getOrientation( ).getYaw().valueDegrees() << std::endl;
-
+
// std::cout << "Soll: " << msg.orientation() << " " << msg.orientation().getYaw().valueDegrees() << std::endl;
std::cout << "Diff: send: " << msg.yaw() << " " << msg.pitch() << " " << msg.roll() << std::endl;
-
- std::cout << "Diff: Pos: " << (srcP-destP).length()
- << " Y:" << interpolateRot_.getYaw().valueDegrees()
- << " P:" << interpolateRot_.getPitch().valueDegrees()
+
+ std::cout << "Diff: Pos: " << (srcP-destP).length()
+ << " Y:" << interpolateRot_.getYaw().valueDegrees()
+ << " P:" << interpolateRot_.getPitch().valueDegrees()
<< " R:" << interpolateRot_.getRoll().valueDegrees() << std::endl;
}
// mainNode_->rotate( interpolateRot_, Ogre::Node::TS_PARENT );
-
+
Ogre::Degree yawTo( interpolateRot_.getYaw() );
Ogre::Degree pitchTo( interpolateRot_.getPitch() );
Ogre::Degree rollTo( interpolateRot_.getRoll() );
-
+
mainNode_->yaw( yawTo / 5.0 , Ogre::Node::TS_PARENT );
mainNode_->pitch( pitchTo / 5.0, Ogre::Node::TS_PARENT );
mainNode_->roll( rollTo / 5.0, Ogre::Node::TS_PARENT );
@@ -309,7 +309,7 @@
// yaw_ += scaledYaw;
// pitch_ += scaledPitch;
// roll_ += scaledRoll;
-
+
// mainNode_->translate( ( destP- srcP ) / 5.0 );
interpolateVel_ = ( destP-srcP ) / lastFrameCount_ / 1.0;
@@ -359,7 +359,7 @@
void SectorObjectMoveable::hitByAmmo( float damage ){
shield_ -= damage;
-
+
if ( shield_ < 0 ){
armor_ += shield_;
shield_ = 0.0;
@@ -367,7 +367,7 @@
}
statusChanged_ = true;
}
-
+
bool SectorObjectMoveable::update( Ogre::Real elapsedTime ){
if ( elapsedTime < 0.001 ) return true;
@@ -389,19 +389,19 @@
//** friction = drag * v^2;
Ogre::Real friction = ethernalDensity_ * dragFactor_ * velocity() * velocity();
-
+
Ogre::Vector3 trustDir( mainNode_->getOrientation().zAxis() );
Ogre::Vector3 flightDir( vel_ ); flightDir.normalise();
-
+
//** thrust = mass * acc;
acc_ = ( - trustDir * thrust() - flightDir * friction ) / mass_;
-
+
if ( breakPressed_ == true ) {
if ( velocity() > 0 ) {
acc_ -= flightDir * 4.0;
}
}
-
+
//** v = a * t;
vel_ += acc_ * elapsedTime;
mainNode_->translate( ( vel_ + interpolateVel_ )* elapsedTime );
@@ -421,27 +421,27 @@
shield_ += shieldRechargeBaseRate_ * elapsedTime;
shield_ = min( maxShield_, shield_ );
- fire( elapsedTime );
+ fire( elapsedTime );
//** snap quaternion
Ogre::Quaternion rnd( mainNode_->getOrientation() );
mainNode_->setOrientation( round( rnd.w, 5 ), round( rnd.x, 5 ), round( rnd.y, 5 ), round( rnd.z, 5 ) );
-
+
return true;
-}
+}
void SectorObjectMoveable::inititializ...
[truncated message content] |
|
From: <ult...@us...> - 2007-04-06 18:13:12
|
Revision: 369
http://svn.sourceforge.net/opengate/?rev=369&view=rev
Author: ultrasick
Date: 2007-04-06 11:07:28 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
activated file compression, removed unused image
Modified Paths:
--------------
trunk/data/commodities/chromium.blend
Modified: trunk/data/commodities/chromium.blend
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-06 16:10:32
|
Revision: 368
http://svn.sourceforge.net/opengate/?rev=368&view=rev
Author: ultrasick
Date: 2007-04-06 09:10:33 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
4 more parts of the primrose are texturized. The ships isn't finished jet but I need to backup my files somewhere so I put them at the right place
Modified Paths:
--------------
trunk/data/ships/solrain/primrose/primrose.blend
Added Paths:
-----------
trunk/templates/data/ships/solrain/primrose/parts/47 + 48.pspimage
trunk/templates/data/ships/solrain/primrose/parts/49 + 50.pspimage
Modified: trunk/data/ships/solrain/primrose/primrose.blend
===================================================================
(Binary files differ)
Added: trunk/templates/data/ships/solrain/primrose/parts/47 + 48.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/primrose/parts/47 + 48.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/solrain/primrose/parts/49 + 50.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/solrain/primrose/parts/49 + 50.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-06 13:14:50
|
Revision: 367
http://svn.sourceforge.net/opengate/?rev=367&view=rev
Author: ultrasick
Date: 2007-04-06 06:14:51 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
removed the description text
Modified Paths:
--------------
trunk/data/power_plants/spud.xml
Modified: trunk/data/power_plants/spud.xml
===================================================================
--- trunk/data/power_plants/spud.xml 2007-04-06 13:09:04 UTC (rev 366)
+++ trunk/data/power_plants/spud.xml 2007-04-06 13:14:51 UTC (rev 367)
@@ -6,7 +6,6 @@
<name>Spud</name>
<class>Magnetohydrodynamic Turbine</class>
<faction>Quantar</faction>
- <description>The Spud is Quantar's stock equipment powerplant, and is a modified Gatherer for cheap production purposes. All Quantar pilots are given this as part of their starter package. TRI subsidizes production of this model, and therefore it cannot be legally traded or sold for much value.</description>
<image>spud.jpg</image>
<model>spud.blend</model>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-06 13:09:03
|
Revision: 366
http://svn.sourceforge.net/opengate/?rev=366&view=rev
Author: ultrasick
Date: 2007-04-06 06:09:04 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
moved the spud to the power plants directory
Added Paths:
-----------
trunk/data/power_plants/spud.blend
trunk/data/power_plants/spud.xml
Removed Paths:
-------------
trunk/data/radar/spud.blend
trunk/data/radar/spud.xml
Added: trunk/data/power_plants/spud.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/power_plants/spud.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/power_plants/spud.xml
===================================================================
--- trunk/data/power_plants/spud.xml (rev 0)
+++ trunk/data/power_plants/spud.xml 2007-04-06 13:09:04 UTC (rev 366)
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!DOCTYPE equipment SYSTEM "http://opengate.sourceforge.net/opengate.dtd">
+
+<equipment type="Power-Plant">
+ <!-- Naming -->
+ <name>Spud</name>
+ <class>Magnetohydrodynamic Turbine</class>
+ <faction>Quantar</faction>
+ <description>The Spud is Quantar's stock equipment powerplant, and is a modified Gatherer for cheap production purposes. All Quantar pilots are given this as part of their starter package. TRI subsidizes production of this model, and therefore it cannot be legally traded or sold for much value.</description>
+ <image>spud.jpg</image>
+ <model>spud.blend</model>
+
+ <!-- Production Data -->
+ <manufacturer>Cromforge Enterprises</manufacturer>
+ <production-center>Quantar Core</production-center>
+ <production-center>Quantar TriPoint</production-center>
+ <production-center>Quantar Corridor</production-center>
+
+ <!-- Generic Data -->
+ <techlevel>0</techlevel>
+ <size>1</size>
+ <mass>1200</mass>
+
+ <!-- Specific data -->
+ <energy-output>1560000</energy-output>
+
+ <!-- Building Data -->
+ <required-component>Water</required-component>
+ <required-component>Copper</required-component>
+ <required-component>Silicon</required-component>
+ <required-component>Electronics</required-component>
+ <required-component>Fuel Cells</required-component>
+ <required-component>Machined Parts</required-component>
+ <required-component>Magnetics</required-component>
+ <required-component>Power Converters</required-component>
+
+</equipment>
Property changes on: trunk/data/power_plants/spud.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Deleted: trunk/data/radar/spud.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/radar/spud.xml
===================================================================
--- trunk/data/radar/spud.xml 2007-04-06 11:38:58 UTC (rev 365)
+++ trunk/data/radar/spud.xml 2007-04-06 13:09:04 UTC (rev 366)
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE equipment SYSTEM "http://opengate.sourceforge.net/opengate.dtd">
-
-<equipment type="Power-Plant">
- <!-- Naming -->
- <name>Spud</name>
- <class>Magnetohydrodynamic Turbine</class>
- <faction>Quantar</faction>
- <description>The Spud is Quantar's stock equipment powerplant, and is a modified Gatherer for cheap production purposes. All Quantar pilots are given this as part of their starter package. TRI subsidizes production of this model, and therefore it cannot be legally traded or sold for much value.</description>
- <image>spud.jpg</image>
- <model>spud.blend</model>
-
- <!-- Production Data -->
- <manufacturer>Cromforge Enterprises</manufacturer>
- <production-center>Quantar Core</production-center>
- <production-center>Quantar TriPoint</production-center>
- <production-center>Quantar Corridor</production-center>
-
- <!-- Generic Data -->
- <techlevel>0</techlevel>
- <size>1</size>
- <mass>1200</mass>
-
- <!-- Specific data -->
- <energy-output>1560000</energy-output>
-
- <!-- Building Data -->
- <required-component>Water</required-component>
- <required-component>Copper</required-component>
- <required-component>Silicon</required-component>
- <required-component>Electronics</required-component>
- <required-component>Fuel Cells</required-component>
- <required-component>Machined Parts</required-component>
- <required-component>Magnetics</required-component>
- <required-component>Power Converters</required-component>
-
-</equipment>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-06 11:39:00
|
Revision: 365
http://svn.sourceforge.net/opengate/?rev=365&view=rev
Author: ultrasick
Date: 2007-04-06 04:38:58 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
activated file compression and ambient occlusion, raised oversampling to 16, moved camera closer to object, changed rendering settings
Modified Paths:
--------------
trunk/data/radar/spud.blend
Modified: trunk/data/radar/spud.blend
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-06 11:15:10
|
Revision: 364
http://svn.sourceforge.net/opengate/?rev=364&view=rev
Author: ultrasick
Date: 2007-04-06 04:15:11 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
activated ambient occlusion and file compression
Modified Paths:
--------------
trunk/data/commodities/gold.blend
Modified: trunk/data/commodities/gold.blend
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-06 10:37:07
|
Revision: 363
http://svn.sourceforge.net/opengate/?rev=363&view=rev
Author: ultrasick
Date: 2007-04-06 03:37:06 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
deactivated ambient occluision because it looked ugly
Modified Paths:
--------------
trunk/data/commodities/xenon.blend
Modified: trunk/data/commodities/xenon.blend
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-06 10:30:34
|
Revision: 362
http://svn.sourceforge.net/opengate/?rev=362&view=rev
Author: ultrasick
Date: 2007-04-06 03:30:33 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
activated compression, changed rendering settings
Modified Paths:
--------------
trunk/data/commodities/xenon.blend
Modified: trunk/data/commodities/xenon.blend
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-06 10:01:09
|
Revision: 361
http://svn.sourceforge.net/opengate/?rev=361&view=rev
Author: ultrasick
Date: 2007-04-06 03:01:09 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
bugfix: uploading some water ... octavia light production now finally works
Added Paths:
-----------
trunk/data/commodities/water.blend
Added: trunk/data/commodities/water.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/water.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-04-06 09:52:53
|
Revision: 360
http://svn.sourceforge.net/opengate/?rev=360&view=rev
Author: egore
Date: 2007-04-06 02:52:53 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
Just found this on my harddisk
Added Paths:
-----------
trunk/data/radar/spud.blend
trunk/data/radar/spud.xml
Added: trunk/data/radar/spud.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/radar/spud.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/radar/spud.xml
===================================================================
--- trunk/data/radar/spud.xml (rev 0)
+++ trunk/data/radar/spud.xml 2007-04-06 09:52:53 UTC (rev 360)
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!DOCTYPE equipment SYSTEM "http://opengate.sourceforge.net/opengate.dtd">
+
+<equipment type="Power-Plant">
+ <!-- Naming -->
+ <name>Spud</name>
+ <class>Magnetohydrodynamic Turbine</class>
+ <faction>Quantar</faction>
+ <description>The Spud is Quantar's stock equipment powerplant, and is a modified Gatherer for cheap production purposes. All Quantar pilots are given this as part of their starter package. TRI subsidizes production of this model, and therefore it cannot be legally traded or sold for much value.</description>
+ <image>spud.jpg</image>
+ <model>spud.blend</model>
+
+ <!-- Production Data -->
+ <manufacturer>Cromforge Enterprises</manufacturer>
+ <production-center>Quantar Core</production-center>
+ <production-center>Quantar TriPoint</production-center>
+ <production-center>Quantar Corridor</production-center>
+
+ <!-- Generic Data -->
+ <techlevel>0</techlevel>
+ <size>1</size>
+ <mass>1200</mass>
+
+ <!-- Specific data -->
+ <energy-output>1560000</energy-output>
+
+ <!-- Building Data -->
+ <required-component>Water</required-component>
+ <required-component>Copper</required-component>
+ <required-component>Silicon</required-component>
+ <required-component>Electronics</required-component>
+ <required-component>Fuel Cells</required-component>
+ <required-component>Machined Parts</required-component>
+ <required-component>Magnetics</required-component>
+ <required-component>Power Converters</required-component>
+
+</equipment>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-04-05 13:01:38
|
Revision: 359
http://svn.sourceforge.net/opengate/?rev=359&view=rev
Author: spom_spom
Date: 2007-04-05 06:01:37 -0700 (Thu, 05 Apr 2007)
Log Message:
-----------
Ported to ogre-1.4. Freeimage from gentoo-ebuild dont work with ogre-1.4, Running ogsector with a manual installed Freeimage works fine.
Modified Paths:
--------------
branches/ogsector/configure.ac
branches/ogsector/data/MediaFromOgre/ogrehead.mesh
branches/ogsector/data/arrow.mesh
branches/ogsector/data/povray/buildSkyBox.sh
branches/ogsector/data/simpleHUD.overlay
branches/ogsector/data/simpleSkybox.material
branches/ogsector/data/simpleSkybox.zip
branches/ogsector/ogre.cfg
branches/ogsector/resources.cfg
branches/ogsector/src/InputManager.cpp
branches/ogsector/src/InputManager.h
branches/ogsector/src/Sector.cpp
branches/ogsector/src/Sector.h
branches/ogsector/src/SectorClient.cpp
branches/ogsector/src/SectorClient.h
branches/ogsector/src/SectorClientFrameListener.cpp
branches/ogsector/src/SectorClientFrameListener.h
branches/ogsector/src/SectorObjects.cpp
branches/ogsector/src/networkClient.cpp
branches/ogsector/src/networkClient.h
branches/ogsector/src/ogsectorclient.cpp
Modified: branches/ogsector/configure.ac
===================================================================
--- branches/ogsector/configure.ac 2007-04-05 12:33:54 UTC (rev 358)
+++ branches/ogsector/configure.ac 2007-04-05 13:01:37 UTC (rev 359)
@@ -21,7 +21,7 @@
AC_SUBST(AM_CXXFLAGS,"$AM_CXXFLAGS $OGRE_CFLAGS")
AC_SUBST(AM_LDFLAGS,"$AM_LDFLAGS $OGRE_LIBS")
-#OIS - http://www.sourceforge.net/projects/wgois/
+dnl OIS - http://www.sourceforge.net/projects/wgois/
PKG_CHECK_MODULES(OIS, [OIS >= 0.9.9])
AC_SUBST(AM_CXXFLAGS, "$AM_CXXFLAGS $OIS_CFLAGS")
AC_SUBST(AM_LDFLAGS, "$AM_LDFLAGS $OIS_LIBS")
@@ -36,6 +36,7 @@
AC_SUBST(AM_CXXFLAGS, "$AM_CXXFLAGS $freealut_CFLAGS")
AC_SUBST(AM_LDFLAGS, "$AM_LDFLAGS $freealut_LIBS")
+AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -I$OGSECTOR_EXTERNALS_PATH/include"])
AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -I$OGSECTOR_EXTERNALS_PATH/ogreopcode/include"])
AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -I$OGSECTOR_EXTERNALS_PATH/ogreopcode/opcode132"])
AC_SUBST([LDFLAGS], ["${LDFLAGS} -L$OGSECTOR_EXTERNALS_PATH/lib/ -lOpcode -lOgreOpcode"])
Modified: branches/ogsector/data/MediaFromOgre/ogrehead.mesh
===================================================================
(Binary files differ)
Modified: branches/ogsector/data/arrow.mesh
===================================================================
(Binary files differ)
Modified: branches/ogsector/data/povray/buildSkyBox.sh
===================================================================
--- branches/ogsector/data/povray/buildSkyBox.sh 2007-04-05 12:33:54 UTC (rev 358)
+++ branches/ogsector/data/povray/buildSkyBox.sh 2007-04-05 13:01:37 UTC (rev 359)
@@ -1,4 +1,4 @@
-RESOLUTION=1024
+RESOLUTION=512
POVFILE=skybox2.pov
OUTNAME=${POVFILE%.pov}
Modified: branches/ogsector/data/simpleHUD.overlay
===================================================================
--- branches/ogsector/data/simpleHUD.overlay 2007-04-05 12:33:54 UTC (rev 358)
+++ branches/ogsector/data/simpleHUD.overlay 2007-04-05 13:01:37 UTC (rev 359)
@@ -64,7 +64,7 @@
colour_bottom 1 1 0.7
}
- element TextArea(Core/DebugText)
+ element TextArea(OpenGate/DebugText)
{
metrics_mode pixels
left 230
Modified: branches/ogsector/data/simpleSkybox.material
===================================================================
--- branches/ogsector/data/simpleSkybox.material 2007-04-05 12:33:54 UTC (rev 358)
+++ branches/ogsector/data/simpleSkybox.material 2007-04-05 13:01:37 UTC (rev 359)
@@ -1,34 +1,34 @@
-material OpenGate/SimpleSkyBox1
-{
- technique
- {
- pass
- {
- lighting off
- depth_write off
-
- texture_unit
- {
- cubic_texture skybox1.jpg separateUV
- tex_address_mode clamp
- }
- }
- }
-}
-material OpenGate/SimpleSkyBox2
-{
- technique
- {
- pass
- {
- lighting off
- depth_write off
-
- texture_unit
- {
- cubic_texture skybox2.jpg separateUV
- tex_address_mode clamp
- }
- }
- }
-}
+material OpenGate/SimpleSkyBox1
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ depth_write off
+
+ texture_unit
+ {
+ cubic_texture skybox1.png separateUV
+ tex_address_mode clamp
+ }
+ }
+ }
+}
+material OpenGate/SimpleSkyBox2
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ depth_write off
+
+ texture_unit
+ {
+ cubic_texture skybox2.png separateUV
+ tex_address_mode clamp
+ }
+ }
+ }
+}
Modified: branches/ogsector/data/simpleSkybox.zip
===================================================================
(Binary files differ)
Modified: branches/ogsector/ogre.cfg
===================================================================
--- branches/ogsector/ogre.cfg 2007-04-05 12:33:54 UTC (rev 358)
+++ branches/ogsector/ogre.cfg 2007-04-05 13:01:37 UTC (rev 359)
@@ -1,7 +1,7 @@
Render System=OpenGL Rendering Subsystem
[OpenGL Rendering Subsystem]
-FSAA=6
+FSAA=0
Full Screen=No
RTT Preferred Mode=FBO
Video Mode=1024 x 768
Modified: branches/ogsector/resources.cfg
===================================================================
--- branches/ogsector/resources.cfg 2007-04-05 12:33:54 UTC (rev 358)
+++ branches/ogsector/resources.cfg 2007-04-05 13:01:37 UTC (rev 359)
@@ -6,9 +6,9 @@
[General]
FileSystem=./data
Zip=./data/simpleSkybox.zip
-
+#
FileSystem=./data/MediaFromOgre
Zip=./data/MediaFromOgre/fonts.zip
-
+#
FileSystem=../../trunk/data/
FileSystem=../../trunk/data/materials
Modified: branches/ogsector/src/InputManager.cpp
===================================================================
--- branches/ogsector/src/InputManager.cpp 2007-04-05 12:33:54 UTC (rev 358)
+++ branches/ogsector/src/InputManager.cpp 2007-04-05 13:01:37 UTC (rev 359)
@@ -1,384 +1,388 @@
#include "InputManager.h"
+#include "OgreStringConverter.h"
-InputManager *InputManager::mInputManager;
+InputManager::InputManager( unsigned long hWnd ){
+ mMouse = NULL;
+ mKeyboard = NULL;
+ mJoyStick = NULL;
+ mInputSystem = NULL;
-InputManager::InputManager( void ) :
- mMouse( 0 ),
- mKeyboard( 0 ),
- mInputSystem( 0 ) {
+ OIS::ParamList pl;
+ pl.insert( OIS::ParamList::value_type( "WINDOW", Ogre::StringConverter::toString( hWnd ) ) );
+
+ m_hWnd = hWnd;
+ mInputSystem = OIS::InputManager::createInputSystem( pl );
+
+ if ( mInputSystem ){
+ mMouse = static_cast<OIS::Mouse*>(mInputSystem->createInputObject( OIS::OISMouse, true ));
+ mMouse->setEventCallback( this );
+
+ mKeyboard = static_cast<OIS::Keyboard*>(mInputSystem->createInputObject( OIS::OISKeyboard, true));
+ mKeyboard->setEventCallback( this );
+
+ if ( mInputSystem->numJoysticks() > 0 ) {
+
+ // mJoysticks.resize( mInputSystem->numJoysticks() );
+
+ // itJoystick = mJoysticks.begin();
+ // itJoystickEnd = mJoysticks.end();
+ // for(; itJoystick != itJoystickEnd; ++itJoystick ) {
+ // (*itJoystick) = static_cast<OIS::JoyStick*>( mInputSystem->createInputObject( OIS::OISJoyStick, true ) );
+ // (*itJoystick)->setEventCallback( this );
+ // }
+ mJoyStick = static_cast<OIS::JoyStick*>(mInputSystem->createInputObject( OIS::OISJoyStick, true));
+ mJoyStick->setEventCallback( this );
+ }
+ }
}
InputManager::~InputManager( void ) {
if( mInputSystem ) {
if( mMouse ) {
mInputSystem->destroyInputObject( mMouse );
- mMouse = 0;
+ mMouse = NULL;
}
-
+
if( mKeyboard ) {
mInputSystem->destroyInputObject( mKeyboard );
- mKeyboard = 0;
+ mKeyboard = NULL;
}
- if( mJoysticks.size() > 0 ) {
- itJoystick = mJoysticks.begin();
- itJoystickEnd = mJoysticks.end();
- for(; itJoystick != itJoystickEnd; ++itJoystick ) {
- mInputSystem->destroyInputObject( *itJoystick );
- }
-
- mJoysticks.clear();
+ if( mJoyStick ) {
+ mInputSystem->destroyInputObject( mJoyStick );
+ mJoyStick = NULL;
}
-
- //** did not compile against my OIS version
- // mInputSystem->destroyInputSystem( );
- //** did not compile against my OIS version
+ }
-
- mInputSystem = 0;
-
- // Clear Listeners
- mKeyListeners.clear();
- mMouseListeners.clear();
- mJoystickListeners.clear();
- }
+ OIS::InputManager::destroyInputSystem( mInputSystem );
+
+ mInputSystem = NULL;
+
+ // Clear Listeners
+ mKeyListeners.clear();
+ mMouseListeners.clear();
+ mJoystickListeners.clear();
}
-void InputManager::initialise( Ogre::RenderWindow *renderWindow ) {
- if( !mInputSystem ) {
- // Setup basic variables
- OIS::ParamList paramList;
- size_t windowHnd = 0;
- std::ostringstream windowHndStr;
+void InputManager::capture( ) {
+ if( mMouse ) mMouse->capture();
- // Get window handle
-#if defined OIS_WIN32_PLATFORM
- renderWindow->getCustomAttribute( "HWND", &windowHnd );
- // Uncomment these two lines to allow users to switch keyboards via the language bar
- //paramList.insert(std::make_pair(std::string("w32_keyboard"), std::string("DISCL_FOREGROUND") ));
- //paramList.insert(std::make_pair(std::string("w32_keyboard"), std::string("DISCL_NONEXCLUSIVE") ));
+ if( mKeyboard ) mKeyboard->capture();
-#elif defined OIS_LINUX_PLATFORM
- renderWindow->getCustomAttribute( "GLXWINDOW", &windowHnd );
-#endif
-
- // Fill parameter list
- windowHndStr << (unsigned int) windowHnd;
- paramList.insert( std::make_pair( std::string( "WINDOW" ), windowHndStr.str() ) );
-
- // Create inputsystem
- mInputSystem = OIS::InputManager::createInputSystem( paramList );
-
- // If possible create a buffered keyboard
- if( mInputSystem->numKeyBoards() > 0 ) {
- mKeyboard = static_cast<OIS::Keyboard*>( mInputSystem->createInputObject( OIS::OISKeyboard, true ) );
- mKeyboard->setEventCallback( this );
- }
-
- // If possible create a buffered mouse
- if( mInputSystem->numMice() > 0 ) {
- mMouse = static_cast<OIS::Mouse*>( mInputSystem->createInputObject( OIS::OISMouse, true ) );
- mMouse->setEventCallback( this );
-
- // Get window size
- unsigned int width, height, depth;
- int left, top;
- renderWindow->getMetrics( width, height, depth, left, top );
-
- // Set mouse region
- this->setWindowExtents( width, height );
- }
-
- // If possible create all joysticks in buffered mode
- if( mInputSystem->numJoysticks() > 0 ) {
- mJoysticks.resize( mInputSystem->numJoysticks() );
-
- itJoystick = mJoysticks.begin();
- itJoystickEnd = mJoysticks.end();
- for(; itJoystick != itJoystickEnd; ++itJoystick ) {
- (*itJoystick) = static_cast<OIS::JoyStick*>( mInputSystem->createInputObject( OIS::OISJoyStick, true ) );
- (*itJoystick)->setEventCallback( this );
- }
- }
- }
+ if( mJoyStick ) mJoyStick->capture();
}
-void InputManager::capture( void ) {
- // Need to capture / update each device every frame
- if( mMouse ) {
- mMouse->capture();
- }
-
- if( mKeyboard ) {
- mKeyboard->capture();
- }
-
- if( mJoysticks.size() > 0 ) {
- itJoystick = mJoysticks.begin();
- itJoystickEnd = mJoysticks.end();
- for(; itJoystick != itJoystickEnd; ++itJoystick ) {
- (*itJoystick)->capture();
- }
- }
+void InputManager::setWindowExtents(int width, int height){
+ //Set Mouse Region.. if window resizes, we should alter this to reflect as well
+ const OIS::MouseState &ms = mMouse->getMouseState();
+ ms.width = width;
+ ms.height = height;
}
void InputManager::addKeyListener( OIS::KeyListener *keyListener, const std::string& instanceName ) {
- if( mKeyboard ) {
- // Check for duplicate items
- itKeyListener = mKeyListeners.find( instanceName );
- if( itKeyListener == mKeyListeners.end() ) {
- mKeyListeners[ instanceName ] = keyListener;
- }
- else {
- // Duplicate Item
- }
- }
-}
-
-void InputManager::addMouseListener( OIS::MouseListener *mouseListener, const std::string& instanceName ) {
- if( mMouse ) {
- // Check for duplicate items
- itMouseListener = mMouseListeners.find( instanceName );
- if( itMouseListener == mMouseListeners.end() ) {
- mMouseListeners[ instanceName ] = mouseListener;
- }
- else {
- // Duplicate Item
- }
- }
-}
-
-void InputManager::addJoystickListener( OIS::JoyStickListener *joystickListener, const std::string& instanceName ) {
- if( mJoysticks.size() > 0 ) {
- // Check for duplicate items
- itJoystickListener = mJoystickListeners.find( instanceName );
- if( itJoystickListener == mJoystickListeners.end() ) {
- mJoystickListeners[ instanceName ] = joystickListener;
- }
- else {
- // Duplicate Item
- }
- }
-}
-
-void InputManager::removeKeyListener( const std::string& instanceName ) {
- // Check if item exists
+ if( mKeyboard ) {
+ // Check for duplicate items
itKeyListener = mKeyListeners.find( instanceName );
- if( itKeyListener != mKeyListeners.end() ) {
- mKeyListeners.erase( itKeyListener );
+ if( itKeyListener == mKeyListeners.end() ) {
+ mKeyListeners[ instanceName ] = keyListener;
}
else {
- // Doesn't Exist
+ // Duplicate Item
}
+ }
}
-void InputManager::removeMouseListener( const std::string& instanceName ) {
- // Check if item exists
+void InputManager::addMouseListener( OIS::MouseListener *mouseListener, const std::string& instanceName ) {
+ if( mMouse ) {
+ // Check for duplicate items
itMouseListener = mMouseListeners.find( instanceName );
- if( itMouseListener != mMouseListeners.end() ) {
- mMouseListeners.erase( itMouseListener );
+ if( itMouseListener == mMouseListeners.end() ) {
+ mMouseListeners[ instanceName ] = mouseListener;
}
else {
- // Doesn't Exist
+ // Duplicate Item
}
+ }
}
-void InputManager::removeJoystickListener( const std::string& instanceName ) {
- // Check if item exists
+void InputManager::addJoystickListener( OIS::JoyStickListener *joystickListener, const std::string& instanceName ) {
+ if( mJoyStick ) {
+ // Check for duplicate items
itJoystickListener = mJoystickListeners.find( instanceName );
- if( itJoystickListener != mJoystickListeners.end() ) {
- mJoystickListeners.erase( itJoystickListener );
+ if( itJoystickListener == mJoystickListeners.end() ) {
+ mJoystickListeners[ instanceName ] = joystickListener;
}
else {
- // Doesn't Exist
+ // Duplicate Item
}
+ }
}
+void InputManager::removeKeyListener( const std::string & instanceName ) {
+ // Check if item exists
+ itKeyListener = mKeyListeners.find( instanceName );
+ if( itKeyListener != mKeyListeners.end() ) {
+ mKeyListeners.erase( itKeyListener );
+ }
+ else {
+ // Doesn't Exist
+ }
+}
+
+void InputManager::removeMouseListener( const std::string & instanceName ) {
+ // Check if item exists
+ itMouseListener = mMouseListeners.find( instanceName );
+ if( itMouseListener != mMouseListeners.end() ) {
+ mMouseListeners.erase( itMouseListener );
+ }
+ else {
+ // Doesn't Exist
+ }
+}
+
+void InputManager::removeJoystickListener( const std::string & instanceName ) {
+ // Check if item exists
+ itJoystickListener = mJoystickListeners.find( instanceName );
+ if( itJoystickListener != mJoystickListeners.end() ) {
+ mJoystickListeners.erase( itJoystickListener );
+ }
+ else {
+ // Doesn't Exist
+ }
+}
+
void InputManager::removeKeyListener( OIS::KeyListener *keyListener ) {
- itKeyListener = mKeyListeners.begin();
- itKeyListenerEnd = mKeyListeners.end();
- for(; itKeyListener != itKeyListenerEnd; ++itKeyListener ) {
- if( itKeyListener->second == keyListener ) {
- mKeyListeners.erase( itKeyListener );
- break;
- }
+ itKeyListener = mKeyListeners.begin();
+ itKeyListenerEnd = mKeyListeners.end();
+ for(; itKeyListener != itKeyListenerEnd; ++itKeyListener ) {
+ if( itKeyListener->second == keyListener ) {
+ mKeyListeners.erase( itKeyListener );
+ break;
}
+ }
}
void InputManager::removeMouseListener( OIS::MouseListener *mouseListener ) {
- itMouseListener = mMouseListeners.begin();
- itMouseListenerEnd = mMouseListeners.end();
- for(; itMouseListener != itMouseListenerEnd; ++itMouseListener ) {
- if( itMouseListener->second == mouseListener ) {
- mMouseListeners.erase( itMouseListener );
- break;
- }
+ itMouseListener = mMouseListeners.begin();
+ itMouseListenerEnd = mMouseListeners.end();
+ for(; itMouseListener != itMouseListenerEnd; ++itMouseListener ) {
+ if( itMouseListener->second == mouseListener ) {
+ mMouseListeners.erase( itMouseListener );
+ break;
}
+ }
}
void InputManager::removeJoystickListener( OIS::JoyStickListener *joystickListener ) {
- itJoystickListener = mJoystickListeners.begin();
- itJoystickListenerEnd = mJoystickListeners.end();
- for(; itJoystickListener != itJoystickListenerEnd; ++itJoystickListener ) {
- if( itJoystickListener->second == joystickListener ) {
- mJoystickListeners.erase( itJoystickListener );
- break;
- }
+ itJoystickListener = mJoystickListeners.begin();
+ itJoystickListenerEnd = mJoystickListeners.end();
+ for(; itJoystickListener != itJoystickListenerEnd; ++itJoystickListener ) {
+ if( itJoystickListener->second == joystickListener ) {
+ mJoystickListeners.erase( itJoystickListener );
+ break;
}
+ }
}
void InputManager::removeAllListeners( void ) {
- mKeyListeners.clear();
- mMouseListeners.clear();
- mJoystickListeners.clear();
+ mKeyListeners.clear();
+ mMouseListeners.clear();
+ mJoystickListeners.clear();
}
void InputManager::removeAllKeyListeners( void ) {
- mKeyListeners.clear();
+ mKeyListeners.clear();
}
void InputManager::removeAllMouseListeners( void ) {
- mMouseListeners.clear();
+ mMouseListeners.clear();
}
void InputManager::removeAllJoystickListeners( void ) {
- mJoystickListeners.clear();
+ mJoystickListeners.clear();
}
-void InputManager::setWindowExtents( int width, int height ) {
- // Set mouse region (if window resizes, we should alter this to reflect as well)
- const OIS::MouseState &mouseState = mMouse->getMouseState();
- mouseState.width = width;
- mouseState.height = height;
-}
-
-OIS::Mouse* InputManager::getMouse( void ) {
- return mMouse;
-}
-
-OIS::Keyboard* InputManager::getKeyboard( void ) {
- return mKeyboard;
-}
-
-OIS::JoyStick* InputManager::getJoystick( unsigned int index ) {
- // Make sure it's a valid index
- if( index < mJoysticks.size() ) {
- return mJoysticks[ index ];
- }
-
- return 0;
-}
-
-int InputManager::getNumOfJoysticks( void ) {
- // Cast to keep compiler happy ^^
- return (int) mJoysticks.size();
-}
-
bool InputManager::keyPressed( const OIS::KeyEvent &e ) {
- itKeyListener = mKeyListeners.begin();
- itKeyListenerEnd = mKeyListeners.end();
- for(; itKeyListener != itKeyListenerEnd; ++itKeyListener ) {
- itKeyListener->second->keyPressed( e );
- }
-
- return true;
+ itKeyListener = mKeyListeners.begin();
+ itKeyListenerEnd = mKeyListeners.end();
+ for(; itKeyListener != itKeyListenerEnd; ++itKeyListener ) {
+ itKeyListener->second->keyPressed( e );
+ }
+ return true;
}
bool InputManager::keyReleased( const OIS::KeyEvent &e ) {
- itKeyListener = mKeyListeners.begin();
- itKeyListenerEnd = mKeyListeners.end();
- for(; itKeyListener != itKeyListenerEnd; ++itKeyListener ) {
- itKeyListener->second->keyReleased( e );
- }
-
- return true;
+ itKeyListener = mKeyListeners.begin();
+ itKeyListenerEnd = mKeyListeners.end();
+ for(; itKeyListener != itKeyListenerEnd; ++itKeyListener ) {
+ itKeyListener->second->keyReleased( e );
+ }
+ return true;
}
bool InputManager::mouseMoved( const OIS::MouseEvent &e ) {
- itMouseListener = mMouseListeners.begin();
- itMouseListenerEnd = mMouseListeners.end();
- for(; itMouseListener != itMouseListenerEnd; ++itMouseListener ) {
+ // for_each( mMouseListeners.begin(), mMouseListeners.end(), std::mem_fun( itMouseListener.second->mouseMoved( e ) ) );
+
+ itMouseListener = mMouseListeners.begin();
+ itMouseListenerEnd = mMouseListeners.end();
+ for(; itMouseListener != itMouseListenerEnd; ++itMouseListener ) {
itMouseListener->second->mouseMoved( e );
- }
-
- return true;
+ }
+ return true;
}
bool InputManager::mousePressed( const OIS::MouseEvent &e, OIS::MouseButtonID id ) {
- itMouseListener = mMouseListeners.begin();
- itMouseListenerEnd = mMouseListeners.end();
- for(; itMouseListener != itMouseListenerEnd; ++itMouseListener ) {
- itMouseListener->second->mousePressed( e, id );
- }
-
- return true;
+ itMouseListener = mMouseListeners.begin();
+ itMouseListenerEnd = mMouseListeners.end();
+ for(; itMouseListener != itMouseListenerEnd; ++itMouseListener ) {
+ itMouseListener->second->mousePressed( e, id );
+ }
+ return true;
}
bool InputManager::mouseReleased( const OIS::MouseEvent &e, OIS::MouseButtonID id ) {
- itMouseListener = mMouseListeners.begin();
- itMouseListenerEnd = mMouseListeners.end();
- for(; itMouseListener != itMouseListenerEnd; ++itMouseListener ) {
- itMouseListener->second->mouseReleased( e, id );
- }
-
- return true;
+ itMouseListener = mMouseListeners.begin();
+ itMouseListenerEnd = mMouseListeners.end();
+ for(; itMouseListener != itMouseListenerEnd; ++itMouseListener ) {
+ itMouseListener->second->mouseReleased( e, id );
+ }
+ return true;
}
bool InputManager::povMoved( const OIS::JoyStickEvent &e, int pov ) {
- itJoystickListener = mJoystickListeners.begin();
- itJoystickListenerEnd = mJoystickListeners.end();
- for(; itJoystickListener != itJoystickListenerEnd; ++itJoystickListener ) {
- itJoystickListener->second->povMoved( e, pov );
- }
-
- return true;
+ itJoystickListener = mJoystickListeners.begin();
+ itJoystickListenerEnd = mJoystickListeners.end();
+ for(; itJoystickListener != itJoystickListenerEnd; ++itJoystickListener ) {
+ itJoystickListener->second->povMoved( e, pov );
+ }
+ return true;
}
bool InputManager::axisMoved( const OIS::JoyStickEvent &e, int axis ) {
itJoystickListener = mJoystickListeners.begin();
itJoystickListenerEnd = mJoystickListeners.end();
-
+
for(; itJoystickListener != itJoystickListenerEnd; ++itJoystickListener ) {
itJoystickListener->second->axisMoved( e, axis );
}
-
return true;
}
bool InputManager::sliderMoved( const OIS::JoyStickEvent &e, int sliderID ) {
- itJoystickListener = mJoystickListeners.begin();
- itJoystickListenerEnd = mJoystickListeners.end();
- for(; itJoystickListener != itJoystickListenerEnd; ++itJoystickListener ) {
- itJoystickListener->second->sliderMoved( e, sliderID );
- }
-
- return true;
+ itJoystickListener = mJoystickListeners.begin();
+ itJoystickListenerEnd = mJoystickListeners.end();
+ for(; itJoystickListener != itJoystickListenerEnd; ++itJoystickListener ) {
+ itJoystickListener->second->sliderMoved( e, sliderID );
+ }
+ return true;
}
bool InputManager::buttonPressed( const OIS::JoyStickEvent &e, int button ) {
- itJoystickListener = mJoystickListeners.begin();
- itJoystickListenerEnd = mJoystickListeners.end();
- for(; itJoystickListener != itJoystickListenerEnd; ++itJoystickListener ) {
- itJoystickListener->second->buttonPressed( e, button );
- }
-
- return true;
+ itJoystickListener = mJoystickListeners.begin();
+ itJoystickListenerEnd = mJoystickListeners.end();
+ for(; itJoystickListener != itJoystickListenerEnd; ++itJoystickListener ) {
+ itJoystickListener->second->buttonPressed( e, button );
+ }
+ return true;
}
bool InputManager::buttonReleased( const OIS::JoyStickEvent &e, int button ) {
- itJoystickListener = mJoystickListeners.begin();
- itJoystickListenerEnd = mJoystickListeners.end();
- for(; itJoystickListener != itJoystickListenerEnd; ++itJoystickListener ) {
- itJoystickListener->second->buttonReleased( e, button );
- }
-
- return true;
+ itJoystickListener = mJoystickListeners.begin();
+ itJoystickListenerEnd = mJoystickListeners.end();
+ for(; itJoystickListener != itJoystickListenerEnd; ++itJoystickListener ) {
+ itJoystickListener->second->buttonReleased( e, button );
+ }
+ return true;
}
-InputManager* InputManager::getSingletonPtr( void ) {
- if( !mInputManager ) {
- mInputManager = new InputManager();
- }
+// void InputManager::initialise( Ogre::RenderWindow *renderWindow ) {
+// if( !mInputSystem ) {
+// // Setup basic variables
+// OIS::ParamList paramList;
+// size_t windowHnd = 0;
+// std::ostringstream windowHndStr;
- return mInputManager;
-}
+// // Get window handle
+// #if defined OIS_WIN32_PLATFORM
+// renderWindow->getCustomAttribute( "HWND", &windowHnd );
+// // Uncomment these two lines to allow users to switch keyboards via the language bar
+// //paramList.insert(std::make_pair(std::string("w32_keyboard"), std::string("DISCL_FOREGROUND") ));
+// //paramList.insert(std::make_pair(std::string("w32_keyboard"), std::string("DISCL_NONEXCLUSIVE") ));
+
+// #elif defined OIS_LINUX_PLATFORM
+// renderWindow->getCustomAttribute( "GLXWINDOW", &windowHnd );
+// #endif
+
+// // Fill parameter list
+// windowHndStr << (unsigned int) windowHnd;
+// paramList.insert( std::make_pair( std::string( "WINDOW" ), windowHndStr.str() ) );
+
+// // Create inputsystem
+// mInputSystem = OIS::InputManager::createInputSystem( paramList );
+
+// // If possible create a buffered keyboard
+// #ifndef WIN32
+// if( mInputSystem->numKeyBoards() > 0 ) {
+// mKeyboard = static_cast<OIS::Keyboard*>( mInputSystem->createInputObject( OIS::OISKeyboard, true ) );
+// mKeyboard->setEventCallback( this );
+// }
+
+// // If possible create a buffered mouse
+// if( mInputSystem->numMice() > 0 ) {
+// mMouse = static_cast<OIS::Mouse*>( mInputSystem->createInputObject( OIS::OISMouse, true ) );
+// mMouse->setEventCallback( this );
+
+// // Get window size
+// unsigned int width, height, depth;
+// int left, top;
+// renderWindow->getMetrics( width, height, depth, left, top );
+
+// // Set mouse region
+// this->setWindowExtents( width, height );
+// }
+
+// // If possible create all joysticks in buffered mode
+// if( mInputSystem->numJoysticks() > 0 ) {
+// mJoysticks.resize( mInputSystem->numJoysticks() );
+
+// itJoystick = mJoysticks.begin();
+// itJoystickEnd = mJoysticks.end();
+// for(; itJoystick != itJoystickEnd; ++itJoystick ) {
+// (*itJoystick) = static_cast<OIS::JoyStick*>( mInputSystem->createInputObject( OIS::OISJoyStick, true ) );
+// (*itJoystick)->setEventCallback( this );
+// }
+// }
+// #endif
+// }
+// }
+
+// OIS::Mouse* InputManager::getMouse( void ) {
+// return mMouse;
+// }
+
+// OIS::Keyboard* InputManager::getKeyboard( void ) {
+// return mKeyboard;
+// }
+
+// OIS::JoyStick* InputManager::getJoystick( unsigned int index ) {
+// // Make sure it's a valid index
+// if( index < mJoysticks.size() ) {
+// return mJoysticks[ index ];
+// }
+
+// return 0;
+// }
+
+// int InputManager::getNumOfJoysticks( void ) {
+// // Cast to keep compiler happy ^^
+// return (int) mJoysticks.size();
+// }
+
+
+// InputManager* InputManager::getSingletonPtr( void ) {
+// if( !mInputManager ) {
+// mInputManager = new InputManager();
+// }
+
+// return mInputManager;
+// }
Modified: branches/ogsector/src/InputManager.h
===================================================================
--- branches/ogsector/src/InputManager.h 2007-04-05 12:33:54 UTC (rev 358)
+++ branches/ogsector/src/InputManager.h 2007-04-05 13:01:37 UTC (rev 359)
@@ -1,97 +1,126 @@
#ifndef INPUTMANAGER_H // INPUTMANAGER_H
#define INPUTMANAGER_H
-#include <OISMouse.h>
-#include <OISKeyboard.h>
-#include <OISJoyStick.h>
-#include <OISInputManager.h>
+#ifdef WIN32
+#define OIS_WIN32_PLATFORM
+#else
+#define OIS_LINUX_PLATFORM
+#endif
-#include <OgreRenderWindow.h>
+#include <OIS/OISEvents.h>
+#include <OIS/OISInputManager.h>
+#include <OIS/OISMouse.h>
+#include <OIS/OISKeyboard.h>
+#include <OIS/OISJoyStick.h>
-#if defined OIS_WIN32_PLATFORM
+#ifdef OIS_WIN32_PLATFORM
#define WIN32_LEAN_AND_MEAN
#include "windows.h"
-#include "resource.h"
-LRESULT DlgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
-
+// #include "resource.h"
+// LRESULT DlgProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
#elif defined OIS_LINUX_PLATFORM
-#include <X11/Xlib.h>
-void checkX11Events();
#endif
-class InputManager : public OIS::KeyListener, public OIS::MouseListener, public OIS::JoyStickListener {
+class InputManager : public OIS::MouseListener, public OIS::KeyListener, public OIS::JoyStickListener {
public:
- virtual ~InputManager( void );
+ InputManager( unsigned long hWnd );
+ virtual ~InputManager();
+
+ void setWindowExtents( int width, int height ) ;
- void initialise( Ogre::RenderWindow *renderWindow );
- void capture( void );
+ /*! Need to capture / update each device every frame. */
+ void capture();
void addKeyListener( OIS::KeyListener *keyListener, const std::string& instanceName );
void addMouseListener( OIS::MouseListener *mouseListener, const std::string& instanceName );
void addJoystickListener( OIS::JoyStickListener *joystickListener, const std::string& instanceName );
-
+
void removeKeyListener( const std::string & instanceName );
void removeMouseListener( const std::string & instanceName );
void removeJoystickListener( const std::string & instanceName );
-
+
void removeKeyListener( OIS::KeyListener * keyListener );
void removeMouseListener( OIS::MouseListener * mouseListener );
void removeJoystickListener( OIS::JoyStickListener * joystickListener );
-
+
void removeAllListeners( void );
void removeAllKeyListeners( void );
void removeAllMouseListeners( void );
void removeAllJoystickListeners( void );
+
+ // KeyListener
+ bool keyPressed(const OIS::KeyEvent &evt);
+ bool keyReleased(const OIS::KeyEvent &evt);
+
+ // MouseListener
+ bool mouseMoved(const OIS::MouseEvent &evt);
+ bool mousePressed(const OIS::MouseEvent &evt, OIS::MouseButtonID);
+ bool mouseReleased(const OIS::MouseEvent &evt, OIS::MouseButtonID);
- void setWindowExtents( int width, int height );
-
- OIS::Mouse* getMouse( void );
- OIS::Keyboard* getKeyboard( void );
- OIS::JoyStick* getJoystick( unsigned int index );
-
- int getNumOfJoysticks( void );
-
- static InputManager* getSingletonPtr( void );
-
-private:
- InputManager( void );
- InputManager( const InputManager & input ) { }
- InputManager & operator = ( const InputManager & input );
-
- bool keyPressed( const OIS::KeyEvent & e );
- bool keyReleased( const OIS::KeyEvent & e );
-
- bool mouseMoved( const OIS::MouseEvent & e );
- bool mousePressed( const OIS::MouseEvent & e, OIS::MouseButtonID id );
- bool mouseReleased( const OIS::MouseEvent & e, OIS::MouseButtonID id );
-
- bool povMoved( const OIS::JoyStickEvent & e, int pov );
- bool axisMoved( const OIS::JoyStickEvent & e, int axis );
+ // JoyStickListener
+ bool axisMoved(const OIS::JoyStickEvent &evt, int index );
+ bool buttonPressed(const OIS::JoyStickEvent &evt, int index );
+ bool buttonReleased(const OIS::JoyStickEvent &evt, int index );
bool sliderMoved( const OIS::JoyStickEvent & e, int sliderID );
- bool buttonPressed( const OIS::JoyStickEvent & e, int button );
- bool buttonReleased( const OIS::JoyStickEvent & e, int button );
-
- OIS::InputManager * mInputSystem;
- OIS::Mouse * mMouse;
- OIS::Keyboard * mKeyboard;
-
- std::vector< OIS::JoyStick * > mJoysticks;
- std::vector< OIS::JoyStick * >::iterator itJoystick;
- std::vector< OIS::JoyStick * >::iterator itJoystickEnd;
-
+ bool povMoved(const OIS::JoyStickEvent &evt, int index );
+
+protected:
+
+ OIS::InputManager *mInputSystem;
+ OIS::Mouse *mMouse;
+ OIS::Keyboard *mKeyboard;
+ OIS::JoyStick *mJoyStick;
+ unsigned long m_hWnd;
+
std::map< std::string, OIS::KeyListener * > mKeyListeners;
std::map< std::string, OIS::MouseListener * > mMouseListeners;
std::map< std::string, OIS::JoyStickListener * > mJoystickListeners;
-
+
std::map< std::string, OIS::KeyListener * >::iterator itKeyListener;
std::map< std::string, OIS::MouseListener * >::iterator itMouseListener;
std::map< std::string, OIS::JoyStickListener * >::iterator itJoystickListener;
-
+
std::map< std::string, OIS::KeyListener * >::iterator itKeyListenerEnd;
std::map< std::string, OIS::MouseListener * >::iterator itMouseListenerEnd;
std::map< std::string, OIS::JoyStickListener * >::iterator itJoystickListenerEnd;
-
- static InputManager *mInputManager;
+
};
+// class InputManager : public OIS::KeyListener, public OIS::MouseListener, public OIS::JoyStickListener {
+// public:
+// virtual ~InputManager( void );
+
+// void initialise( Ogre::RenderWindow *renderWindow );
+// void capture( void );
+
+// void setWindowExtents( int width, int height );
+
+// OIS::Mouse* getMouse( void );
+// OIS::Keyboard* getKeyboard( void );
+// OIS::JoyStick* getJoystick( unsigned int index );
+
+// int getNumOfJoysticks( void );
+
+// static InputManager* getSingletonPtr( void );
+
+// private:
+// InputManager( void );
+// InputManager( const InputManager & input ) { }
+// InputManager & operator = ( const InputManager & input );
+
+// OIS::InputManager * mInputSystem;
+// OIS::Mouse * mMouse;
+// OIS::Keyboard * mKeyboard;
+
+// std::vector< OIS::JoyStick * > mJoysticks;
+// std::vector< OIS::JoyStick * >::iterator itJoystick;
+// std::vector< OIS::JoyStick * >::iterator itJoystickEnd;
+
+// std::map< std::string, OIS::KeyListener * > mKeyListeners;
+// std::map< std::string, OIS::MouseListener * > mMouseListeners;
+// std::map< std::string, OIS::JoyStickListener * > mJoystickListeners;
+
+// static InputManager *mInputManager;
+// };
+
#endif // INPUTMANAGER_H
Modified: branches/ogsector/src/Sector.cpp
===================================================================
--- branches/ogsector/src/Sector.cpp 2007-04-05 12:33:54 UTC (rev 358)
+++ branches/ogsector/src/Sector.cpp 2007-04-05 13:01:37 UTC (rev 359)
@@ -5,20 +5,23 @@
Sector::Sector( Ogre::SceneManager * sceneMgr, Network * network ) : sceneMgr_( sceneMgr ), network_( network ){
sectorname_ = "Testsector";
+ avatar_ = NULL;
+
avatarDeathSequenceTime_ = 0.0;
sceneMgr_->setAmbientLight( Ogre::ColourValue(0.5, 0.5, 0.5) );
//** Create a skybox;
sceneMgr_->setSkyBox( true, "OpenGate/SimpleSkyBox1", 100 );
- //** Create a light;
- Ogre::Light * l = sceneMgr_->createLight("MainLight");
+// //** Create a light;
+ // Ogre::Light * l = sceneMgr_->createLight("MainLight");
- // Accept default settings: point light, white diffuse, just set position
- // NB I could attach the light to a SceneNode if I wanted it to move automatically with
- // other objects, but I don't
- l->setPosition( 20, 80, 50 );
+// // Accept default settings: point light, white diffuse, just set position
+// // NB I could attach the light to a SceneNode if I wanted it to move automatically with
+// // other objects, but I don't
+// l->setPosition( 0, 0, 200 );
+
new OgreOpcode::CollisionManager( sceneMgr_ );
OgreOpcode::CollisionManager::getSingletonPtr()->addCollClass( "SectorObject" );
OgreOpcode::CollisionManager::getSingletonPtr()->addCollClass( "Bullet" );
@@ -39,28 +42,28 @@
createStaticObject( Ogre::String("ogrehead.mesh"),
- "ogreheadStation",
- Ogre::Vector3( 5000, 0, 0 ),
- Ogre::Real( 500.0 ),
- Ogre::Degree( 0.0 ) );
+ "ogreheadStation",
+ Ogre::Vector3( 5000, 0, 0 ),
+ Ogre::Real( 500.0 ),
+ Ogre::Degree( 0.0 ) );
// createCircle();
createStaticObject( Ogre::String("ogrehead.mesh"),
- "-100 0 0",
- Ogre::Vector3( -100, 0, 0 ),
- Ogre::Real( 10.0 ),
- Ogre::Degree( 0.0 ) );
+ "-100 0 0",
+ Ogre::Vector3( -100, 0, 0 ),
+ Ogre::Real( 10.0 ),
+ Ogre::Degree( 0.0 ) );
createStaticObject( Ogre::String("ogrehead.mesh"),
- "100 0 0",
- Ogre::Vector3( 100, 0, 0 ),
- Ogre::Real( 10.0 ),
- Ogre::Degree( 0.0 ) );
+ "100 0 0",
+ Ogre::Vector3( 100, 0, 0 ),
+ Ogre::Real( 10.0 ),
+ Ogre::Degree( 0.0 ) );
itTarget_ = sectorObjects_.begin();
-}
+}
Sector::~Sector( ){
delete OgreOpcode::CollisionManager::getSingletonPtr();
@@ -73,7 +76,8 @@
void Sector::update( Ogre::Real elapsedTime ){
collideInSectorContext_->collide( 0.0 );
- // collideInSectorContext_->collide( elapsedTime );
+ collideInSectorContext_->collide( elapsedTime );
+
OgreOpcode::CollisionReporter report( collideInSectorContext_->getCollisionReport() );
int nCollids = report.getNumCollisions();
@@ -91,14 +95,12 @@
static_cast< BaseObject * >( col2->getClientData() )->collide( static_cast< BaseObject * >( col1->getClientData() ) );
}
-// std::cout << "CollisionContext attached objects: " + Ogre::StringConverter::toString(collideInSectorContext_->getAttachedObjectCount()) << std::endl;
-// std::cout << "CollisionContext owned objects: " + Ogre::StringConverter::toString(collideInSectorContext_->getOwnedObjectCount()) << std::endl;
-// std::cout << "CollisionManager shapes: " + Ogre::StringConverter::toString(OgreOpcode::CollisionManager::getSingletonPtr()->getShapeCount())<< std::endl;
+ std::cout << "CollisionContext attached objects: " + Ogre::StringConverter::toString(collideInSectorContext_->getAttachedObjectCount()) << std::endl;
+ std::cout << "CollisionContext owned objects: " + Ogre::StringConverter::toString(collideInSectorContext_->getOwnedObjectCount()) << std::endl;
+ std::cout << "CollisionManager shapes: " + Ogre::StringConverter::toString(OgreOpcode::CollisionManager::getSingletonPtr()->getShapeCount())<< std::endl;
- }
+ }
- // avatar_->update( elapsedTime);
-
bool tmpsegfaultDebug = false;
for ( std::map< long, SectorObjectMoveable * >::iterator it = movableObjects_.begin(); it != movableObjects_.end();){
if ( !it->second->update( elapsedTime ) ) {
@@ -114,13 +116,13 @@
std::cout << "tmpsegfaultDebug done." << std::endl;
tmpsegfaultDebug = false;
}
-
- if ( avatarDeathSequenceTime_ > 0 ){
- avatarDeathSequenceTime_ -= elapsedTime;
- } else if ( avatarDeathSequenceTime_ > -1 ) {
- spawnAvatar();
- }
-
+
+ if ( avatarDeathSequenceTime_ > 0 ){
+ avatarDeathSequenceTime_ -= elapsedTime;
+ } else if ( avatarDeathSequenceTime_ > -1 ) {
+ spawnAvatar();
+ }
+
}
SectorObjectMoveable * Sector::createMoveableObject( const Ogre::String & name, int userID, int childID ){
@@ -198,8 +200,6 @@
MessageShipRegister msg( 0, obj->childID(), obj->name(), obj->mainNode()->getPosition(), true );
network_->send( msg );
-
-
}
void Sector::createAvatar( const Ogre::String & playername ){
@@ -211,7 +211,7 @@
void Sector::destructAvatar( ){
// sectorObjects_.erase( avatar_ );
movableObjects_.erase( avatar_->globalID() );
- delete avatar_;
+ if ( avatar_ != NULL ) delete avatar_;
avatar_ = NULL;
}
@@ -224,24 +224,28 @@
}
void Sector::spawnAvatar( ){
- avatarDeathSequenceTime_ = -1.0;
-
- avatar_->mainNode()->setPosition( 0.0, 0.0, 0.0 );
- avatar_->mainNode()->setOrientation( Ogre::Quaternion( 1.0, 0.0, 0.0, 0.0 ) );
- avatar_->setVelocity( Ogre::Vector3( 0.0, 0.0, -20.0 ) );
- avatar_->reset();
-
- MessageShipRegister msg( 0, 0, avatar_->name(), avatar_->mainNode()->getPosition(), true );
- network_->send( msg );
-
- avatar_->setVisible( false );
- listener_->avatarDeathSequence( false );
+ if ( avatar_ != NULL ){
+ avatarDeathSequenceTime_ = -1.0;
+
+ avatar_->mainNode()->setPosition( 0.0, 0.0, 500.0 );
+ avatar_->mainNode()->setOrientation( Ogre::Quaternion( 1.0, 0.0, 0.0, 0.0 ) );
+ avatar_->setVelocity( Ogre::Vector3( 0.0, 0.0, -20.0 ) );
+ avatar_->reset();
+
+ MessageShipRegister msg( 0, 0, avatar_->name(), avatar_->mainNode()->getPosition(), true );
+ network_->send( msg );
+
+ avatar_->setVisible( false );
+ listener_->avatarDeathSequence( false );
+ }
}
SectorObject * Sector::nextTarget( ){
if ( sectorObjects_.size() != 0 ){
itTarget_ ++;
- if ( (*itTarget_) == avatar_ ) return nextTarget();
+ if ( avatar_ != NULL ){
+ if ( (*itTarget_) == avatar_ ) return nextTarget();
+ }
if ( itTarget_ == sectorObjects_.end() ) itTarget_ = sectorObjects_.begin();
return (*itTarget_);
@@ -254,7 +258,9 @@
if ( itTarget_ == sectorObjects_.begin() ) itTarget_ = sectorObjects_.end();
itTarget_ --;
- if ( (*itTarget_) == avatar_ ) return prevTarget();
+ if ( avatar_ != NULL ){
+ if ( (*itTarget_) == avatar_ ) return prevTarget();
+ }
return (*itTarget_);
}
return NULL;
@@ -323,17 +329,19 @@
}
void Sector::sendAllVesselMovements( ){
- MessageShipMovement msg( 0,
- avatar_->mainNode()->getPosition(),
- avatar_->velDirection(),
- avatar_->mainNode()->getOrientation(),
- avatar_->thrustPercent(),
- avatar_->scaledYaw(),
- avatar_->scaledPitch(),
- avatar_->scaledRoll(),
- avatar_->incNetSequence() );
+ if ( avatar_ != NULL ){
+ MessageShipMovement msg( 0,
+ avatar_->mainNode()->getPosition(),
+ avatar_->velDirection(),
+ avatar_->mainNode()->getOrientation(),
+ avatar_->thrustPercent(),
+ avatar_->scaledYaw(),
+ avatar_->scaledPitch(),
+ avatar_->scaledRoll(),
+ avatar_->incNetSequence() );
- network_->send( msg, false );
+ network_->send( msg, false );
+ }
for ( std::map< int, SectorObjectMoveableAi * >::iterator it = localAiObjects_.begin(); it != localAiObjects_.end(); it ++ ){
MessageShipMovement msgObj( it->second->childID(),
@@ -375,7 +383,9 @@
}
void Sector::sendAllVesselStatus( ){
- sendVesselStatus( *avatar_ );
+ if ( avatar_ != NULL ){
+ sendVesselStatus( *avatar_ );
+ }
// for ( std::map< int, SectorObjectMoveableAi * >::iterator it = localAiObjects_.begin(); it != localAiObjects_.end(); it ++ ){
// sendVesselStatus( *(it->second) );
// }
Modified: branches/ogsector/src/Sector.h
===================================================================
--- branches/ogsector/src/Sector.h 2007-04-05 12:33:54 UTC (rev 358)
+++ branches/ogsector/src/Sector.h 2007-04-05 13:01:37 UTC (rev 359)
@@ -25,7 +25,6 @@
void setNetwork( Network * network ){ network_ = network; }
-
void update( Ogre::Real elapsedTime );
void createStaticObject( const Ogre::String & meshname, const Ogre::String & objectname,
@@ -57,7 +56,6 @@
SectorObject * prevTarget( );
-
void receiveVesselRegister( const MessageShipRegister & msg );
void sendAllVesselStatus( );
@@ -74,7 +72,6 @@
void receiveVesselAmmoHit( const MessageShipAmmoHit & msg );
-
protected:
SectorClientFrameListener * listener_;
Ogre::SceneManager * sceneMgr_;
Modified: branches/ogsector/src/SectorClient.cpp
===================================================================
--- branches/ogsector/src/SectorClient.cpp 2007-04-05 12:33:54 UTC (rev 358)
+++ branches/ogsector/src/SectorClient.cpp 2007-04-05 13:01:37 UTC (rev 359)
@@ -11,28 +11,30 @@
if ( sector_ != NULL ) delete sector_;
}
-bool SectorClient::setup( ){
- root_ = new Ogre::Root();
+bool SectorClient::setup( bool dialog ){
+ root_ = new Ogre::Root;
setupResources();
- if ( !configure() ) return false;
+ if ( !configure( dialog ) ) return false;
- sceneMgr_ = root_->createSceneManager( Ogre::ST_GENERIC, "BaseSMInstance");
+ //** load ressources
+ Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
+ //** load scene Manager
+ sceneMgr_ = root_->createSceneManager( Ogre::ST_GENERIC, "BaseSMInstance" );
+
createCameras();
createViewports();
+ //** spom dont what for
// Set default mipmap level (NB some APIs ignore this)
- Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(5);
-
- // Create any resource listeners (for loading screens)
+ // Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(5);
+ // Create any resource listeners (for loading screens)
// createResourceListener();
-
- // Load resources
- loadResources();
-
+ //** spom dont what for
+
// Create the scene
createScene();
@@ -64,58 +66,61 @@
}
}
-bool SectorClient::configure( void ){
- root_->restoreConfig();
- window_ = root_->initialise( true );
- return true;
-
- // Show the configuration dialog and initialise the system
- // You can skip this and use root.restoreConfig() to load configuration
- // settings if you were sure there are valid ones saved in ogre.cfg
- if ( root_->showConfigDialog() ) {
- // If returned true, user clicked OK so initialise
- // Here we choose to let the system create a default rendering window by passing 'true'
- window_ = root_->initialise( true );
+bool SectorClient::configure( bool dialog ){
+ if ( !dialog ){
+ root_->restoreConfig();
+ window_ = root_->initialise( true, "OGSectorClient");
return true;
} else {
- return false;
+ // Show the configuration dialog and initialise the system
+ // You can skip this and use root.restoreConfig() to load configuration
+ // settings if you were sure there are valid ones saved in ogre.cfg
+ if ( root_->showConfigDialog() ) {
+ // If returned true, user clicked OK so initialise
+ // Here we choose to let the system create a default rendering window by passing 'true'
+ window_ = root_->initialise( true );
+ return true;
+ } else {
+ return false;
+ }
}
+ return false;
}
void SectorClient::createCameras( ) {
camera_ = sceneMgr_->createCamera("CameraMain");
- camera_->setPosition( Ogre::Vector3( 0, 0, 200 ) );
- camera_->lookAt( Ogre::Vector3( 0, 0, -300 ) );
+ camera_->setPosition( Ogre::Vector3( 0, 0, 500 ) );
+ camera_->lookAt( Ogre::Vector3( 0, 0, 0 ) );
camera_->setNearClipDistance( 1 );
// camera_->setAspectRatio( Real(vp->getActualWidth()) / Real(vp->getActualHeight()));
Ogre::Camera * camera1 = sceneMgr_->createCamera("Camera1");
- camera1->setPosition( Ogre::Vector3( 0, 0, 200 ) );
- camera1->lookAt( Ogre::Vector3( 0, 0, -300 ) );
+ camera1->setPosition( Ogre::Vector3( 0, 0, 500 ) );
+ camera1->lookAt( Ogre::Vector3( 0, 0, 0 ) );
camera1->setNearClipDistance( 1 );
- Ogre::Camera * camera2 = sceneMgr_->createCamera("Camera2");
- camera2->setPosition( Ogre::Vector3( 0, 0, 200 ) );
- camera2->lookAt( Ogre::Vector3( 0, 0, -300 ) );
- camera2->setNearClipDistance( 1 );
+// Ogre::Camera * camera2 = sceneMgr_->createCamera("Camera2");
+// camera2->setPosition( Ogre::Vector3( 0, 0, 200 ) );
+// camera2->lookAt( Ogre::Vector3( 0, 0, -300 ) );
+// camera2->setNearClipDistance( 1 );
}
void SectorClient::createViewports( ) {
Ogre::Viewport* vp = window_->addViewport( camera_, 0, 0.0, 0.0, 1.0f, 1.0f );
vp->setBackgroundColour( Ogre::ColourValue( 0, 0, 0) );
- Ogre::Viewport* vp1 = window_->addViewport( sceneMgr_->getCamera( "Camera1" ), 1, 0.84, 0.84, 0.15, 0.15 );
+ Ogre::Viewport* vp1 = window_->addViewport( sceneMgr_->getCamera( "Camera1" ), 1, 0.01, 0.84, 0.15, 0.15 );
vp1->setBackgroundColour( Ogre::ColourValue( 0.1, 0.1, 0.1 ) );
vp1->setSkiesEnabled( true );
vp1->setShadowsEnabled( false );
vp1->setOverlaysEnabled( false );
- Ogre::Viewport* vp2 = window_->addViewport( sceneMgr_->getCamera( "Camera2" ), 2, 0.84, 0.01, 0.15, 0.15 );
- vp2->setBackgroundColour( Ogre::ColourValue( 0.1, 0.1, 0.1 ) );
- vp2->setSkiesEnabled( false );
- vp2->setOverlaysEnabled( false );
- vp2->setShadowsEnabled( false );
- window_->removeViewport( 2 );
+// Ogre::Viewport* vp2 = window_->addViewport( sceneMgr_->getCamera( "Camera2" ), 2, 0.84, 0.01, 0.15, 0.15 );
+// vp2->setBackgroundColour( Ogre::ColourValue( 0.1, 0.1, 0.1 ) );
+// vp2->setSkiesEnabled( false );
+// vp2->setOverlaysEnabled( false );
+// vp2->setShadowsEnabled( false );
+// window_->removeViewport( 2 );
}
void SectorClient::createFrameListener( ) {
Modified: branches/ogsector/src/SectorClient.h
===================================================================
--- branches/ogsector/src/SectorClient.h 2007-04-05 12:33:54 UTC (rev 358)
+++ branches/ogsector/src/SectorClient.h 2007-04-05 13:01:37 UTC (rev 359)
@@ -26,8 +26,8 @@
if ( root_ != NULL ) delete root_;
}
- virtual void go( void ){
- if ( !setup() ) return;
+ virtual void go( bool dialog ){
+ if ( !setup( dialog ) ) return;
root_->startRendering();
@@ -36,12 +36,12 @@
protected:
- virtual bool setup( );
+ virtual bool setup( bool dialog );
//! Method which will define the source of resources (other than current folder)
virtual void setupResources( );
- virtual bool configure( );
+ virtual bool configure( bool dialog );
// virtual void chooseSceneManager( ){ }
@@ -55,10 +55,6 @@
virtual void destroyScene( );
- virtual void loadResources( ) {
- Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
- }
-
Ogre::Root * root_;
Ogre::Camera * camera_;
Modified: branches/ogsector/src/SectorClientFrameListener.cpp
===================================================================
--- branches/ogsector/src/SectorClientFrameListener.cpp 2007-04-05 12:33:54 UTC (rev 358)
+++ branches/ogsector/src/SectorClientFrameListener.cpp 2007-04-05 13:01:37 UTC (rev 359)
@@ -14,30 +14,33 @@
bool useBufferedInputMouse )
: camera_( cam ), window_( win ), sector_( sector ), network_( nw ){
+ shutDownRequest_ = false;
+ deathSequence_ = false;
+ sceneDetailIndex_ = 0;
+ target_ = NULL;
+ cameraMode_ = 1;
+
sector_->setListener( this );
- inputManager_ = InputManager::getSingletonPtr();
- inputManager_->initialise( window_ );
+ windowsWidth_ = window_->getWidth( );
+ windowsHeight_ = window_->getHeight( );
+ windowsHalfWidth_ = (int)(windowsWidth_ * 0.5);
+ windowsHalfHeight_ = (int)(windowsHeight_ * 0.5);
+
+ unsigned long hWnd;
+ window_->getCustomAttribute( "WINDOW", &hWnd );
+
+ inputManager_ = new InputManager( hWnd );
+ inputManager_->setWindowExtents( windowsWidth_, windowsHeight_ );
+
inputManager_->addKeyListener( this, "SectorClientKeyListener" );
inputManager_->addMouseListener( this, "SectorClientMouseListener" );
inputManager_->addJoystickListener( this, "SectorClientJoystickListener" );
- cameraMode_ = 1;
- cameraRotateSpeed_ = 36;
- cameraRotateScale_ = 0.0f;
- cameraMoveSpeed_ = 100;
- cameraMoveScale_ = 0.0f;
- cameraTranslate_ = Ogre::Vector3::ZERO;
-
timeSinceLastSectorUpdate_ = 0.0;
timeSinceLastNetworkUpdate_ = 0.0;
- deathSequence_ = false;
inputInitialState_ = true;
lastInputWheelState_ = 0;
- windowsWidth_ = window_->getWidth( );
- windowsHeight_ = window_->getHeight( );
- windowsHalfWidth_ = (int)(windowsWidth_ * 0.5);
- windowsHalfHeight_ = (int)(windowsHeight_ * 0.5);
hudOverlay_ = Ogre::OverlayManager::getSingleton().getByName("OpenGate/SimpleHUD");
@@ -58,32 +61,35 @@
mouseOverlay_->show();
chatMode_ = false;
- setTarget( sector_->nextTarget() );
- // targetPointer_ = camera_->getSceneManager()->getRootSceneNode()->createChildSceneNode( "TargetPointer" );
+// cameraRotateSpeed_ = 36;
+// cameraRotateScale_ = 0.0f;
+// cameraMoveSpeed_ = 100;
+// cameraMoveScale_ = 0.0f;
+// cameraTranslate_ = Ogre::Vector3::ZERO;
+
+// targetPointer_ = camera_->getSceneManager()->getRootSceneNode()->createChildSceneNode( "TargetPointer" );
// BillboardSet* mySet = camera_->getSceneManager()->createBillboardSet("mySet");
// targetPointerBB_ = mySet->createBillboard( Vector3(0, 0, 0) );
// mySet->setMaterialName( "TargetPointer" );
// targetPointerBB_->setDimensions( 32.0, 32.0 );
// targetPointer_->attachObject( mySet );
- //targetPointer_->scale( 0.05, 0.05, 0.05 );
+// targetPointer_->scale( 0.05, 0.05, 0.05 );
// BillboardSet *targetPointerBillboard = camera_->getSceneManager()->createBillboardSet( "hudTargetPointer" );
// targetPointerBillboard->setMaterialName( "TargetPointer" );
// Billboard * hudTargetPointer = targetPointerBillboard->createBillboard( Ogre::Vector3( 0.0, 0.0, -100 ) );
-// // hudTargetPointer->
+// hudTargetPointer->
-
- spaceDustParticleSystem_ = camera_->getSceneManager()->createParticleSystem( "SpaceDust", "Space/Dust" );
- Ogre::SceneNode * spaceDustNode = sector_->avatar()->mainNode()->createChildSceneNode( "DustParticles", camera_->getRealPosition() );
+// spaceDustParticleSystem_ = camera_->getSceneManager()->createParticleSystem( "SpaceDust", "Space/Dust" );
+// Ogre::SceneNode * spaceDustNode = sector_->avatar()->mainNode()->createChildSceneNode( "DustParticles", camera_->getRealPosition() );
- // spaceDustNode_->attachObject( spaceDustParticleSystem_ );
- //camera_->getParentSceneNode()
+// spaceDustNode_->attachObject( spaceDustParticleSystem_ );
+// camera_->getParentSceneNode()
-
- // listener for the space dust
+// listener for the space dust
// SpaceDust* psd = new SpaceDust(mCamera, ps);
// mRoot->addFrameListener(psd);
@@ -93,7 +99,6 @@
// statsOn_ = true;
// numScreenShots_ = 0;
- sceneDetailIndex_ = 0;
// aniso_ = 1;
// filtering_ = TFO_BILINEAR;
}
@@ -102,21 +107,18 @@
inputManager_->removeKeyListener( "SectorClientKeyListener" );
inputManager_->removeMouseListener( "SectorClientMouseListener" );
inputManager_->removeJoystickListener( "SectorClientJoystickListener" );
-
- //** neccesary because of new operator in inputmanager
+
+ //** neccesary because of new operator in inputmanager;
if ( inputManager_ != NULL ) delete inputManager_;
}
bool SectorClientFrameListener::frameStarted( const Ogre::FrameEvent & evt ) {
if ( window_->isClosed() ) return false;
-
-
timeSinceLastSectorUpdate_ += evt.timeSinceLastFrame;
timeSinceLastNetworkUpdate_ += evt.timeSinceLastFrame;
if ( deathSequence_ ){
-
} else {
//** capture my input
inputManager_->capture();
@@ -164,7 +166,7 @@
timeSinceLastSectorUpdate_ = 0.0;
updateHUD_();
}
-
+
//** send movement data, max 10 net-updates/second
if ( timeSinceLastNetworkUpdate_ > 0.1 ){
sector_->sendAllVesselMovements( );
@@ -174,7 +176,7 @@
//** update my camera;
updateCamera_();
- renderSpaceDust();
+// renderSpaceDust();
return true;
}
@@ -185,67 +187,67 @@
bool SectorClientFrameListener::keyPressed( const OIS::KeyEvent & e ){
+ //** ESCAPE leads to shutdown;
+ if ( e.key == OIS::KC_ESCAPE) { shutDownRequest_ = true; }
+
if ( !chatMode_ ){
if ( e.key == OIS::KC_RETURN) {
chatMode_ = true;
}
-
- //** ESCAPE leads to shutdown;
- if ( e.key == OIS::KC_ESCAPE) { shutDownRequest_ = true; }
- //** Avatar yaw LEFT;
- if ( e.key == OIS::KC_A || e.key == OIS::KC_NUMPAD4 ) { sector_->avatar()->setScaledYaw( 1.0 ); }
-
- //** Avatar yaw RIGHT;
- if ( e.key == OIS::KC_D || e.key == OIS::KC_NUMPAD6 ) { sector_->avatar()->setScaledYaw( -1.0 ); }
+ if ( sector_->avatar() != NULL ){
+ //** Avatar yaw LEFT;
+ if ( e.key == OIS::KC_A || e.key == OIS::KC_NUMPAD4 ) { sector_->avatar()->setScaledYaw( 1.0 ); }
+
+ //** Avatar yaw RIGHT;
+ if ( e.key == OIS::KC_D || e.key == OIS::KC_NUMPAD6 ) { sector_->avatar()->setScaledYaw( -1.0 ); }
+
+ //** Avatar pitch DOWN;
+ if ( e.key == OIS::KC_W || e.key == OIS::KC_NUMPAD8 ) { sector_->avatar()->setScaledPitch( -1.0 ); }
+
+ //** Avatar pitch UP;
+ if ( e.key == OIS::KC_S || e.key == OIS::KC_NUMPAD2 ) { sector_->avatar()->setScaledPitch( 1.0 ); }
+
+ //** Avatar roll (181 == NUM/);
+ if ( e.key == OIS::KC_NUMPAD0 || e.key == 181 ) { sector_->avatar()->setScaledRoll( 1.0 ); }
+
+ //** Avatar roll (55 == NUM*);
+ if ( e.key == OIS::KC_NUMPADCOMMA || e.key == 55 ) { sector_->avatar()->setScaledRoll( -1.0 ); }
+
+ //** Avatar increase thrust by 10%;
+ if ( e.key == OIS::KC_NUMPAD7 ) { sector_->avatar()->incrementThrust(); }
+
+ //** Avatar increase thrust by 10%;
+ if ( e.key == OIS::KC_NUMPAD1 ) { sector_->avatar()->decrementThrust(); }
+
+ //** Avatar press break;
+ if ( e.key == OIS::KC_NUMPAD3 ) { sector_->avatar()->setBreakPressed( true ); }
+
+ //** Avatar press afterburner;
+ if ( e.key == OIS::KC_NUMPAD9 ) { sector_->avatar()->setAfterburnerPressed( true ); }
+
+ //** Avatar centering;
+ if ( e.key == OIS::KC_NUMPAD5 ) {
+ sector_->avatar()->setScaledYaw( 0.0 );
+ sector_->avatar()->setScaledPitch( 0.0 );
+ sector_->avatar()->setScaledRoll( 0.0 );
+ }
+ //** selfdestruct and eject;
+ if ( e.key == OIS::KC_F11 ) { sector_->avatarDied(); }
+ } // if avatar;
- //** Avatar pitch DOWN;
- if ( e.key == OIS::KC_W || e.key == OIS::KC_NUMPAD8 ) { sector_->avatar()->setScaledPitch( -1.0 ); }
-
- //** Avatar pitch UP;
- if ( e.key == OIS::KC_S || e.key == OIS::KC_NUMPAD2 ) { sector_->avatar()->setScaledPitch( 1.0 ); }
-
- //** Avatar roll (181 == NUM/);
- if ( e.key == OIS::KC_NUMPAD0 || e.key == 181 ) { sector_->avatar()->setScaledRoll( 1.0 ); }
-
- //** Avatar roll (55 == NUM*);
- if ( e.key == OIS::KC_NUMPADCOMMA || e.key == 55 ) { sector_->avatar()->setScaledRoll( -1.0 ); }
-
- //** Avatar increase thrust by 10%;
- if ( e.key == OIS::KC_NUMPAD7 ) { sector_->avatar()->incrementThrust(); }
-
- //** Avatar increase thrust by 10%;
- if ( e.key == OIS::KC_NUMPAD1 ) { sector_->avatar()->decrementThrust(); }
-
- //** Avatar press break;
- if ( e.key == OIS::KC_NUMPAD3 ) { sector_->avatar()->setBreakPressed( true ); }
-
- //** Avatar press afterburner;
- if ( e.key == OIS::KC_NUMPAD9 ) { sector_->avatar()->setAfterburnerPressed( true ); }
-
- //** Avatar centering;
- if ( e.key == OIS::KC_NUMPAD5 ) {
- sector_->avatar()->setScaledYaw( 0.0 );
- sector_->avatar()->setScaledPitch( 0.0 );
- sector_->avatar()->setScaledRoll( 0.0 );
- }
-
//** next Target;
if ( e.key == OIS::KC_N ) { setTarget( sector_->nextTarget() ); }
-
+
//** prev Target;
if ( e.key == OIS::KC_P ) { setTarget( sector_->prevTarget() ); }
-
- //** selfdestruct and eject;
- if ( e.key == OIS::KC_F11 ) { sector_->avatarDied(); }
-
+
//** spawn;
if ( e.key == OIS::KC_F12 ) { sector_->spawnAiObject(); }
-
//** Toggle through camera modes;
if ( e.key == OIS::KC_6 ) { toggleNextCamera_(); }
-
+
//** Create one screenshot;
if ( e.key == OIS::KC_SYSRQ ) {
char tmp[ 20 ];
@@ -304,159 +306,169 @@
// MaterialManager::getSingleton().setDefaultTextureFiltering( filtering_ );
// MaterialManager::getSingleton().setDefaultAnisotropy( aniso_ );...
[truncated message content] |
|
From: <ult...@us...> - 2007-04-05 12:33:55
|
Revision: 358
http://svn.sourceforge.net/opengate/?rev=358&view=rev
Author: ultrasick
Date: 2007-04-05 05:33:54 -0700 (Thu, 05 Apr 2007)
Log Message:
-----------
uploading the organic foods 3d model
Added Paths:
-----------
trunk/data/commodities/organic foods.blend
Added: trunk/data/commodities/organic foods.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/organic foods.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-05 03:35:15
|
Revision: 357
http://svn.sourceforge.net/opengate/?rev=357&view=rev
Author: ultrasick
Date: 2007-04-04 20:35:17 -0700 (Wed, 04 Apr 2007)
Log Message:
-----------
activated 7z compression, file size reduced by ca. 12 mb
Modified Paths:
--------------
trunk/templates/data/commodities/manufactured_foods/front.pspimage
Modified: trunk/templates/data/commodities/manufactured_foods/front.pspimage
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-05 03:28:30
|
Revision: 356
http://svn.sourceforge.net/opengate/?rev=356&view=rev
Author: ultrasick
Date: 2007-04-04 20:28:30 -0700 (Wed, 04 Apr 2007)
Log Message:
-----------
renaming manufactured food -> manufactured foods
+ uploading template of organic foods texture
Added Paths:
-----------
trunk/templates/data/commodities/manufactured_foods/
trunk/templates/data/commodities/manufactured_foods/front.pspimage
trunk/templates/data/commodities/manufactured_foods/picture_blueberry.png
trunk/templates/data/commodities/manufactured_foods/picture_strawberry.png
trunk/templates/data/commodities/manufactured_foods/side_blue.png
trunk/templates/data/commodities/manufactured_foods/side_red.png
trunk/templates/data/commodities/manufactured_foods/structur.png
trunk/templates/data/commodities/manufactured_foods/structur_blueberry.png
trunk/templates/data/commodities/manufactured_foods/structur_strawberre.png
trunk/templates/data/commodities/manufactured_foods/top.png
trunk/templates/data/commodities/organic_foods/
trunk/templates/data/commodities/organic_foods/Etikett.pspimage
Removed Paths:
-------------
trunk/templates/data/commodities/manufactured_food/
Added: trunk/templates/data/commodities/manufactured_foods/front.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/commodities/manufactured_foods/front.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/commodities/manufactured_foods/picture_blueberry.png
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/commodities/manufactured_foods/picture_blueberry.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/commodities/manufactured_foods/picture_strawberry.png
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/commodities/manufactured_foods/picture_strawberry.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/commodities/manufactured_foods/side_blue.png
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/commodities/manufactured_foods/side_blue.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/commodities/manufactured_foods/side_red.png
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/commodities/manufactured_foods/side_red.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/commodities/manufactured_foods/structur.png
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/commodities/manufactured_foods/structur.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/commodities/manufactured_foods/structur_blueberry.png
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/commodities/manufactured_foods/structur_blueberry.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/commodities/manufactured_foods/structur_strawberre.png
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/commodities/manufactured_foods/structur_strawberre.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/commodities/manufactured_foods/top.png
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/commodities/manufactured_foods/top.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/commodities/organic_foods/Etikett.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/commodities/organic_foods/Etikett.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-04 21:11:18
|
Revision: 355
http://svn.sourceforge.net/opengate/?rev=355&view=rev
Author: ultrasick
Date: 2007-04-04 14:11:17 -0700 (Wed, 04 Apr 2007)
Log Message:
-----------
moved textures into the templates directory because they are already in the wings files
+ added the primrose textures in the templates directory
Added Paths:
-----------
trunk/templates/data/ships/
trunk/templates/data/ships/octavius/
trunk/templates/data/ships/octavius/apteryx/
trunk/templates/data/ships/octavius/apteryx/apteryx_auv.png
trunk/templates/data/ships/octavius/apteryx/apteryx_auv.svg
trunk/templates/data/ships/octavius/apteryx/apteryx_auv_org.png
trunk/templates/data/ships/quantar/
trunk/templates/data/ships/quantar/storm/
trunk/templates/data/ships/quantar/storm/storm_auv.png
trunk/templates/data/ships/quantar/storm/storm_auv.svg
trunk/templates/data/ships/quantar/storm/storm_auv_org.png
trunk/templates/data/ships/solrain/
trunk/templates/data/ships/solrain/primrose/
trunk/templates/data/ships/solrain/primrose/dark background.png
trunk/templates/data/ships/solrain/primrose/info.txt
trunk/templates/data/ships/solrain/primrose/panels - big.png
trunk/templates/data/ships/solrain/primrose/panels - dark.png
trunk/templates/data/ships/solrain/primrose/panels.jpg
trunk/templates/data/ships/solrain/primrose/parts/
trunk/templates/data/ships/solrain/primrose/parts/1.pspimage
trunk/templates/data/ships/solrain/primrose/parts/11.pspimage
trunk/templates/data/ships/solrain/primrose/parts/12 + 13.pspimage
trunk/templates/data/ships/solrain/primrose/parts/14 + 15.pspimage
trunk/templates/data/ships/solrain/primrose/parts/16.pspimage
trunk/templates/data/ships/solrain/primrose/parts/17 + 18.pspimage
trunk/templates/data/ships/solrain/primrose/parts/19 + 20.pspimage
trunk/templates/data/ships/solrain/primrose/parts/2.pspimage
trunk/templates/data/ships/solrain/primrose/parts/21 + 22.pspimage
trunk/templates/data/ships/solrain/primrose/parts/23 + 24.pspimage
trunk/templates/data/ships/solrain/primrose/parts/25 + 26.pspimage
trunk/templates/data/ships/solrain/primrose/parts/27 + 28.pspimage
trunk/templates/data/ships/solrain/primrose/parts/29 + 30.pspimage
trunk/templates/data/ships/solrain/primrose/parts/3 + 4.pspimage
trunk/templates/data/ships/solrain/primrose/parts/31 + 32.pspimage
trunk/templates/data/ships/solrain/primrose/parts/33 + 34.pspimage
trunk/templates/data/ships/solrain/primrose/parts/35 + 36.pspimage
trunk/templates/data/ships/solrain/primrose/parts/37 + 38.pspimage
trunk/templates/data/ships/solrain/primrose/parts/39 + 40.pspimage
trunk/templates/data/ships/solrain/primrose/parts/41 + 42.pspimage
trunk/templates/data/ships/solrain/primrose/parts/43 + 44.pspimage
trunk/templates/data/ships/solrain/primrose/parts/45 + 46.pspimage
trunk/templates/data/ships/solrain/primrose/parts/5 + 6.pspimage
trunk/templates/data/ships/solrain/primrose/parts/7 + 8.pspimage
trunk/templates/data/ships/solrain/primrose/parts/9 + 10.pspimage
Removed Paths:
-------------
trunk/data/ships/octavius/apteryx/apteryx_auv.png
trunk/data/ships/octavius/apteryx/apteryx_auv.svg
trunk/data/ships/octavius/apteryx/apteryx_auv_org.png
trunk/data/ships/quantar/storm/storm_auv.png
trunk/data/ships/quantar/storm/storm_auv.svg
trunk/data/ships/quantar/storm/storm_auv_org.png
Deleted: trunk/data/ships/octavius/apteryx/apteryx_auv.png
===================================================================
(Binary files differ)
Deleted: trunk/data/ships/octavius/apteryx/apteryx_auv.svg
===================================================================
--- trunk/data/ships/octavius/apteryx/apteryx_auv.svg 2007-04-04 20:26:40 UTC (rev 354)
+++ trunk/data/ships/octavius/apteryx/apteryx_auv.svg 2007-04-04 21:11:17 UTC (rev 355)
@@ -1,2207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.43"
- width="2048"
- height="2048"
- version="1.0"
- sodipodi:docbase="/home/egore/source/opengate/data/Octavius/Apteryx"
- sodipodi:docname="octavius_apteryx_auv.svg"
- inkscape:export-filename="/home/egore/source/opengate/data/Octavius/Apteryx/octavius_apteryx_auv.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs5">
- <linearGradient
- id="linearGradient5897">
- <stop
- style="stop-color:#ff8c8c;stop-opacity:1;"
- offset="0"
- id="stop5899" />
- <stop
- style="stop-color:#ff1111;stop-opacity:1;"
- offset="1"
- id="stop5901" />
- </linearGradient>
- <linearGradient
- id="linearGradient4139">
- <stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="0"
- id="stop4141" />
- <stop
- style="stop-color:#2e2e2e;stop-opacity:1;"
- offset="1"
- id="stop4143" />
- </linearGradient>
- <linearGradient
- id="linearGradient3218">
- <stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="0"
- id="stop3220" />
- <stop
- id="stop3226"
- offset="0.66233766"
- style="stop-color:#5f5f5f;stop-opacity:1;" />
- <stop
- style="stop-color:#5f5f5f;stop-opacity:0;"
- offset="1"
- id="stop3222" />
- </linearGradient>
- <linearGradient
- id="linearGradient7044">
- <stop
- style="stop-color:#06ff02;stop-opacity:1;"
- offset="0"
- id="stop7046" />
- <stop
- id="stop7052"
- offset="0.33000001"
- style="stop-color:#002800;stop-opacity:1;" />
- <stop
- style="stop-color:#005600;stop-opacity:1;"
- offset="0.5"
- id="stop7054" />
- <stop
- id="stop7056"
- offset="0.66000003"
- style="stop-color:#002100;stop-opacity:1;" />
- <stop
- style="stop-color:#023801;stop-opacity:1;"
- offset="0.85000002"
- id="stop9683" />
- <stop
- style="stop-color:#061505;stop-opacity:1;"
- offset="1"
- id="stop7048" />
- </linearGradient>
- <linearGradient
- id="linearGradient4410">
- <stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="0"
- id="stop4412" />
- <stop
- id="stop4418"
- offset="0"
- style="stop-color:#484848;stop-opacity:1;" />
- <stop
- style="stop-color:#212121;stop-opacity:1;"
- offset="1"
- id="stop4414" />
- </linearGradient>
- <linearGradient
- id="linearGradient6793">
- <stop
- style="stop-color:#261003;stop-opacity:1;"
- offset="0"
- id="stop6795" />
- <stop
- id="stop6801"
- offset="0.5"
- style="stop-color:#421b04;stop-opacity:1;" />
- <stop
- style="stop-color:#230e02;stop-opacity:1;"
- offset="1"
- id="stop6797" />
- </linearGradient>
- <linearGradient
- id="linearGradient4156">
- <stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="0"
- id="stop4158" />
- <stop
- id="stop4164"
- offset="0.5"
- style="stop-color:#4a4a4a;stop-opacity:1;" />
- <stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="1"
- id="stop4160" />
- </linearGradient>
- <linearGradient
- id="linearGradient2265">
- <stop
- id="stop2267"
- offset="0"
- style="stop-color:#85870a;stop-opacity:1;" />
- <stop
- id="stop2269"
- offset="1"
- style="stop-color:#850a0a;stop-opacity:1;" />
- </linearGradient>
- <linearGradient
- id="linearGradient3180">
- <stop
- style="stop-color:#ebee1d;stop-opacity:1;"
- offset="0"
- id="stop3182" />
- <stop
- style="stop-color:#ee2121;stop-opacity:1;"
- offset="1"
- id="stop3184" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient3186"
- x1="886.37238"
- y1="251.26514"
- x2="980.30768"
- y2="431.82245"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient2263"
- x1="886.37238"
- y1="251.26514"
- x2="980.30768"
- y2="431.82245"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient3172"
- x1="1008.2186"
- y1="271.1517"
- x2="1009.257"
- y2="380.05429"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(5.681874,-32.82861)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient3174"
- x1="1023.4564"
- y1="221.59314"
- x2="1023.1208"
- y2="322.15723"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(3.156596,40.7201)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient3176"
- x1="1051.2625"
- y1="253.1591"
- x2="1047.1649"
- y2="346.91003"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient3185"
- x1="1008.2186"
- y1="271.1517"
- x2="1009.257"
- y2="380.05429"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(5.681874,-32.82861)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient3187"
- x1="1023.4564"
- y1="221.59314"
- x2="1023.1208"
- y2="322.15723"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(3.156596,40.7201)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient3189"
- x1="1051.2625"
- y1="253.1591"
- x2="1047.1649"
- y2="346.91003"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient3195"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-46.40198,74.18002)"
- x1="1006.4108"
- y1="208.33543"
- x2="1032.2749"
- y2="303.21762" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient3197"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-46.40198,74.18002)"
- x1="1006.4108"
- y1="208.33543"
- x2="1032.2749"
- y2="303.21762" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient3201"
- gradientUnits="userSpaceOnUse"
- x1="1037.0577"
- y1="232.32556"
- x2="1071.2645"
- y2="318.685"
- gradientTransform="translate(-102.5894,30.61899)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient3203"
- gradientUnits="userSpaceOnUse"
- x1="1037.0577"
- y1="232.32556"
- x2="1071.2645"
- y2="318.685"
- gradientTransform="translate(-102.5894,30.61899)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient3207"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-30.04548,-49.24291)"
- x1="1003.4837"
- y1="277.78055"
- x2="1030.4063"
- y2="389.83975" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient3209"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-30.04548,-49.24291)"
- x1="1003.4837"
- y1="277.78055"
- x2="1030.4063"
- y2="389.83975" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient3213"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-80.23537,0.315659)"
- x1="1003.4837"
- y1="277.78055"
- x2="1030.4063"
- y2="389.83975" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient3215"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-80.23537,0.315659)"
- x1="1003.4837"
- y1="277.78055"
- x2="1030.4063"
- y2="389.83975" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient3219"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-132.8927,93.75092)"
- x1="1022.853"
- y1="180.24171"
- x2="1069.4365"
- y2="308.89954" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient3221"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-132.8927,93.75092)"
- x1="1022.853"
- y1="180.24171"
- x2="1069.4365"
- y2="308.89954" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient3225"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.892412,-0.451221,0.451221,0.892412,-251.0083,534.0843)"
- x1="1003.4837"
- y1="277.78055"
- x2="1030.4063"
- y2="389.83975" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient3227"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.892412,-0.451221,0.451221,0.892412,-251.0083,534.0843)"
- x1="1003.4837"
- y1="277.78055"
- x2="1030.4063"
- y2="389.83975" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient3233"
- gradientUnits="userSpaceOnUse"
- x1="1051.7666"
- y1="226.37248"
- x2="1047.1649"
- y2="346.91003"
- gradientTransform="matrix(0.728161,-0.685406,0.685406,0.728161,-145.3746,844.8027)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient3235"
- gradientUnits="userSpaceOnUse"
- x1="1051.7666"
- y1="226.37248"
- x2="1047.1649"
- y2="346.91003"
- gradientTransform="matrix(0.728161,-0.685406,0.685406,0.728161,-145.3746,844.8027)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient3239"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-196.656,137.9433)"
- x1="1013.3833"
- y1="195.07771"
- x2="1071.2645"
- y2="318.685" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient3241"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-196.656,137.9433)"
- x1="1013.3833"
- y1="195.07771"
- x2="1071.2645"
- y2="318.685" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient3245"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-197.603,58.7127)"
- x1="1037.0577"
- y1="232.32556"
- x2="1071.2645"
- y2="318.685" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient3247"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-197.603,58.7127)"
- x1="1037.0577"
- y1="232.32556"
- x2="1071.2645"
- y2="318.685" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient3257"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.957434,-0.288651,0.288651,0.957434,-186.5105,308.9438)"
- x1="1008.2186"
- y1="271.1517"
- x2="1026.241"
- y2="422.14078" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient3259"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.957434,-0.288651,0.288651,0.957434,-186.5105,308.9438)"
- x1="1008.2186"
- y1="271.1517"
- x2="1026.241"
- y2="422.14078" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient3263"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.630764,0.775975,0.775975,0.630764,1311.201,-589.7138)"
- x1="1006.4108"
- y1="208.33543"
- x2="1032.2749"
- y2="303.21762" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient3265"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-0.630764,0.775975,0.775975,0.630764,1311.201,-589.7138)"
- x1="1006.4108"
- y1="208.33543"
- x2="1032.2749"
- y2="303.21762" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient3271"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(31.1925,0.631319)"
- x1="1016.1101"
- y1="289.45996"
- x2="1023.7774"
- y2="377.21338" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient3273"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(31.1925,0.631319)"
- x1="1016.1101"
- y1="289.45996"
- x2="1023.7774"
- y2="377.21338" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient3275"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.504272,-0.863545,0.863545,0.504272,48.13574,1125.626)"
- x1="1019.4821"
- y1="257.26352"
- x2="1010.4813"
- y2="344.97867" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient3277"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.504272,-0.863545,0.863545,0.504272,48.13574,1125.626)"
- x1="1019.4821"
- y1="257.26352"
- x2="1010.4813"
- y2="344.97867" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4156"
- id="linearGradient4168"
- x1="1531.712"
- y1="892.68561"
- x2="2080.0659"
- y2="1038.5204"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6793"
- id="linearGradient6799"
- x1="945.21637"
- y1="531.57086"
- x2="865.53882"
- y2="54.293461"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6793"
- id="linearGradient7684"
- x1="865.53882"
- y1="54.293461"
- x2="945.21637"
- y2="531.57086"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6793"
- id="linearGradient7692"
- x1="1117.9749"
- y1="604.90381"
- x2="1883.639"
- y2="1872.7087"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient10321"
- x1="1914.413"
- y1="378.79172"
- x2="1408.8519"
- y2="1919.2109"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient12950"
- x1="1919.4889"
- y1="348.48837"
- x2="1391.1498"
- y2="1924.2615"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient14046"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient14054"
- x1="1252.887"
- y1="897.52625"
- x2="1212.4825"
- y2="757.58325"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient14073"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient14081"
- x1="1252.887"
- y1="897.52625"
- x2="1212.4825"
- y2="757.58325"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient14097"
- gradientUnits="userSpaceOnUse"
- x1="1252.887"
- y1="897.52625"
- x2="1212.4825"
- y2="757.58325"
- gradientTransform="translate(1024.958,85.71076)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient14099"
- gradientUnits="userSpaceOnUse"
- x1="1252.887"
- y1="897.52625"
- x2="1212.4825"
- y2="757.58325"
- gradientTransform="translate(1024.958,85.71076)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient14105"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient14107"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient14109"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient14111"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient14113"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient14115"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient14117"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient14119"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient14121"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient14123"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient15887"
- gradientUnits="userSpaceOnUse"
- x1="1252.887"
- y1="897.52625"
- x2="1212.4825"
- y2="757.58325"
- gradientTransform="translate(1049.957,67.85435)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient15889"
- gradientUnits="userSpaceOnUse"
- x1="1252.887"
- y1="897.52625"
- x2="1212.4825"
- y2="757.58325"
- gradientTransform="translate(1049.957,67.85435)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient15895"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient15897"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient15899"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient15901"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient15903"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient15905"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient15907"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient15909"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient15911"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient15913"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient15916"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449"
- gradientTransform="translate(1049.957,67.85435)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient15918"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449"
- gradientTransform="translate(1049.957,67.85435)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient15921"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449"
- gradientTransform="translate(1049.957,67.85435)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient15923"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449"
- gradientTransform="translate(1049.957,67.85435)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient15926"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449"
- gradientTransform="translate(1049.957,67.85435)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient15928"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449"
- gradientTransform="translate(1049.957,67.85435)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient15931"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449"
- gradientTransform="translate(1049.957,67.85435)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient15933"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449"
- gradientTransform="translate(1049.957,67.85435)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient15936"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449"
- gradientTransform="translate(1049.957,67.85435)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2265"
- id="linearGradient15938"
- gradientUnits="userSpaceOnUse"
- x1="1191.0677"
- y1="1613.038"
- x2="1227.8309"
- y2="807.47449"
- gradientTransform="translate(1049.957,67.85435)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6793"
- id="linearGradient2647"
- x1="-248.65974"
- y1="1517.0902"
- x2="962.06757"
- y2="562.08936"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4410"
- id="linearGradient4416"
- x1="1328.463"
- y1="160.35452"
- x2="1431.2446"
- y2="309.45554"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient7044"
- id="radialGradient7050"
- cx="1747.2172"
- cy="217.05728"
- fx="1747.2172"
- fy="217.05728"
- r="114.02873"
- gradientTransform="matrix(-1.891297,-3.716008e-7,-1.121701e-7,-0.678494,5051.727,340.2513)"
- gradientUnits="userSpaceOnUse"
- spreadMethod="reflect" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4410"
- id="linearGradient7060"
- gradientUnits="userSpaceOnUse"
- x1="1328.463"
- y1="160.35452"
- x2="1431.2446"
- y2="309.45554"
- gradientTransform="translate(193.742,-91.9605)" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6793"
- id="linearGradient12312"
- x1="1394.5686"
- y1="111.48162"
- x2="1452.5087"
- y2="321.07965"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6793"
- id="linearGradient14068"
- x1="436.37299"
- y1="1642.193"
- x2="798.48761"
- y2="2239.2898"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="radialGradient14953"
- cx="1015.918"
- cy="419.0386"
- fx="1015.918"
- fy="419.0386"
- r="37.663666"
- gradientTransform="matrix(0.766309,0.492952,-0.42577,0.661875,415.8252,-359.1007)"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4410"
- id="radialGradient16711"
- cx="1016.3375"
- cy="416.89279"
- fx="1016.3375"
- fy="416.89279"
- r="29.73985"
- gradientTransform="matrix(2.06948,1.19481,-0.913366,1.581997,-705.368,-1455.809)"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient3224"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient3230"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient3234"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient3238"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient3242"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient3246"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient3250"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient3254"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient3258"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient3262"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4139"
- id="linearGradient4145"
- x1="1772.9821"
- y1="1896.7207"
- x2="1451.0525"
- y2="1671.1023"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5897"
- id="radialGradient5903"
- cx="1692.3972"
- cy="1397.8149"
- fx="1692.3972"
- fy="1397.8149"
- r="25.490135"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.645611,-0.628424,0.586602,0.602645,-223.1806,1619.528)" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5897"
- id="radialGradient5915"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.645611,-0.628424,0.586602,0.602645,-223.1806,1619.528)"
- cx="1692.3972"
- cy="1397.8149"
- fx="1692.3972"
- fy="1397.8149"
- r="25.490135" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5897"
- id="radialGradient5919"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.645611,-0.628424,0.586602,0.602645,-223.1806,1619.528)"
- cx="1692.3972"
- cy="1397.8149"
- fx="1692.3972"
- fy="1397.8149"
- r="25.490135" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5897"
- id="radialGradient5923"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.645611,-0.628424,0.586602,0.602645,-223.1806,1619.528)"
- cx="1692.3972"
- cy="1397.8149"
- fx="1692.3972"
- fy="1397.8149"
- r="25.490135" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5897"
- id="radialGradient5927"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.645611,-0.628424,0.586602,0.602645,-223.1806,1619.528)"
- cx="1692.3972"
- cy="1397.8149"
- fx="1692.3972"
- fy="1397.8149"
- r="25.490135" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient5897"
- id="radialGradient5931"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.645611,-0.628424,0.586602,0.602645,-223.1806,1619.528)"
- cx="1692.3972"
- cy="1397.8149"
- fx="1692.3972"
- fy="1397.8149"
- r="25.490135" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient6793"
- id="linearGradient6822"
- x1="1871.7443"
- y1="76.206192"
- x2="1782.4623"
- y2="229.74501"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6830"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6834"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6838"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6842"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6846"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6850"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6858"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6862"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6866"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6870"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6874"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6878"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6882"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6886"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6890"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6894"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6898"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6902"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6906"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6910"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6914"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6918"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6922"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6926"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6930"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6934"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6938"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6942"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6946"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3218"
- id="radialGradient6950"
- gradientUnits="userSpaceOnUse"
- cx="1863.5393"
- cy="1355.8409"
- fx="1863.5393"
- fy="1355.8409"
- r="21.472433" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient7837"
- x1="942.95282"
- y1="9.4526634"
- x2="905.05078"
- y2="144.56055"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3180"
- id="linearGradient7841"
- gradientUnits="userSpaceOnUse"
- x1="942.95282"
- y1="9.4526634"
- x2="905.05078"
- y2="144.56055"
- gradientTransform="translate(24.62146,90.90998)" />
- </defs>
- <sodipodi:namedview
- inkscape:window-height="945"
- inkscape:window-width="1270"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0.0"
- borderopacity="1.0"
- bordercolor="#666666"
- pagecolor="#ffffff"
- id="base"
- inkscape:zoom="0.56002306"
- inkscape:cx="374.03041"
- inkscape:cy="1645.7829"
- inkscape:window-x="0"
- inkscape:window-y="25"
- inkscape:current-layer="svg2"
- showguides="true"
- inkscape:guide-bbox="true" />
- <path
- style="fill:url(#linearGradient6799);fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient7684);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 1131.3243,12.626385 L 1057.4599,386.36745 L 1012.0049,385.10481 L 1049.2528,410.35758 L 1032.8385,459.60049 L 976.01973,419.19605 L 910.99384,450.1307 L 859.22565,459.60049 L 599.75339,182.45129 L 678.66831,119.95068 L 856.06905,51.136866 L 954.55487,21.464856 L 1131.3243,12.626385 z "
- id="path1422"
- sodipodi:nodetypes="ccccccccccccc" />
- <path
- style="fill:url(#linearGradient3186);fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2263);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 1063.1418,356.69544 C 1065.8775,329.96959 1067.9819,317.76408 1064.4044,273.9926 C 1059.9852,322.18331 1044.8335,325.55035 1041.0456,347.22565 C 1035.5742,294.82614 1049.6737,300.50802 1047.3588,232.32553 C 1045.2544,283.25195 1022.3165,288.09207 1022.106,340.91245 C 1021.8956,309.13604 1010.3213,309.55693 1004.4291,267.04809 C 1001.2724,311.45088 1012.6363,313.55528 1004.4291,337.12454 C 997.69503,319.86848 985.27908,318.3954 979.17633,294.19482 C 982.33293,323.02507 992.43404,331.02178 989.90876,358.58939 C 980.22853,314.81792 959.18455,291.24867 941.92848,241.16399 C 945.08508,280.72667 969.07522,304.50637 970.33786,347.85697 C 963.81422,340.70201 964.2351,321.55199 942.55981,304.92725 C 957.71147,330.6009 943.82244,332.28442 952.66091,352.2762 C 940.87628,333.33662 919.62187,335.23058 921.72626,315.65968 C 917.30703,344.27949 929.30209,348.27784 932.45869,369.95314 C 911.20427,334.38882 898.15701,332.28442 881.32183,294.19482 C 878.16524,323.44595 904.68064,344.48992 900.89273,379.42293 C 881.53227,365.5339 887.42458,337.75586 865.53884,330.18002 C 885.53062,347.01521 864.48664,362.58775 883.8471,386.36745 C 865.74928,389.52404 860.27784,362.37731 841.5487,359.85203 C 861.75093,389.73448 845.96794,372.26798 861.11961,415.40814 C 831.65804,376.0559 845.12619,366.37567 797.98767,340.28114 C 834.81464,376.89766 824.92396,389.52405 845.96794,426.14057 C 824.71352,396.04768 821.76736,413.30375 808.7201,388.89273 C 813.77065,411.62022 832.07891,418.56474 837.12947,436.24168 L 860.48829,460.23181 L 910.36252,450.1307 L 976.01973,419.19605 L 1012.0049,385.73613 L 1058.4069,386.68311 L 1063.1418,356.69544 z "
- id="path2305"
- sodipodi:nodetypes="ccccccccccccccccccccccccccccccc" />
- <path
- style="fill:url(#linearGradient3174);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3187);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 1024.9469,352.27622 C 1016.2136,326.39212 1040.3091,312.81877 1032.2071,279.6745 C 1049.7788,308.39952 1031.6809,338.07153 1024.9469,352.27622 z "
- id="path2279"
- sodipodi:nodetypes="ccc" />
- <path
- style="fill:url(#linearGradient3176);fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient3189);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 1043.2552,334.28363 C 1054.4085,317.55366 1062.7209,274.93961 1059.0382,233.90385 C 1057.3547,270.52037 1038.9412,304.61162 1043.2552,334.28363 z "
- id="path2281"
- sodipodi:nodetypes="ccc" />
- <path
- style="fill:url(#linearGradient3172);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3185);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 1015.7929,337.44022 C 1010.3214,315.6597 1008.638,271.15169 1019.5808,242.74231 C 1013.3729,278.0962 1033.6803,315.97536 1015.7929,337.44022 z "
- id="path2291"
- sodipodi:nodetypes="ccc" />
- <path
- sodipodi:nodetypes="ccc"
- id="path3191"
- d="M 852.94443,426.49299 C 831.37685,420.23456 817.03038,408.71393 798.01579,384.93823 C 825.41498,408.12701 843.42869,400.22228 852.94443,426.49299 z "
- style="fill:url(#linearGradient3275);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3277);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
- <path
- sodipodi:nodetypes="ccc"
- id="path3193"
- d="M 982.96416,373.74108 C 970.75861,357.95809 981.28074,326.70779 973.81006,299.56105 C 988.22516,327.97041 991.59211,357.64243 982.96416,373.74108 z "
- style="fill:url(#linearGradient3195);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3197);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
- <path
- sodipodi:nodetypes="ccc"
- id="path3199"
- d="M 963.70897,333.33666 C 973.28397,313.45008 943.7172,292.61655 940.35016,261.05058 C 939.61364,292.61655 952.45045,321.34159 963.70897,333.33666 z "
- style="fill:url(#linearGradient3201);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3203);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
- <path
- sodipodi:nodetypes="ccc"
- id="path3205"
- d="M 992.37628,323.5512 C 986.90478,301.77068 972.91065,275.88659 976.59328,243.37363 C 977.01423,276.5179 1010.2637,302.08634 992.37628,323.5512 z "
- style="fill:url(#linearGradient3207);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3209);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
- <path
- style="fill:url(#linearGradient3213);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3215);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 942.18639,373.10977 C 936.71489,351.32925 922.72076,325.44516 926.40339,292.9322 C 926.82434,326.07647 960.07381,351.64491 942.18639,373.10977 z "
- id="path3211"
- sodipodi:nodetypes="ccc" />
- <path
- style="fill:url(#linearGradient3219);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3221);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 933.40564,396.46859 C 948.03119,372.47843 896.99957,319.44762 898.68308,283.46241 C 893.21167,319.44762 911.41469,385.4205 933.40564,396.46859 z "
- id="path3217"
- sodipodi:nodetypes="ccc" />
- <path
- style="fill:url(#linearGradient3225);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3227);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 829.62584,405.43185 C 814.91518,388.4635 790.74719,371.67868 779.36308,341.00203 C 794.69414,370.39044 835.90339,378.20516 829.62584,405.43185 z "
- id="path3223"
- sodipodi:nodetypes="ccc" />
- <path
- sodipodi:nodetypes="ccc"
- id="path3229"
- d="M 1043.2552,334.28363 C 1054.4085,317.55366 1062.7209,274.93961 1059.0382,233.90385 C 1057.3547,270.52037 1038.9412,304.61162 1043.2552,334.28363 z "
- style="fill:url(#linearGradient3176);fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient3189);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
- <path
- style="fill:url(#linearGradient3233);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3235);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 843.40324,373.16159 C 840.05782,353.33494 816.90266,316.60767 786.0949,289.25117 C 809.96623,317.06778 819.92458,354.51243 843.40324,373.16159 z "
- id="path3231"
- sodipodi:nodetypes="ccc" />
- <path
- style="fill:url(#linearGradient3239);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3241);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 869.64238,440.66095 C 879.21738,420.77437 849.65061,399.94084 846.28357,368.37487 C 845.54705,399.94084 858.38386,428.66588 869.64238,440.66095 z "
- id="path3237"
- sodipodi:nodetypes="ccc" />
- <path
- style="fill:url(#linearGradient3245);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3247);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 868.69541,361.43037 C 878.27041,341.54379 848.70364,320.71026 845.3366,289.14429 C 844.60008,320.71026 857.43689,349.4353 868.69541,361.43037 z "
- id="path3243"
- sodipodi:nodetypes="ccc" />
- <path
- style="fill:url(#linearGradient3257);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3259);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 912.10447,416.39024 C 901.84154,403.42937 866.23331,336.99599 863.77502,280.12181 C 879.71572,346.38175 929.03216,381.20603 912.10447,416.39024 z "
- id="path3255"
- sodipodi:nodetypes="ccc" />
- <path
- style="fill:url(#linearGradient3263);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3265);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 894.36679,398.00119 C 889.8184,378.57465 858.93197,367.02801 842.57901,344.10777 C 855.53144,373.21312 876.43244,394.54182 894.36679,398.00119 z "
- id="path3261"
- sodipodi:nodetypes="ccc" />
- <path
- style="fill:url(#linearGradient3271);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3273);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 1053.6143,373.42543 C 1048.1428,351.64491 1041.7244,340.91248 1045.4071,308.39952 C 1045.828,341.54379 1071.5017,351.96057 1053.6143,373.42543 z "
- id="path3267"
- sodipodi:nodetypes="ccc" />
- <path
- sodipodi:nodetypes="ccc"
- id="path3269"
- d="M 868.69541,361.43037 C 878.27041,341.54379 848.70364,320.71026 845.3366,289.14429 C 844.60008,320.71026 857.43689,349.4353 868.69541,361.43037 z "
- style="fill:url(#linearGradient3245);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3247);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
- <path
- style="fill:url(#linearGradient4168);fill-opacity:1.0;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1"
- d="M 1958.9839,625.00619 L 1977.9235,882.58448 L 1972.873,1129.4303 L 1968.4537,1260.1135 L 1845.3465,1253.8003 L 1744.9667,1126.9051 L 1716.5573,902.15538 L 1741.1788,771.47228 L 1838.4019,634.47598 L 1958.9839,625.00619 z "
- id="path3281" />
- <path
- style="fill:#ffffff;fill-opacity:0.19565214;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 1844.7152,807.45748 C 1843.3046,795.68804 1829.7825,868.57876 1840.2959,875.00865 C 1857.1401,885.31051 1943.9483,874.16089 1933.7312,872.48337 C 1851.8255,859.03548 1853.2785,878.90638 1844.7152,807.45748 z "
- id="path4170"
- sodipodi:nodetypes="csss" />
- <path
- sodipodi:nodetypes="csss"
- id="path5045"
- d="M 1847.8718,991.80276 C 1846.4612...
[truncated message content] |
|
From: <ult...@us...> - 2007-04-04 20:27:00
|
Revision: 354
http://svn.sourceforge.net/opengate/?rev=354&view=rev
Author: ultrasick
Date: 2007-04-04 13:26:40 -0700 (Wed, 04 Apr 2007)
Log Message:
-----------
uppercase -> lowercase
Added Paths:
-----------
trunk/data/ships/solrain/
trunk/data/ships/solrain/intensity/
trunk/data/ships/solrain/intensity/intensity.wings
trunk/data/ships/solrain/intensity/intensity.xml
trunk/data/ships/solrain/pioneer/
trunk/data/ships/solrain/pioneer/pioneer.wings
trunk/data/ships/solrain/pioneer/pioneer.xml
trunk/data/ships/solrain/primrose/
trunk/data/ships/solrain/primrose/primrose.blend
trunk/data/ships/solrain/primrose/primrose.wings
trunk/data/ships/solrain/primrose/primrose.xml
Added: trunk/data/ships/solrain/intensity/intensity.wings
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/solrain/intensity/intensity.wings
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/ships/solrain/intensity/intensity.xml
===================================================================
--- trunk/data/ships/solrain/intensity/intensity.xml (rev 0)
+++ trunk/data/ships/solrain/intensity/intensity.xml 2007-04-04 20:26:40 UTC (rev 354)
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+
+<ship>
+ <!-- Naming -->
+ <faction>Solrain</faction>
+ <codename>Intensity</codename>
+
+ <!-- Generic Data -->
+ <class>Fighter</class>
+ <techlevel>26</techlevel>
+ <size>23.0</size>
+ <mass>23000</mass>
+
+ <!-- Sizes -->
+ <capacitorsize>3</capacitorsize>
+ <ecmsize>1</ecmsize>
+ <engines>2</engines>
+ <enginesize>3</enginesize>
+ <guns>3</guns>
+ <gunsize>3:2:2</gunsize>
+ <missiles>3</missiles>
+ <missilesize>2:2:4</missilesize>
+ <modx>5</modx>
+ <powerplantsize>4</powerplantsize>
+ <radarsize>2</radarsize>
+ <shieldsize>3</shieldsize>
+ <armor>11400</armor>
+ <cargocapacity>24</cargocapacity>
+
+ <!-- Movement -->
+ <dragfactor>21.6</dragfactor>
+ <pitch>0.000785</pitch> <!-- 45.0 in jossh -->
+ <roll>0.001047</roll> <!-- 60.0 in jossh -->
+ <yaw>0.001047</yaw> <!-- 60.0 in jossh -->
+</ship>
Property changes on: trunk/data/ships/solrain/intensity/intensity.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/data/ships/solrain/pioneer/pioneer.wings
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/solrain/pioneer/pioneer.wings
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/ships/solrain/pioneer/pioneer.xml
===================================================================
--- trunk/data/ships/solrain/pioneer/pioneer.xml (rev 0)
+++ trunk/data/ships/solrain/pioneer/pioneer.xml 2007-04-04 20:26:40 UTC (rev 354)
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+
+<ship>
+ <!-- Naming -->
+ <faction>Solrain</faction>
+ <codename>Pioneer</codename>
+
+ <!-- Generic Data -->
+ <class>Cargo Tow</class>
+ <techlevel>26</techlevel>
+ <size>48.2</size>
+ <mass>55000</mass>
+
+ <!-- Sizes -->
+ <capacitorsize>4</capacitorsize>
+ <ecmsize>3</ecmsize>
+ <engines>2</engines>
+ <enginesize>5</enginesize>
+ <guns>2</guns>
+ <gunsize>2:2</gunsize>
+ <missiles>4</missiles>
+ <missilesize>2:2:6:6</missilesize>
+ <modx>5</modx>
+ <powerplantsize>4</powerplantsize>
+ <radarsize>4</radarsize>
+ <shieldsize>5</shieldsize>
+ <armor>60000</armor>
+ <cargocapacity>500</cargocapacity>
+
+ <!-- Movement -->
+ <dragfactor>44.9</dragfactor>
+ <pitch>0.000506</pitch> <!-- 29.0 in jossh -->
+ <roll>0.000506</roll> <!-- 29.0 in jossh -->
+ <yaw>0.000506</yaw> <!-- 29.0 in jossh -->
+</ship>
Property changes on: trunk/data/ships/solrain/pioneer/pioneer.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/data/ships/solrain/primrose/primrose.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/solrain/primrose/primrose.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/ships/solrain/primrose/primrose.wings
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/solrain/primrose/primrose.wings
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/ships/solrain/primrose/primrose.xml
===================================================================
--- trunk/data/ships/solrain/primrose/primrose.xml (rev 0)
+++ trunk/data/ships/solrain/primrose/primrose.xml 2007-04-04 20:26:40 UTC (rev 354)
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!DOCTYPE ship SYSTEM "../../../opengate.dtd">
+
+<ship type="Player">
+ <!-- Naming -->
+ <name>Premia</name>
+ <class>Shuttle Trainer</class>
+ <faction>Solrain</faction>
+ <description>The Premia was the first commercially viable series of spacecraft following the Great Collapse. The latest Premia is a well-balanced ship, combining adequate speed with good weapon capacity and decent shields.</description>
+ <image>s_c_15.jpg</image>
+ <model>s_c_15.wings</model>
+
+ <!-- Production Data -->
+
+ <production-center>Solrain Core</production-center>
+ <production-center>Solrain Wake</production-center>
+ <production-center>Solrain Cornea</production-center>
+
+ <!-- Generic Data -->
+ <techlevel>0</techlevel>
+ <size>10.9</size>
+ <mass>9000</mass>
+
+ <!-- Sizes -->
+ <capacitorsize>1</capacitorsize>
+ <ecmsize>1</ecmsize>
+ <enginecount>2</enginecount>
+ <enginesize>1</enginesize>
+ <gunsize>1</gunsize>
+ <gunsize>1</gunsize>
+ <missilesize>1</missilesize>
+ <missilesize>1</missilesize>
+ <modx>3</modx>
+ <powerplantsize>1</powerplantsize>
+ <radarsize>1</radarsize>
+ <shieldsize>2</shieldsize>
+ <armor>4500</armor>
+ <cargocapacity>4</cargocapacity>
+
+ <!-- Movement -->
+ <dragfactor>14.55</dragfactor> <!-- 14.6 ingame -->
+ <pitch>0.000960</pitch> <!-- 55.0 in jossh -->
+ <roll>0.001222</roll> <!-- 70.0 in jossh -->
+ <yaw>0.001187</yaw> <!-- 68.0 in jossh -->
+</ship>
Property changes on: trunk/data/ships/solrain/primrose/primrose.xml
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-04-04 20:23:10
|
Revision: 353
http://svn.sourceforge.net/opengate/?rev=353&view=rev
Author: ultrasick
Date: 2007-04-04 13:23:10 -0700 (Wed, 04 Apr 2007)
Log Message:
-----------
uppercase -> lowercase
Removed Paths:
-------------
trunk/data/ships/Solrain/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
