Menu
▾
▴
opengate-svn
|
From: <eg...@us...> - 2007-04-04 19:26:49
|
Revision: 348
http://svn.sourceforge.net/opengate/?rev=348&view=rev
Author: egore
Date: 2007-04-04 12:26:48 -0700 (Wed, 04 Apr 2007)
Log Message:
-----------
OGRE 1.4 meshes
Modified Paths:
--------------
trunk/data/ships/Octavius/Apteryx/octavius_apteryx.mesh
trunk/data/ships/Quantar/Storm/quantar_storm.mesh
Modified: trunk/data/ships/Octavius/Apteryx/octavius_apteryx.mesh
===================================================================
(Binary files differ)
Modified: trunk/data/ships/Quantar/Storm/quantar_storm.mesh
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-04-04 19:56:51
|
Revision: 349
http://svn.sourceforge.net/opengate/?rev=349&view=rev
Author: egore
Date: 2007-04-04 12:56:49 -0700 (Wed, 04 Apr 2007)
Log Message:
-----------
Models mit 2 LOD Ebenen
Modified Paths:
--------------
trunk/data/ships/Octavius/Apteryx/octavius_apteryx.mesh
trunk/data/ships/Octavius/Apteryx/octavius_apteryx.mesh.xml
trunk/data/ships/Quantar/Storm/quantar_storm.mesh
trunk/data/ships/Quantar/Storm/quantar_storm.mesh.xml
Modified: trunk/data/ships/Octavius/Apteryx/octavius_apteryx.mesh
===================================================================
(Binary files differ)
Modified: trunk/data/ships/Octavius/Apteryx/octavius_apteryx.mesh.xml
===================================================================
--- trunk/data/ships/Octavius/Apteryx/octavius_apteryx.mesh.xml 2007-04-04 19:26:48 UTC (rev 348)
+++ trunk/data/ships/Octavius/Apteryx/octavius_apteryx.mesh.xml 2007-04-04 19:56:49 UTC (rev 349)
@@ -2,10 +2,10 @@
<mesh>
<materials>
<material name="octavius_apteryx_auv">
- <ambient red="0.000000" green="0.000000" blue="0.000000" alpha="1.000000"/>
- <diffuse red="1.000000" green="1.000000" blue="1.000000" alpha="1.000000"/>
- <specular red="0.000000" green="0.000000" blue="0.000000" alpha="1.000000"/>
- <shininess value="0"/>
+ <ambient green="1.000000" alpha="1.000000" blue="1.000000" red="1.000000"/>
+ <diffuse green="1.000000" alpha="1.000000" blue="1.000000" red="1.000000"/>
+ <specular green="1.000000" alpha="1.000000" blue="1.000000" red="1.000000"/>
+ <shininess value="1.000000"/>
<texturelayers>
<texturelayer texture="octavius_apteryx_auv.png"/>
</texturelayers>
@@ -13,1231 +13,1231 @@
</materials>
<sharedgeometry vertexcount="0"/>
<submeshes>
- <submesh material="octavius_apteryx_auv" usesharedvertices="false" use32bitindexes="false" operationtype="triangle_list">
+ <submesh use32bitindexes="false" operationtype="triangle_list" usesharedvertices="false" material="octavius_apteryx_auv">
<faces count="232">
- <face v1="48" v2="44" v3="55"/>
- <face v1="48" v2="55" v3="52"/>
- <face v1="15" v2="6" v3="33"/>
- <face v1="15" v2="33" v3="38"/>
- <face v1="17" v2="56" v3="57"/>
- <face v1="17" v2="57" v3="43"/>
- <face v1="37" v2="35" v3="40"/>
- <face v1="37" v2="40" v3="42"/>
+ <face v1="48" v2="45" v3="55"/>
+ <face v1="55" v2="52" v3="48"/>
+ <face v1="16" v2="7" v3="34"/>
+ <face v1="34" v2="38" v3="16"/>
+ <face v1="19" v2="56" v3="57"/>
+ <face v1="57" v2="43" v3="19"/>
+ <face v1="37" v2="36" v3="41"/>
+ <face v1="42" v2="37" v3="41"/>
<face v1="109" v2="108" v3="37"/>
- <face v1="37" v2="42" v3="109"/>
- <face v1="43" v2="4" v3="0"/>
- <face v1="0" v2="17" v3="43"/>
- <face v1="41" v2="54" v3="53"/>
- <face v1="46" v2="41" v3="53"/>
- <face v1="23" v2="27" v3="54"/>
- <face v1="45" v2="42" v3="40"/>
- <face v1="40" v2="47" v3="45"/>
+ <face v1="109" v2="37" v3="42"/>
+ <face v1="43" v2="4" v3="1"/>
+ <face v1="19" v2="43" v3="1"/>
+ <face v1="40" v2="54" v3="53"/>
+ <face v1="53" v2="47" v3="40"/>
+ <face v1="54" v2="24" v3="27"/>
+ <face v1="44" v2="42" v3="41"/>
+ <face v1="46" v2="44" v3="41"/>
<face v1="55" v2="53" v3="31"/>
- <face v1="31" v2="29" v3="55"/>
+ <face v1="55" v2="31" v3="30"/>
<face v1="49" v2="109" v3="42"/>
- <face v1="42" v2="45" v3="49"/>
- <face v1="50" v2="8" v3="10"/>
- <face v1="10" v2="51" v3="50"/>
- <face v1="10" v2="13" v3="51"/>
+ <face v1="49" v2="42" v3="44"/>
+ <face v1="50" v2="9" v3="10"/>
+ <face v1="51" v2="50" v3="10"/>
+ <face v1="14" v2="51" v3="10"/>
<face v1="52" v2="50" v3="38"/>
- <face v1="38" v2="48" v3="52"/>
- <face v1="52" v2="55" v3="29"/>
- <face v1="29" v2="2" v3="52"/>
+ <face v1="52" v2="38" v3="48"/>
+ <face v1="52" v2="55" v3="30"/>
+ <face v1="30" v2="3" v3="52"/>
<face v1="31" v2="53" v3="54"/>
- <face v1="27" v2="31" v3="54"/>
- <face v1="46" v2="53" v3="55"/>
- <face v1="44" v2="46" v3="55"/>
- <face v1="50" v2="51" v3="15"/>
- <face v1="15" v2="38" v3="50"/>
- <face v1="50" v2="52" v3="2"/>
- <face v1="2" v2="8" v3="50"/>
- <face v1="54" v2="41" v3="56"/>
- <face v1="13" v2="15" v3="51"/>
- <face v1="56" v2="17" v3="23"/>
- <face v1="56" v2="23" v3="54"/>
- <face v1="56" v2="41" v3="36"/>
- <face v1="36" v2="57" v3="56"/>
- <face v1="28" v2="68" v3="66"/>
- <face v1="32" v2="28" v3="66"/>
- <face v1="61" v2="20" v3="21"/>
- <face v1="21" v2="58" v3="61"/>
- <face v1="70" v2="24" v3="59"/>
- <face v1="59" v2="22" v3="70"/>
- <face v1="25" v2="18" v3="61"/>
- <face v1="25" v2="61" v3="60"/>
- <face v1="18" v2="80" v3="20"/>
- <face v1="18" v2="20" v3="61"/>
- <face v1="30" v2="62" v3="64"/>
- <face v1="30" v2="64" v3="3"/>
- <face v1="32" v2="66" v3="62"/>
- <face v1="62" v2="30" v3="32"/>
- <face v1="71" v2="68" v3="28"/>
- <face v1="28" v2="26" v3="71"/>
- <face v1="1" v2="5" v3="85"/>
- <face v1="1" v2="85" v3="83"/>
- <face v1="3" v2="64" v3="73"/>
- <face v1="9" v2="3" v3="73"/>
+ <face v1="54" v2="27" v3="31"/>
+ <face v1="47" v2="53" v3="55"/>
+ <face v1="55" v2="45" v3="47"/>
+ <face v1="50" v2="51" v3="16"/>
+ <face v1="50" v2="16" v3="38"/>
+ <face v1="50" v2="52" v3="3"/>
+ <face v1="50" v2="3" v3="9"/>
+ <face v1="56" v2="54" v3="40"/>
+ <face v1="51" v2="14" v3="16"/>
+ <face v1="56" v2="19" v3="24"/>
+ <face v1="54" v2="56" v3="24"/>
+ <face v1="56" v2="40" v3="35"/>
+ <face v1="57" v2="56" v3="35"/>
+ <face v1="28" v2="69" v3="67"/>
+ <face v1="28" v2="67" v3="32"/>
+ <face v1="61" v2="20" v3="22"/>
+ <face v1="61" v2="22" v3="59"/>
+ <face v1="70" v2="23" v3="58"/>
+ <face v1="21" v2="70" v3="58"/>
+ <face v1="26" v2="18" v3="61"/>
+ <face v1="61" v2="60" v3="26"/>
+ <face v1="18" v2="81" v3="20"/>
+ <face v1="20" v2="61" v3="18"/>
+ <face v1="29" v2="62" v3="64"/>
+ <face v1="64" v2="2" v3="29"/>
+ <face v1="32" v2="67" v3="62"/>
+ <face v1="62" v2="29" v3="32"/>
+ <face v1="72" v2="69" v3="28"/>
+ <face v1="25" v2="72" v3="28"/>
+ <face v1="0" v2="5" v3="86"/>
+ <face v1="86" v2="84" v3="0"/>
+ <face v1="2" v2="64" v3="73"/>
+ <face v1="73" v2="8" v3="2"/>
<face v1="73" v2="75" v3="11"/>
- <face v1="11" v2="9" v3="73"/>
- <face v1="76" v2="78" v3="14"/>
- <face v1="14" v2="12" v3="76"/>
- <face v1="81" v2="19" v3="1"/>
- <face v1="1" v2="83" v3="81"/>
+ <face v1="11" v2="8" v3="73"/>
+ <face v1="76" v2="78" v3="13"/>
+ <face v1="13" v2="12" v3="76"/>
+ <face v1="82" v2="17" v3="0"/>
+ <face v1="84" v2="82" v3="0"/>
<face v1="102" v2="98" v3="97"/>
- <face v1="97" v2="103" v3="102"/>
- <face v1="16" v2="14" v3="78"/>
- <face v1="16" v2="78" v3="87"/>
- <face v1="89" v2="7" v3="16"/>
- <face v1="16" v2="87" v3="89"/>
- <face v1="82" v2="93" v3="94"/>
- <face v1="82" v2="94" v3="95"/>
- <face v1="20" v2="80" v3="70"/>
- <face v1="22" v2="20" v3="70"/>
+ <face v1="103" v2="102" v3="97"/>
+ <face v1="15" v2="13" v3="78"/>
+ <face v1="88" v2="15" v3="78"/>
+ <face v1="89" v2="6" v3="15"/>
+ <face v1="89" v2="15" v3="88"/>
+ <face v1="80" v2="93" v3="94"/>
+ <face v1="94" v2="95" v3="80"/>
+ <face v1="20" v2="81" v3="70"/>
+ <face v1="70" v2="21" v3="20"/>
<face v1="91" v2="92" v3="90"/>
- <face v1="90" v2="88" v3="91"/>
- <face v1="86" v2="93" v3="82"/>
- <face v1="82" v2="84" v3="86"/>
+ <face v1="91" v2="90" v3="87"/>
+ <face v1="85" v2="93" v3="80"/>
+ <face v1="80" v2="83" v3="85"/>
<face v1="107" v2="106" v3="97"/>
<face v1="97" v2="98" v3="107"/>
<face v1="103" v2="101" v3="65"/>
- <face v1="65" v2="63" v3="103"/>
+ <face v1="103" v2="65" v3="63"/>
<face v1="102" v2="104" v3="95"/>
- <face v1="95" v2="98" v3="102"/>
+ <face v1="102" v2="95" v3="98"/>
<face v1="101" v2="100" v3="74"/>
- <face v1="74" v2="65" v3="101"/>
- <face v1="88" v2="79" v3="99"/>
+ <face v1="101" v2="74" v3="65"/>
+ <face v1="79" v2="99" v3="87"/>
<face v1="77" v2="74" v3="100"/>
- <face v1="77" v2="100" v3="99"/>
- <face v1="67" v2="102" v3="103"/>
- <face v1="63" v2="67" v3="103"/>
+ <face v1="100" v2="99" v3="77"/>
+ <face v1="66" v2="102" v3="103"/>
+ <face v1="103" v2="63" v3="66"/>
<face v1="96" v2="101" v3="103"/>
- <face v1="97" v2="96" v3="103"/>
+ <face v1="103" v2="97" v3="96"/>
<face v1="96" v2="91" v3="100"/>
- <face v1="96" v2="100" v3="101"/>
- <face v1="88" v2="99" v3="100"/>
- <face v1="91" v2="88" v3="100"/>
- <face v1="69" v2="72" v3="104"/>
- <face v1="69" v2="104" v3="102"/>
- <face v1="67" v2="69" v3="102"/>
- <face v1="79" v2="77" v3="99"/>
+ <face v1="100" v2="101" v3="96"/>
+ <face v1="87" v2="99" v3="100"/>
+ <face v1="100" v2="91" v3="87"/>
+ <face v1="71" v2="104" v3="68"/>
+ <face v1="68" v2="104" v3="102"/>
+ <face v1="102" v2="66" v3="68"/>
+ <face v1="99" v2="79" v3="77"/>
<face v1="95" v2="94" v3="107"/>
- <face v1="95" v2="107" v3="98"/>
+ <face v1="107" v2="98" v3="95"/>
<face v1="97" v2="106" v3="105"/>
- <face v1="96" v2="97" v3="105"/>
+ <face v1="105" v2="96" v3="97"/>
<face v1="105" v2="92" v3="91"/>
- <face v1="91" v2="96" v3="105"/>
- <face v1="72" v2="82" v3="95"/>
- <face v1="72" v2="95" v3="104"/>
- <face v1="34" v2="108" v3="109"/>
- <face v1="39" v2="34" v3="109"/>
- <face v1="49" v2="39" v3="109"/>
- <face v1="155" v2="144" v3="148"/>
- <face v1="148" v2="152" v3="155"/>
- <face v1="139" v2="33" v3="6"/>
- <face v1="6" v2="121" v3="139"/>
+ <face v1="96" v2="105" v3="91"/>
+ <face v1="71" v2="80" v3="95"/>
+ <face v1="104" v2="71" v3="95"/>
+ <face v1="33" v2="108" v3="109"/>
+ <face v1="109" v2="39" v3="33"/>
+ <face v1="109" v2="49" v3="39"/>
+ <face v1="155" v2="145" v3="149"/>
+ <face v1="152" v2="155" v3="149"/>
+ <face v1="140" v2="34" v3="7"/>
+ <face v1="140" v2="7" v3="122"/>
<face v1="57" v2="156" v3="123"/>
- <face v1="43" v2="57" v3="123"/>
- <face v1="141" v2="35" v3="37"/>
- <face v1="37" v2="143" v3="141"/>
+ <face v1="57" v2="123" v3="43"/>
+ <face v1="142" v2="36" v3="37"/>
+ <face v1="37" v2="143" v3="142"/>
<face v1="143" v2="37" v3="108"/>
<face v1="108" v2="197" v3="143"/>
<face v1="110" v2="4" v3="43"/>
<face v1="43" v2="123" v3="110"/>
- <face v1="154" v2="142" v3="146"/>
- <face v1="146" v2="153" v3="154"/>
- <face v1="133" v2="129" v3="154"/>
- <face v1="141" v2="143" v3="145"/>
- <face v1="141" v2="145" v3="147"/>
- <face v1="137" v2="153" v3="155"/>
- <face v1="135" v2="137" v3="155"/>
- <face v1="197" v2="149" v3="145"/>
- <face v1="143" v2="197" v3="145"/>
- <face v1="151" v2="116" v3="114"/>
- <face v1="114" v2="150" v3="151"/>
- <face v1="119" v2="116" v3="151"/>
- <face v1="139" v2="150" v3="152"/>
- <face v1="148" v2="139" v3="152"/>
- <face v1="155" v2="152" v3="112"/>
- <face v1="135" v2="155" v3="112"/>
- <face v1="154" v2="153" v3="137"/>
- <face v1="137" v2="133" v3="154"/>
- <face v1="155" v2="153" v3="146"/>
- <face v1="146" v2="144" v3="155"/>
- <face v1="121" v2="151" v3="150"/>
- <face v1="139" v2="121" v3="150"/>
- <face v1="112" v2="152" v3="150"/>
- <face v1="114" v2="112" v3="150"/>
- <face v1="142" v2="154" v3="156"/>
- <face v1="121" v2="119" v3="151"/>
+ <face v1="154" v2="141" v3="147"/>
+ <face v1="153" v2="154" v3="147"/>
+ <face v1="129" v2="154" v3="134"/>
+ <face v1="142" v2="143" v3="144"/>
+ <face v1="144" v2="146" v3="142"/>
+ <face v1="138" v2="153" v3="155"/>
+ <face v1="155" v2="136" v3="138"/>
+ <face v1="197" v2="148" v3="144"/>
+ <face v1="197" v2="144" v3="143"/>
+ <face v1="151" v2="116" v3="115"/>
+ <face v1="150" v2="151" v3="115"/>
+ <face v1="151" v2="119" v3="116"/>
+ <face v1="140" v2="150" v3="152"/>
+ <face v1="152" v2="149" v3="140"/>
+ <face v1="155" v2="152" v3="113"/>
+ <face v1="113" v2="136" v3="155"/>
+ <face v1="154" v2="153" v3="138"/>
+ <face v1="154" v2="138" v3="134"/>
+ <face v1="155" v2="153" v3="147"/>
+ <face v1="155" v2="147" v3="145"/>
+ <face v1="122" v2="151" v3="150"/>
+ <face v1="150" v2="140" v3="122"/>
+ <face v1="113" v2="152" v3="150"/>
+ <face v1="150" v2="115" v3="113"/>
+ <face v1="154" v2="156" v3="141"/>
+ <face v1="119" v2="151" v3="122"/>
<face v1="129" v2="123" v3="156"/>
<face v1="156" v2="154" v3="129"/>
- <face v1="36" v2="142" v3="156"/>
- <face v1="57" v2="36" v3="156"/>
- <face v1="165" v2="167" v3="134"/>
- <face v1="134" v2="138" v3="165"/>
- <face v1="127" v2="126" v3="160"/>
- <face v1="127" v2="160" v3="157"/>
- <face v1="130" v2="169" v3="128"/>
- <face v1="128" v2="158" v3="130"/>
- <face v1="160" v2="124" v3="131"/>
- <face v1="131" v2="159" v3="160"/>
- <face v1="126" v2="179" v3="124"/>
- <face v1="124" v2="160" v3="126"/>
- <face v1="113" v2="163" v3="161"/>
- <face v1="161" v2="136" v3="113"/>
- <face v1="161" v2="165" v3="138"/>
- <face v1="136" v2="161" v3="138"/>
- <face v1="134" v2="167" v3="170"/>
- <face v1="132" v2="134" v3="170"/>
- <face v1="85" v2="5" v3="111"/>
- <face v1="85" v2="111" v3="182"/>
- <face v1="172" v2="163" v3="113"/>
- <face v1="113" v2="115" v3="172"/>
+ <face v1="35" v2="141" v3="156"/>
+ <face v1="156" v2="57" v3="35"/>
+ <face v1="166" v2="167" v3="133"/>
+ <face v1="133" v2="137" v3="166"/>
+ <face v1="128" v2="126" v3="160"/>
+ <face v1="160" v2="159" v3="128"/>
+ <face v1="131" v2="170" v3="127"/>
+ <face v1="127" v2="157" v3="131"/>
+ <face v1="160" v2="124" v3="132"/>
+ <face v1="160" v2="132" v3="158"/>
+ <face v1="126" v2="181" v3="124"/>
+ <face v1="126" v2="124" v3="160"/>
+ <face v1="112" v2="163" v3="161"/>
+ <face v1="112" v2="161" v3="135"/>
+ <face v1="161" v2="166" v3="137"/>
+ <face v1="161" v2="137" v3="135"/>
+ <face v1="133" v2="167" v3="169"/>
+ <face v1="169" v2="130" v3="133"/>
+ <face v1="86" v2="5" v3="111"/>
+ <face v1="183" v2="86" v3="111"/>
+ <face v1="172" v2="163" v3="112"/>
+ <face v1="114" v2="172" v3="112"/>
<face v1="117" v2="174" v3="172"/>
- <face v1="115" v2="117" v3="172"/>
- <face v1="120" v2="177" v3="175"/>
- <face v1="118" v2="120" v3="175"/>
+ <face v1="117" v2="172" v3="114"/>
+ <face v1="120" v2="178" v3="176"/>
+ <face v1="120" v2="176" v3="118"/>
<face v1="111" v2="125" v3="180"/>
- <face v1="111" v2="180" v3="182"/>
+ <face v1="180" v2="183" v3="111"/>
<face v1="189" v2="190" v3="194"/>
- <face v1="189" v2="194" v3="195"/>
- <face v1="177" v2="120" v3="122"/>
- <face v1="122" v2="184" v3="177"/>
- <face v1="7" v2="89" v3="184"/>
- <face v1="7" v2="184" v3="122"/>
+ <face v1="194" v2="195" v3="189"/>
+ <face v1="178" v2="120" v3="121"/>
+ <face v1="121" v2="185" v3="178"/>
+ <face v1="6" v2="89" v3="185"/>
+ <face v1="185" v2="121" v3="6"/>
<face v1="187" v2="94" v3="93"/>
- <face v1="93" v2="181" v3="187"/>
- <face v1="169" v2="179" v3="126"/>
- <face v1="126" v2="128" v3="169"/>
+ <face v1="187" v2="93" v3="179"/>
+ <face v1="170" v2="181" v3="126"/>
+ <face v1="170" v2="126" v3="127"/>
<face v1="90" v2="92" v3="186"/>
- <face v1="90" v2="186" v3="185"/>
- <face v1="181" v2="93" v3="86"/>
- <face v1="86" v2="183" v3="181"/>
+ <face v1="186" v2="184" v3="90"/>
+ <face v1="179" v2="93" v3="85"/>
+ <face v1="179" v2="85" v3="182"/>
<face v1="189" v2="106" v3="107"/>
- <face v1="107" v2="190" v3="189"/>
+ <face v1="189" v2="107" v3="190"/>
<face v1="164" v2="193" v3="195"/>
- <face v1="162" v2="164" v3="195"/>
+ <face v1="195" v2="162" v3="164"/>
<face v1="190" v2="187" v3="196"/>
- <face v1="190" v2="196" v3="194"/>
+ <face v1="196" v2="194" v3="190"/>
<face v1="173" v2="192" v3="193"/>
- <face v1="164" v2="173" v3="193"/>
- <face v1="178" v2="185" v3="191"/>
- <face v1="192" v2="173" v3="176"/>
- <face v1="176" v2="191" v3="192"/>
- <face v1="195" v2="194" v3="166"/>
- <face v1="166" v2="162" v3="195"/>
+ <face v1="193" v2="164" v3="173"/>
+ <face v1="191" v2="177" v3="184"/>
+ <face v1="192" v2="173" v3="175"/>
+ <face v1="191" v2="192" v3="175"/>
+ <face v1="195" v2="194" v3="165"/>
+ <face v1="195" v2="165" v3="162"/>
<face v1="195" v2="193" v3="188"/>
- <face v1="188" v2="189" v3="195"/>
+ <face v1="195" v2="188" v3="189"/>
<face v1="192" v2="186" v3="188"/>
- <face v1="188" v2="193" v3="192"/>
- <face v1="191" v2="185" v3="186"/>
- <face v1="186" v2="192" v3="191"/>
- <face v1="171" v2="168" v3="196"/>
+ <face v1="193" v2="192" v3="188"/>
+ <face v1="191" v2="184" v3="186"/>
+ <face v1="192" v2="191" v3="186"/>
+ <face v1="196" v2="171" v3="168"/>
<face v1="194" v2="196" v3="168"/>
- <face v1="168" v2="166" v3="194"/>
- <face v1="176" v2="178" v3="191"/>
+ <face v1="194" v2="168" v3="165"/>
+ <face v1="177" v2="191" v3="175"/>
<face v1="107" v2="94" v3="187"/>
- <face v1="107" v2="187" v3="190"/>
+ <face v1="190" v2="107" v3="187"/>
<face v1="105" v2="106" v3="189"/>
- <face v1="105" v2="189" v3="188"/>
+ <face v1="188" v2="105" v3="189"/>
<face v1="186" v2="92" v3="105"/>
<face v1="105" v2="188" v3="186"/>
- <face v1="187" v2="181" v3="171"/>
+ <face v1="187" v2="179" v3="171"/>
<face v1="171" v2="196" v3="187"/>
- <face v1="197" v2="108" v3="34"/>
- <face v1="34" v2="140" v3="197"/>
- <face v1="140" v2="149" v3="197"/>
+ <face v1="197" v2="108" v3="33"/>
+ <face v1="197" v2="33" v3="139"/>
+ <face v1="148" v2="197" v3="139"/>
</faces>
<geometry vertexcount="198">
- <vertexbuffer positions="true" normals="true" colours_diffuse="false" texture_coords="1" texture_coord_dimensions_0="2">
+ <vertexbuffer normals="true" colours_diffuse="false" texture_coord_dimensions_0="2" positions="true" texture_coords="1">
<vertex>
- <position x="-0.791543" y="0.066844" z="0.061540"/>
- <normal x="-0.862227" y="0.242887" z="0.444489"/>
+ <position y="0.626787" x="-8.985925" z="0.676926"/>
+ <normal y="0.242887" x="-0.862227" z="0.444489"/>
+ <texcoord u="0.892077" v="0.050693"/>
+ </vertex>
+ <vertex>
+ <position y="0.626787" x="-8.985925" z="0.676926"/>
+ <normal y="0.242887" x="-0.862227" z="0.444489"/>
<texcoord u="0.915236" v="0.125134"/>
</vertex>
<vertex>
- <position x="-0.791543" y="0.066844" z="0.061540"/>
- <normal x="-0.862227" y="0.242887" z="0.444489"/>
- <texcoord u="0.892077" v="0.050693"/>
+ <position y="-2.900711" x="2.815779" z="10.885320"/>
+ <normal y="0.416505" x="-0.004394" z="0.909123"/>
+ <texcoord u="0.336625" v="0.947344"/>
</vertex>
<vertex>
- <position x="0.283294" y="-0.254422" z="0.991267"/>
- <normal x="-0.004394" y="0.416505" z="0.909123"/>
+ <position y="-2.900711" x="2.815779" z="10.885320"/>
+ <normal y="0.416505" x="-0.004394" z="0.909123"/>
<texcoord u="0.483717" v="0.558810"/>
</vertex>
<vertex>
- <position x="0.283294" y="-0.254422" z="0.991267"/>
- <normal x="-0.004394" y="0.416505" z="0.909123"/>
- <texcoord u="0.336625" v="0.947344"/>
- </vertex>
- <vertex>
- <position x="-0.791543" y="0.066844" z="-0.000121"/>
- <normal x="-0.895922" y="0.444212" z="0.000000"/>
+ <position y="0.626787" x="-8.985925" z="-0.000121"/>
+ <normal y="0.444212" x="-0.895922" z="-0.000000"/>
<texcoord u="0.939793" v="0.124796"/>
</vertex>
<vertex>
- <position x="-0.791543" y="0.066844" z="-0.000121"/>
- <normal x="-0.895922" y="0.444212" z="0.000000"/>
+ <position y="0.626787" x="-8.985925" z="-0.000121"/>
+ <normal y="0.444212" x="-0.895922" z="-0.000000"/>
<texcoord u="0.870397" v="0.063053"/>
</vertex>
<vertex>
- <position x="1.178863" y="0.233637" z="-0.000121"/>
- <normal x="0.630650" y="0.776067" z="-0.000000"/>
+ <position y="2.458172" x="12.649132" z="-0.000121"/>
+ <normal y="0.776067" x="0.630650" z="-0.000000"/>
+ <texcoord u="0.851139" v="0.051437"/>
+ </vertex>
+ <vertex>
+ <position y="2.458172" x="12.649132" z="-0.000121"/>
+ <normal y="0.776067" x="0.630650" z="-0.000000"/>
<texcoord u="0.933370" v="0.949252"/>
</vertex>
<vertex>
- <position x="1.178863" y="0.233637" z="-0.000121"/>
- <normal x="0.630650" y="0.776067" z="-0.000000"/>
- <texcoord u="0.851139" v="0.051437"/>
+ <position y="-1.649501" x="9.032329" z="9.648228"/>
+ <normal y="0.432299" x="0.180045" z="0.883573"/>
+ <texcoord u="0.481860" v="0.950392"/>
</vertex>
<vertex>
- <position x="0.849464" y="-0.140468" z="0.878599"/>
- <normal x="0.180045" y="0.432299" z="0.883573"/>
+ <position y="-1.649501" x="9.032329" z="9.648228"/>
+ <normal y="0.432299" x="0.180045" z="0.883573"/>
<texcoord u="0.537993" v="0.792215"/>
</vertex>
<vertex>
- <position x="0.849464" y="-0.140468" z="0.878599"/>
- <normal x="0.180045" y="0.432299" z="0.883573"/>
- <texcoord u="0.481860" v="0.950392"/>
- </vertex>
- <vertex>
- <position x="1.231654" y="-0.032411" z="0.707710"/>
- <normal x="0.408566" y="0.458115" z="0.789433"/>
+ <position y="-0.463032" x="13.228780" z="7.771864"/>
+ <normal y="0.458115" x="0.408566" z="0.789433"/>
<texcoord u="0.611671" v="0.951961"/>
</vertex>
<vertex>
- <position x="1.231654" y="-0.032411" z="0.707710"/>
- <normal x="0.408566" y="0.458115" z="0.789433"/>
+ <position y="-0.463032" x="13.228780" z="7.771864"/>
+ <normal y="0.458115" x="0.408566" z="0.789433"/>
<texcoord u="0.588611" v="0.956403"/>
</vertex>
<vertex>
- <position x="1.231654" y="-0.032411" z="0.707710"/>
- <normal x="0.408566" y="0.458115" z="0.789433"/>
+ <position y="-0.463032" x="13.228780" z="7.771864"/>
+ <normal y="0.458115" x="0.408566" z="0.789433"/>
<texcoord u="0.544984" v="0.179350"/>
</vertex>
<vertex>
- <position x="1.325066" y="0.135811" z="0.513532"/>
- <normal x="0.662584" y="0.647362" z="0.376702"/>
+ <position y="1.384049" x="14.254442" z="5.639791"/>
+ <normal y="0.647362" x="0.662584" z="0.376702"/>
+ <texcoord u="0.627203" v="0.101915"/>
+ </vertex>
+ <vertex>
+ <position y="1.384049" x="14.254442" z="5.639791"/>
+ <normal y="0.647362" x="0.662584" z="0.376702"/>
<texcoord u="0.713995" v="0.995251"/>
</vertex>
<vertex>
- <position x="1.325066" y="0.135811" z="0.513532"/>
- <normal x="0.662584" y="0.647362" z="0.376702"/>
- <texcoord u="0.627203" v="0.101915"/>
+ <position y="2.458172" x="12.656326" z="2.860729"/>
+ <normal y="0.856673" x="0.512599" z="0.057909"/>
+ <texcoord u="0.743496" v="0.050336"/>
</vertex>
<vertex>
- <position x="1.179518" y="0.233637" z="0.260430"/>
- <normal x="0.512599" y="0.856673" z="0.057909"/>
+ <position y="2.458172" x="12.656326" z="2.860729"/>
+ <normal y="0.856673" x="0.512599" z="0.057909"/>
<texcoord u="0.827485" v="0.942344"/>
</vertex>
<vertex>
- <position x="1.179518" y="0.233637" z="0.260430"/>
- <normal x="0.512599" y="0.856673" z="0.057909"/>
- <texcoord u="0.743496" v="0.050336"/>
+ <position y="1.051610" x="-6.904983" z="1.808935"/>
+ <normal y="0.934589" x="-0.354774" z="-0.026055"/>
+ <texcoord u="0.976829" v="0.024487"/>
</vertex>
<vertex>
- <position x="-0.602022" y="0.105535" z="0.164638"/>
- <normal x="-0.354774" y="0.934589" z="-0.026055"/>
- <texcoord u="0.875234" v="0.202728"/>
- </vertex>
- <vertex>
- <position x="-0.602022" y="0.105535" z="0.164638"/>
- <normal x="-0.354774" y="0.934589" z="-0.026055"/>
+ <position y="1.051610" x="-6.904983" z="1.808935"/>
+ <normal y="0.934589" x="-0.354774" z="-0.026055"/>
<texcoord u="0.466258" v="0.010438"/>
</vertex>
<vertex>
- <position x="-0.602022" y="0.105535" z="0.164638"/>
- <normal x="-0.354774" y="0.934589" z="-0.026055"/>
- <texcoord u="0.976829" v="0.024487"/>
+ <position y="1.051610" x="-6.904983" z="1.808935"/>
+ <normal y="0.934589" x="-0.354774" z="-0.026055"/>
+ <texcoord u="0.875234" v="0.202728"/>
</vertex>
<vertex>
- <position x="-1.311399" y="-0.072724" z="0.263593"/>
- <normal x="-0.708114" y="-0.272696" z="-0.651315"/>
+ <position y="-0.905670" x="-14.693949" z="2.895462"/>
+ <normal y="-0.272696" x="-0.708114" z="-0.651315"/>
<texcoord u="0.475824" v="0.204685"/>
</vertex>
<vertex>
- <position x="-1.311362" y="-0.072724" z="0.393471"/>
- <normal x="-0.720778" y="-0.205699" z="0.661942"/>
+ <position y="-0.905670" x="-14.693536" z="4.321519"/>
+ <normal y="-0.205699" x="-0.720778" z="0.661942"/>
+ <texcoord u="0.445009" v="0.219570"/>
+ </vertex>
+ <vertex>
+ <position y="-0.905670" x="-14.693536" z="4.321519"/>
+ <normal y="-0.205699" x="-0.720778" z="0.661942"/>
<texcoord u="0.503976" v="0.224142"/>
</vertex>
<vertex>
- <position x="-1.311362" y="-0.072724" z="0.393471"/>
- <normal x="-0.720778" y="-0.205699" z="0.661942"/>
- <texcoord u="0.445009" v="0.219570"/>
+ <position y="1.051610" x="-6.648792" z="5.386738"/>
+ <normal y="0.821994" x="-0.282504" z="0.494486"/>
+ <texcoord u="0.292600" v="0.089296"/>
</vertex>
<vertex>
- <position x="-0.578689" y="0.105535" z="0.490485"/>
- <normal x="-0.282504" y="0.821994" z="0.494486"/>
+ <position y="1.051610" x="-6.648792" z="5.386738"/>
+ <normal y="0.821994" x="-0.282504" z="0.494486"/>
<texcoord u="0.744245" v="0.212145"/>
</vertex>
<vertex>
- <position x="-0.578689" y="0.105535" z="0.490485"/>
- <normal x="-0.282504" y="0.821994" z="0.494486"/>
- <texcoord u="0.292600" v="0.089296"/>
+ <position y="1.051610" x="-6.648792" z="5.386738"/>
+ <normal y="0.821994" x="-0.282504" z="0.494486"/>
+ <texcoord u="0.020979" v="0.940013"/>
</vertex>
<vertex>
- <position x="-0.578689" y="0.105535" z="0.490485"/>
- <normal x="-0.282504" y="0.821994" z="0.494486"/>
+ <position y="1.051610" x="-6.648792" z="5.386738"/>
+ <normal y="0.821994" x="-0.282504" z="0.494486"/>
<texcoord u="0.552230" v="0.006162"/>
</vertex>
<vertex>
- <position x="-0.578689" y="0.105535" z="0.490485"/>
- <normal x="-0.282504" y="0.821994" z="0.494486"/>
- <texcoord u="0.020979" v="0.940013"/>
- </vertex>
- <vertex>
- <position x="-0.431603" y="-0.011715" z="0.688577"/>
- <normal x="-0.335300" y="0.627230" z="0.702962"/>
+ <position y="-0.235792" x="-5.033788" z="7.561788"/>
+ <normal y="0.627230" x="-0.335300" z="0.702962"/>
<texcoord u="0.651395" v="0.271757"/>
</vertex>
<vertex>
- <position x="-0.431603" y="-0.011715" z="0.688577"/>
- <normal x="-0.335300" y="0.627230" z="0.702962"/>
+ <position y="-0.235792" x="-5.033788" z="7.561788"/>
+ <normal y="0.627230" x="-0.335300" z="0.702962"/>
<texcoord u="0.101206" v="0.938647"/>
</vertex>
<vertex>
- <position x="-0.005923" y="-0.253867" z="0.945840"/>
- <normal x="-0.215231" y="0.418904" z="0.882154"/>
- <texcoord u="0.503086" v="0.441213"/>
+ <position y="-2.894624" x="-0.359815" z="10.386533"/>
+ <normal y="0.418904" x="-0.215231" z="0.882154"/>
+ <texcoord u="0.259691" v="0.950972"/>
</vertex>
<vertex>
- <position x="-0.005923" y="-0.253867" z="0.945840"/>
- <normal x="-0.215231" y="0.418904" z="0.882154"/>
- <texcoord u="0.259691" v="0.950972"/>
+ <position y="-2.894624" x="-0.359815" z="10.386533"/>
+ <normal y="0.418904" x="-0.215231" z="0.882154"/>
+ <texcoord u="0.503086" v="0.441213"/>
</vertex>
<vertex>
- <position x="-0.282346" y="-0.131034" z="0.809969"/>
- <normal x="-0.305724" y="0.498475" z="0.811206"/>
+ <position y="-1.545918" x="-3.394943" z="8.894669"/>
+ <normal y="0.498475" x="-0.305724" z="0.811206"/>
<texcoord u="0.581318" v="0.330903"/>
</vertex>
<vertex>
- <position x="-0.282346" y="-0.131034" z="0.809969"/>
- <normal x="-0.305724" y="0.498475" z="0.811206"/>
+ <position y="-1.545918" x="-3.394943" z="8.894669"/>
+ <normal y="0.498475" x="-0.305724" z="0.811206"/>
<texcoord u="0.167826" v="0.945690"/>
</vertex>
<vertex>
- <position x="0.427560" y="0.266449" z="-0.000121"/>
- <normal x="0.158466" y="0.987364" z="0.000000"/>
+ <position y="2.818449" x="4.399825" z="-0.000121"/>
+ <normal y="0.987364" x="0.158466" z="-0.000000"/>
+ <texcoord u="0.960972" v="0.615165"/>
+ </vertex>
+ <vertex>
+ <position y="2.818449" x="4.399825" z="-0.000121"/>
+ <normal y="0.987364" x="0.158466" z="-0.000000"/>
<texcoord u="0.954115" v="0.643701"/>
</vertex>
<vertex>
- <position x="0.427560" y="0.266449" z="-0.000121"/>
- <normal x="0.158466" y="0.987364" z="0.000000"/>
- <texcoord u="0.960972" v="0.615165"/>
+ <position y="1.606481" x="-4.374999" z="-0.000121"/>
+ <normal y="0.937069" x="-0.349145" z="0.000000"/>
+ <texcoord u="0.942056" v="0.295582"/>
</vertex>
<vertex>
- <position x="-0.371604" y="0.156069" z="-0.000121"/>
- <normal x="-0.349145" y="0.937069" z="0.000000"/>
+ <position y="1.606481" x="-4.374999" z="-0.000121"/>
+ <normal y="0.937069" x="-0.349145" z="0.000000"/>
<texcoord u="0.956819" v="0.305634"/>
</vertex>
<vertex>
- <position x="-0.371604" y="0.156069" z="-0.000121"/>
- <normal x="-0.349145" y="0.937069" z="0.000000"/>
- <texcoord u="0.942056" v="0.295582"/>
- </vertex>
- <vertex>
- <position x="-0.070611" y="0.334507" z="-0.000121"/>
- <normal x="-0.238609" y="0.971116" z="0.000000"/>
+ <position y="3.565721" x="-1.070097" z="-0.000121"/>
+ <normal y="0.971116" x="-0.238609" z="0.000000"/>
<texcoord u="0.965629" v="0.431512"/>
</vertex>
<vertex>
- <position x="0.427466" y="0.271987" z="0.164532"/>
- <normal x="0.152720" y="0.972255" z="0.177192"/>
+ <position y="2.879257" x="4.398788" z="1.807774"/>
+ <normal y="0.972255" x="0.152720" z="0.177192"/>
<texcoord u="0.887184" v="0.639022"/>
</vertex>
<vertex>
- <position x="0.427466" y="0.271987" z="0.164532"/>
- <normal x="0.152720" y="0.972255" z="0.177192"/>
+ <position y="2.879257" x="4.398788" z="1.807774"/>
+ <normal y="0.972255" x="0.152720" z="0.177192"/>
<texcoord u="0.901091" v="0.612148"/>
</vertex>
<vertex>
- <position x="-0.371020" y="0.156069" z="0.164430"/>
- <normal x="-0.318105" y="0.937800" z="0.139068"/>
- <texcoord u="0.897639" v="0.309841"/>
+ <position y="1.606481" x="-4.368584" z="1.806649"/>
+ <normal y="0.937800" x="-0.318105" z="0.139068"/>
+ <texcoord u="0.876854" v="0.296815"/>
</vertex>
<vertex>
- <position x="-0.371020" y="0.156069" z="0.164430"/>
- <normal x="-0.318105" y="0.937800" z="0.139068"/>
- <texcoord u="0.876854" v="0.296815"/>
+ <position y="1.606481" x="-4.368584" z="1.806649"/>
+ <normal y="0.937800" x="-0.318105" z="0.139068"/>
+ <texcoord u="0.897639" v="0.309841"/>
</vertex>
<vertex>
- <position x="-0.071017" y="0.325693" z="0.201946"/>
- <normal x="-0.241639" y="0.944523" z="0.222458"/>
+ <position y="3.468952" x="-1.074552" z="2.218575"/>
+ <normal y="0.944523" x="-0.241639" z="0.222458"/>
<texcoord u="0.893990" v="0.432495"/>
</vertex>
<vertex>
- <position x="-0.603193" y="0.105535" z="-0.000121"/>
- <normal x="-0.214827" y="0.976652" z="0.000000"/>
+ <position y="1.051610" x="-6.917842" z="-0.000121"/>
+ <normal y="0.976652" x="-0.214827" z="-0.000000"/>
<texcoord u="0.940797" v="0.201395"/>
</vertex>
<vertex>
- <position x="-0.037109" y="0.256817" z="0.342328"/>
- <normal x="-0.204986" y="0.868910" z="0.450529"/>
+ <position y="2.712690" x="-0.702242" z="3.759976"/>
+ <normal y="0.868910" x="-0.204986" z="0.450529"/>
+ <texcoord u="0.837991" v="0.440663"/>
+ </vertex>
+ <vertex>
+ <position y="2.712690" x="-0.702242" z="3.759976"/>
+ <normal y="0.868910" x="-0.204986" z="0.450529"/>
<texcoord u="0.825011" v="0.442708"/>
</vertex>
<vertex>
- <position x="-0.037109" y="0.256817" z="0.342328"/>
- <normal x="-0.204986" y="0.868910" z="0.450529"/>
- <texcoord u="0.837991" v="0.440663"/>
+ <position y="2.060508" x="-2.388349" z="3.275107"/>
+ <normal y="0.866647" x="-0.331047" z="0.373272"/>
+ <texcoord u="0.849723" v="0.377177"/>
</vertex>
<vertex>
- <position x="-0.190671" y="0.197420" z="0.298169"/>
- <normal x="-0.331047" y="0.866647" z="0.373272"/>
+ <position y="2.060508" x="-2.388349" z="3.275107"/>
+ <normal y="0.866647" x="-0.331047" z="0.373272"/>
<texcoord u="0.830014" v="0.374971"/>
</vertex>
<vertex>
- <position x="-0.190671" y="0.197420" z="0.298169"/>
- <normal x="-0.331047" y="0.866647" z="0.373272"/>
- <texcoord u="0.849723" v="0.377177"/>
- </vertex>
- <vertex>
- <position x="0.263659" y="0.284910" z="0.304981"/>
- <normal x="0.098334" y="0.929720" z="0.354895"/>
+ <position y="3.021154" x="2.600186" z="3.349899"/>
+ <normal y="0.929720" x="0.098334" z="0.354895"/>
<texcoord u="0.840669" v="0.564759"/>
</vertex>
<vertex>
- <position x="0.263659" y="0.284910" z="0.304981"/>
- <normal x="0.098334" y="0.929720" z="0.354895"/>
+ <position y="3.021154" x="2.600186" z="3.349899"/>
+ <normal y="0.929720" x="0.098334" z="0.354895"/>
<texcoord u="0.852199" v="0.550263"/>
</vertex>
<vertex>
- <position x="0.533752" y="0.176732" z="0.457637"/>
- <normal x="0.056558" y="0.869820" z="0.490116"/>
+ <position y="1.833362" x="5.565812" z="5.026063"/>
+ <normal y="0.869820" x="0.056558" z="0.490116"/>
<texcoord u="0.759156" v="0.674445"/>
</vertex>
<vertex>
- <position x="1.090004" y="0.129608" z="0.525529"/>
- <normal x="0.011018" y="0.865900" z="0.500095"/>
+ <position y="1.315936" x="11.673458" z="5.771516"/>
+ <normal y="0.865900" x="0.011018" z="0.500095"/>
<texcoord u="0.713735" v="0.899320"/>
</vertex>
<vertex>
- <position x="0.285411" y="0.165251" z="0.517465"/>
- <normal x="0.018268" y="0.834686" z="0.550424"/>
+ <position y="1.707294" x="2.839030" z="5.682980"/>
+ <normal y="0.834686" x="0.018268" z="0.550424"/>
<texcoord u="0.741432" v="0.571509"/>
</vertex>
<vertex>
- <position x="-0.248043" y="0.126098" z="0.437624"/>
- <normal x="-0.157557" y="0.878153" z="0.451690"/>
+ <position y="1.277396" x="-3.018296" z="4.806324"/>
+ <normal y="0.878153" x="-0.157557" z="0.451690"/>
<texcoord u="0.766062" v="0.350803"/>
</vertex>
<vertex>
- <position x="-0.442447" y="0.140193" z="0.316134"/>
- <normal x="-0.079682" y="0.971810" z="0.221894"/>
+ <position y="1.432154" x="-5.152852" z="3.472360"/>
+ <normal y="0.971810" x="-0.079682" z="0.221894"/>
<texcoord u="0.814639" v="0.269517"/>
</vertex>
<vertex>
- <position x="-0.005184" y="0.140382" z="0.523476"/>
- <normal x="-0.133369" y="0.806994" z="0.575303"/>
+ <position y="1.434233" x="-0.351700" z="5.748981"/>
+ <normal y="0.806994" x="-0.133369" z="0.575303"/>
<texcoord u="0.738102" v="0.452849"/>
</vertex>
<vertex>
- <position x="-0.454696" y="0.140193" z="0.164505"/>
- <normal x="-0.207265" y="0.978248" z="0.008543"/>
+ <position y="1.432154" x="-5.287349" z="1.807477"/>
+ <normal y="0.978248" x="-0.207265" z="0.008543"/>
<texcoord u="0.875993" v="0.263112"/>
</vertex>
<vertex>
- <position x="-0.455493" y="0.140193" z="-0.000121"/>
- <normal x="-0.207502" y="0.978235" z="0.000000"/>
+ <position y="1.432154" x="-5.296098" z="-0.000121"/>
+ <normal y="0.978235" x="-0.207502" z="0.000000"/>
<texcoord u="0.941534" v="0.261749"/>
</vertex>
<vertex>
- <position x="-1.265887" y="0.007741" z="0.369034"/>
- <normal x="-0.522413" y="0.738513" z="0.426243"/>
- <texcoord u="0.512529" v="0.200448"/>
+ <position y="-0.022163" x="-14.194227" z="4.053202"/>
+ <normal y="0.738513" x="-0.522413" z="0.426243"/>
+ <texcoord u="0.420237" v="0.224142"/>
</vertex>
<vertex>
- <position x="-1.265887" y="0.007741" z="0.369034"/>
- <normal x="-0.522413" y="0.738513" z="0.426243"/>
- <texcoord u="0.420237" v="0.224142"/>
+ <position y="-0.022163" x="-14.194227" z="4.053202"/>
+ <normal y="0.738513" x="-0.522413" z="0.426243"/>
+ <texcoord u="0.512529" v="0.200448"/>
</vertex>
<vertex>
- <position x="-1.265887" y="0.007741" z="0.369034"/>
- <normal x="-0.522413" y="0.738513" z="0.426243"/>
+ <position y="-0.022163" x="-14.194227" z="4.053202"/>
+ <normal y="0.738513" x="-0.522413" z="0.426243"/>
<texcoord u="0.516385" v="0.188342"/>
</vertex>
<vertex>
- <position x="-1.266410" y="0.007741" z="0.285703"/>
- <normal x="-0.535439" y="0.720331" z="-0.440940"/>
+ <position y="-0.022163" x="-14.199970" z="3.138235"/>
+ <normal y="0.720331" x="-0.535439" z="-0.440940"/>
<texcoord u="0.494430" v="0.188017"/>
</vertex>
<vertex>
- <position x="-0.005671" y="-0.336577" z="0.946622"/>
- <normal x="-0.261013" y="-0.846779" z="0.463505"/>
+ <position y="-3.802771" x="-0.357053" z="10.395116"/>
+ <normal y="-0.846779" x="-0.261013" z="0.463505"/>
<texcoord u="0.264416" v="0.971986"/>
</vertex>
<vertex>
- <position x="-0.005671" y="-0.336577" z="0.946622"/>
- <normal x="-0.261013" y="-0.846779" z="0.463505"/>
+ <position y="-3.802771" x="-0.357053" z="10.395116"/>
+ <normal y="-0.846779" x="-0.261013" z="0.463505"/>
<texcoord u="0.453084" v="0.370693"/>
</vertex>
<vertex>
- <position x="0.283972" y="-0.335710" z="0.990498"/>
- <normal x="0.075320" y="-0.860119" z="0.504502"/>
+ <position y="-3.793255" x="2.823228" z="10.876877"/>
+ <normal y="-0.860119" x="0.075320" z="0.504502"/>
<texcoord u="0.334474" v="0.967127"/>
</vertex>
<vertex>
- <position x="0.283972" y="-0.335710" z="0.990498"/>
- <normal x="0.075320" y="-0.860119" z="0.504502"/>
+ <position y="-3.793255" x="2.823228" z="10.876877"/>
+ <normal y="-0.860119" x="0.075320" z="0.504502"/>
<texcoord u="0.469402" v="0.492076"/>
</vertex>
<vertex>
- <position x="-0.281841" y="-0.248174" z="0.810231"/>
- <normal x="-0.475620" y="-0.769463" z="0.426277"/>
+ <position y="-2.832112" x="-3.389394" z="8.897550"/>
+ <normal y="-0.769463" x="-0.475620" z="0.426277"/>
+ <texcoord u="0.385394" v="0.254748"/>
+ </vertex>
+ <vertex>
+ <position y="-2.832112" x="-3.389394" z="8.897550"/>
+ <normal y="-0.769463" x="-0.475620" z="0.426277"/>
<texcoord u="0.179655" v="0.975658"/>
</vertex>
<vertex>
- <position x="-0.281841" y="-0.248174" z="0.810231"/>
- <normal x="-0.475620" y="-0.769463" z="0.426277"/>
- <texcoord u="0.385394" v="0.254748"/>
+ <position y="-1.902075" x="-5.590593" z="7.567440"/>
+ <normal y="-0.654681" x="-0.682538" z="0.324860"/>
+ <texcoord u="0.325781" v="0.170191"/>
</vertex>
<vertex>
- <position x="-0.482314" y="-0.163471" z="0.689092"/>
- <normal x="-0.682538" y="-0.654681" z="0.324860"/>
+ <position y="-1.902075" x="-5.590593" z="7.567440"/>
+ <normal y="-0.654681" x="-0.682538" z="0.324860"/>
<texcoord u="0.111772" v="0.983561"/>
</vertex>
<vertex>
- <position x="-0.482314" y="-0.163471" z="0.689092"/>
- <normal x="-0.682538" y="-0.654681" z="0.324860"/>
- <texcoord u="0.325781" v="0.170191"/>
+ <position y="-0.992026" x="-6.592994" z="5.663315"/>
+ <normal y="-0.823338" x="-0.405159" z="0.397443"/>
+ <texcoord u="0.331410" v="0.058559"/>
</vertex>
<vertex>
- <position x="-0.573607" y="-0.080589" z="0.515674"/>
- <normal x="-0.405159" y="-0.823338" z="0.397443"/>
- <texcoord u="0.331410" v="0.058559"/>
+ <position y="-0.992026" x="-6.592994" z="5.663315"/>
+ <normal y="-0.823338" x="-0.405159" z="0.397443"/>
+ <texcoord u="0.247583" v="0.129540"/>
</vertex>
<vertex>
- <position x="-0.573607" y="-0.080589" z="0.515674"/>
- <normal x="-0.405159" y="-0.823338" z="0.397443"/>
+ <position y="-0.992026" x="-6.592994" z="5.663315"/>
+ <normal y="-0.823338" x="-0.405159" z="0.397443"/>
<texcoord u="0.050252" v="0.985830"/>
</vertex>
<vertex>
- <position x="-0.573607" y="-0.080589" z="0.515674"/>
- <normal x="-0.405159" y="-0.823338" z="0.397443"/>
- <texcoord u="0.247583" v="0.129540"/>
- </vertex>
- <vertex>
- <position x="0.847803" y="-0.240681" z="0.877129"/>
- <normal x="0.306730" y="-0.831228" z="0.463656"/>
+ <position y="-2.749834" x="9.014091" z="9.632089"/>
+ <normal y="-0.831228" x="0.306730" z="0.463656"/>
<texcoord u="0.475325" v="0.974061"/>
</vertex>
<vertex>
- <position x="0.847803" y="-0.240681" z="0.877129"/>
- <normal x="0.306730" y="-0.831228" z="0.463656"/>
+ <position y="-2.749834" x="9.014091" z="9.632089"/>
+ <normal y="-0.831228" x="0.306730" z="0.463656"/>
<texcoord u="0.410195" v="0.728597"/>
</vertex>
<vertex>
- <position x="1.230643" y="-0.157288" z="0.706861"/>
- <normal x="0.570827" y="-0.795337" z="0.203950"/>
+ <position y="-1.834187" x="13.217674" z="7.762546"/>
+ <normal y="-0.795337" x="0.570827" z="0.203950"/>
<texcoord u="0.579224" v="0.985830"/>
</vertex>
<vertex>
- <position x="1.230643" y="-0.157288" z="0.706861"/>
- <normal x="0.570827" y="-0.795337" z="0.203950"/>
+ <position y="-1.834187" x="13.217674" z="7.762546"/>
+ <normal y="-0.795337" x="0.570827" z="0.203950"/>
<texcoord u="0.549889" v="0.230713"/>
</vertex>
<vertex>
- <position x="1.230643" y="-0.157288" z="0.706861"/>
- <normal x="0.570827" y="-0.795337" z="0.203950"/>
+ <position y="-1.834187" x="13.217674" z="7.762546"/>
+ <normal y="-0.795337" x="0.570827" z="0.203950"/>
<texcoord u="0.331136" v="0.889002"/>
</vertex>
<vertex>
- <position x="1.325053" y="-0.060818" z="0.504545"/>
- <normal x="0.683047" y="-0.652150" z="-0.328857"/>
+ <position y="-0.774939" x="14.254298" z="5.541114"/>
+ <normal y="-0.652150" x="0.683047" z="-0.328857"/>
<texcoord u="0.638056" v="0.182510"/>
</vertex>
<vertex>
- <position x="1.325053" y="-0.060818" z="0.504545"/>
- <normal x="0.683047" y="-0.652150" z="-0.328857"/>
+ <position y="-0.774939" x="14.254298" z="5.541114"/>
+ <normal y="-0.652150" x="0.683047" z="-0.328857"/>
<texcoord u="0.237598" v="0.928740"/>
</vertex>
<vertex>
- <position x="-0.601916" y="-0.086321" z="0.164963"/>
- <normal x="-0.177452" y="-0.962913" z="-0.203248"/>
+ <position y="-1.054964" x="-6.903826" z="1.812509"/>
+ <normal y="-0.962913" x="-0.177452" z="-0.203248"/>
+ <texcoord u="0.100780" v="0.119386"/>
+ </vertex>
+ <vertex>
+ <position y="-1.054964" x="-6.903826" z="1.812509"/>
+ <normal y="-0.962913" x="-0.177452" z="-0.203248"/>
<texcoord u="0.417857" v="0.025031"/>
</vertex>
<vertex>
- <position x="-0.601916" y="-0.086321" z="0.164963"/>
- <normal x="-0.177452" y="-0.962913" z="-0.203248"/>
+ <position y="-1.054964" x="-6.903826" z="1.812509"/>
+ <normal y="-0.962913" x="-0.177452" z="-0.203248"/>
<texcoord u="0.987504" v="0.101398"/>
</vertex>
<vertex>
- <position x="-0.601916" y="-0.086321" z="0.164963"/>
- <normal x="-0.177452" y="-0.962913" z="-0.203248"/>
- <texcoord u="0.100780" v="0.119386"/>
+ <position y="-0.450138" x="-8.470729" z="0.670670"/>
+ <normal y="-0.687867" x="-0.679846" z="0.254260"/>
+ <texcoord u="0.050074" v="0.061108"/>
</vertex>
<vertex>
- <position x="-0.744622" y="-0.031237" z="0.060971"/>
- <normal x="-0.679846" y="-0.687867" z="0.254260"/>
+ <position y="-0.450138" x="-8.470729" z="0.670670"/>
+ <normal y="-0.687867" x="-0.679846" z="0.254260"/>
<texcoord u="0.913671" v="0.089035"/>
</vertex>
<vertex>
- <position x="-0.744622" y="-0.031237" z="0.060971"/>
- <normal x="-0.679846" y="-0.687867" z="0.254260"/>
- <texcoord u="0.050074" v="0.061108"/>
+ <position y="-0.451642" x="-8.465400" z="-0.000121"/>
+ <normal y="-0.831459" x="-0.555586" z="0.000000"/>
+ <texcoord u="0.024595" v="0.061902"/>
</vertex>
<vertex>
- <position x="-0.744136" y="-0.031373" z="-0.000121"/>
- <normal x="-0.555586" y="-0.831459" z="-0.000000"/>
+ <position y="-0.451642" x="-8.465400" z="-0.000121"/>
+ <normal y="-0.831459" x="-0.555586" z="0.000000"/>
<texcoord u="0.892258" v="0.101398"/>
</vertex>
<vertex>
- <position x="-0.744136" y="-0.031373" z="-0.000121"/>
- <normal x="-0.555586" y="-0.831459" z="-0.000000"/>
- <texcoord u="0.024595" v="0.061902"/>
+ <position y="0.216233" x="13.455312" z="3.526704"/>
+ <normal y="-0.725482" x="0.581297" z="-0.368470"/>
+ <texcoord u="0.151833" v="0.899561"/>
</vertex>
<vertex>
- <position x="1.252286" y="0.029453" z="0.321083"/>
- <normal x="0.581297" y="-0.725482" z="-0.368470"/>
+ <position y="0.216233" x="13.455312" z="3.526704"/>
+ <normal y="-0.725482" x="0.581297" z="-0.368470"/>
<texcoord u="0.716668" v="0.139379"/>
</vertex>
<vertex>
- <position x="1.252286" y="0.029453" z="0.321083"/>
- <normal x="0.581297" y="-0.725482" z="-0.368470"/>
- <texcoord u="0.151833" v="0.899561"/>
- </vertex>
- <vertex>
- <position x="1.215574" y="0.029109" z="-0.000121"/>
- <normal x="0.808009" y="-0.589170" z="-0.000000"/>
+ <position y="0.212457" x="13.052222" z="-0.000121"/>
+ <normal y="-0.589170" x="0.808009" z="-0.000000"/>
<texcoord u="0.850223" v="0.137284"/>
</vertex>
<vertex>
- <position x="1.215574" y="0.029109" z="-0.000121"/>
- <normal x="0.808009" y="-0.589170" z="-0.000000"/>
+ <position y="0.212457" x="13.052222" z="-0.000121"/>
+ <normal y="-0.589170" x="0.808009" z="-0.000000"/>
<texcoord u="0.017964" v="0.880308"/>
</vertex>
<vertex>
- <position x="0.423115" y="-0.028434" z="0.200233"/>
- <normal x="0.047525" y="-0.981266" z="-0.186702"/>
+ <position y="-0.419366" x="4.351016" z="2.199768"/>
+ <normal y="-0.981266" x="0.047525" z="-0.186702"/>
<texcoord u="0.111623" v="0.550171"/>
</vertex>
<vertex>
- <position x="0.422496" y="-0.001132" z="-0.000121"/>
- <normal x="0.033424" y="-0.999441" z="0.000000"/>
+ <position y="-0.119592" x="4.344222" z="-0.000121"/>
+ <normal y="-0.999441" x="0.033424" z="-0.000000"/>
<texcoord u="0.026956" v="0.548379"/>
</vertex>
<vertex>
- <position x="-0.602566" y="-0.016253" z="-0.000121"/>
- <normal x="0.003744" y="-0.999993" z="-0.000000"/>
+ <position y="-0.285617" x="-6.910962" z="-0.000121"/>
+ <normal y="-0.999993" x="0.003744" z="0.000000"/>
<texcoord u="0.025920" v="0.121308"/>
</vertex>
<vertex>
- <position x="-0.354501" y="-0.012594" z="-0.000121"/>
- <normal x="0.076039" y="-0.997105" z="0.000000"/>
+ <position y="-0.245439" x="-4.187208" z="-0.000121"/>
+ <normal y="-0.997105" x="0.076039" z="-0.000000"/>
<texcoord u="0.028302" v="0.224880"/>
</vertex>
<vertex>
- <position x="-0.352498" y="-0.072312" z="0.165331"/>
- <normal x="0.043431" y="-0.978338" z="-0.202405"/>
+ <position y="-0.901150" x="-4.165207" z="1.816542"/>
+ <normal y="-0.978338" x="0.043431" z="-0.202405"/>
<texcoord u="0.101947" v="0.224074"/>
</vertex>
<vertex>
- <position x="0.259900" y="-0.039404" z="0.283914"/>
- <normal x="0.019138" y="-0.976984" z="-0.212453"/>
+ <position y="-0.539812" x="2.558921" z="3.118590"/>
+ <normal y="-0.976984" x="0.019138" z="-0.212453"/>
<texcoord u="0.147206" v="0.481777"/>
</vertex>
<vertex>
- <position x="-0.002882" y="-0.050373" z="0.348501"/>
- <normal x="0.038636" y="-0.971991" z="-0.231819"/>
+ <position y="-0.660258" x="-0.326426" z="3.827747"/>
+ <normal y="-0.971991" x="0.038636" z="-0.231819"/>
<texcoord u="0.174975" v="0.372244"/>
</vertex>
<vertex>
- <position x="-0.191413" y="-0.061343" z="0.276291"/>
- <normal x="0.071078" y="-0.973477" z="-0.217463"/>
+ <position y="-0.780704" x="-2.396499" z="3.034885"/>
+ <normal y="-0.973477" x="0.071078" z="-0.217463"/>
<texcoord u="0.146719" v="0.292920"/>
</vertex>
<vertex>
- <position x="1.241464" y="-0.063918" z="0.513972"/>
- <normal x="0.014536" y="-0.916011" z="-0.400890"/>
+ <position y="-0.808977" x="13.336493" z="5.644625"/>
+ <normal y="-0.916011" x="0.014536" z="-0.400890"/>
<texcoord u="0.241420" v="0.893734"/>
</vertex>
<vertex>
- <position x="0.635459" y="-0.088291" z="0.538681"/>
- <normal x="0.046983" y="-0.931948" z="-0.359535"/>
+ <position y="-1.076600" x="6.682553" z="5.915929"/>
+ <normal y="-0.931948" x="0.046983" z="-0.359535"/>
<texcoord u="0.254798" v="0.640132"/>
</vertex>
<vertex>
- <position x="0.271936" y="-0.151717" z="0.637206"/>
- <normal x="0.041648" y="-0.923898" z="-0.380365"/>
+ <position y="-1.773012" x="2.691075" z="6.997733"/>
+ <normal y="-0.923898" x="0.041648" z="-0.380365"/>
<texcoord u="0.302531" v="0.487618"/>
</vertex>
<vertex>
- <position x="-0.236627" y="-0.133254" z="0.543261"/>
- <normal x="0.002184" y="-0.947322" z="-0.320274"/>
+ <position y="-1.570295" x="-2.892947" z="5.966217"/>
+ <normal y="-0.947322" x="0.002184" z="-0.320274"/>
<texcoord u="0.263156" v="0.273393"/>
</vertex>
<vertex>
- <position x="-0.004276" y="-0.171971" z="0.647561"/>
- <normal x="0.031383" y="-0.918680" z="-0.393754"/>
+ <position y="-1.995402" x="-0.341739" z="7.111432"/>
+ <normal y="-0.918680" x="0.031383" z="-0.393754"/>
<texcoord u="0.309932" v="0.371463"/>
</vertex>
<vertex>
- <position x="-0.417406" y="-0.096388" z="0.427211"/>
- <normal x="-0.081648" y="-0.973526" z="-0.213497"/>
+ <position y="-1.165500" x="-4.877900" z="4.691991"/>
+ <normal y="-0.973526" x="-0.081648" z="-0.213497"/>
<texcoord u="0.212394" v="0.196401"/>
</vertex>
<vertex>
- <position x="0.228247" y="-0.003998" z="-0.000121"/>
- <normal x="0.010464" y="-0.999945" z="0.000000"/>
+ <position y="-0.151054" x="2.211365" z="-0.000121"/>
+ <normal y="-0.999945" x="0.010464" z="-0.000000"/>
<texcoord u="0.027928" v="0.467647"/>
</vertex>
<vertex>
- <position x="0.033997" y="-0.006863" z="-0.000121"/>
- <normal x="0.038017" y="-0.999277" z="0.000000"/>
+ <position y="-0.182516" x="0.078507" z="-0.000121"/>
+ <normal y="-0.999277" x="0.038017" z="-0.000000"/>
<texcoord u="0.028574" v="0.386657"/>
</vertex>
<vertex>
- <position x="-0.160252" y="-0.009728" z="-0.000121"/>
- <normal x="0.088748" y="-0.996054" z="0.000000"/>
+ <position y="-0.213977" x="-2.054350" z="-0.000121"/>
+ <normal y="-0.996054" x="0.088748" z="-0.000000"/>
<texcoord u="0.029316" v="0.305716"/>
</vertex>
<vertex>
- <position x="0.258680" y="0.319295" z="-0.000121"/>
- <normal x="0.156659" y="0.987653" z="0.000000"/>
+ <position y="3.398701" x="2.545521" z="-0.000121"/>
+ <normal y="0.987653" x="0.156659" z="0.000000"/>
<texcoord u="0.963532" v="0.550815"/>
</vertex>
<vertex>
- <position x="0.258480" y="0.312652" z="0.177215"/>
- <normal x="0.143584" y="0.978686" z="0.146824"/>
+ <position y="3.325759" x="2.543326" z="1.947035"/>
+ <normal y="0.978686" x="0.143584" z="0.146824"/>
<texcoord u="0.899493" v="0.549229"/>
</vertex>
<vertex>
- <position x="-0.791543" y="0.066844" z="-0.061783"/>
- <normal x="-0.862227" y="0.242887" z="-0.444489"/>
+ <position y="0.626787" x="-8.985925" z="-0.677168"/>
+ <normal y="0.242887" x="-0.862227" z="-0.444489"/>
<texcoord u="0.915236" v="0.125134"/>
</vertex>
<vertex>
- <position x="-0.791543" y="0.066844" z="-0.061783"/>
- <normal x="-0.862227" y="0.242887" z="-0.444489"/>
+ <position y="0.626787" x="-8.985925" z="-0.677168"/>
+ <normal y="0.242887" x="-0.862227" z="-0.444489"/>
<texcoord u="0.892077" v="0.050693"/>
</vertex>
<vertex>
- <position x="0.283294" y="-0.254422" z="-0.991509"/>
- <normal x="-0.004394" y="0.416505" z="-0.909123"/>
+ <position y="-2.900711" x="2.815779" z="-10.885563"/>
+ <normal y="0.416505" x="-0.004394" z="-0.909123"/>
+ <texcoord u="0.336625" v="0.947344"/>
+ </vertex>
+ <vertex>
+ <position y="-2.900711" x="2.815779" z="-10.885563"/>
+ <normal y="0.416505" x="-0.004394" z="-0.909123"/>
<texcoord u="0.483717" v="0.558810"/>
</vertex>
<vertex>
- <position x="0.283294" y="-0.254422" z="-0.991509"/>
- <normal x="-0.004394" y="0.416505" z="-0.909123"/>
- <texcoord u="0.336625" v="0.947344"/>
+ <position y="-1.649501" x="9.032329" z="-9.648471"/>
+ <normal y="0.432299" x="0.180045" z="-0.883573"/>
+ <texcoord u="0.481860" v="0.950392"/>
</vertex>
<vertex>
- <position x="0.849464" y="-0.140468" z="-0.878842"/>
- <normal x="0.180045" y="0.432299" z="-0.883573"/>
+ <position y="-1.649501" x="9.032329" z="-9.648471"/>
+ <normal y="0.432299" x="0.180045" z="-0.883573"/>
<texcoord u="0.537993" v="0.792215"/>
</vertex>
<vertex>
- <position x="0.849464" y="-0.140468" z="-0.878842"/>
- <normal x="0.180045" y="0.432299" z="-0.883573"/>
- <texcoord u="0.481860" v="0.950392"/>
- </vertex>
- <vertex>
- <position x="1.231654" y="-0.032411" z="-0.707952"/>
- <normal x="0.408566" y="0.458115" z="-0.789433"/>
+ <position y="-0.463032" x="13.228780" z="-7.772107"/>
+ <normal y="0.458115" x="0.408566" z="-0.789433"/>
<texcoord u="0.611671" v="0.951961"/>
</vertex>
<vertex>
- <position x="1.231654" y="-0.032411" z="-0.707952"/>
- <normal x="0.408566" y="0.458115" z="-0.789433"/>
+ <position y="-0.463032" x="13.228780" z="-7.772107"/>
+ <normal y="0.458115" x="0.408566" z="-0.789433"/>
<texcoord u="0.588611" v="0.956403"/>
</vertex>
<vertex>
- <position x="1.231654" y="-0.032411" z="-0.707952"/>
- <normal x="0.408566" y="0.458115" z="-0.789433"/>
+ <position y="-0.463032" x="13.228780" z="-7.772107"/>
+ <normal y="0.458115" x="0.408566" z="-0.789433"/>
<texcoord u="0.544984" v="0.179350"/>
</vertex>
<vertex>
- <position x="1.325066" y="0.135811" z="-0.513775"/>
- <normal x="0.662584" y="0.647362" z="-0.376702"/>
+ <position y="1.384049" x="14.254442" z="-5.640034"/>
+ <normal y="0.647362" x="0.662584" z="-0.376702"/>
<texcoord u="0.713995" v="0.995251"/>
</vertex>
<vertex>
- <position x="1.325066" y="0.135811" z="-0.513775"/>
- <normal x="0.662584" y="0.647362" z="-0.376702"/>
+ <position y="1.384049" x="14.254442" z="-5.640034"/>
+ <normal y="0.647362" x="0.662584" z="-0.376702"/>
<texcoord u="0.627203" v="0.101915"/>
</vertex>
<vertex>
- <position x="1.179518" y="0.233637" z="-0.260672"/>
- <normal x="0.512599" y="0.856673" z="-0.057909"/>
- <texcoord u="0.827485" v="0.942344"/>
+ <position y="2.458172" x="12.656326" z="-2.860972"/>
+ <normal y="0.856673" x="0.512599" z="-0.057909"/>
+ <texcoord u="0.743496" v="0.050336"/>
</vertex>
<vertex>
- <position x="1.179518" y="0.233637" z="-0.260672"/>
- <normal x="0.512599" y="0.856673" z="-0.057909"/>
- <texcoord u="0.743496" v="0.050336"/>
+ <position y="2.458172" x="12.656326" z="-2.860972"/>
+ <normal y="0.856673" x="0.512599" z="-0.057909"/>
+ <texcoord u="0.827485" v="0.942344"/>
</vertex>
<vertex>
- <position x="-0.602022" y="0.105535" z="-0.164881"/>
- <normal x="-0.354774" y="0.934589" z="0.026055"/>
+ <position y="1.051610" x="-6.904983" z="-1.809178"/>
+ <normal y="0.934589" x="-0.354774" z="0.026055"/>
<texcoord u="0.875234" v="0.202728"/>
</vertex>
<vertex>
- <position x="-0.602022" y="0.105535" z="-0.164881"/>
- <normal x="-0.354774" y="0.934589" z="0.026055"/>
+ <position y="1.051610" x="-6.904983" z="-1.809178"/>
+ <normal y="0.934589" x="-0.354774" z="0.026055"/>
<texcoord u="0.466258" v="0.010438"/>
</vertex>
<vertex>
- <position x="-0.602022" y="0.105535" z="-0.164881"/>
- <normal x="-0.354774" y="0.934589" z="0.026055"/>
+ <position y="1.051610" x="-6.904983" z="-1.809178"/>
+ <normal y="0.934589" x="-0.354774" z="0.026055"/>
<texcoord u="0.976829" v="0.024487"/>
</vertex>
<vertex>
- <position x="-1.311399" y="-0.072724" z="-0.263836"/>
- <normal x="-0.708114" y="-0.272696" z="0.651315"/>
+ <position y="-0.905670" x="-14.693949" z="-2.895705"/>
+ <normal y="-0.272696" x="-0.708114" z="0.651315"/>
<texcoord u="0.475824" v="0.204685"/>
</vertex>
<vertex>
- <position x="-1.311362" y="-0.072724" z="-0.393713"/>
- <normal x="-0.720778" y="-0.205699" z="-0.661942"/>
- <texcoord u="0.503976" v="0.224142"/>
+ <position y="-0.905670" x="-14.693536" z="-4.321761"/>
+ <normal y="-0.205699" x="-0.720778" z="-0.661942"/>
+ <texcoord u="0.445009" v="0.219570"/>
</vertex>
<vertex>
- <position x="-1.311362" y="-0.072724" z="-0.393713"/>
- <normal x="-0.720778" y="-0.205699" z="-0.661942"/>
- <texcoord u="0.445009" v="0.219570"/>
+ <position y="-0.905670" x="-14.693536" z="-4.321761"/>
+ <normal y="-0.205699" x="-0.720778" z="-0.661942"/>
+ <texcoord u="0.503976" v="0.224142"/>
</vertex>
<vertex>
- <position x="-0.578689" y="0.105535" z="-0.490728"/>
- <normal x="-0.282504" y="0.821994" z="-0.494486"/>
+ <position y="1.051610" x="-6.648792" z="-5.386980"/>
+ <normal y="0.821994" x="-0.282504" z="-0.494486"/>
<texcoord u="0.744245" v="0.212145"/>
</vertex>
<vertex>
- <position x="-0.578689" y="0.105535" z="-0.490728"/>
-...
[truncated message content] |
|
From: <ult...@us...> - 2007-04-04 20:17:46
|
Revision: 351
http://svn.sourceforge.net/opengate/?rev=351&view=rev
Author: ultrasick
Date: 2007-04-04 13:17:10 -0700 (Wed, 04 Apr 2007)
Log Message:
-----------
uppercase -> lowercase
Removed Paths:
-------------
trunk/data/ships/Conflux/
trunk/data/ships/Octavius/
trunk/data/ships/Quantar/
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:22:17
|
Revision: 352
http://svn.sourceforge.net/opengate/?rev=352&view=rev
Author: ultrasick
Date: 2007-04-04 13:22:16 -0700 (Wed, 04 Apr 2007)
Log Message:
-----------
uppercase -> lowercase
Added Paths:
-----------
trunk/data/ships/conflux/
trunk/data/ships/octavius/
trunk/data/ships/octavius/apteryx/
trunk/data/ships/octavius/apteryx/apteryx.mesh
trunk/data/ships/octavius/apteryx/apteryx.mesh.xml
trunk/data/ships/octavius/apteryx/apteryx.wings
trunk/data/ships/octavius/apteryx/apteryx.xml
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/octavius/condor/
trunk/data/ships/octavius/condor/condor.wings
trunk/data/ships/octavius/condor/condor.xml
trunk/data/ships/octavius/phoenix/
trunk/data/ships/octavius/phoenix/phoenix.wings
trunk/data/ships/octavius/phoenix/phoenix.xml
trunk/data/ships/quantar/
trunk/data/ships/quantar/storm/
trunk/data/ships/quantar/storm/storm.mesh
trunk/data/ships/quantar/storm/storm.mesh.xml
trunk/data/ships/quantar/storm/storm.wings
trunk/data/ships/quantar/storm/storm.xml
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
trunk/data/ships/quantar/thunder/
trunk/data/ships/quantar/thunder/thunder.wings
trunk/data/ships/quantar/typhoon/
trunk/data/ships/quantar/typhoon/typhoon.wings
trunk/data/ships/quantar/typhoon/typhoon.xml
Added: trunk/data/ships/octavius/apteryx/apteryx.mesh
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/octavius/apteryx/apteryx.mesh
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/ships/octavius/apteryx/apteryx.mesh.xml
===================================================================
--- trunk/data/ships/octavius/apteryx/apteryx.mesh.xml (rev 0)
+++ trunk/data/ships/octavius/apteryx/apteryx.mesh.xml 2007-04-04 20:22:16 UTC (rev 352)
@@ -0,0 +1,1247 @@
+<?xml version="1.0"?>
+<mesh>
+ <materials>
+ <material name="octavius_apteryx_auv">
+ <ambient green="1.000000" alpha="1.000000" blue="1.000000" red="1.000000"/>
+ <diffuse green="1.000000" alpha="1.000000" blue="1.000000" red="1.000000"/>
+ <specular green="1.000000" alpha="1.000000" blue="1.000000" red="1.000000"/>
+ <shininess value="1.000000"/>
+ <texturelayers>
+ <texturelayer texture="octavius_apteryx_auv.png"/>
+ </texturelayers>
+ </material>
+ </materials>
+ <sharedgeometry vertexcount="0"/>
+ <submeshes>
+ <submesh use32bitindexes="false" operationtype="triangle_list" usesharedvertices="false" material="octavius_apteryx_auv">
+ <faces count="232">
+ <face v1="48" v2="45" v3="55"/>
+ <face v1="55" v2="52" v3="48"/>
+ <face v1="16" v2="7" v3="34"/>
+ <face v1="34" v2="38" v3="16"/>
+ <face v1="19" v2="56" v3="57"/>
+ <face v1="57" v2="43" v3="19"/>
+ <face v1="37" v2="36" v3="41"/>
+ <face v1="42" v2="37" v3="41"/>
+ <face v1="109" v2="108" v3="37"/>
+ <face v1="109" v2="37" v3="42"/>
+ <face v1="43" v2="4" v3="1"/>
+ <face v1="19" v2="43" v3="1"/>
+ <face v1="40" v2="54" v3="53"/>
+ <face v1="53" v2="47" v3="40"/>
+ <face v1="54" v2="24" v3="27"/>
+ <face v1="44" v2="42" v3="41"/>
+ <face v1="46" v2="44" v3="41"/>
+ <face v1="55" v2="53" v3="31"/>
+ <face v1="55" v2="31" v3="30"/>
+ <face v1="49" v2="109" v3="42"/>
+ <face v1="49" v2="42" v3="44"/>
+ <face v1="50" v2="9" v3="10"/>
+ <face v1="51" v2="50" v3="10"/>
+ <face v1="14" v2="51" v3="10"/>
+ <face v1="52" v2="50" v3="38"/>
+ <face v1="52" v2="38" v3="48"/>
+ <face v1="52" v2="55" v3="30"/>
+ <face v1="30" v2="3" v3="52"/>
+ <face v1="31" v2="53" v3="54"/>
+ <face v1="54" v2="27" v3="31"/>
+ <face v1="47" v2="53" v3="55"/>
+ <face v1="55" v2="45" v3="47"/>
+ <face v1="50" v2="51" v3="16"/>
+ <face v1="50" v2="16" v3="38"/>
+ <face v1="50" v2="52" v3="3"/>
+ <face v1="50" v2="3" v3="9"/>
+ <face v1="56" v2="54" v3="40"/>
+ <face v1="51" v2="14" v3="16"/>
+ <face v1="56" v2="19" v3="24"/>
+ <face v1="54" v2="56" v3="24"/>
+ <face v1="56" v2="40" v3="35"/>
+ <face v1="57" v2="56" v3="35"/>
+ <face v1="28" v2="69" v3="67"/>
+ <face v1="28" v2="67" v3="32"/>
+ <face v1="61" v2="20" v3="22"/>
+ <face v1="61" v2="22" v3="59"/>
+ <face v1="70" v2="23" v3="58"/>
+ <face v1="21" v2="70" v3="58"/>
+ <face v1="26" v2="18" v3="61"/>
+ <face v1="61" v2="60" v3="26"/>
+ <face v1="18" v2="81" v3="20"/>
+ <face v1="20" v2="61" v3="18"/>
+ <face v1="29" v2="62" v3="64"/>
+ <face v1="64" v2="2" v3="29"/>
+ <face v1="32" v2="67" v3="62"/>
+ <face v1="62" v2="29" v3="32"/>
+ <face v1="72" v2="69" v3="28"/>
+ <face v1="25" v2="72" v3="28"/>
+ <face v1="0" v2="5" v3="86"/>
+ <face v1="86" v2="84" v3="0"/>
+ <face v1="2" v2="64" v3="73"/>
+ <face v1="73" v2="8" v3="2"/>
+ <face v1="73" v2="75" v3="11"/>
+ <face v1="11" v2="8" v3="73"/>
+ <face v1="76" v2="78" v3="13"/>
+ <face v1="13" v2="12" v3="76"/>
+ <face v1="82" v2="17" v3="0"/>
+ <face v1="84" v2="82" v3="0"/>
+ <face v1="102" v2="98" v3="97"/>
+ <face v1="103" v2="102" v3="97"/>
+ <face v1="15" v2="13" v3="78"/>
+ <face v1="88" v2="15" v3="78"/>
+ <face v1="89" v2="6" v3="15"/>
+ <face v1="89" v2="15" v3="88"/>
+ <face v1="80" v2="93" v3="94"/>
+ <face v1="94" v2="95" v3="80"/>
+ <face v1="20" v2="81" v3="70"/>
+ <face v1="70" v2="21" v3="20"/>
+ <face v1="91" v2="92" v3="90"/>
+ <face v1="91" v2="90" v3="87"/>
+ <face v1="85" v2="93" v3="80"/>
+ <face v1="80" v2="83" v3="85"/>
+ <face v1="107" v2="106" v3="97"/>
+ <face v1="97" v2="98" v3="107"/>
+ <face v1="103" v2="101" v3="65"/>
+ <face v1="103" v2="65" v3="63"/>
+ <face v1="102" v2="104" v3="95"/>
+ <face v1="102" v2="95" v3="98"/>
+ <face v1="101" v2="100" v3="74"/>
+ <face v1="101" v2="74" v3="65"/>
+ <face v1="79" v2="99" v3="87"/>
+ <face v1="77" v2="74" v3="100"/>
+ <face v1="100" v2="99" v3="77"/>
+ <face v1="66" v2="102" v3="103"/>
+ <face v1="103" v2="63" v3="66"/>
+ <face v1="96" v2="101" v3="103"/>
+ <face v1="103" v2="97" v3="96"/>
+ <face v1="96" v2="91" v3="100"/>
+ <face v1="100" v2="101" v3="96"/>
+ <face v1="87" v2="99" v3="100"/>
+ <face v1="100" v2="91" v3="87"/>
+ <face v1="71" v2="104" v3="68"/>
+ <face v1="68" v2="104" v3="102"/>
+ <face v1="102" v2="66" v3="68"/>
+ <face v1="99" v2="79" v3="77"/>
+ <face v1="95" v2="94" v3="107"/>
+ <face v1="107" v2="98" v3="95"/>
+ <face v1="97" v2="106" v3="105"/>
+ <face v1="105" v2="96" v3="97"/>
+ <face v1="105" v2="92" v3="91"/>
+ <face v1="96" v2="105" v3="91"/>
+ <face v1="71" v2="80" v3="95"/>
+ <face v1="104" v2="71" v3="95"/>
+ <face v1="33" v2="108" v3="109"/>
+ <face v1="109" v2="39" v3="33"/>
+ <face v1="109" v2="49" v3="39"/>
+ <face v1="155" v2="145" v3="149"/>
+ <face v1="152" v2="155" v3="149"/>
+ <face v1="140" v2="34" v3="7"/>
+ <face v1="140" v2="7" v3="122"/>
+ <face v1="57" v2="156" v3="123"/>
+ <face v1="57" v2="123" v3="43"/>
+ <face v1="142" v2="36" v3="37"/>
+ <face v1="37" v2="143" v3="142"/>
+ <face v1="143" v2="37" v3="108"/>
+ <face v1="108" v2="197" v3="143"/>
+ <face v1="110" v2="4" v3="43"/>
+ <face v1="43" v2="123" v3="110"/>
+ <face v1="154" v2="141" v3="147"/>
+ <face v1="153" v2="154" v3="147"/>
+ <face v1="129" v2="154" v3="134"/>
+ <face v1="142" v2="143" v3="144"/>
+ <face v1="144" v2="146" v3="142"/>
+ <face v1="138" v2="153" v3="155"/>
+ <face v1="155" v2="136" v3="138"/>
+ <face v1="197" v2="148" v3="144"/>
+ <face v1="197" v2="144" v3="143"/>
+ <face v1="151" v2="116" v3="115"/>
+ <face v1="150" v2="151" v3="115"/>
+ <face v1="151" v2="119" v3="116"/>
+ <face v1="140" v2="150" v3="152"/>
+ <face v1="152" v2="149" v3="140"/>
+ <face v1="155" v2="152" v3="113"/>
+ <face v1="113" v2="136" v3="155"/>
+ <face v1="154" v2="153" v3="138"/>
+ <face v1="154" v2="138" v3="134"/>
+ <face v1="155" v2="153" v3="147"/>
+ <face v1="155" v2="147" v3="145"/>
+ <face v1="122" v2="151" v3="150"/>
+ <face v1="150" v2="140" v3="122"/>
+ <face v1="113" v2="152" v3="150"/>
+ <face v1="150" v2="115" v3="113"/>
+ <face v1="154" v2="156" v3="141"/>
+ <face v1="119" v2="151" v3="122"/>
+ <face v1="129" v2="123" v3="156"/>
+ <face v1="156" v2="154" v3="129"/>
+ <face v1="35" v2="141" v3="156"/>
+ <face v1="156" v2="57" v3="35"/>
+ <face v1="166" v2="167" v3="133"/>
+ <face v1="133" v2="137" v3="166"/>
+ <face v1="128" v2="126" v3="160"/>
+ <face v1="160" v2="159" v3="128"/>
+ <face v1="131" v2="170" v3="127"/>
+ <face v1="127" v2="157" v3="131"/>
+ <face v1="160" v2="124" v3="132"/>
+ <face v1="160" v2="132" v3="158"/>
+ <face v1="126" v2="181" v3="124"/>
+ <face v1="126" v2="124" v3="160"/>
+ <face v1="112" v2="163" v3="161"/>
+ <face v1="112" v2="161" v3="135"/>
+ <face v1="161" v2="166" v3="137"/>
+ <face v1="161" v2="137" v3="135"/>
+ <face v1="133" v2="167" v3="169"/>
+ <face v1="169" v2="130" v3="133"/>
+ <face v1="86" v2="5" v3="111"/>
+ <face v1="183" v2="86" v3="111"/>
+ <face v1="172" v2="163" v3="112"/>
+ <face v1="114" v2="172" v3="112"/>
+ <face v1="117" v2="174" v3="172"/>
+ <face v1="117" v2="172" v3="114"/>
+ <face v1="120" v2="178" v3="176"/>
+ <face v1="120" v2="176" v3="118"/>
+ <face v1="111" v2="125" v3="180"/>
+ <face v1="180" v2="183" v3="111"/>
+ <face v1="189" v2="190" v3="194"/>
+ <face v1="194" v2="195" v3="189"/>
+ <face v1="178" v2="120" v3="121"/>
+ <face v1="121" v2="185" v3="178"/>
+ <face v1="6" v2="89" v3="185"/>
+ <face v1="185" v2="121" v3="6"/>
+ <face v1="187" v2="94" v3="93"/>
+ <face v1="187" v2="93" v3="179"/>
+ <face v1="170" v2="181" v3="126"/>
+ <face v1="170" v2="126" v3="127"/>
+ <face v1="90" v2="92" v3="186"/>
+ <face v1="186" v2="184" v3="90"/>
+ <face v1="179" v2="93" v3="85"/>
+ <face v1="179" v2="85" v3="182"/>
+ <face v1="189" v2="106" v3="107"/>
+ <face v1="189" v2="107" v3="190"/>
+ <face v1="164" v2="193" v3="195"/>
+ <face v1="195" v2="162" v3="164"/>
+ <face v1="190" v2="187" v3="196"/>
+ <face v1="196" v2="194" v3="190"/>
+ <face v1="173" v2="192" v3="193"/>
+ <face v1="193" v2="164" v3="173"/>
+ <face v1="191" v2="177" v3="184"/>
+ <face v1="192" v2="173" v3="175"/>
+ <face v1="191" v2="192" v3="175"/>
+ <face v1="195" v2="194" v3="165"/>
+ <face v1="195" v2="165" v3="162"/>
+ <face v1="195" v2="193" v3="188"/>
+ <face v1="195" v2="188" v3="189"/>
+ <face v1="192" v2="186" v3="188"/>
+ <face v1="193" v2="192" v3="188"/>
+ <face v1="191" v2="184" v3="186"/>
+ <face v1="192" v2="191" v3="186"/>
+ <face v1="196" v2="171" v3="168"/>
+ <face v1="194" v2="196" v3="168"/>
+ <face v1="194" v2="168" v3="165"/>
+ <face v1="177" v2="191" v3="175"/>
+ <face v1="107" v2="94" v3="187"/>
+ <face v1="190" v2="107" v3="187"/>
+ <face v1="105" v2="106" v3="189"/>
+ <face v1="188" v2="105" v3="189"/>
+ <face v1="186" v2="92" v3="105"/>
+ <face v1="105" v2="188" v3="186"/>
+ <face v1="187" v2="179" v3="171"/>
+ <face v1="171" v2="196" v3="187"/>
+ <face v1="197" v2="108" v3="33"/>
+ <face v1="197" v2="33" v3="139"/>
+ <face v1="148" v2="197" v3="139"/>
+ </faces>
+ <geometry vertexcount="198">
+ <vertexbuffer normals="true" colours_diffuse="false" texture_coord_dimensions_0="2" positions="true" texture_coords="1">
+ <vertex>
+ <position y="0.626787" x="-8.985925" z="0.676926"/>
+ <normal y="0.242887" x="-0.862227" z="0.444489"/>
+ <texcoord u="0.892077" v="0.050693"/>
+ </vertex>
+ <vertex>
+ <position y="0.626787" x="-8.985925" z="0.676926"/>
+ <normal y="0.242887" x="-0.862227" z="0.444489"/>
+ <texcoord u="0.915236" v="0.125134"/>
+ </vertex>
+ <vertex>
+ <position y="-2.900711" x="2.815779" z="10.885320"/>
+ <normal y="0.416505" x="-0.004394" z="0.909123"/>
+ <texcoord u="0.336625" v="0.947344"/>
+ </vertex>
+ <vertex>
+ <position y="-2.900711" x="2.815779" z="10.885320"/>
+ <normal y="0.416505" x="-0.004394" z="0.909123"/>
+ <texcoord u="0.483717" v="0.558810"/>
+ </vertex>
+ <vertex>
+ <position y="0.626787" x="-8.985925" z="-0.000121"/>
+ <normal y="0.444212" x="-0.895922" z="-0.000000"/>
+ <texcoord u="0.939793" v="0.124796"/>
+ </vertex>
+ <vertex>
+ <position y="0.626787" x="-8.985925" z="-0.000121"/>
+ <normal y="0.444212" x="-0.895922" z="-0.000000"/>
+ <texcoord u="0.870397" v="0.063053"/>
+ </vertex>
+ <vertex>
+ <position y="2.458172" x="12.649132" z="-0.000121"/>
+ <normal y="0.776067" x="0.630650" z="-0.000000"/>
+ <texcoord u="0.851139" v="0.051437"/>
+ </vertex>
+ <vertex>
+ <position y="2.458172" x="12.649132" z="-0.000121"/>
+ <normal y="0.776067" x="0.630650" z="-0.000000"/>
+ <texcoord u="0.933370" v="0.949252"/>
+ </vertex>
+ <vertex>
+ <position y="-1.649501" x="9.032329" z="9.648228"/>
+ <normal y="0.432299" x="0.180045" z="0.883573"/>
+ <texcoord u="0.481860" v="0.950392"/>
+ </vertex>
+ <vertex>
+ <position y="-1.649501" x="9.032329" z="9.648228"/>
+ <normal y="0.432299" x="0.180045" z="0.883573"/>
+ <texcoord u="0.537993" v="0.792215"/>
+ </vertex>
+ <vertex>
+ <position y="-0.463032" x="13.228780" z="7.771864"/>
+ <normal y="0.458115" x="0.408566" z="0.789433"/>
+ <texcoord u="0.611671" v="0.951961"/>
+ </vertex>
+ <vertex>
+ <position y="-0.463032" x="13.228780" z="7.771864"/>
+ <normal y="0.458115" x="0.408566" z="0.789433"/>
+ <texcoord u="0.588611" v="0.956403"/>
+ </vertex>
+ <vertex>
+ <position y="-0.463032" x="13.228780" z="7.771864"/>
+ <normal y="0.458115" x="0.408566" z="0.789433"/>
+ <texcoord u="0.544984" v="0.179350"/>
+ </vertex>
+ <vertex>
+ <position y="1.384049" x="14.254442" z="5.639791"/>
+ <normal y="0.647362" x="0.662584" z="0.376702"/>
+ <texcoord u="0.627203" v="0.101915"/>
+ </vertex>
+ <vertex>
+ <position y="1.384049" x="14.254442" z="5.639791"/>
+ <normal y="0.647362" x="0.662584" z="0.376702"/>
+ <texcoord u="0.713995" v="0.995251"/>
+ </vertex>
+ <vertex>
+ <position y="2.458172" x="12.656326" z="2.860729"/>
+ <normal y="0.856673" x="0.512599" z="0.057909"/>
+ <texcoord u="0.743496" v="0.050336"/>
+ </vertex>
+ <vertex>
+ <position y="2.458172" x="12.656326" z="2.860729"/>
+ <normal y="0.856673" x="0.512599" z="0.057909"/>
+ <texcoord u="0.827485" v="0.942344"/>
+ </vertex>
+ <vertex>
+ <position y="1.051610" x="-6.904983" z="1.808935"/>
+ <normal y="0.934589" x="-0.354774" z="-0.026055"/>
+ <texcoord u="0.976829" v="0.024487"/>
+ </vertex>
+ <vertex>
+ <position y="1.051610" x="-6.904983" z="1.808935"/>
+ <normal y="0.934589" x="-0.354774" z="-0.026055"/>
+ <texcoord u="0.466258" v="0.010438"/>
+ </vertex>
+ <vertex>
+ <position y="1.051610" x="-6.904983" z="1.808935"/>
+ <normal y="0.934589" x="-0.354774" z="-0.026055"/>
+ <texcoord u="0.875234" v="0.202728"/>
+ </vertex>
+ <vertex>
+ <position y="-0.905670" x="-14.693949" z="2.895462"/>
+ <normal y="-0.272696" x="-0.708114" z="-0.651315"/>
+ <texcoord u="0.475824" v="0.204685"/>
+ </vertex>
+ <vertex>
+ <position y="-0.905670" x="-14.693536" z="4.321519"/>
+ <normal y="-0.205699" x="-0.720778" z="0.661942"/>
+ <texcoord u="0.445009" v="0.219570"/>
+ </vertex>
+ <vertex>
+ <position y="-0.905670" x="-14.693536" z="4.321519"/>
+ <normal y="-0.205699" x="-0.720778" z="0.661942"/>
+ <texcoord u="0.503976" v="0.224142"/>
+ </vertex>
+ <vertex>
+ <position y="1.051610" x="-6.648792" z="5.386738"/>
+ <normal y="0.821994" x="-0.282504" z="0.494486"/>
+ <texcoord u="0.292600" v="0.089296"/>
+ </vertex>
+ <vertex>
+ <position y="1.051610" x="-6.648792" z="5.386738"/>
+ <normal y="0.821994" x="-0.282504" z="0.494486"/>
+ <texcoord u="0.744245" v="0.212145"/>
+ </vertex>
+ <vertex>
+ <position y="1.051610" x="-6.648792" z="5.386738"/>
+ <normal y="0.821994" x="-0.282504" z="0.494486"/>
+ <texcoord u="0.020979" v="0.940013"/>
+ </vertex>
+ <vertex>
+ <position y="1.051610" x="-6.648792" z="5.386738"/>
+ <normal y="0.821994" x="-0.282504" z="0.494486"/>
+ <texcoord u="0.552230" v="0.006162"/>
+ </vertex>
+ <vertex>
+ <position y="-0.235792" x="-5.033788" z="7.561788"/>
+ <normal y="0.627230" x="-0.335300" z="0.702962"/>
+ <texcoord u="0.651395" v="0.271757"/>
+ </vertex>
+ <vertex>
+ <position y="-0.235792" x="-5.033788" z="7.561788"/>
+ <normal y="0.627230" x="-0.335300" z="0.702962"/>
+ <texcoord u="0.101206" v="0.938647"/>
+ </vertex>
+ <vertex>
+ <position y="-2.894624" x="-0.359815" z="10.386533"/>
+ <normal y="0.418904" x="-0.215231" z="0.882154"/>
+ <texcoord u="0.259691" v="0.950972"/>
+ </vertex>
+ <vertex>
+ <position y="-2.894624" x="-0.359815" z="10.386533"/>
+ <normal y="0.418904" x="-0.215231" z="0.882154"/>
+ <texcoord u="0.503086" v="0.441213"/>
+ </vertex>
+ <vertex>
+ <position y="-1.545918" x="-3.394943" z="8.894669"/>
+ <normal y="0.498475" x="-0.305724" z="0.811206"/>
+ <texcoord u="0.581318" v="0.330903"/>
+ </vertex>
+ <vertex>
+ <position y="-1.545918" x="-3.394943" z="8.894669"/>
+ <normal y="0.498475" x="-0.305724" z="0.811206"/>
+ <texcoord u="0.167826" v="0.945690"/>
+ </vertex>
+ <vertex>
+ <position y="2.818449" x="4.399825" z="-0.000121"/>
+ <normal y="0.987364" x="0.158466" z="-0.000000"/>
+ <texcoord u="0.960972" v="0.615165"/>
+ </vertex>
+ <vertex>
+ <position y="2.818449" x="4.399825" z="-0.000121"/>
+ <normal y="0.987364" x="0.158466" z="-0.000000"/>
+ <texcoord u="0.954115" v="0.643701"/>
+ </vertex>
+ <vertex>
+ <position y="1.606481" x="-4.374999" z="-0.000121"/>
+ <normal y="0.937069" x="-0.349145" z="0.000000"/>
+ <texcoord u="0.942056" v="0.295582"/>
+ </vertex>
+ <vertex>
+ <position y="1.606481" x="-4.374999" z="-0.000121"/>
+ <normal y="0.937069" x="-0.349145" z="0.000000"/>
+ <texcoord u="0.956819" v="0.305634"/>
+ </vertex>
+ <vertex>
+ <position y="3.565721" x="-1.070097" z="-0.000121"/>
+ <normal y="0.971116" x="-0.238609" z="0.000000"/>
+ <texcoord u="0.965629" v="0.431512"/>
+ </vertex>
+ <vertex>
+ <position y="2.879257" x="4.398788" z="1.807774"/>
+ <normal y="0.972255" x="0.152720" z="0.177192"/>
+ <texcoord u="0.887184" v="0.639022"/>
+ </vertex>
+ <vertex>
+ <position y="2.879257" x="4.398788" z="1.807774"/>
+ <normal y="0.972255" x="0.152720" z="0.177192"/>
+ <texcoord u="0.901091" v="0.612148"/>
+ </vertex>
+ <vertex>
+ <position y="1.606481" x="-4.368584" z="1.806649"/>
+ <normal y="0.937800" x="-0.318105" z="0.139068"/>
+ <texcoord u="0.876854" v="0.296815"/>
+ </vertex>
+ <vertex>
+ <position y="1.606481" x="-4.368584" z="1.806649"/>
+ <normal y="0.937800" x="-0.318105" z="0.139068"/>
+ <texcoord u="0.897639" v="0.309841"/>
+ </vertex>
+ <vertex>
+ <position y="3.468952" x="-1.074552" z="2.218575"/>
+ <normal y="0.944523" x="-0.241639" z="0.222458"/>
+ <texcoord u="0.893990" v="0.432495"/>
+ </vertex>
+ <vertex>
+ <position y="1.051610" x="-6.917842" z="-0.000121"/>
+ <normal y="0.976652" x="-0.214827" z="-0.000000"/>
+ <texcoord u="0.940797" v="0.201395"/>
+ </vertex>
+ <vertex>
+ <position y="2.712690" x="-0.702242" z="3.759976"/>
+ <normal y="0.868910" x="-0.204986" z="0.450529"/>
+ <texcoord u="0.837991" v="0.440663"/>
+ </vertex>
+ <vertex>
+ <position y="2.712690" x="-0.702242" z="3.759976"/>
+ <normal y="0.868910" x="-0.204986" z="0.450529"/>
+ <texcoord u="0.825011" v="0.442708"/>
+ </vertex>
+ <vertex>
+ <position y="2.060508" x="-2.388349" z="3.275107"/>
+ <normal y="0.866647" x="-0.331047" z="0.373272"/>
+ <texcoord u="0.849723" v="0.377177"/>
+ </vertex>
+ <vertex>
+ <position y="2.060508" x="-2.388349" z="3.275107"/>
+ <normal y="0.866647" x="-0.331047" z="0.373272"/>
+ <texcoord u="0.830014" v="0.374971"/>
+ </vertex>
+ <vertex>
+ <position y="3.021154" x="2.600186" z="3.349899"/>
+ <normal y="0.929720" x="0.098334" z="0.354895"/>
+ <texcoord u="0.840669" v="0.564759"/>
+ </vertex>
+ <vertex>
+ <position y="3.021154" x="2.600186" z="3.349899"/>
+ <normal y="0.929720" x="0.098334" z="0.354895"/>
+ <texcoord u="0.852199" v="0.550263"/>
+ </vertex>
+ <vertex>
+ <position y="1.833362" x="5.565812" z="5.026063"/>
+ <normal y="0.869820" x="0.056558" z="0.490116"/>
+ <texcoord u="0.759156" v="0.674445"/>
+ </vertex>
+ <vertex>
+ <position y="1.315936" x="11.673458" z="5.771516"/>
+ <normal y="0.865900" x="0.011018" z="0.500095"/>
+ <texcoord u="0.713735" v="0.899320"/>
+ </vertex>
+ <vertex>
+ <position y="1.707294" x="2.839030" z="5.682980"/>
+ <normal y="0.834686" x="0.018268" z="0.550424"/>
+ <texcoord u="0.741432" v="0.571509"/>
+ </vertex>
+ <vertex>
+ <position y="1.277396" x="-3.018296" z="4.806324"/>
+ <normal y="0.878153" x="-0.157557" z="0.451690"/>
+ <texcoord u="0.766062" v="0.350803"/>
+ </vertex>
+ <vertex>
+ <position y="1.432154" x="-5.152852" z="3.472360"/>
+ <normal y="0.971810" x="-0.079682" z="0.221894"/>
+ <texcoord u="0.814639" v="0.269517"/>
+ </vertex>
+ <vertex>
+ <position y="1.434233" x="-0.351700" z="5.748981"/>
+ <normal y="0.806994" x="-0.133369" z="0.575303"/>
+ <texcoord u="0.738102" v="0.452849"/>
+ </vertex>
+ <vertex>
+ <position y="1.432154" x="-5.287349" z="1.807477"/>
+ <normal y="0.978248" x="-0.207265" z="0.008543"/>
+ <texcoord u="0.875993" v="0.263112"/>
+ </vertex>
+ <vertex>
+ <position y="1.432154" x="-5.296098" z="-0.000121"/>
+ <normal y="0.978235" x="-0.207502" z="0.000000"/>
+ <texcoord u="0.941534" v="0.261749"/>
+ </vertex>
+ <vertex>
+ <position y="-0.022163" x="-14.194227" z="4.053202"/>
+ <normal y="0.738513" x="-0.522413" z="0.426243"/>
+ <texcoord u="0.420237" v="0.224142"/>
+ </vertex>
+ <vertex>
+ <position y="-0.022163" x="-14.194227" z="4.053202"/>
+ <normal y="0.738513" x="-0.522413" z="0.426243"/>
+ <texcoord u="0.512529" v="0.200448"/>
+ </vertex>
+ <vertex>
+ <position y="-0.022163" x="-14.194227" z="4.053202"/>
+ <normal y="0.738513" x="-0.522413" z="0.426243"/>
+ <texcoord u="0.516385" v="0.188342"/>
+ </vertex>
+ <vertex>
+ <position y="-0.022163" x="-14.199970" z="3.138235"/>
+ <normal y="0.720331" x="-0.535439" z="-0.440940"/>
+ <texcoord u="0.494430" v="0.188017"/>
+ </vertex>
+ <vertex>
+ <position y="-3.802771" x="-0.357053" z="10.395116"/>
+ <normal y="-0.846779" x="-0.261013" z="0.463505"/>
+ <texcoord u="0.264416" v="0.971986"/>
+ </vertex>
+ <vertex>
+ <position y="-3.802771" x="-0.357053" z="10.395116"/>
+ <normal y="-0.846779" x="-0.261013" z="0.463505"/>
+ <texcoord u="0.453084" v="0.370693"/>
+ </vertex>
+ <vertex>
+ <position y="-3.793255" x="2.823228" z="10.876877"/>
+ <normal y="-0.860119" x="0.075320" z="0.504502"/>
+ <texcoord u="0.334474" v="0.967127"/>
+ </vertex>
+ <vertex>
+ <position y="-3.793255" x="2.823228" z="10.876877"/>
+ <normal y="-0.860119" x="0.075320" z="0.504502"/>
+ <texcoord u="0.469402" v="0.492076"/>
+ </vertex>
+ <vertex>
+ <position y="-2.832112" x="-3.389394" z="8.897550"/>
+ <normal y="-0.769463" x="-0.475620" z="0.426277"/>
+ <texcoord u="0.385394" v="0.254748"/>
+ </vertex>
+ <vertex>
+ <position y="-2.832112" x="-3.389394" z="8.897550"/>
+ <normal y="-0.769463" x="-0.475620" z="0.426277"/>
+ <texcoord u="0.179655" v="0.975658"/>
+ </vertex>
+ <vertex>
+ <position y="-1.902075" x="-5.590593" z="7.567440"/>
+ <normal y="-0.654681" x="-0.682538" z="0.324860"/>
+ <texcoord u="0.325781" v="0.170191"/>
+ </vertex>
+ <vertex>
+ <position y="-1.902075" x="-5.590593" z="7.567440"/>
+ <normal y="-0.654681" x="-0.682538" z="0.324860"/>
+ <texcoord u="0.111772" v="0.983561"/>
+ </vertex>
+ <vertex>
+ <position y="-0.992026" x="-6.592994" z="5.663315"/>
+ <normal y="-0.823338" x="-0.405159" z="0.397443"/>
+ <texcoord u="0.331410" v="0.058559"/>
+ </vertex>
+ <vertex>
+ <position y="-0.992026" x="-6.592994" z="5.663315"/>
+ <normal y="-0.823338" x="-0.405159" z="0.397443"/>
+ <texcoord u="0.247583" v="0.129540"/>
+ </vertex>
+ <vertex>
+ <position y="-0.992026" x="-6.592994" z="5.663315"/>
+ <normal y="-0.823338" x="-0.405159" z="0.397443"/>
+ <texcoord u="0.050252" v="0.985830"/>
+ </vertex>
+ <vertex>
+ <position y="-2.749834" x="9.014091" z="9.632089"/>
+ <normal y="-0.831228" x="0.306730" z="0.463656"/>
+ <texcoord u="0.475325" v="0.974061"/>
+ </vertex>
+ <vertex>
+ <position y="-2.749834" x="9.014091" z="9.632089"/>
+ <normal y="-0.831228" x="0.306730" z="0.463656"/>
+ <texcoord u="0.410195" v="0.728597"/>
+ </vertex>
+ <vertex>
+ <position y="-1.834187" x="13.217674" z="7.762546"/>
+ <normal y="-0.795337" x="0.570827" z="0.203950"/>
+ <texcoord u="0.579224" v="0.985830"/>
+ </vertex>
+ <vertex>
+ <position y="-1.834187" x="13.217674" z="7.762546"/>
+ <normal y="-0.795337" x="0.570827" z="0.203950"/>
+ <texcoord u="0.549889" v="0.230713"/>
+ </vertex>
+ <vertex>
+ <position y="-1.834187" x="13.217674" z="7.762546"/>
+ <normal y="-0.795337" x="0.570827" z="0.203950"/>
+ <texcoord u="0.331136" v="0.889002"/>
+ </vertex>
+ <vertex>
+ <position y="-0.774939" x="14.254298" z="5.541114"/>
+ <normal y="-0.652150" x="0.683047" z="-0.328857"/>
+ <texcoord u="0.638056" v="0.182510"/>
+ </vertex>
+ <vertex>
+ <position y="-0.774939" x="14.254298" z="5.541114"/>
+ <normal y="-0.652150" x="0.683047" z="-0.328857"/>
+ <texcoord u="0.237598" v="0.928740"/>
+ </vertex>
+ <vertex>
+ <position y="-1.054964" x="-6.903826" z="1.812509"/>
+ <normal y="-0.962913" x="-0.177452" z="-0.203248"/>
+ <texcoord u="0.100780" v="0.119386"/>
+ </vertex>
+ <vertex>
+ <position y="-1.054964" x="-6.903826" z="1.812509"/>
+ <normal y="-0.962913" x="-0.177452" z="-0.203248"/>
+ <texcoord u="0.417857" v="0.025031"/>
+ </vertex>
+ <vertex>
+ <position y="-1.054964" x="-6.903826" z="1.812509"/>
+ <normal y="-0.962913" x="-0.177452" z="-0.203248"/>
+ <texcoord u="0.987504" v="0.101398"/>
+ </vertex>
+ <vertex>
+ <position y="-0.450138" x="-8.470729" z="0.670670"/>
+ <normal y="-0.687867" x="-0.679846" z="0.254260"/>
+ <texcoord u="0.050074" v="0.061108"/>
+ </vertex>
+ <vertex>
+ <position y="-0.450138" x="-8.470729" z="0.670670"/>
+ <normal y="-0.687867" x="-0.679846" z="0.254260"/>
+ <texcoord u="0.913671" v="0.089035"/>
+ </vertex>
+ <vertex>
+ <position y="-0.451642" x="-8.465400" z="-0.000121"/>
+ <normal y="-0.831459" x="-0.555586" z="0.000000"/>
+ <texcoord u="0.024595" v="0.061902"/>
+ </vertex>
+ <vertex>
+ <position y="-0.451642" x="-8.465400" z="-0.000121"/>
+ <normal y="-0.831459" x="-0.555586" z="0.000000"/>
+ <texcoord u="0.892258" v="0.101398"/>
+ </vertex>
+ <vertex>
+ <position y="0.216233" x="13.455312" z="3.526704"/>
+ <normal y="-0.725482" x="0.581297" z="-0.368470"/>
+ <texcoord u="0.151833" v="0.899561"/>
+ </vertex>
+ <vertex>
+ <position y="0.216233" x="13.455312" z="3.526704"/>
+ <normal y="-0.725482" x="0.581297" z="-0.368470"/>
+ <texcoord u="0.716668" v="0.139379"/>
+ </vertex>
+ <vertex>
+ <position y="0.212457" x="13.052222" z="-0.000121"/>
+ <normal y="-0.589170" x="0.808009" z="-0.000000"/>
+ <texcoord u="0.850223" v="0.137284"/>
+ </vertex>
+ <vertex>
+ <position y="0.212457" x="13.052222" z="-0.000121"/>
+ <normal y="-0.589170" x="0.808009" z="-0.000000"/>
+ <texcoord u="0.017964" v="0.880308"/>
+ </vertex>
+ <vertex>
+ <position y="-0.419366" x="4.351016" z="2.199768"/>
+ <normal y="-0.981266" x="0.047525" z="-0.186702"/>
+ <texcoord u="0.111623" v="0.550171"/>
+ </vertex>
+ <vertex>
+ <position y="-0.119592" x="4.344222" z="-0.000121"/>
+ <normal y="-0.999441" x="0.033424" z="-0.000000"/>
+ <texcoord u="0.026956" v="0.548379"/>
+ </vertex>
+ <vertex>
+ <position y="-0.285617" x="-6.910962" z="-0.000121"/>
+ <normal y="-0.999993" x="0.003744" z="0.000000"/>
+ <texcoord u="0.025920" v="0.121308"/>
+ </vertex>
+ <vertex>
+ <position y="-0.245439" x="-4.187208" z="-0.000121"/>
+ <normal y="-0.997105" x="0.076039" z="-0.000000"/>
+ <texcoord u="0.028302" v="0.224880"/>
+ </vertex>
+ <vertex>
+ <position y="-0.901150" x="-4.165207" z="1.816542"/>
+ <normal y="-0.978338" x="0.043431" z="-0.202405"/>
+ <texcoord u="0.101947" v="0.224074"/>
+ </vertex>
+ <vertex>
+ <position y="-0.539812" x="2.558921" z="3.118590"/>
+ <normal y="-0.976984" x="0.019138" z="-0.212453"/>
+ <texcoord u="0.147206" v="0.481777"/>
+ </vertex>
+ <vertex>
+ <position y="-0.660258" x="-0.326426" z="3.827747"/>
+ <normal y="-0.971991" x="0.038636" z="-0.231819"/>
+ <texcoord u="0.174975" v="0.372244"/>
+ </vertex>
+ <vertex>
+ <position y="-0.780704" x="-2.396499" z="3.034885"/>
+ <normal y="-0.973477" x="0.071078" z="-0.217463"/>
+ <texcoord u="0.146719" v="0.292920"/>
+ </vertex>
+ <vertex>
+ <position y="-0.808977" x="13.336493" z="5.644625"/>
+ <normal y="-0.916011" x="0.014536" z="-0.400890"/>
+ <texcoord u="0.241420" v="0.893734"/>
+ </vertex>
+ <vertex>
+ <position y="-1.076600" x="6.682553" z="5.915929"/>
+ <normal y="-0.931948" x="0.046983" z="-0.359535"/>
+ <texcoord u="0.254798" v="0.640132"/>
+ </vertex>
+ <vertex>
+ <position y="-1.773012" x="2.691075" z="6.997733"/>
+ <normal y="-0.923898" x="0.041648" z="-0.380365"/>
+ <texcoord u="0.302531" v="0.487618"/>
+ </vertex>
+ <vertex>
+ <position y="-1.570295" x="-2.892947" z="5.966217"/>
+ <normal y="-0.947322" x="0.002184" z="-0.320274"/>
+ <texcoord u="0.263156" v="0.273393"/>
+ </vertex>
+ <vertex>
+ <position y="-1.995402" x="-0.341739" z="7.111432"/>
+ <normal y="-0.918680" x="0.031383" z="-0.393754"/>
+ <texcoord u="0.309932" v="0.371463"/>
+ </vertex>
+ <vertex>
+ <position y="-1.165500" x="-4.877900" z="4.691991"/>
+ <normal y="-0.973526" x="-0.081648" z="-0.213497"/>
+ <texcoord u="0.212394" v="0.196401"/>
+ </vertex>
+ <vertex>
+ <position y="-0.151054" x="2.211365" z="-0.000121"/>
+ <normal y="-0.999945" x="0.010464" z="-0.000000"/>
+ <texcoord u="0.027928" v="0.467647"/>
+ </vertex>
+ <vertex>
+ <position y="-0.182516" x="0.078507" z="-0.000121"/>
+ <normal y="-0.999277" x="0.038017" z="-0.000000"/>
+ <texcoord u="0.028574" v="0.386657"/>
+ </vertex>
+ <vertex>
+ <position y="-0.213977" x="-2.054350" z="-0.000121"/>
+ <normal y="-0.996054" x="0.088748" z="-0.000000"/>
+ <texcoord u="0.029316" v="0.305716"/>
+ </vertex>
+ <vertex>
+ <position y="3.398701" x="2.545521" z="-0.000121"/>
+ <normal y="0.987653" x="0.156659" z="0.000000"/>
+ <texcoord u="0.963532" v="0.550815"/>
+ </vertex>
+ <vertex>
+ <position y="3.325759" x="2.543326" z="1.947035"/>
+ <normal y="0.978686" x="0.143584" z="0.146824"/>
+ <texcoord u="0.899493" v="0.549229"/>
+ </vertex>
+ <vertex>
+ <position y="0.626787" x="-8.985925" z="-0.677168"/>
+ <normal y="0.242887" x="-0.862227" z="-0.444489"/>
+ <texcoord u="0.915236" v="0.125134"/>
+ </vertex>
+ <vertex>
+ <position y="0.626787" x="-8.985925" z="-0.677168"/>
+ <normal y="0.242887" x="-0.862227" z="-0.444489"/>
+ <texcoord u="0.892077" v="0.050693"/>
+ </vertex>
+ <vertex>
+ <position y="-2.900711" x="2.815779" z="-10.885563"/>
+ <normal y="0.416505" x="-0.004394" z="-0.909123"/>
+ <texcoord u="0.336625" v="0.947344"/>
+ </vertex>
+ <vertex>
+ <position y="-2.900711" x="2.815779" z="-10.885563"/>
+ <normal y="0.416505" x="-0.004394" z="-0.909123"/>
+ <texcoord u="0.483717" v="0.558810"/>
+ </vertex>
+ <vertex>
+ <position y="-1.649501" x="9.032329" z="-9.648471"/>
+ <normal y="0.432299" x="0.180045" z="-0.883573"/>
+ <texcoord u="0.481860" v="0.950392"/>
+ </vertex>
+ <vertex>
+ <position y="-1.649501" x="9.032329" z="-9.648471"/>
+ <normal y="0.432299" x="0.180045" z="-0.883573"/>
+ <texcoord u="0.537993" v="0.792215"/>
+ </vertex>
+ <vertex>
+ <position y="-0.463032" x="13.228780" z="-7.772107"/>
+ <normal y="0.458115" x="0.408566" z="-0.789433"/>
+ <texcoord u="0.611671" v="0.951961"/>
+ </vertex>
+ <vertex>
+ <position y="-0.463032" x="13.228780" z="-7.772107"/>
+ <normal y="0.458115" x="0.408566" z="-0.789433"/>
+ <texcoord u="0.588611" v="0.956403"/>
+ </vertex>
+ <vertex>
+ <position y="-0.463032" x="13.228780" z="-7.772107"/>
+ <normal y="0.458115" x="0.408566" z="-0.789433"/>
+ <texcoord u="0.544984" v="0.179350"/>
+ </vertex>
+ <vertex>
+ <position y="1.384049" x="14.254442" z="-5.640034"/>
+ <normal y="0.647362" x="0.662584" z="-0.376702"/>
+ <texcoord u="0.713995" v="0.995251"/>
+ </vertex>
+ <vertex>
+ <position y="1.384049" x="14.254442" z="-5.640034"/>
+ <normal y="0.647362" x="0.662584" z="-0.376702"/>
+ <texcoord u="0.627203" v="0.101915"/>
+ </vertex>
+ <vertex>
+ <position y="2.458172" x="12.656326" z="-2.860972"/>
+ <normal y="0.856673" x="0.512599" z="-0.057909"/>
+ <texcoord u="0.743496" v="0.050336"/>
+ </vertex>
+ <vertex>
+ <position y="2.458172" x="12.656326" z="-2.860972"/>
+ <normal y="0.856673" x="0.512599" z="-0.057909"/>
+ <texcoord u="0.827485" v="0.942344"/>
+ </vertex>
+ <vertex>
+ <position y="1.051610" x="-6.904983" z="-1.809178"/>
+ <normal y="0.934589" x="-0.354774" z="0.026055"/>
+ <texcoord u="0.875234" v="0.202728"/>
+ </vertex>
+ <vertex>
+ <position y="1.051610" x="-6.904983" z="-1.809178"/>
+ <normal y="0.934589" x="-0.354774" z="0.026055"/>
+ <texcoord u="0.466258" v="0.010438"/>
+ </vertex>
+ <vertex>
+ <position y="1.051610" x="-6.904983" z="-1.809178"/>
+ <normal y="0.934589" x="-0.354774" z="0.026055"/>
+ <texcoord u="0.976829" v="0.024487"/>
+ </vertex>
+ <vertex>
+ <position y="-0.905670" x="-14.693949" z="-2.895705"/>
+ <normal y="-0.272696" x="-0.708114" z="0.651315"/>
+ <texcoord u="0.475824" v="0.204685"/>
+ </vertex>
+ <vertex>
+ <position y="-0.905670" x="-14.693536" z="-4.321761"/>
+ <normal y="-0.205699" x="-0.720778" z="-0.661942"/>
+ <texcoord u="0.445009" v="0.219570"/>
+ </vertex>
+ <vertex>
+ <position y="-0.905670" x="-14.693536" z="-4.321761"/>
+ <normal y="-0.205699" x="-0.720778" z="-0.661942"/>
+ <texcoord u="0.503976" v="0.224142"/>
+ </vertex>
+ <vertex>
+ <position y="1.051610" x="-6.648792" z="-5.386980"/>
+ <normal y="0.821994" x="-0.282504" z="-0.494486"/>
+ <texcoord u="0.744245" v="0.212145"/>
+ </vertex>
+ <vertex>
+ <position y="1.051610" x="-6.648792" z="-5.386980"/>
+ <normal y="0.821994" x="-0.282504" z="-0.494486"/>
+ <texcoord u="0.020979" v="0.940013"/>
+ </vertex>
+ <vertex>
+ <position y="1.051610" x="-6.648792" z="-5.386980"/>
+ <normal y="0.821994" x="-0.282504" z="-0.494486"/>
+ <texcoord u="0.292600" v="0.089296"/>
+ </vertex>
+ <vertex>
+ <position y="1.051610" x="-6.648792" z="-5.386980"/>
+ <normal y="0.821994" x="-0.282504" z="-0.494486"/>
+ <texcoord u="0.552230" v="0.006162"/>
+ </vertex>
+ <vertex>
+ <position y="-0.235792" x="-5.033788" z="-7.562031"/>
+ <normal y="0.627230" x="-0.335300" z="-0.702962"/>
+ <texcoord u="0.101206" v="0.938647"/>
+ </vertex>
+ <vertex>
+ <position y="-0.235792" x="-5.033788" z="-7.562031"/>
+ <normal y="0.627230" x="-0.335300" z="-0.702962"/>
+ <texcoord u="0.651395" v="0.271757"/>
+ </vertex>
+ <vertex>
+ <position y="-2.894624" x="-0.359815" z="-10.386775"/>
+ <normal y="0.418904" x="-0.215231" z="-0.882154"/>
+ <texcoord u="0.259691" v="0.950972"/>
+ </vertex>
+ <vertex>
+ <position y="-2.894624" x="-0.359815" z="-10.386775"/>
+ <normal y="0.418904" x="-0.215231" z="-0.882154"/>
+ <texcoord u="0.503086" v="0.441213"/>
+ </vertex>
+ <vertex>
+ <position y="-1.545918" x="-3.394943" z="-8.894912"/>
+ <normal y="0.498475" x="-0.305724" z="-0.811206"/>
+ <texcoord u="0.167826" v="0.945690"/>
+ </vertex>
+ <vertex>
+ <position y="-1.545918" x="-3.394943" z="-8.894912"/>
+ <normal y="0.498475" x="-0.305724" z="-0.811206"/>
+ <texcoord u="0.581318" v="0.330903"/>
+ </vertex>
+ <vertex>
+ <position y="2.879257" x="4.398788" z="-1.808017"/>
+ <normal y="0.972255" x="0.152720" z="-0.177192"/>
+ <texcoord u="0.901091" v="0.612148"/>
+ </vertex>
+ <vertex>
+ <position y="2.879257" x="4.398788" z="-1.808017"/>
+ <normal y="0.972255" x="0.152720" z="-0.177192"/>
+ <texcoord u="0.887184" v="0.639022"/>
+ </vertex>
+ <vertex>
+ <position y="1.606481" x="-4.368584" z="-1.806892"/>
+ <normal y="0.937800" x="-0.318105" z="-0.139068"/>
+ <texcoord u="0.876854" v="0.296815"/>
+ </vertex>
+ <vertex>
+ <position y="1.606481" x="-4.368584" z="-1.806892"/>
+ <normal y="0.937800" x="-0.318105" z="-0.139068"/>
+ <texcoord u="0.897639" v="0.309841"/>
+ </vertex>
+ <vertex>
+ <position y="3.468952" x="-1.074552" z="-2.218817"/>
+ <normal y="0.944523" x="-0.241639" z="-0.222458"/>
+ <texcoord u="0.893990" v="0.432495"/>
+ </vertex>
+ <vertex>
+ <position y="2.712690" x="-0.702242" z="-3.760219"/>
+ <normal y="0.868910" x="-0.204986" z="-0.450529"/>
+ <texcoord u="0.837991" v="0.440663"/>
+ </vertex>
+ <vertex>
+ <position y="2.712690" x="-0.702242" z="-3.760219"/>
+ <normal y="0.868910" x="-0.204986" z="-0.450529"/>
+ <texcoord u="0.825011" v="0.442708"/>
+ </vertex>
+ <vertex>
+ <position y="2.060508" x="-2.388349" z="-3.275349"/>
+ <normal y="0.866647" x="-0.331047" z="-0.373272"/>
+ <texcoord u="0.849723" v="0.377177"/>
+ </vertex>
+ <vertex>
+ <position y="2.060508" x="-2.388349" z="-3.275349"/>
+ <normal y="0.866647" x="-0.331047" z="-0.373272"/>
+ <texcoord u="0.830014" v="0.374971"/>
+ </vertex>
+ <vertex>
+ <position y="3.021154" x="2.600186" z="-3.350141"/>
+ <normal y="0.929720" x="0.098334" z="-0.354895"/>
+ <texcoord u="0.852199" v="0.550263"/>
+ </vertex>
+ <vertex>
+ <position y="3.021154" x="2.600186" z="-3.350141"/>
+ <normal y="0.929720" x="0.098334" z="-0.354895"/>
+ <texcoord u="0.840669" v="0.564759"/>
+ </vertex>
+ <vertex>
+ <position y="1.833362" x="5.565812" z="-5.026306"/>
+ <normal y="0.869820" x="0.056558" z="-0.490116"/>
+ <texcoord u="0.759156" v="0.674445"/>
+ </vertex>
+ <vertex>
+ <position y="1.315936" x="11.673458" z="-5.771758"/>
+ <normal y="0.865900" x="0.011018" z="-0.500095"/>
+ <texcoord u="0.713735" v="0.899320"/>
+ </vertex>
+ <vertex>
+ <position y="1.707294" x="2.839030" z="-5.683223"/>
+ <normal y="0.834686" x="0.018268" z="-0.550424"/>
+ <texcoord u="0.741432" v="0.571509"/>
+ </vertex>
+ <vertex>
+ <position y="1.277396" x="-3.018296" z="-4.806566"/>
+ <normal y="0.878153" x="-0.157557" z="-0.451690"/>
+ <texcoord u="0.766062" v="0.350803"/>
+ </vertex>
+ <vertex>
+ <position y="1.432154" x="-5.152852" z="-3.472603"/>
+ <normal y="0.971810" x="-0.079682" z="-0.221894"/>
+ <texcoord u="0.814639" v="0.269517"/>
+ </vertex>
+ <vertex>
+ <position y="1.434233" x="-0.351700" z="-5.749224"/>
+ <normal y="0.806994" x="-0.133369" z="-0.575303"/>
+ <texcoord u="0.738102" v="0.452849"/>
+ </vertex>
+ <vertex>
+ <position y="1.432154" x="-5.287349" z="-1.807720"/>
+ <normal y="0.978248" x="-0.207265" z="-0.008543"/>
+ <texcoord u="0.875993" v="0.263112"/>
+ </vertex>
+ <vertex>
+ <position y="-0.022163" x="-14.194227" z="-4.053445"/>
+ <normal y="0.738513" x="-0.522413" z="-0.426243"/>
+ <texcoord u="0.420237" v="0.224142"/>
+ </vertex>
+ <vertex>
+ <position y="-0.022163" x="-14.194227" z="-4.053445"/>
+ <normal y="0.738513" x="-0.522413" z="-0.426243"/>
+ <texcoord u="0.516385" v="0.188342"/>
+ </vertex>
+ <vertex>
+ <position y="-0.022163" x="-14.194227" z="-4.053445"/>
+ <normal y="0.738513" x="-0.522413" z="-0.426243"/>
+ <texcoord u="0.512529" v="0.200448"/>
+ </vertex>
+ <vertex>
+ <position y="-0.022163" x="-14.199970" z="-3.138477"/>
+ <normal y="0.720331" x="-0.535439" z="0.440940"/>
+ <texcoord u="0.494430" v="0.188017"/>
+ </vertex>
+ <vertex>
+ <position y="-3.802771" x="-0.357053" z="-10.395359"/>
+ <normal y="-0.846779" x="-0.261013" z="-0.463505"/>
+ <texcoord u="0.264416" v="0.971986"/>
+ </vertex>
+ <vertex>
+ <position y="-3.802771" x="-0.357053" z="-10.395359"/>
+ <normal y="-0.846779" x="-0.261013" z="-0.463505"/>
+ <texcoord u="0.453084" v="0.370693"/>
+ </vertex>
+ <vertex>
+ <position y="-3.793255" x="2.823228" z="-10.877119"/>
+ <normal y="-0.860119" x="0.075320" z="-0.504502"/>
+ <texcoord u="0.334474" v="0.967127"/>
+ </vertex>
+ <vertex>
+ <position y="-3.793255" x="2.823228" z="-10.877119"/>
+ <normal y="-0.860119" x="0.075320" z="-0.504502"/>
+ <texcoord u="0.469402" v="0.492076"/>
+ </vertex>
+ <vertex>
+ <position y="-2.832112" x="-3.389394" z="-8.897792"/>
+ <normal y="-0.769463" x="-0.475620" z="-0.426277"/>
+ <texcoord u="0.385394" v="0.254748"/>
+ </vertex>
+ <vertex>
+ <position y="-2.832112" x="-3.389394" z="-8.897792"/>
+ <normal y="-0.769463" x="-0.475620" z="-0.426277"/>
+ <texcoord u="0.179655" v="0.975658"/>
+ </vertex>
+ <vertex>
+ <position y="-1.902075" x="-5.590593" z="-7.567683"/>
+ <normal y="-0.654681" x="-0.682538" z="-0.324860"/>
+ <texcoord u="0.111772" v="0.983561"/>
+ </vertex>
+ <vertex>
+ <position y="-1.902075" x="-5.590593" z="-7.567683"/>
+ <normal y="-0.654681" x="-0.682538" z="-0.324860"/>
+ <texcoord u="0.325781" v="0.170191"/>
+ </vertex>
+ <vertex>
+ <position y="-0.992026" x="-6.592994" z="-5.663558"/>
+ <normal y="-0.823338" x="-0.405159" z="-0.397443"/>
+ <texcoord u="0.050252" v="0.985830"/>
+ </vertex>
+ <vertex>
+ <position y="-0.992026" x="-6.592994" z="-5.663558"/>
+ <normal y="-0.823338" x="-0.405159" z="-0.397443"/>
+ <texcoord u="0.331410" v="0.058559"/>
+ </vertex>
+ <vertex>
+ <position y="-0.992026" x="-6.592994" z="-5.663558"/>
+ <normal y="-0.823338" x="-0.405159" z="-0.397443"/>
+ <texcoord u="0.247583" v="0.129540"/>
+ </vertex>
+ <vertex>
+ <position y="-2.749834" x="9.014091" z="-9.632332"/>
+ <normal y="-0.831228" x="0.306730" z="-0.463656"/>
+ <texcoord u="0.475325" v="0.974061"/>
+ </vertex>
+ <vertex>
+ <position y="-2.749834" x="9.014091" z="-9.632332"/>
+ <normal y="-0.831228" x="0.306730" z="-0.463656"/>
+ <texcoord u="0.410195" v="0.728597"/>
+ </vertex>
+ <vertex>
+ <position y="-1.834187" x="13.217674" z="-7.762789"/>
+ <normal y="-0.795337" x="0.570827" z="-0.203950"/>
+ <texcoord u="0.579224" v="0.985830"/>
+ </vertex>
+ <vertex>
+ <position y="-1.834187" x="13.217674" z="-7.762789"/>
+ <normal y="-0.795337" x="0.570827" z="-0.203950"/>
+ <texcoord u="0.331136" v="0.889002"/>
+ </vertex>
+ <vertex>
+ <position y="-1.834187" x="13.217674" z="-7.762789"/>
+ <normal y="-0.795337" x="0.570827" z="-0.203950"/>
+ <texcoord u="0.549889" v="0.230713"/>
+ </vertex>
+ <vertex>
+ <position y="-0.774939" x="14.254298" z="-5.541356"/>
+ <normal y="-0.652150" x="0.683047" z="0.328857"/>
+ <texcoord u="0.237598" v="0.928740"/>
+ </vertex>
+ <vertex>
+ <position y="-0.774939" x="14.254298" z="-5.541356"/>
+ <normal y="-0.652150" x="0.683047" z="0.328857"/>
+ <texcoord u="0.638056" v="0.182510"/>
+ </vertex>
+ <vertex>
+ <position y="-1.054964" x="-6.903826" z="-1.812751"/>
+ <normal y="-0.962913" x="-0.177452" z="0.203248"/>
+ <texcoord u="0.100780" v="0.119386"/>
+ </vertex>
+ <vertex>
+ <position y="-1.054964" x="-6.903826" z="-1.812751"/>
+ <normal y="-0.962913" x="-0.177452" z="0.203248"/>
+ <texcoord u="0.987504" v="0.101398"/>
+ </vertex>
+ <vertex>
+ <position y="-1.054964" x="-6.903826" z="-1.812751"/>
+ <normal y="-0.962913" x="-0.177452" z="0.203248"/>
+ <texcoord u="0.417857" v="0.025031"/>
+ </vertex>
+ <vertex>
+ <position y="-0.450138" x="-8.470729" z="-0.670912"/>
+ <normal y="-0.687867" x="-0.679846" z="-0.254260"/>
+ <texcoord u="0.050074" v="0.061108"/>
+ </vertex>
+ <vertex>
+ <position y="-0.450138" x="-8.470729" z="-0.670912"/>
+ <normal y="-0.687867" x="-0.679846" z="-0.254260"/>
+ <texcoord u="0.913671" v="0.089035"/>
+ </vertex>
+ <vertex>
+ <position y="0.216233" x="13.455312" z="-3.526947"/>
+ <normal y="-0.725482" x="0.581297" z="0.368470"/>
+ <texcoord u="0.151833" v="0.899561"/>
+ </vertex>
+ <vertex>
+ <position y="0.216233" x="13.455312" z="-3.526947"/>
+ <normal y="-0.725482" x="0.581297" z="0.368470"/>
+ <texcoord u="0.716668" v="0.139379"/>
+ </vertex>
+ <vertex>
+ <position y="-0.419366" x="4.351016" z="-2.200011"/>
+ <normal y="-0.981266" x="0.047525" z="0.186702"/>
+ <texcoord u="0.111623" v="0.550171"/>
+ </vertex>
+ <vertex>
+ <position y="-0.901150" x="-4.165207" z="-1.816785"/>
+ <normal y="-0.978338" x="0.043431" z="0.202405"/>
+ <texcoord u="0.101947" v="0.224074"/>
+ </vertex>
+ <vertex>
+ <position y="-0.539812" x="2.558921" z="-3.118833"/>
+ <normal y="-0.976984" x="0.019138" z="0.212453"/>
+ <texcoord u="0.147206" v="0.481777"/>
+ </vertex>
+ <vertex>
+ <position y="-0.660258" x="-0.326426" z="-3.827990"/>
+ <normal y="-0.971991" x="0.038636" z="0.231819"/>
+ <texcoord u="0.174975" v="0.372244"/>
+ </vertex>
+ <vertex>
+ <position y="-0.780704" x="-2.396499" z="-3.035128"/>
+ <normal y="-0.973477" x="0.071078" z="0.217463"/>
+ <texcoord u="0.146719" v="0.292920"/>
+ </vertex>
+ <vertex>
+ <position y="-0.808977" x="13.336493" z="-5.644868"/>
+ <normal y="-0.916011" x="0.014536" z="0.400890"/>
+ <texcoord u="0.241420" v="0.893734"/>
+ </vertex>
+ <vertex>
+ <position y="-1.076600" x="6.682553" z="-5.916171"/>
+ <normal y="-0.931948" x="0.046983" z="0.359535"/>
+ <texcoord u="0.254798" v="0.640132"/>
+ </vertex>
+ <vertex>
+ <position y="-1.773012" x="2.691075" z="-6.997976"/>
+ <normal y="-0.923898" x="0.041648" z="0.380365"/>
+ <texcoord u="0.302531" v="0.487618"/>
+ </vertex>
+ <vertex>
+ <position y="-1.570295" x="-2.892947" z="-5.966460"/>
+ <normal y="-0.947322" x="0.002184" z="0.320274"/>
+ <texcoord u="0.263156" v="0.273393"/>
+ </vertex>
+ <vertex>
+ <position y="-1.995402" x="-0.341739" z="-7.111674"/>
+ <normal y="-0.918680" x="0.031383" z="0.393754"/>
+ <texcoord u="0.309932" v="0.371463"/>
+ </vertex>
+ <vertex>
+ <position y="-1.165500" x="-4.877900" z="-4.692234"/>
+ <normal y="-0.973526" x="-0.081648" z="0.213497"/>
+ <texcoord u="0.212394" v="0.196401"/>
+ </vertex>
+ <vertex>
+ <position y="3.325759" x="2.543326" z="-1.947278"/>
+ <normal y="0.978686" x="0.143584" z="-0.146824"/>
+ <texcoord u="0.899493" v="0.549229"/>
+ </vertex>
+ </vertexbuffer>
+ </geometry>
+ </submesh>
+ </submeshes>
+</mesh>
Property changes on: trunk/data/ships/octavius/apteryx/apteryx.mesh.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/data/ships/octavius/apteryx/apteryx.wings
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/octavius/apteryx/apteryx.wings
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/ships/octavius/apteryx/apteryx.xml
===================================================================
--- trunk/data/ships/octavius/apteryx/apteryx.xml (rev 0)
+++ trunk/data/ships/octavius/apteryx/apteryx.xml 2007-04-04 20:22:16 UTC (rev 352)
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+
+<ship>
+ <!-- Naming -->
+ <faction>Ocavius</faction>
+ <name>Storm</name>
+
+ <!-- Generic Data -->
+ <class>Patrol Trainer</class>
+ <techlevel>0</techlevel>
+ <size>12.2</size>
+ <mass>8500</mass>
+
+ <!-- Sizes -->
+ <capacitorsize>1</capacitorsize>
+ <ecmsize>1</ecmsize>
+ <engines>1</engines>
+ <enginesize>3</enginesize>
+ <guns>2</guns>
+ <gunsize>1:1</gunsize>
+ <missiles>2</missiles>
+ <missilesize>2:2</missilesize>
+ <modx>2</modx>
+ <powerplantsize>2</powerplantsize>
+ <radarsize>1</radarsize>
+ <shieldsize>1</shieldsize>
+ <armor>9000</armor>
+ <cargocapacity>1</cargocapacity>
+
+ <!-- Movement -->
+ <dragfactor>12.96</dragfactor> <!-- 13.0 ingame -->
+ <pitch>0.001571</pitch> <!-- 90.0 in jossh -->
+ <roll>0.001222</roll> <!-- 70.0 in jossh -->
+ <yaw>0.001396</yaw> <!-- 80.0 in jossh -->
+</ship>
\ No newline at end of file
Property changes on: trunk/data/ships/octavius/apteryx/apteryx.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/data/ships/octavius/apteryx/apteryx_auv.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/octavius/apteryx/apteryx_auv.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/ships/octavius/apteryx/apteryx_auv.svg
===================================================================
--- trunk/data/ships/octavius/apteryx/apteryx_auv.svg (rev 0)
+++ trunk/data/ships/octavius/apteryx/apteryx_auv.svg 2007-04-04 20:22:16 UTC (rev 352)
@@ -0,0 +1,2207 @@
+<?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"
+...
[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-17 14:29:20
|
Revision: 395
http://svn.sourceforge.net/opengate/?rev=395&view=rev
Author: ultrasick
Date: 2007-04-17 07:29:21 -0700 (Tue, 17 Apr 2007)
Log Message:
-----------
renaming solrain -> tauseti
Added Paths:
-----------
trunk/data/ships/tauseti/
trunk/data/ships/tauseti/intensity/
trunk/data/ships/tauseti/intensity/intensity.wings
trunk/data/ships/tauseti/lady kickstart/
trunk/data/ships/tauseti/lady kickstart/lady kickstart.blend
trunk/data/ships/tauseti/pioneer/
trunk/data/ships/tauseti/pioneer/pioneer.wings
Removed Paths:
-------------
trunk/data/ships/solrain/
Added: trunk/data/ships/tauseti/intensity/intensity.wings
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/tauseti/intensity/intensity.wings
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/ships/tauseti/lady kickstart/lady kickstart.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/tauseti/lady kickstart/lady kickstart.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/ships/tauseti/pioneer/pioneer.wings
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/tauseti/pioneer/pioneer.wings
___________________________________________________________________
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: <spo...@us...> - 2007-04-29 14:57:53
|
Revision: 421
http://svn.sourceforge.net/opengate/?rev=421&view=rev
Author: spom_spom
Date: 2007-04-29 07:57:54 -0700 (Sun, 29 Apr 2007)
Log Message:
-----------
Added mandatory mesh entry to ship description
Modified Paths:
--------------
trunk/data/ships/octavius/apteryx/apteryx.xml
trunk/data/ships/quantar/storm/storm.xml
Modified: trunk/data/ships/octavius/apteryx/apteryx.xml
===================================================================
--- trunk/data/ships/octavius/apteryx/apteryx.xml 2007-04-29 11:57:45 UTC (rev 420)
+++ trunk/data/ships/octavius/apteryx/apteryx.xml 2007-04-29 14:57:54 UTC (rev 421)
@@ -2,8 +2,8 @@
<ship>
<!-- Naming -->
- <faction>Ocavius</faction>
- <name>Storm</name>
+ <faction>octavius</faction>
+ <name>apteryx</name>
<!-- Generic Data -->
<class>Patrol Trainer</class>
@@ -32,4 +32,7 @@
<pitch>0.001571</pitch> <!-- 90.0 in jossh -->
<roll>0.001222</roll> <!-- 70.0 in jossh -->
<yaw>0.001396</yaw> <!-- 80.0 in jossh -->
-</ship>
\ No newline at end of file
+
+ <mesh>apteryx.mesh</mesh>
+ <baseyaw>-90</baseyaw>
+</ship>
Modified: trunk/data/ships/quantar/storm/storm.xml
===================================================================
--- trunk/data/ships/quantar/storm/storm.xml 2007-04-29 11:57:45 UTC (rev 420)
+++ trunk/data/ships/quantar/storm/storm.xml 2007-04-29 14:57:54 UTC (rev 421)
@@ -2,8 +2,8 @@
<ship>
<!-- Naming -->
- <faction>Quantar</faction>
- <name>Storm</name>
+ <faction>quantar</faction>
+ <name>storm</name>
<!-- Generic Data -->
<class>Mining Trainer</class>
@@ -32,4 +32,7 @@
<pitch>0.001047</pitch> <!-- 60.0 in jossh -->
<roll>0.001571</roll> <!-- 90.0 in jossh -->
<yaw>0.001571</yaw> <!-- 90.0 in jossh -->
+
+ <mesh>storm.mesh</mesh> <!-- 90.0 in jossh -->
+ <baseyaw>-90</baseyaw>
</ship>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-05-04 21:51:13
|
Revision: 436
http://svn.sourceforge.net/opengate/?rev=436&view=rev
Author: spom_spom
Date: 2007-05-04 14:51:13 -0700 (Fri, 04 May 2007)
Log Message:
-----------
adapt material scripts
Modified Paths:
--------------
trunk/data/ships/octavius/apteryx/apteryx.material
trunk/data/ships/quantar/storm/storm.material
Modified: trunk/data/ships/octavius/apteryx/apteryx.material
===================================================================
--- trunk/data/ships/octavius/apteryx/apteryx.material 2007-05-04 21:01:26 UTC (rev 435)
+++ trunk/data/ships/octavius/apteryx/apteryx.material 2007-05-04 21:51:13 UTC (rev 436)
@@ -6,8 +6,7 @@
{
texture_unit
{
- texture octavius_apteryx_auv.png
- //scale 0.1 0.1
+ texture apteryx.png
}
}
}
Modified: trunk/data/ships/quantar/storm/storm.material
===================================================================
--- trunk/data/ships/quantar/storm/storm.material 2007-05-04 21:01:26 UTC (rev 435)
+++ trunk/data/ships/quantar/storm/storm.material 2007-05-04 21:51:13 UTC (rev 436)
@@ -6,7 +6,7 @@
{
texture_unit
{
- texture quantar_storm_auv.png
+ texture storm.png
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-05-20 21:36:03
|
Revision: 502
http://svn.sourceforge.net/opengate/?rev=502&view=rev
Author: ultrasick
Date: 2007-05-20 14:36:05 -0700 (Sun, 20 May 2007)
Log Message:
-----------
imported the mesh from the wings3d files into blender. I needed the meshes for the loading screen. we will probably need the blender files anyway as soon as we start texturing
Added Paths:
-----------
trunk/data/ships/octavius/phoenix/phoenix.blend
trunk/data/ships/quantar/typhoon/typhoon.blend
trunk/data/ships/tauseti/intensity/intensity.blend
trunk/data/ships/tauseti/pioneer/pioneer.blend
Added: trunk/data/ships/octavius/phoenix/phoenix.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/octavius/phoenix/phoenix.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/ships/quantar/typhoon/typhoon.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/quantar/typhoon/typhoon.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/ships/tauseti/intensity/intensity.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/tauseti/intensity/intensity.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/ships/tauseti/pioneer/pioneer.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/tauseti/pioneer/pioneer.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: <spo...@us...> - 2007-06-06 17:23:17
|
Revision: 540
http://svn.sourceforge.net/opengate/?rev=540&view=rev
Author: spom_spom
Date: 2007-06-06 10:23:19 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/data/ships/octavius/apteryx/apteryx.xml
trunk/data/ships/quantar/storm/storm.xml
Modified: trunk/data/ships/octavius/apteryx/apteryx.xml
===================================================================
--- trunk/data/ships/octavius/apteryx/apteryx.xml 2007-06-06 17:15:33 UTC (rev 539)
+++ trunk/data/ships/octavius/apteryx/apteryx.xml 2007-06-06 17:23:19 UTC (rev 540)
@@ -3,6 +3,7 @@
<ship>
<!-- Naming -->
<faction>octavius</faction>
+ <faction_id>3</faction_id>
<name>apteryx</name>
<!-- Generic Data -->
Modified: trunk/data/ships/quantar/storm/storm.xml
===================================================================
--- trunk/data/ships/quantar/storm/storm.xml 2007-06-06 17:15:33 UTC (rev 539)
+++ trunk/data/ships/quantar/storm/storm.xml 2007-06-06 17:23:19 UTC (rev 540)
@@ -2,7 +2,7 @@
<ship>
<!-- Naming -->
- <faction>quantar</faction>
+ <faction_id>4</faction_id>
<name>storm</name>
<!-- Generic Data -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-06-06 20:17:23
|
Revision: 545
http://svn.sourceforge.net/opengate/?rev=545&view=rev
Author: spom_spom
Date: 2007-06-06 13:17:16 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
add object_id to apti and storm
Modified Paths:
--------------
trunk/data/ships/octavius/apteryx/apteryx.xml
trunk/data/ships/quantar/storm/storm.xml
Modified: trunk/data/ships/octavius/apteryx/apteryx.xml
===================================================================
--- trunk/data/ships/octavius/apteryx/apteryx.xml 2007-06-06 20:00:40 UTC (rev 544)
+++ trunk/data/ships/octavius/apteryx/apteryx.xml 2007-06-06 20:17:16 UTC (rev 545)
@@ -4,6 +4,7 @@
<!-- Naming -->
<faction>octavius</faction>
<faction_id>3</faction_id>
+ <object_id>1</object_id>
<name>apteryx</name>
<!-- Generic Data -->
Modified: trunk/data/ships/quantar/storm/storm.xml
===================================================================
--- trunk/data/ships/quantar/storm/storm.xml 2007-06-06 20:00:40 UTC (rev 544)
+++ trunk/data/ships/quantar/storm/storm.xml 2007-06-06 20:17:16 UTC (rev 545)
@@ -2,8 +2,9 @@
<ship>
<!-- Naming -->
- <faction_id>4</faction_id>
- <name>storm</name>
+ <faction_id>2</faction_id>
+ <object_id>2</object_id>
+ <name>storm</name>
<!-- Generic Data -->
<class>Mining Trainer</class>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-06-18 17:51:58
|
Revision: 571
http://svn.sourceforge.net/opengate/?rev=571&view=rev
Author: spom_spom
Date: 2007-06-18 10:51:58 -0700 (Mon, 18 Jun 2007)
Log Message:
-----------
change object_id for vessels
Modified Paths:
--------------
trunk/data/ships/octavius/apteryx/apteryx.xml
trunk/data/ships/quantar/storm/storm.xml
trunk/data/ships/squadrok/squid/squid.xml
Modified: trunk/data/ships/octavius/apteryx/apteryx.xml
===================================================================
--- trunk/data/ships/octavius/apteryx/apteryx.xml 2007-06-18 09:25:02 UTC (rev 570)
+++ trunk/data/ships/octavius/apteryx/apteryx.xml 2007-06-18 17:51:58 UTC (rev 571)
@@ -4,7 +4,7 @@
<!-- Naming -->
<faction>octavius</faction>
<faction_id>3</faction_id>
- <object_id>1</object_id>
+ <object_id>301</object_id>
<name>apteryx</name>
<!-- Generic Data -->
Modified: trunk/data/ships/quantar/storm/storm.xml
===================================================================
--- trunk/data/ships/quantar/storm/storm.xml 2007-06-18 09:25:02 UTC (rev 570)
+++ trunk/data/ships/quantar/storm/storm.xml 2007-06-18 17:51:58 UTC (rev 571)
@@ -3,7 +3,7 @@
<ship>
<!-- Naming -->
<faction_id>2</faction_id>
- <object_id>2</object_id>
+ <object_id>201</object_id>
<name>storm</name>
<!-- Generic Data -->
Modified: trunk/data/ships/squadrok/squid/squid.xml
===================================================================
--- trunk/data/ships/squadrok/squid/squid.xml 2007-06-18 09:25:02 UTC (rev 570)
+++ trunk/data/ships/squadrok/squid/squid.xml 2007-06-18 17:51:58 UTC (rev 571)
@@ -4,7 +4,7 @@
<!-- Naming -->
<faction_id>4</faction_id>
<name>Squid</name>
- <object_id>1</object_id>
+ <object_id>401</object_id>
<!-- Generic Data -->
<class>Probe</class>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-06-28 16:05:55
|
Revision: 602
http://svn.sourceforge.net/opengate/?rev=602&view=rev
Author: spom_spom
Date: 2007-06-28 09:05:43 -0700 (Thu, 28 Jun 2007)
Log Message:
-----------
read the xml files for the vessels. Scale and rotate the vessels in game. Fixed some some small issues.
Modified Paths:
--------------
branches/ogsector/ToDo
branches/ogsector/aclocal.m4
branches/ogsector/resources.cfg
branches/ogsector/src/Console.h
branches/ogsector/src/DockedState.cpp
branches/ogsector/src/DockedState.h
branches/ogsector/src/EntityManager.cpp
branches/ogsector/src/GameStateManager.cpp
branches/ogsector/src/LogManager.cpp
branches/ogsector/src/LogManager.h
branches/ogsector/src/Makefile.am
branches/ogsector/src/Makefile.in
branches/ogsector/src/MarketDialog.cpp
branches/ogsector/src/OpcodeWrapper.cpp
branches/ogsector/src/OpcodeWrapper.h
branches/ogsector/src/Sector.cpp
branches/ogsector/src/Sector.h
branches/ogsector/src/SectorObjects.cpp
branches/ogsector/src/SectorObjects.h
branches/ogsector/src/ShipConfigDialog.cpp
branches/ogsector/src/ShipConfigDialog.h
branches/ogsector/src/UnDockedState.cpp
branches/ogsector/src/UnDockedState.h
branches/ogsector/src/Vessel.cpp
branches/ogsector/src/Vessel.h
branches/ogsector/src/VesselManager.cpp
branches/ogsector/src/common.cpp
branches/ogsector/src/common.h
branches/ogsector/src/networkProtocol.h
branches/ogsector/src/opengateclient.cpp
trunk/data/misc/testsector.xml
trunk/data/ships/octavius/apteryx/apteryx.xml
trunk/data/ships/quantar/storm/storm.xml
trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml
Added Paths:
-----------
branches/ogsector/data/materials/gradientshader.cg
branches/ogsector/data/materials/gradientshader.material
branches/ogsector/src/Projectile.cpp
branches/ogsector/src/Projectile.h
branches/ogsector/src/networkProtocol.cpp
Modified: branches/ogsector/ToDo
===================================================================
--- branches/ogsector/ToDo 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/ToDo 2007-06-28 16:05:43 UTC (rev 602)
@@ -6,6 +6,7 @@
- Class: Sector
- enth\xE4llt alle Informationen des Sector (noMovable, movable und avatar)
- add/new/remove/update aller Objecte erfolgt \xFCber den Sector
+ - setor content by xml-file
- Class: SectorClient (Verwaltung)
- HauptKlasse enth\xE4llt Sector und SectorCientFrameListener
@@ -45,7 +46,7 @@
- global/code
- cleaning / refaktoring
- integrate in currect OpenGate framework
- - add licence header
+# - add licence header
- mark third persons thingies (mousecurser, skybox)
#ALT-TAB - free mousepointer from widget contents
- fullscreen switch (probably not supported by ogre)
@@ -62,15 +63,16 @@
- cheatprotection
- testsector
- - show all shipmodels
+# - show all shipmodels
- show all objects
- skybox with higher resolution
- stars
# - planet
- xml-read
- - read playership data
- - read nonmovable objects
+# - read playership data
+# - read nonmovable objects
+# - read equipment and commodities
- global config
- openal
@@ -92,6 +94,7 @@
- toggle Astro/Stations/Friends/Enemies/All
- nearest Enemy/Friend
- last Enemy/Friend
+ - proper radar rotation instead of 0.5 scaling
- HUD
# - targetarrow
@@ -99,11 +102,19 @@
# - duellist
# - bullseye/VCR (??)
# - flydirection arrow
- - colorindex for break/AB/FF
+# - colorindex for break/AB/FF
# - shield/ammo
- selected rockets
+- GUI
+# - market dialog
+ - ship config dialog
+ - global config dialog
+ - mision dialog
+ - private trade dialog
+
- moving
+
- flyindicator particle
- fire!
@@ -122,6 +133,8 @@
# - simple follow
- calculate fireing solution
- rockets
+ - pathfinding
+ - genetic learning
For the talented:
- particle for thrust
Modified: branches/ogsector/aclocal.m4
===================================================================
--- branches/ogsector/aclocal.m4 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/aclocal.m4 2007-06-28 16:05:43 UTC (rev 602)
@@ -149,7 +149,8 @@
_PKG_TEXT
])],
- [$4])
+ [AC_MSG_RESULT([no])
+ $4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
Added: branches/ogsector/data/materials/gradientshader.cg
===================================================================
--- branches/ogsector/data/materials/gradientshader.cg (rev 0)
+++ branches/ogsector/data/materials/gradientshader.cg 2007-06-28 16:05:43 UTC (rev 602)
@@ -0,0 +1,39 @@
+// --------------------------------------------------------------------
+// Gradient shader : vertex program
+// Author : David de Lorenzo
+// -----------------------------------------------------------------
+void gradient_vp( in float4 position : POSITION,
+ uniform float4x4 worldViewProj,
+ uniform float3 camera_position_object_space,
+ uniform float4 customParamColour,
+ uniform float4 customParamRadius,
+ out float4 oPosition : POSITION,
+ out float4 oColor : COLOR
+ )
+{
+ // Get the custom parameters
+ float objectradius = customParamRadius.x;
+
+ // calculate output position
+ oPosition = mul(worldViewProj, position);
+
+ // Calculate the color value, depending on the position
+ float3 vect_center_to_cam = camera_position_object_space;
+ float3 position_closest = normalize(vect_center_to_cam) * objectradius;
+
+ float Rc = (position_closest.z * position.z ) + (position_closest.x * position.x); // Ratio on Center-to-Cam axis
+ Rc = Rc / (objectradius * objectradius); // recalibrate (-1..1)
+ float ratio = (1+Rc); // recalibrate ( 0..2) - (x2 to emphasis the color)
+
+ oColor= ratio * customParamColour;
+}
+
+
+// -----------------------------------------------------------------
+// Gradient shader : fragment program
+// Author : David de Lorenzo
+// -----------------------------------------------------------------
+float4 main_fp(in float4 color : COLOR) : COLOR0
+{
+ return (color);
+}
Added: branches/ogsector/data/materials/gradientshader.material
===================================================================
--- branches/ogsector/data/materials/gradientshader.material (rev 0)
+++ branches/ogsector/data/materials/gradientshader.material 2007-06-28 16:05:43 UTC (rev 602)
@@ -0,0 +1,39 @@
+vertex_program shader/gradientVP cg
+{
+ source gradientshader.cg
+ entry_point gradient_vp
+ profiles vs_1_1 arbvp1
+
+ default_params
+ {
+ param_named_auto worldViewProj worldviewproj_matrix
+ param_named_auto camera_position_object_space camera_position_object_space
+ }
+}
+
+fragment_program shader/gradientFP cg
+{
+ source gradientshader.cg
+ entry_point main_fp
+ profiles vs_1_1 arbfp1
+}
+
+material shader/gradient
+{
+ technique
+ {
+ pass
+ {
+ scene_blend alpha_blend
+ depth_write off
+ vertex_program_ref shader/gradientVP
+ {
+ param_named_auto customParamColour custom 0
+ param_named_auto customParamRadius custom 1
+ }
+ fragment_program_ref shader/gradientFP
+ {
+ }
+ }
+ }
+}
\ No newline at end of file
Modified: branches/ogsector/resources.cfg
===================================================================
--- branches/ogsector/resources.cfg 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/resources.cfg 2007-06-28 16:05:43 UTC (rev 602)
@@ -15,6 +15,7 @@
FileSystem=../../trunk/data/ships/octavius/apteryx
FileSystem=../../trunk/data/ships/quantar/storm
FileSystem=../../trunk/data/ships/tauseti/lady_kickstart
+FileSystem=../../trunk/data/ships/squadrok/squid
FileSystem=../../trunk/data/stations/tauseti
FileSystem=../../trunk/data/misc/asteroids
Modified: branches/ogsector/src/Console.h
===================================================================
--- branches/ogsector/src/Console.h 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/src/Console.h 2007-06-28 16:05:43 UTC (rev 602)
@@ -21,7 +21,7 @@
#ifndef CONSOLE__H
#define CONSOLE__H
-#include <Ogre.h>
+#include <OgrePrerequisites.h>
#include <list>
#include <vector>
#include "GameState.h"
Modified: branches/ogsector/src/DockedState.cpp
===================================================================
--- branches/ogsector/src/DockedState.cpp 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/src/DockedState.cpp 2007-06-28 16:05:43 UTC (rev 602)
@@ -23,10 +23,12 @@
#include "Avatar.h"
#include "Vessel.h"
+#include <OgreRoot.h>
+#include <OgreRenderWindow.h>
+#include <OgreManualObject.h>
#include <OgreCEGUITexture.h>
#include <CEGUI/elements/CEGUIPushButton.h>
-#include <Ogre.h>
namespace OpenGate{
Modified: branches/ogsector/src/DockedState.h
===================================================================
--- branches/ogsector/src/DockedState.h 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/src/DockedState.h 2007-06-28 16:05:43 UTC (rev 602)
@@ -21,14 +21,13 @@
#ifndef _OPENGATE_DOCKEDSTATELISTENER__H
#define _OPENGATE_DOCKEDSTATELISTENER__H
-#include <OgreCamera.h>
+#include <OgrePrerequisites.h>
#include "LogManager.h"
#include "GameState.h"
#include "ShipConfigDialog.h"
#include "MarketDialog.h"
-
namespace OpenGate{
Modified: branches/ogsector/src/EntityManager.cpp
===================================================================
--- branches/ogsector/src/EntityManager.cpp 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/src/EntityManager.cpp 2007-06-28 16:05:43 UTC (rev 602)
@@ -41,7 +41,7 @@
Ogre::StringVectorPtr files = pArch->find( "*.xml", true, false);
for ( unsigned int i = 0; i < (*files).size(); i ++ ){
- log_->info( std::string( "Found ressource: " ) + (*files)[ i ] );
+ log_->fout( std::string( "Found ressource: " ) + (*files)[ i ] );
loadAndCreate( (*resourcePaths.begin()) + "/" + resourceName + "/" + (*files)[ i ] );
}
Modified: branches/ogsector/src/GameStateManager.cpp
===================================================================
--- branches/ogsector/src/GameStateManager.cpp 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/src/GameStateManager.cpp 2007-06-28 16:05:43 UTC (rev 602)
@@ -22,6 +22,7 @@
#include <OgreRoot.h>
#include <OgreRenderWindow.h>
+#include <OgreConfigFile.h>
#include <OgreWindowEventUtilities.h>
#include "LogManager.h"
#include "Console.h"
Modified: branches/ogsector/src/LogManager.cpp
===================================================================
--- branches/ogsector/src/LogManager.cpp 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/src/LogManager.cpp 2007-06-28 16:05:43 UTC (rev 602)
@@ -106,6 +106,10 @@
std::cout << msg << std::endl;
}
+void LogManager::fout( const std::string & msg ){
+ write_( msg );
+}
+
void LogManager::writeToConsole_( const std::string & msg ){
if ( haveConsole_ ) console_->print( msg );
}
Modified: branches/ogsector/src/LogManager.h
===================================================================
--- branches/ogsector/src/LogManager.h 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/src/LogManager.h 2007-06-28 16:05:43 UTC (rev 602)
@@ -96,9 +96,12 @@
/*! Protocol a message with fatal-level importance */
void fatal( const std::string & msg );
- /*! TODO: Do we really need that? All messages should go into a logfile. */
+ /*! Write to std::out only. For debug purposes only.*/
void cout( const std::string & msg );
+ /*! Write to logfile only. */
+ void fout( const std::string & msg );
+
/*! This method returns the single instance of the LogManager */
static LogManager & getSingleton( void );
Modified: branches/ogsector/src/Makefile.am
===================================================================
--- branches/ogsector/src/Makefile.am 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/src/Makefile.am 2007-06-28 16:05:43 UTC (rev 602)
@@ -8,6 +8,7 @@
common.h \
common.cpp \
networkProtocol.h \
+ networkProtocol.cpp \
networkClient.h \
networkClient.cpp \
tinyxml/tinyxml.h \
@@ -42,6 +43,8 @@
MarketDialog.cpp \
OpcodeWrapper.h \
OpcodeWrapper.cpp \
+ Projectile.h \
+ Projectile.cpp \
Sector.h \
Sector.cpp \
SectorObjects.h \
@@ -65,6 +68,7 @@
InputManager.h \
InputManager.cpp \
networkProtocol.h \
+ networkProtocol.cpp \
networkServer.h \
networkServer.cpp \
networkServerUser.h \
Modified: branches/ogsector/src/Makefile.in
===================================================================
--- branches/ogsector/src/Makefile.in 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/src/Makefile.in 2007-06-28 16:05:43 UTC (rev 602)
@@ -49,22 +49,24 @@
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
am_opengateclient_OBJECTS = opengateclient.$(OBJEXT) common.$(OBJEXT) \
- networkClient.$(OBJEXT) tinyxml.$(OBJEXT) \
- tinyxmlerror.$(OBJEXT) tinyxmlparser.$(OBJEXT) \
- Avatar.$(OBJEXT) BaseDialog.$(OBJEXT) ConfigDialog.$(OBJEXT) \
- Console.$(OBJEXT) DeviceManager.$(OBJEXT) \
- DockedState.$(OBJEXT) Entity.$(OBJEXT) EntityManager.$(OBJEXT) \
- GameState.$(OBJEXT) GameStateManager.$(OBJEXT) \
- InputManager.$(OBJEXT) LogManager.$(OBJEXT) \
- MarketDialog.$(OBJEXT) OpcodeWrapper.$(OBJEXT) \
- Sector.$(OBJEXT) SectorObjects.$(OBJEXT) \
- ShipConfigDialog.$(OBJEXT) UnDockedState.$(OBJEXT) \
- Vessel.$(OBJEXT) VesselManager.$(OBJEXT)
+ networkProtocol.$(OBJEXT) networkClient.$(OBJEXT) \
+ tinyxml.$(OBJEXT) tinyxmlerror.$(OBJEXT) \
+ tinyxmlparser.$(OBJEXT) Avatar.$(OBJEXT) BaseDialog.$(OBJEXT) \
+ ConfigDialog.$(OBJEXT) Console.$(OBJEXT) \
+ DeviceManager.$(OBJEXT) DockedState.$(OBJEXT) Entity.$(OBJEXT) \
+ EntityManager.$(OBJEXT) GameState.$(OBJEXT) \
+ GameStateManager.$(OBJEXT) InputManager.$(OBJEXT) \
+ LogManager.$(OBJEXT) MarketDialog.$(OBJEXT) \
+ OpcodeWrapper.$(OBJEXT) Projectile.$(OBJEXT) Sector.$(OBJEXT) \
+ SectorObjects.$(OBJEXT) ShipConfigDialog.$(OBJEXT) \
+ UnDockedState.$(OBJEXT) Vessel.$(OBJEXT) \
+ VesselManager.$(OBJEXT)
opengateclient_OBJECTS = $(am_opengateclient_OBJECTS)
opengateclient_LDADD = $(LDADD)
am_opengateserver_OBJECTS = opengateserver.$(OBJEXT) common.$(OBJEXT) \
LogManager.$(OBJEXT) InputManager.$(OBJEXT) \
- networkServer.$(OBJEXT) networkServerUser.$(OBJEXT)
+ networkProtocol.$(OBJEXT) networkServer.$(OBJEXT) \
+ networkServerUser.$(OBJEXT)
opengateserver_OBJECTS = $(am_opengateserver_OBJECTS)
opengateserver_LDADD = $(LDADD)
am_testopenalmanager_OBJECTS = testopenalmanager.$(OBJEXT) \
@@ -187,6 +189,7 @@
common.h \
common.cpp \
networkProtocol.h \
+ networkProtocol.cpp \
networkClient.h \
networkClient.cpp \
tinyxml/tinyxml.h \
@@ -221,6 +224,8 @@
MarketDialog.cpp \
OpcodeWrapper.h \
OpcodeWrapper.cpp \
+ Projectile.h \
+ Projectile.cpp \
Sector.h \
Sector.cpp \
SectorObjects.h \
@@ -244,6 +249,7 @@
InputManager.h \
InputManager.cpp \
networkProtocol.h \
+ networkProtocol.cpp \
networkServer.h \
networkServer.cpp \
networkServerUser.h \
@@ -340,6 +346,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LogManager.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MarketDialog.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OpcodeWrapper.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Projectile.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sector.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SectorObjects.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ShipConfigDialog.Po@am__quote@
@@ -348,6 +355,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VesselManager.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/networkClient.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/networkProtocol.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/networkServer.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/networkServerUser.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openALSoundManager.Po@am__quote@
Modified: branches/ogsector/src/MarketDialog.cpp
===================================================================
--- branches/ogsector/src/MarketDialog.cpp 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/src/MarketDialog.cpp 2007-06-28 16:05:43 UTC (rev 602)
@@ -151,8 +151,10 @@
bool lesserMass( const Entity * l, const Entity * r ) { return ( l->mass() < r->mass() ); }
bool greaterMass( const Entity * l, const Entity * r ) { return ( l->mass() > r->mass() ); }
-bool lesserName( const Entity * l, const Entity * r ) { return ( l->name() < r->name() ); }
-bool greaterName( const Entity * l, const Entity * r ) { return ( l->name() > r->name() ); }
+bool lesserName( const Entity * l, const Entity * r ) { return ( strCopyToLowerCase( l->name() ) <
+ strCopyToLowerCase( r->name() ) ); }
+bool greaterName( const Entity * l, const Entity * r ) { return ( strCopyToLowerCase( l->name() ) >
+ strCopyToLowerCase( r->name() ) ); }
bool lesserSize( const Entity * l, const Entity * r ) { return ( l->size() < r->size() ); }
bool greaterSize( const Entity * l, const Entity * r ) { return ( l->size() > r->size() ); }
Modified: branches/ogsector/src/OpcodeWrapper.cpp
===================================================================
--- branches/ogsector/src/OpcodeWrapper.cpp 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/src/OpcodeWrapper.cpp 2007-06-28 16:05:43 UTC (rev 602)
@@ -21,9 +21,13 @@
#include "OpcodeWrapper.h"
#include "SectorObjects.h"
+#include "Projectile.h"
#include <OgreOpcode.h>
+#include <OgreSceneManager.h>
+#include <OgreRay.h>
+
namespace OpenGate{
template<> OpcodeCollisionDetection * Ogre::Singleton< OpcodeCollisionDetection >::ms_Singleton = 0;
@@ -106,7 +110,7 @@
OgreOpcode::CollisionObject* col1 = rayPickReport[ 0 ]->this_object;
OgreOpcode::CollisionObject* col2 = rayPickReport[ 0 ]->other_object;
- if ( ammo->name() != static_cast< BaseObject * >( col1->getClientData() )->name() ){
+ if ( ammo->parent()->name() != static_cast< BaseObject * >( col1->getClientData() )->name() ){
ammo->mainNode()->setPosition( rayPickReport[ 0 ]->contact );
Modified: branches/ogsector/src/OpcodeWrapper.h
===================================================================
--- branches/ogsector/src/OpcodeWrapper.h 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/src/OpcodeWrapper.h 2007-06-28 16:05:43 UTC (rev 602)
@@ -21,10 +21,8 @@
#ifndef _OPENGATE_OPCODEWRAPPER__H
#define _OPENGATE_OPCODEWRAPPER__H
-#include <OgreSceneManager.h>
-
#include <OgreSingleton.h>
-#include <OgreRay.h>
+#include <OgrePrerequisites.h>
namespace OgreOpcode{
class CollisionContext;
@@ -53,6 +51,7 @@
OgreOpcode::CollisionContext * collideInSectorContext(){ return collideInSectorContext_; }
static OpcodeCollisionDetection & getSingleton( );
+
static OpcodeCollisionDetection * getSingletonPtr( );
protected:
Added: branches/ogsector/src/Projectile.cpp
===================================================================
--- branches/ogsector/src/Projectile.cpp (rev 0)
+++ branches/ogsector/src/Projectile.cpp 2007-06-28 16:05:43 UTC (rev 602)
@@ -0,0 +1,194 @@
+/***************************************************************************
+ * Copyright (C) 2006-2007 by OpenGate development team *
+ * spo...@us... *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+
+#include "Projectile.h"
+#include "Sector.h"
+#include "OpcodeWrapper.h"
+
+#include <OgreVector3.h>
+#include <OgreManualObject.h>
+#include <OgreBillboard.h>
+#include <OgreBillboardSet.h>
+
+namespace OpenGate{
+
+Projectile::Projectile( BaseObject * parent, long shotCounter, Ogre::Real speed, Uint32 damage, Ogre::Real liveTime )
+ : BaseObject( parent->name() + "_" + toStr( shotCounter ), parent->sector() ), parent_( parent ),
+ shotCount_( shotCounter), damage_( damage ), maxLiveTime_( liveTime ){
+ selectable_ = false;
+
+ Ogre::String bulletName( name_ + "_" + toStr( shotCounter ) );
+
+ beam_ = NULL;
+ bullet_ = NULL;
+ shape_ = NULL;
+
+ Ogre::Vector3 position( parent_->mainNode()->getPosition() );
+ Ogre::Quaternion direction( parent_->mainNode()->getOrientation() );
+
+ bool bullet = true;
+
+ if ( bullet ){
+ int maxBB = 20;
+ bullet_ = sceneMgr_->createBillboardSet( bulletName + "_BBS", maxBB );
+ bullet_->setMaterialName("Bullet");
+
+ Ogre::Billboard *bb;
+// bb = bullet_->createBillboard( Ogre::Vector3::ZERO, Ogre::ColourValue( 1.0f, 1.0f, 1.0f) );
+// bb->setDimensions( 1.0, 0.2 );
+// bb->setRotation ( Ogre::Radian( 0 ) );
+
+ for ( int i = 0; i < maxBB; i ++ ){
+ bb = bullet_->createBillboard( Ogre::Vector3::ZERO, Ogre::ColourValue( 0.5f, 0.5f, 0.5f) );
+ bb->setDimensions( 1.0 - i * 1.0/maxBB* 0.5 , 1.0 - i * 1.0/maxBB * 0.5 );
+ bb->setRotation ( Ogre::Radian( i*10.0 ) );
+ bb->setPosition( direction.zAxis().normalisedCopy() * i * 0.5 );
+ }
+ mainNode_->attachObject( bullet_ );
+
+ } else {
+ beam_ = sceneMgr_->createManualObject( bulletName + "_MObj" );
+ beam_->begin( "WhiteNoBackground", Ogre::RenderOperation::OT_TRIANGLE_LIST);
+
+// beam_->position( direction.xAxis().normalisedCopy() * -0.2 );
+// beam_->position( direction.xAxis().normalisedCopy() * 0.2 );
+// beam_->position( direction.xAxis().normalisedCopy() * 0.2 + direction.zAxis().normalisedCopy() * 1.0 );
+// beam_->position( direction.xAxis().normalisedCopy() * -0.2 + direction.zAxis().normalisedCopy() * 1.0 );
+
+ beam_->position( -0.2, 0, 0 );
+ beam_->position( 0.2, 0, 0 );
+ beam_->position( 0.2, 0, 1.0 );
+ beam_->position( -0.2, 0, 1.0 );
+
+ beam_->quad( 0, 1, 2, 3 );
+ beam_->quad( 0, 3, 2, 1 );
+ beam_->end();
+
+ shape_ = mainNode_->createChildSceneNode( bulletName + "_transform" );
+ shape_->attachObject( beam_ );
+
+ mainNode_->setOrientation( direction );
+ }
+
+// 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 ) ),
+// 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 ) ),
+// // 0.2, 0.1, Ogre::ColourValue(1.0f, 1.0f, 1.0f) ) );
+// }
+// mainNode_->attachObject( chain_ );
+// chain_->setVisible( true );
+
+// bullet_ = sceneMgr_->createManualObject( bulletName + "_BulletShape" );
+// bullet_->begin("Bullet1", Ogre::RenderOperation::OT_TRIANGLE_LIST);
+// Ogre::Real scale = 0.1;
+// unsigned point_index = 0;
+// bullet_->position( -scale, -scale, 0 );
+// bullet_->position( scale, -scale, 0 );
+// bullet_->position( scale, scale, 0 );
+// bullet_->position( -scale, -scale, 0 );
+// bullet_->quad(point_index, point_index + 1, point_index + 2, point_index + 3);
+// point_index += 4;
+// bullet_->position( -scale, -scale, 0 );
+// bullet_->position( scale, scale, 0 );
+// bullet_->position( -scale, scale, 0 );
+// bullet_->position( -scale, -scale, 0 );
+// bullet_->quad(point_index, point_index + 1, point_index + 2, point_index + 3);
+// point_index += 4;
+// bullet_->end();
+// mainNode_->attachObject( bullet_ );
+
+
+ mainNode_->setPosition( position );
+ mainNode_->setPosition( position +
+ direction.zAxis().normalisedCopy() * -6.2 +
+ direction.xAxis().normalisedCopy() * 1.5 +
+ direction.yAxis().normalisedCopy() * -0.2 );
+
+ lifeTime_ = 0.0;
+ oldTime_ = 0.0;
+
+ vel_ = speed * -direction.zAxis().normalisedCopy() + parent->velocity();
+}
+
+Projectile::~Projectile() {
+ if ( bullet_ ){
+ mainNode_->detachObject( bullet_ );
+ sceneMgr_->destroyBillboardSet( bullet_ );
+ }
+
+ if ( beam_ ){
+ if ( shape_ ) {
+ shape_->detachObject( beam_ );
+ mainNode_->removeAndDestroyChild( shape_->getName() );
+ // sceneMgr_->destroySceneNode( shape_ );
+ }
+ sceneMgr_->destroyManualObject( beam_ );
+ }
+ // mainNode_->detachObject( chain_ );
+ // sceneMgr_->destroyBillboardChain( chain_ );
+}
+
+void Projectile::collide( BaseObject * object ){
+ if ( name_ != object->name() ){
+ vel_ *= 0.0;
+
+ //** show us a small visible feedback;
+ if ( bullet_ ){
+ bullet_->getBillboard( 0 )->setColour( Ogre::ColourValue(0.0, 1.0, 0.0) );
+ bullet_->getBillboard( 0 )->setDimensions( 5, 5 );
+ }
+ lifeTime_ = max( lifeTime_, maxLiveTime_ - 0.1f );
+
+// sector_->collisionContext()->removeObject( collObj_ );
+// OgreOpcode::CollisionManager::getSingletonPtr()->detachShape( collObj_->getShape() );
+ }
+
+ sector_->sendVesselAmmoHit( *this, object );
+}
+
+bool Projectile::update( Ogre::Real elapsedTime ){
+ if ( elapsedTime < 0.001 ) return true;
+
+ lifeTime_ += elapsedTime;
+ if ( lifeTime_ >= maxLiveTime_ ) return false;
+
+ if ( vel_.length() > 0.1 ){
+
+ Ogre::Ray bulletRay( mainNode_->getPosition(), vel_.normalisedCopy() );
+
+ if ( !OpcodeCollisionDetection::getSingleton().checkCollideRay( this, bulletRay, (vel_ * elapsedTime).length() ) ){
+ if ( bullet_ ){
+ mainNode_->translate( vel_ * elapsedTime );
+ } else if ( beam_ ){
+ mainNode_->translate( vel_ * elapsedTime );
+ shape_->setScale( 1.0, 1.0, (vel_ * lifeTime_).length() );
+ // mainNode_->translate( 0.0, 0.0, - (vel_ * elapsedTime ).length()/2.0 );
+ }
+ }
+ }
+ return true;
+}
+
+} //namespace OpenGate{
Added: branches/ogsector/src/Projectile.h
===================================================================
--- branches/ogsector/src/Projectile.h (rev 0)
+++ branches/ogsector/src/Projectile.h 2007-06-28 16:05:43 UTC (rev 602)
@@ -0,0 +1,73 @@
+/***************************************************************************
+ * Copyright (C) 2006-2007 by OpenGate development team *
+ * spo...@us... *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+
+#ifndef _OPENGATE_PROJECTILE__H
+#define _OPENGATE_PROJECTILE__H
+
+#include "SectorObjects.h"
+#include <OgrePrerequisites.h>
+
+namespace OpenGate{
+
+class Projectile : public BaseObject {
+public:
+ Projectile( BaseObject * parent, long shotCount, Ogre::Real speed, Uint32 damage, Ogre::Real liveTime );
+
+ virtual ~Projectile();
+
+ inline virtual long getTypeID() const { return PROJECTILE_RTTI; }
+
+ virtual void collide( BaseObject * object );
+
+ inline Uint32 damage( ) const { return damage_; }
+
+ virtual bool update( Ogre::Real elapsedTime );
+
+ BaseObject * parent( ) { return parent_; }
+
+ BaseObject & parent( ) const { return *parent_; }
+
+ Ogre::Vector3 velocity() const { return vel_; }
+
+ Ogre::Real liveTime() const { return maxLiveTime_; }
+
+ Uint16 shotCount() const { return shotCount_; }
+
+protected:
+
+ BaseObject * parent_;
+ Uint16 shotCount_;
+ Uint32 damage_;
+ // Ogre::BillboardChain * chain_;
+ Ogre::BillboardSet * bullet_;
+ Ogre::ManualObject * beam_;
+ Ogre::Vector3 vel_;
+
+ Ogre::SceneNode * shape_;
+
+ Ogre::Real maxLiveTime_;
+ Ogre::Real oldTime_;
+};
+
+
+} // namespace OpenGate
+
+
+#endif // _OPENGATE_PROJECTILE__H
Modified: branches/ogsector/src/Sector.cpp
===================================================================
--- branches/ogsector/src/Sector.cpp 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/src/Sector.cpp 2007-06-28 16:05:43 UTC (rev 602)
@@ -23,7 +23,12 @@
#include "OpcodeWrapper.h"
#include "tinyxml/tinyxml.h"
#include "DeviceManager.h"
+#include "Projectile.h"
+#include <OgreManualObject.h>
+#include <OgreOverlayManager.h>
+#include <OgreOverlayContainer.h>
+
namespace OpenGate{
// class StarField : public Ogre::SimpleRenderable {
@@ -140,8 +145,13 @@
// entity->setMaterialName("Examples/OffsetMapping/Specular");
// entity->setVisible( true );
+ populate( "testsector.xml" );
+// createCircle();
- populate( "testsector.xml" );
+// SectorObject *obj = createStaticObject( "lady_kickstart.mesh", "lady_kickstart", Ogre::Vector3( 0,0,450) );
+// obj->setBaseRot( -90, -90, 0 );
+// obj->setBaseSize( Ogre::Vector3( 10, 3.4, 10.9 ) );
+
itTarget_ = sectorObjects_.begin();
}
@@ -225,9 +235,12 @@
std::set < Vessel * > vessels( VesselManager::getSingleton().factionVessels( (*factIt) ) );
int vesselCounter = 0;
for ( std::set < Vessel * >::iterator it = vessels.begin(); it != vessels.end(); it ++ ){
- createStaticObject( (*it)->meshPtr().get()->getName(), (*it)->factionName() + "/" + (*it)->name(),
- Ogre::Vector3( -1000.0, 50 * factionCounter, -100.0 + 100 * vesselCounter ),
- Ogre::Real( (*it)->baseSize() ), Ogre::Degree( (*it)->baseYaw() ) );
+ SectorObject * obj = createStaticObject( (*it)->meshPtr().get()->getName(),
+ (*it)->factionName() + "/" + (*it)->name(),
+ Ogre::Vector3( -1000.0, 50 * factionCounter,
+ -100.0 + 100 * vesselCounter ) );
+ obj->setBaseRot( (*it)->baseYaw(), (*it)->basePitch(), (*it)->baseRoll() );
+ obj->setBaseSize( (*it)->baseSize() );
vesselCounter++;
}
factionCounter++;
@@ -338,22 +351,26 @@
Ogre::Quaternion q;
q.FromAngleAxis( -avatar_->mainNode()->getOrientation( ).getYaw(), Ogre::Vector3::UNIT_Y);
relativPosition = q * relativPosition;
-
+
+// Ogre::Quaternion r( Ogre::Degree(20), Ogre::Vector3::UNIT_Z);
+// relativPosition = r * relativPosition;
+ // std::cout << relativPosition << std::endl;
+
Ogre::Plane viewPlane( avatar_->mainNode()->getOrientation().yAxis().normalisedCopy(),
avatar_->mainNode()->getPosition() );
float distToPlane = viewPlane.getDistance( (*it)->mainNode()->getPosition( ) ) / yScale;
- dotB->setHeight( fabs( distToPlane ) );
-
dotA->setPosition( radarWidth / 2.0 + relativPosition[ 0 ] / xScale - dotAWidth / 2,
- - distToPlane - dotAHeight / 2 + radarHeight / 2.0 + relativPosition[ 2 ] / yScale );
+ radarHeight / 2.0 + relativPosition[ 2 ] / yScale - dotAHeight / 2 - distToPlane );
if ( distToPlane < 0 ) distToPlane = 0;
+ dotB->setHeight( fabs( distToPlane ) );
dotB->setPosition( radarWidth / 2.0 + relativPosition[ 0 ] / xScale,
- distToPlane + radarHeight / 2.0 + relativPosition[ 2 ] / yScale );
+
if ( (*it)->isOnRadar() == false ){
radarMap->addChild( dotA );
radarMap->addChild( dotB );
@@ -457,12 +474,13 @@
}
SectorObject * Sector::createStaticObject( const Ogre::String & meshname, const Ogre::String & objectname,
- const Ogre::Vector3 & pos, Ogre::Real targetSize, Ogre::Degree yaw ){
+ const Ogre::Vector3 & pos, const Ogre::Vector3 & targetSize, Ogre::Degree yaw ){
SectorObject * obj = new SectorObject( objectname, this );
- obj->baseYaw( yaw );
+ obj->mainNode()->yaw( yaw );
obj->setShape( meshname );
+
obj->setBaseSize( targetSize );
obj->mainNode()->setPosition( pos );
@@ -594,39 +612,90 @@
return NULL;
}
-void Sector::createCircle(){
-
+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;
+ Ogre::Real radius = 200;
+ Ogre::Real thickness = 200.0; // Of course this must be less than the radius value.
+ Ogre::Real nSegments = 96;
+ Ogre::Real dPhi = 2.0 * 3.141592 / nSegments;
+
+ circle->begin( "shader/gradient", Ogre::RenderOperation::OT_TRIANGLE_LIST);
+ circle->getSection( 0 )->setCustomParameter( 0, Ogre::Vector4( 23./255, 118./255, 9./255, 0.1 ) );
+ circle->getSection( 0 )->setCustomParameter( 1, Ogre::Vector4( radius, 0, 0, 0 ) );
+
+ unsigned point_index = 0;
- circle->begin("BaseWhiteNoLighting", Ogre::RenderOperation::OT_TRIANGLE_LIST);
+ for ( int segment = 0; segment < nSegments; segment++ ) {
+ Ogre::Real theta = segment * dPhi;
+ circle->position( radius * cos( theta ),
+ 0,
+ radius * sin( theta ) );
+ circle->position( (radius - thickness) * cos( theta ),
+ 0,
+ (radius - thickness) * sin( theta ) );
+
+ if ( segment > 0 ){
+ point_index = (segment+1)*2-1;
+ circle->quad( point_index, point_index-1, point_index-3, point_index-2 );
+ circle->quad( point_index, point_index-2, point_index-3, point_index-1 );
+ }
+ }
+ circle->quad( 1, 0, (uint)nSegments*2-2, (uint)nSegments*2-1 );
+ circle->quad( 1, (uint)nSegments*2-1, (uint)nSegments*2-2, 0 );
+ circle->end();
+ object->translate( 0, 0, 50);
+ object->pitch( Ogre::Degree( 10 ) );
+ object->attachObject( circle );
+
+}
+
+void Sector::createRings( ){
+
+ Ogre::String name = "rings";
+
+ Ogre::SceneNode * object = sceneMgr_->getRootSceneNode()->createChildSceneNode( name );
+ Ogre::ManualObject * circle = sceneMgr_->createManualObject( name + "shape" );
+
+ Ogre::Real radius = 50;
+ Ogre::Real thickness = 4; // Of course this must be less than the radius value.
+ Ogre::Real nSegments = 32;
+ Ogre::Real dPhi = 2.0 * 3.141592 / nSegments;
+
unsigned point_index = 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 );
- circle->position(radius * cos(theta - 3.141592 / (radius * accuracy)),
- radius * sin(theta - 3.141592 / (radius * accuracy)), -50);
+ int nRings = 10;
+ for ( int i = 0; i < nRings; i ++ ){
- circle->position((radius - thickness) * cos(theta - 3.141592 / (radius * accuracy)),
- (radius - thickness) * sin(theta - 3.141592 / (radius * accuracy)), -50);
+ circle->begin( "shader/gradient", Ogre::RenderOperation::OT_TRIANGLE_LIST);
+ circle->getSection( i )->setCustomParameter( 0, Ogre::Vector4( 0.0, 1.0-i*0.1, i*0.1, 0.4 ) );
+ circle->getSection( i )->setCustomParameter( 1, Ogre::Vector4( radius, 0, 0, 0 ) );
- circle->position((radius - thickness) * cos(theta), (radius - thickness) * sin(theta), -50);
- // Join the 4 vertices created above to form a quad.
- circle->quad(point_index, point_index + 3, point_index + 2, point_index + 1);
- point_index += 4;
+ for ( int segment = 0; segment < nSegments; segment++ ) {
+ Ogre::Real theta = segment * dPhi;
+ circle->position( radius * cos( theta ),
+ -radius + i * radius /( nRings / 2.0 ),
+ radius * sin( theta ) );
+ circle->position( (radius - thickness) * cos( theta ),
+ -radius + i * radius / ( nRings / 2.0 ),
+ (radius - thickness) * sin( theta ) );
+
+ if ( segment > 0 ){
+ point_index = (segment+1)*2-1;
+ circle->quad( point_index, point_index-1, point_index-3, point_index-2 );
+ circle->quad( point_index, point_index-2, point_index-3, point_index-1 );
+ }
+ }
+ circle->quad( 1, 0, (uint)nSegments*2-2, (uint)nSegments*2-1 );
+ circle->quad( 1, (uint)nSegments*2-1, (uint)nSegments*2-2, 0 );
+ circle->end();
}
- circle->end();
-
- object->translate( 500, 0, -200);
+
+ object->translate( -2000, -200, -300);
object->attachObject( circle );
}
Modified: branches/ogsector/src/Sector.h
===================================================================
--- branches/ogsector/src/Sector.h 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/src/Sector.h 2007-06-28 16:05:43 UTC (rev 602)
@@ -21,7 +21,7 @@
#ifndef _OPENGATE_SECTOR__H
#define _OPENGATE_SECTOR__H
-#include <Ogre.h>
+#include <OgrePrerequisites.h>
#include "UnDockedState.h"
#include "SectorObjects.h"
@@ -51,7 +51,7 @@
SectorObject * createStaticObject( const Ogre::String & meshname, const Ogre::String & objectname, const Ogre::Vector3 & pos );
SectorObject * createStaticObject( const Ogre::String & meshname, const Ogre::String & objectname,
- const Ogre::Vector3 & pos, Ogre::Real targetSize, Ogre::Degree yaw );
+ const Ogre::Vector3 & pos, const Ogre::Vector3 & targetSize, Ogre::Degree yaw );
SectorObjectMoveable * createMoveableObject( const Ogre::String & name, int userId, int childId, Vessel & vessel );
@@ -70,6 +70,8 @@
void spawnAiObject( const std::string & vesselName );
void createCircle( );
+ void createRings( );
+
void selectNextTarget( SectorObject * obj = NULL );
Modified: branches/ogsector/src/SectorObjects.cpp
===================================================================
--- branches/ogsector/src/SectorObjects.cpp 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/src/SectorObjects.cpp 2007-06-28 16:05:43 UTC (rev 602)
@@ -18,12 +18,19 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include "common.h"
#include "Sector.h"
#include "SectorObjects.h"
-#include "common.h"
+#include "Projectile.h"
#include "OpcodeWrapper.h"
-//#include <OgreOpcode.h>
+#include <OgreOverlayManager.h>
+#include <OgreOverlayElement.h>
+#include <OgreEntity.h>
+#include <OgreParticleSystem.h>
+#include <OgreParticleEmitter.h>
+#include <OgreBillboardSet.h>
+
#include <string>
namespace OpenGate{
@@ -48,147 +55,16 @@
sceneMgr_->getRootSceneNode()->removeAndDestroyChild( mainNode_->getName() );
}
-Projectile::Projectile( BaseObject * parent, long shotCounter, Ogre::Real speed, Uint32 damage, Ogre::Real liveTime )
- : BaseObject( parent->name() + "_" + toStr( shotCounter ), parent->sector() ), parent_( parent ),
- shotCount_( shotCounter), damage_( damage ), maxLiveTime_( liveTime ){
- selectable_ = false;
+Ogre::Vector3 BaseObject::position() const { return mainNode_->getPosition(); }
- Ogre::String bulletName( name_ + "_" + toStr( shotCounter ) );
-
-// 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 ) ),
-// 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 ) ),
-// // 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() );
-
- int maxBB = 20;
- bbs_ = sceneMgr_->createBillboardSet( bulletName + "_BBS", maxBB );
- bbs_->setMaterialName("Bullet");
-
- Ogre::Billboard *bb;
-// bb = bbs_->createBillboard( Ogre::Vector3::ZERO, Ogre::ColourValue( 1.0f, 1.0f, 1.0f) );
-// bb->setDimensions( 1.0, 0.2 );
-// bb->setRotation ( Ogre::Radian( 0 ) );
-
- for ( int i = 0; i < maxBB; i ++ ){
- bb = bbs_->createBillboard( Ogre::Vector3::ZERO, Ogre::ColourValue( 0.5f, 0.5f, 0.5f) );
- bb->setDimensions( 1.0 - i * 1.0/maxBB* 0.5 , 1.0 - i * 1.0/maxBB * 0.5 );
- bb->setRotation ( Ogre::Radian( i*10.0 ) );
- bb->setPosition( direction.zAxis().normalisedCopy() * i * 0.5 );
- }
-
- mainNode_->attachObject( bbs_ );
-
-// bullet_ = sceneMgr_->createManualObject( bulletName + "_BulletShape" );
-// bullet_->begin("Bullet1", Ogre::RenderOperation::OT_TRIANGLE_LIST);
-// Ogre::Real scale = 0.1;
-// unsigned point_index = 0;
-// bullet_->position( -scale, -scale, 0 );
-// bullet_->position( scale, -scale, 0 );
-// bullet_->position( scale, scale, 0 );
-// bullet_->position( -scale, -scale, 0 );
-// bullet_->quad(point_index, point_index + 1, point_index + 2, point_index + 3);
-// point_index += 4;
-// bullet_->position( -scale, -scale, 0 );
-// bullet_->position( scale, scale, 0 );
-// bullet_->position( -scale, scale, 0 );
-// bullet_->position( -scale, -scale, 0 );
-// bullet_->quad(point_index, point_index + 1, point_index + 2, point_index + 3);
-// point_index += 4;
-// bullet_->end();
-// mainNode_->attachObject( bullet_ );
-
- mainNode_->setPosition( position );
- mainNode_->setPosition( position +
- direction.zAxis().normalisedCopy() * -6.2 +
- direction.xAxis().normalisedCopy() * 1.5 +
- direction.yAxis().normalisedCopy() * -0.2 );
-
- // mainNode_->setOrientation( direction );
-
- lifeTime_ = 0.0;
- oldTime_ = 0.0;
-
- vel_ = speed * -direction.zAxis().normalisedCopy() + parent->velocity();
-}
-
-Projectile::~Projectile() {
- mainNode_->detachObject( bbs_ );
- sceneMgr_->destroyBillboardSet( bbs_ );
- // mainNode_->detachObject( chain_ );
- // sceneMgr_->destroyBillboardChain( chain_ );
-}
-
-void Projectile::collide( BaseObject * object ){
- if ( name_ != object->name() ){
- vel_ *= 0.0;
-
- //** show us a small visible feedback
- bbs_->getBillboard( 0 )->setColour( Ogre::ColourValue(0.0, 1.0, 0.0) );
- bbs_->getBillboard( 0 )->setDimensions( 5, 5 );
- lifeTime_ = max( lifeTime_, maxLiveTime_ - 0.1f );
-
-// sector_->collisionContext()->removeObject( collObj_ );
-// OgreOpcode::CollisionManager::getSingletonPtr()->detachShape( collObj_->getShape() );
- }
-
- sector_->sendVesselAmmoHit( *this, object );
-}
-
-bool Projectile::update( Ogre::Real elapsedTime ){
- if ( elapsedTime < 0.001 ) return true;
-
- lifeTime_ += elapsedTime;
- if ( lifeTime_ >= maxLiveTime_ ) return false;
-
- if ( vel_.length() > 0.1 ){
-
- Ogre::Ray bulletRay( mainNode_->getPosition(), vel_.normalisedCopy() );
-
- if ( !OpcodeCollisionDetection::getSingleton().checkCollideRay( this, bulletRay, (vel_ * elapsedTime).length() ) ){
- mainNode_->translate( vel_ * elapsedTime );
- }
-
-// OgreOpcode::CollisionPair ** rayPickReport;
-// int nColl = OgreOpcode::CollisionManager::getSingletonPtr()
-// ->getDefaultContext()->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() ) );
-// static_cast< BaseObject * >( col1->getClientData() )->collide( this );
-// return true;
-// }
-// }
- }
- return true;
-}
-
-
SectorObject::SectorObject( const Ogre::String & name, Sector * sector, int userID, int childID )
: BaseObject( name, sector, userID, childID ) {
isOnRadar_ = false;
- mainNodeEntity_ = mainNode_->createChildSceneNode( name_ + "_transform" );
- baseSize_ = 0.0;
+ mainNodeEntityScale_ = mainNode_->createChildSceneNode( name_ + "_baseScale" );
+ mainNodeEntityRot_ = mainNodeEntityScale_->createChildSceneNode( name_ + "_baseRot" );
+
+ baseSize_ = Ogre::Vector3::ZERO;
selectable_ = true;
int dotAWidth = 4;
@@ -214,42 +90,61 @@
OpcodeCollisionDetection::getSingleton().destroyObject( collObj_ );
- mainNodeEntity_->detachObject( entity_ );
+ mainNodeEntityRot_->detachObject( entity_ );
sceneMgr_->destroyEntity( entity_ );
- mainNode_->removeAndDestroyChild( mainNodeEntity_->getName() );
+ mainNodeEntityScale_->removeAndDestroyChild( mainNodeEntityRot_->getName() );
+ mainNode_->removeAndDestroyChild( mainNodeEntityScale_->getName() );
}
void SectorObject::setShape( const Ogre::String & meshname ){
entity_ = sceneMgr_->createEntity( name_ + "_shape", meshname );
- mainNodeEntity_->attachObject( entity_ );
+ mainNodeEntityRot_->attachObject( entity_ );
collObj_ = OpcodeCollisionDetection::getSingleton().createObject( this );
}
void SectorObject::scale( const Ogre::Vector3 & scale ){
- baseSize_ = scale[ 0 ] * ( entity_->getBoundingBox().getMaximum()[ 0 ]
- - entity_->getBoundingBox().getMinimum()[ 0 ] );
- mainNodeEntity_->scale( scale );
+ baseSize_ = scale * ( entity_->getBoundingBox().getMaximum() - entity_->getBoundingBox().getMinimum() );
+ mainNodeEntityScale_->scale( scale );
}
void SectorObject::setBaseSize( const Ogre::Vector3 & size ){
- Ogre::Real scaleX = size[ 0 ] / ( entity_->getBoundingBox().getMaximum()[ 0 ]
- - entity_->getBoundingBox().getMinimum()[ 0 ] );
- Ogre::Real scaleY = size[ 1 ] / ( entity_->getBoundingBox().getMaximum()[ 1 ]
- - entity_->getBoundingBox().getMinimum()[ 1 ] );
- Ogre::Real scaleZ = size[ 2 ] / ( entity_->getBoundingBox().getMaximum()[ 2 ]
- - entity_->getBoundingBox().getMinimum()[ 2 ] );
- mainNodeEntity_->scale( scaleX, scaleY, scaleZ );
- baseSize_ = size[ 0 ];
-}
+ Ogre::Vector3 scale( size / ( mainNodeEntityRot_->getOrientation() * ( mainNodeEntityRot_->_getWorldAABB().getMaximum()-
+ mainNodeEntityRot_->_getWorldAABB().getMinimum() ) ) );
-void SectorObject::setBaseSize( Ogre::Real targetSize ){
+ scale[0]= fabs(scale[0]);
+ scale[1]= fabs(scale[1]);
+ scale[2]= fabs(scale[2]);
- Ogre::Real scale = targetSize / ( entity_->getBoundingBox().getMaximum()[ 0 ]
- - entity_->getBoundingBox().getMinimum()[ 0 ] );
- mainNodeEntity_->scale( scale, scale, scale );
- baseSize_ = targetSize;
+ if ( scale[ 0 ] == 0.0 && scale[ 1 ] == 0.0 && scale[ 2 ] != 0.0) {
+ scale[ 0 ] = scale[ 2 ]; scale[ 1 ] = scale[ 2 ];
+ }
+ if ( scale[ 0 ] == 0.0 && scale[ 1 ] != 0.0 && scale[ 2 ] == 0.0) {
+ scale[ 0 ] = scale[ 1 ]; scale[ 2 ] = scale[ 1 ];
+ }
+ if ( scale[ 0 ] != 0.0 && scale[ 1 ] == 0.0 && scale[ 2 ] == 0.0) {
+ scale[ 2 ] = scale[ 0 ]; scale[ 1 ] = scale[ 0 ];
+ }
+
+// std::cout << name_ << std::endl;
+// std::cout << size << std::endl;
+// std::cout << scale << std::endl;
+// std::cout << entity_->getBoundingBox().getMaximum()- entity_->getBoundingBox().getMinimum() << std::endl;
+// std::cout << mainNodeEntityRot_->getOrientation() * (entity_->getBoundingBox().getMaximum()- entity_->getBoundingBox().getMinimum()) << std::endl;
+// std::cout << mainNode_->_getWorldAABB().getMaximum()-
+// mainNode_->_getWorldAABB().getMinimum() << std::endl;
+// std::cout << mainNode_->_getDerivedScale() << std::endl;
+
+ mainNodeEntityScale_->scale( scale );
+
+ baseSize_ = size;
}
+void SectorObject::setBaseRot( const Ogre::Real & yaw, const Ogre::Real & pitch, const Ogre::Real & roll ){
+ mainNodeEntityRot_->yaw( Ogre::Degree( yaw ) );
+ mainNodeEntityRot_->pitch( Ogre::Degree( pitch ) );
+ mainNodeEntityRot_->roll( Ogre::Degree( roll ) );
+}
+
SectorObjectMoveable::SectorObjectMoveable( const Ogre::String & name, Sector * sector, int userID, int childID,
Vessel * vessel )
: SectorObject( name, sector, userID, childID ), vessel_( vessel ) {
@@ -259,7 +154,7 @@
LogManager::getSingleton().info( "Create " + name + " with " + vessel_->name() );
- baseYaw( Ogre::Degree( vessel_->baseYaw() ) );
+ setBaseRot( vessel_->baseYaw(), vessel_->basePitch(), vessel_->baseRoll() );
setBaseSize( vessel_->baseSize() );
if ( vessel_->factionID() == 4 ){
@@ -365,6 +260,8 @@
return true;
}
+void SectorObjectMoveable::setVisible( bool visible ) { mainNode_->setVisible( visible ); }
+
void SectorObjectMoveable::setFlightProperties( const MessageBodyShipMovement & msg ){
if ( forceMovement_ ){
mainNode_->setPosition( msg.position() );
@@ -628,7 +525,12 @@
if ( fireDelay_ <= 0 ){
Uint32 damage = 1000000;
+// Ogre::Real liveTime = 0.14;
+// ammoSpeed_ = 10000;
+
Ogre::Real liveTime = 1.4;
+ ammoSpeed_ = 1000;
+
if ( firePressed_ ){
if ( capacity_ > damage ){
Projectile * pro = new Projectile( this, shotsFired_, ammoSpeed_, damage, liveTime );
@@ -758,8 +660,6 @@
SectorObjectAvatar::SectorObjectAvatar( const Ogre::String & name, Sector * sector, long userID, Vessel * vessel )
: SectorObjectMoveableLocal( name, sector, userID, 0, vessel ) {
- ammoSpeed_ = 1000;
-
thrustRate_ = 0;
maxCapacity_ = 0;
Modified: branches/ogsector/src/SectorObjects.h
===================================================================
--- branches/ogsector/src/SectorObjects.h 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/src/SectorObjects.h 2007-06-28 16:05:43 UTC (rev 602)
@@ -21,7 +21,7 @@
#ifndef PLAYERSHIP__H
#define PLAYERSHIP__H
-#include <Ogre.h>
+#include <OgrePrerequisites.h>
#include "common.h"
#include "networkProtocol.h"
@@ -40,13 +40,14 @@
#define AVATAR_RTTI 100005
class Sector;
+class Projectile;
class OpcodeCollisionDetection;
-class BaseObject : public Ogre::UserDefinedObject{
+class BaseObject{
public:
BaseObject( const Ogre::String & name, Sector * sector, int userId = 0, int childId = 0 );
- ~BaseObject();
+ virtual ~BaseObject();
virtual long getTypeID() const = 0;
@@ -76,6 +77,8 @@
void setSelectable( bool selectable ) { selectable_ = selectable; }
+ Ogre::Vector3 position() const;
+
protected:
Ogre::String name_;
Sector * sector_;
@@ -90,44 +93,6 @@
Ogre::Real lifeTime_;
};
-class Projectile : public BaseObject {
-public:
- Projectile( BaseObject * parent, long shotCount, Ogre::Real speed, Uint32 damage, Ogre::Real liveTime );
-
- virtual ~Projectile();
-
- inline virtual long getTypeID() const { return PROJECTILE_RTTI; }
-
- virtual void collide( BaseObject * object );
-
- inline Uint32 damage( ) const { return damage_; }
-
- virtual bool update( Ogre::Real elapsedTime );
-
- BaseObject * parent( ) { return parent_; }
-
- BaseObject & parent( ) const { return *parent_; }
-
- Ogre::Vector3 velocity() const { return vel_; }
- Ogre::Vector3 position() const { return Ogre::Vector3( mainNode_->getPosition() ); }
-
- Ogre::Real liveTime() const { return maxLiveTime_; }
-
- Uint16 shotCount() const { return shotCount_; }
-
-protected:
- BaseObject * parent_;
- Uint16 shotCount_;
- Uint32 damage_;
- // Ogre::BillboardChain * chain_;
- Ogre::BillboardSet * bbs_;
- // Ogre::ManualObject * bullet_;
- Ogre::Vector3 vel_;
-
- Ogre::Real maxLiveTime_;
- Ogre::Real oldTime_;
-};
-
class SectorObject : public BaseObject {
public:
SectorObject( const Ogre::String & name, Sector * sector, int userID = 0, int childID = 0 );
@@ -142,22 +107,20 @@
virtual bool update( Ogre::Real elapsedTime ){ return true; }
- void baseYaw( Ogre::Degree yaw ) { mainNodeEntity_->yaw( yaw ); }
-
void setShape( const Ogre::String & meshname );
-
void setShape( Ogre::MeshPtr & mesh );
-
Ogre::Entity * shape(){ return entity_; }
void scale( const Ogre::Vector3 & scale );
void setBaseSize( const Ogre::Vector3 & targetSize );
+ void setBaseRot( const Ogre::Real & yaw, const Ogre::Real & pitch = 0, const Ogre::Real & roll = 0 );
- void setBaseSize( Ogre::Real targetSize );
+ Ogre::Vector3 baseSize( ) const { return baseSize_; }
+ Ogre::Real maxBaseSize( ) const {
+ return max( max( baseSize_[0],baseSize_[1] ), baseSize_[2] );
+ }
- Ogre::Real baseSize( ) const { return baseSize_; }
-
bool isOnRadar() const { return isOnRadar_; }
void onRadar( bool onradar ) { isOnRadar_ = onradar; }
@@ -168,14 +131,15 @@
protected:
- Ogre::SceneNode * mainNodeEntity_; // Main character node
+ Ogre::SceneNode * mainNodeEntityRot_; // Main character node for base rotation
+ Ogre::SceneNode * mainNodeEntityScale_; // Main character node for base size
Ogre::Entity * entity_;
Ogre::OverlayElement * dotA_;
Ogre::OverlayElement * dotB_;
bool isOnRadar_;
- double baseSize_;
+ Ogre::Vector3 baseSize_;
};
/*! Base class for movable objects, instances are only used for foreign player objects. */
@@ -194,7 +158,7 @@
virtual bool update( Ogre::Real elapsedTime );
/*! Change visibility - Useful for 1st person view and death sequence */
- inline void setVisible( bool visible ) { mainNodeEntity_->setVisible( visible ); }
+ void setVisible( bool visible );
/*! Apply movement from net.*/
void setFlightProperties( const MessageBodyShipMovement & msg );
Modified: branches/ogsector/src/ShipConfigDialog.cpp
===================================================================
--- branches/ogsector/src/ShipConfigDialog.cpp 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/src/ShipConfigDialog.cpp 2007-06-28 16:05:43 UTC (rev 602)
@@ -24,6 +24,9 @@
#include <OgreEntity.h>
#include <OgreRoot.h>
#include <OgreRenderSystem.h>
+#include <OgreRenderTargetListener.h>
+#include <OgreRenderTexture.h>
+#include <OgreCEGUITexture.h>
#include <CEGUIWindow.h>
#include <CEGUI/elements/CEGUIPushButton.h>
@@ -35,7 +38,7 @@
#include "VesselManager.h"
namespace CEGUI{
- //** dont know why, but these to functions are not defined in libCEUGUOgreRenderer.so ??????
+//** dont know why, but these two functions are not defined in libCEUGUOgreRenderer.so ??????
void OgreCEGUITexture::freeOgreTexture(void){
if ((!d_ogre_texture.isNull()) && !d_isLinked) {
Ogre::TextureManager::getSingleton().remove(d_ogre_texture->getHandle());
Modified: branches/ogsector/src/ShipConfigDialog.h
===================================================================
--- branches/ogsector/src/ShipConfigDialog.h 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/src/ShipConfigDialog.h 2007-06-28 16:05:43 UTC (rev 602)
@@ -23,9 +23,8 @@
#include "BaseDialog.h"
+#include <OgrePrerequisites.h>
#include <OgreRenderTargetListener.h>
-#include <OgreRenderTexture.h>
-#include <OgreCEGUITexture.h>
namespace OpenGate{
Modified: branches/ogsector/src/UnDockedState.cpp
===================================================================
--- branches/ogsector/src/UnDockedState.cpp 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/src/UnDockedState.cpp 2007-06-28 16:05:43 UTC (rev 602)
@@ -31,6 +31,11 @@
#include <OgreTextAreaOverlayElement.h>
#include <OgreFontManager.h>
+#include <OgreRoot.h>
+#include <OgreRenderWindow.h>
+#include <OgreViewport.h>
+#include <OgreOverlayManager.h>
+#include <OgreStringConverter.h>
#include <CEGUI/elements/CEGUIPushButton.h>
@@ -750,7 +755,7 @@
secondCamera_->rotate( rot );
// }
- if ( target_ != NULL ) secondCamera_->setPosition( avatarPos + distNorm * ( dist.length() - 2.0 * target_->baseSize() ) );
+ if ( target_ != NULL ) secondCamera_->setPosition( avatarPos + distNorm * ( dist.length() - 2.0 * target_->maxBaseSize() ) );
switch ( cameraMode_ ){
case 0: //** free camera at orign
Modified: branches/ogsector/src/UnDockedState.h
===================================================================
--- branches/ogsector/src/UnDockedState.h 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/src/UnDockedState.h 2007-06-28 16:05:43 UTC (rev 602)
@@ -20,7 +20,7 @@
#ifndef UNDOCKEDSTATE__H
#define UNDOCKEDSTATE__H
-#include <Ogre.h>
+#include <OgrePrerequisites.h>
#include "GameState.h"
#include "InputManager.h"
Modified: branches/ogsector/src/Vessel.cpp
===================================================================
--- branches/ogsector/src/Vessel.cpp 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/src/Vessel.cpp 2007-06-28 16:05:43 UTC (rev 602)
@@ -18,15 +18,18 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#include "common.h"
#include "Vessel.h"
+#include <OgreMeshManager.h>
+
namespace OpenGate{
Vessel::Vessel( ) : Entity() {
- vesselSize_ = 10.0;
+ vesselSize_ = Ogre::Vector3::ZERO;
vesselArmor_ = 1;
- vesselYaw_ = 0;
+ baseYaw_ = 0;
+ basePitch_ = 0;
+ baseRoll_ = 0;
yaw_ = 1.0;
pitch_ = 1.0;
Modified: branches/ogsector/src/Vessel.h
===================================================================
--- branches/ogsector/src/Vessel.h 2007-06-27 03:26:07 UTC (rev 601)
+++ branches/ogsector/src/Vessel.h 2007-06-28 16:05:43 UTC (rev 602)
@@ -21,13 +21,10 @@
#ifndef _OPENGATE_VESSEL__H
#define _OPENGATE_VESSEL__H
-#include <OgreMesh.h>
-#include <OgreMeshManager.h>
#include "common.h"
-
#include "Entity.h"
+#include <OgreMesh.h>
-
namespace OpenGate{
/*!
@@ -57,12 +54,27 @@
/*! Desctructor */
~Vessel(){}
- inline void setBaseSize( float vesselSize ){ vesselSize_ = vesselSize; }
- inline float baseSize( ) const { return vesselSize_; }
+ inline void setBaseSize( float length, float width, float height ){
+ vesselSize_[ 0 ] = length;
+ vesselSize_[ 1 ] = width;
+ vesselSize_[ 2 ] = height;
+ }
- inline void setBaseYaw( float vesselYaw ){ vesselYaw_ = vesselYaw; }
- inline float baseYaw( ) const { return vesselYaw_; }
+ /*! If size is a scalar value, the length of the vessel is given. */
+ inline void setBaseSize( float vesselSize ){
+ vesselSize_[ 2 ] = vesselSize;
+ }
+ inline Ogre::Vector3 baseSize( ) const { return vesselSize_; }
+ inline void setBaseYaw...
[truncated message content] |
|
From: <ult...@us...> - 2007-09-03 17:06:49
|
Revision: 713
http://opengate.svn.sourceforge.net/opengate/?rev=713&view=rev
Author: ultrasick
Date: 2007-09-03 10:06:51 -0700 (Mon, 03 Sep 2007)
Log Message:
-----------
uploading escape capsule, check project page if you wish to see a rendered image
Added Paths:
-----------
trunk/data/ships/escape_capsule.blend
trunk/data/ships/escape_capsule.xml
Added: trunk/data/ships/escape_capsule.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/escape_capsule.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/ships/escape_capsule.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/escape_capsule.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X