Menu
▾
▴
opengate-svn
|
From: <ult...@us...> - 2007-06-27 03:21:30
|
Revision: 600
http://svn.sourceforge.net/opengate/?rev=600&view=rev
Author: ultrasick
Date: 2007-06-26 20:19:23 -0700 (Tue, 26 Jun 2007)
Log Message:
-----------
added gun points in the texture
Modified Paths:
--------------
trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.blend
trunk/templates/data/ships/tauseti/lady_kickstart/parts/21_+_22.pspimage
trunk/templates/data/ships/tauseti/lady_kickstart/viewable_area.7z
Modified: trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.blend
===================================================================
(Binary files differ)
Modified: trunk/templates/data/ships/tauseti/lady_kickstart/parts/21_+_22.pspimage
===================================================================
(Binary files differ)
Modified: trunk/templates/data/ships/tauseti/lady_kickstart/viewable_area.7z
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-07-27 16:55:07
|
Revision: 642
http://opengate.svn.sourceforge.net/opengate/?rev=642&view=rev
Author: ultrasick
Date: 2007-07-27 09:55:08 -0700 (Fri, 27 Jul 2007)
Log Message:
-----------
bug fixed (vectors weren't placed very good)
Modified Paths:
--------------
trunk/data/ships/tauseti/lady_kickstart/17_+_18.png
trunk/templates/data/ships/tauseti/lady_kickstart/parts/17_+_18.pspimage
Modified: trunk/data/ships/tauseti/lady_kickstart/17_+_18.png
===================================================================
(Binary files differ)
Modified: trunk/templates/data/ships/tauseti/lady_kickstart/parts/17_+_18.pspimage
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-07-28 19:38:49
|
Revision: 646
http://opengate.svn.sourceforge.net/opengate/?rev=646&view=rev
Author: ultrasick
Date: 2007-07-28 12:38:45 -0700 (Sat, 28 Jul 2007)
Log Message:
-----------
uploading anomaly
Added Paths:
-----------
trunk/data/misc/anomaly.png
trunk/templates/data/misc/anomaly.blend
Added: trunk/data/misc/anomaly.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/anomaly.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/misc/anomaly.blend
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/misc/anomaly.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-08-27 13:43:05
|
Revision: 673
http://opengate.svn.sourceforge.net/opengate/?rev=673&view=rev
Author: ultrasick
Date: 2007-08-26 06:07:46 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
uploading soundtrack for tauseti sectors
Added Paths:
-----------
trunk/data/sectors/
trunk/data/sectors/tauseti/
trunk/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3
trunk/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.txt
trunk/doc/data/sectors/
trunk/doc/data/sectors/tauseti/
trunk/doc/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.odt
trunk/doc/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.pdf
Added: trunk/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3
===================================================================
(Binary files differ)
Property changes on: trunk/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.txt
===================================================================
--- trunk/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.txt (rev 0)
+++ trunk/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.txt 2007-08-26 13:07:46 UTC (rev 673)
@@ -0,0 +1 @@
+see trunk/doc/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.pdf
\ No newline at end of file
Property changes on: trunk/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/doc/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.odt
===================================================================
(Binary files differ)
Property changes on: trunk/doc/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.odt
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.pdf
===================================================================
(Binary files differ)
Property changes on: trunk/doc/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.pdf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-08-27 15:56:47
|
Revision: 672
http://opengate.svn.sourceforge.net/opengate/?rev=672&view=rev
Author: ultrasick
Date: 2007-08-26 06:02:37 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
another sound file. it's a simple "click" or an "roll over" for the GUI
Added Paths:
-----------
trunk/data/GUI/docked/click.wav
trunk/templates/data/GUI/docked/click.aup
trunk/templates/data/GUI/docked/click.txt
trunk/templates/data/GUI/docked/click_data/
trunk/templates/data/GUI/docked/click_data/e00/
trunk/templates/data/GUI/docked/click_data/e00/d00/
trunk/templates/data/GUI/docked/click_data/e00/d00/e0000efe.au
Added: trunk/data/GUI/docked/click.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/GUI/docked/click.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/GUI/docked/click.aup
===================================================================
--- trunk/templates/data/GUI/docked/click.aup (rev 0)
+++ trunk/templates/data/GUI/docked/click.aup 2007-08-26 13:02:37 UTC (rev 672)
@@ -0,0 +1,15 @@
+<?xml version="1.0" standalone="no" ?>
+<!DOCTYPE project PUBLIC "-//audacityproject-1.3.0//DTD//EN" "http://audacity.sourceforge.net/xml/audacityproject-1.3.0.dtd" >
+<project xmlns="http://audacity.sourceforge.net/xml/" projname="click_data" version="1.3.0" audacityversion="1.3.3-beta" sel0="0.0000000000" sel1="0.0000000000" vpos="0" h="0.0000000000" zoom="52234.2431761787" rate="44100">
+ <tags title="" artist="" album="" track="-1" year="" genre="-1" comments="" id3v2="1"/>
+ <wavetrack name="Tonspur" channel="2" linked="0" offset="0.00000000" rate="44100" gain="1" pan="0">
+ <waveclip offset="0.00000000">
+ <sequence maxsamples="262144" sampleformat="262159" numsamples="1209">
+ <waveblock start="0">
+ <simpleblockfile filename="e0000efe.au" len="1209" min="-0.748553" max="0.748331" rms="0.065612"/>
+ </waveblock>
+ </sequence>
+ <envelope numpoints="0"/>
+ </waveclip>
+ </wavetrack>
+</project>
Property changes on: trunk/templates/data/GUI/docked/click.aup
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/templates/data/GUI/docked/click.txt
===================================================================
--- trunk/templates/data/GUI/docked/click.txt (rev 0)
+++ trunk/templates/data/GUI/docked/click.txt 2007-08-26 13:02:37 UTC (rev 672)
@@ -0,0 +1,11 @@
+neue monospur (44.100 Hz; 32 bit float)
+click track erzeugen (werte egal)
+einen der starken schallimpulse rausschneiden, rest l\xF6schen
+stille wegschneiden, alles wegschneiden was nicht zur sauberen sinuskurve geh\xF6rt, an den anfang der tonspur schieben
+2 volle wellen am anfang ausw\xE4hlen und fade in effekt anwenden
+2 volle wellen am ende ausw\xE4hlen und fade out effekt anwenden
+effekt "tonh\xF6he \xE4ndern" anwenden (-24 halbtonschritte)
+stille wegschneiden
+projekt speichern
+schlie\xDFen und wieder aufrufen (nutzlose dateien l\xF6schen lassen)
+sound exportieren (wave; 32 bit float; microsoft)
\ No newline at end of file
Property changes on: trunk/templates/data/GUI/docked/click.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/templates/data/GUI/docked/click_data/e00/d00/e0000efe.au
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/GUI/docked/click_data/e00/d00/e0000efe.au
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-08-27 16:12:52
|
Revision: 671
http://opengate.svn.sourceforge.net/opengate/?rev=671&view=rev
Author: ultrasick
Date: 2007-08-26 05:59:08 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
uploading the sound of an laser shot. it still needs improvement (like an cool impulse at the beginning of the shot to make it sound more like .... um ... well little more like a cool super fat laser gun) ;-)
Added Paths:
-----------
trunk/data/guns/laser.wav
trunk/templates/data/guns/
trunk/templates/data/guns/laser.aup
trunk/templates/data/guns/laser.txt
trunk/templates/data/guns/laser_data/
trunk/templates/data/guns/laser_data/e00/
trunk/templates/data/guns/laser_data/e00/d00/
trunk/templates/data/guns/laser_data/e00/d00/e00002bb.au
trunk/templates/data/guns/laser_data/e00/d00/e0000fbe.au
Added: trunk/data/guns/laser.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/guns/laser.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/guns/laser.aup
===================================================================
--- trunk/templates/data/guns/laser.aup (rev 0)
+++ trunk/templates/data/guns/laser.aup 2007-08-26 12:59:08 UTC (rev 671)
@@ -0,0 +1,23 @@
+<?xml version="1.0" standalone="no" ?>
+<!DOCTYPE project PUBLIC "-//audacityproject-1.3.0//DTD//EN" "http://audacity.sourceforge.net/xml/audacityproject-1.3.0.dtd" >
+<project xmlns="http://audacity.sourceforge.net/xml/" projname="laser_data" version="1.3.0" audacityversion="1.3.3-beta" sel0="0.0000000000" sel1="0.4998866213" vpos="0" h="0.0000000000" zoom="2864.0000000000" rate="44100">
+ <tags title="" artist="" album="" track="-1" year="" genre="-1" comments="" id3v2="1"/>
+ <wavetrack name="Tonspur" channel="2" linked="0" offset="0.00000000" rate="44100" gain="1" pan="0">
+ <waveclip offset="0.01571429">
+ <sequence maxsamples="262144" sampleformat="262159" numsamples="21352">
+ <waveblock start="0">
+ <simpleblockfile filename="e00002bb.au" len="21352" min="-1" max="0.9393" rms="0.158803"/>
+ </waveblock>
+ </sequence>
+ <envelope numpoints="0"/>
+ </waveclip>
+ <waveclip offset="0.00000000">
+ <sequence maxsamples="262144" sampleformat="262159" numsamples="693">
+ <waveblock start="0">
+ <simpleblockfile filename="e0000fbe.au" len="693" min="-0.218896" max="0.567895" rms="0.016289"/>
+ </waveblock>
+ </sequence>
+ <envelope numpoints="0"/>
+ </waveclip>
+ </wavetrack>
+</project>
Property changes on: trunk/templates/data/guns/laser.aup
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/templates/data/guns/laser.txt
===================================================================
--- trunk/templates/data/guns/laser.txt (rev 0)
+++ trunk/templates/data/guns/laser.txt 2007-08-26 12:59:08 UTC (rev 671)
@@ -0,0 +1,8 @@
+neue monospur (44.100 Hz; 32 bit float)
+rauschen erzeugen (0,5 sekunden; amplitude: 1; braunes rauschen)
+0,015 sekunden am anfang ausw\xE4hlen und fade in effekt
+0,25 sekunden am ende ausw\xE4hlen und fade out effekt
+wahwah effek (lfo requenz: 1,25 Hz; lfo anfangsphase: 0 grad; modulationstiefe: 70%; resonanzgte: 2,5 Q; frequenzverschiebung: 30%)
+projekt speichern
+schlie\xDFen und wieder aufrufen (nutzlose dateien l\xF6schen lassen)
+sound exportieren (wave; 32 bit float; microsoft)
\ No newline at end of file
Property changes on: trunk/templates/data/guns/laser.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/templates/data/guns/laser_data/e00/d00/e00002bb.au
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/guns/laser_data/e00/d00/e00002bb.au
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/guns/laser_data/e00/d00/e0000fbe.au
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/guns/laser_data/e00/d00/e0000fbe.au
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-09-02 12:41:07
|
Revision: 674
http://opengate.svn.sourceforge.net/opengate/?rev=674&view=rev
Author: ultrasick
Date: 2007-08-26 06:16:42 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
moving click sound and saved wave pcm coded (will delete old files soon)
Added Paths:
-----------
trunk/data/sounds/
trunk/data/sounds/click.wav
trunk/templates/data/sounds/
trunk/templates/data/sounds/click.aup
trunk/templates/data/sounds/click.txt
trunk/templates/data/sounds/click_data/
trunk/templates/data/sounds/click_data/e00/
trunk/templates/data/sounds/click_data/e00/d00/
trunk/templates/data/sounds/click_data/e00/d00/e0000efe.au
Added: trunk/data/sounds/click.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/click.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/sounds/click.aup
===================================================================
--- trunk/templates/data/sounds/click.aup (rev 0)
+++ trunk/templates/data/sounds/click.aup 2007-08-26 13:16:42 UTC (rev 674)
@@ -0,0 +1,15 @@
+<?xml version="1.0" standalone="no" ?>
+<!DOCTYPE project PUBLIC "-//audacityproject-1.3.0//DTD//EN" "http://audacity.sourceforge.net/xml/audacityproject-1.3.0.dtd" >
+<project xmlns="http://audacity.sourceforge.net/xml/" projname="click_data" version="1.3.0" audacityversion="1.3.3-beta" sel0="0.0000000000" sel1="0.0000000000" vpos="0" h="0.0000000000" zoom="52234.2431761787" rate="44100">
+ <tags title="" artist="" album="" track="-1" year="" genre="-1" comments="" id3v2="1"/>
+ <wavetrack name="Tonspur" channel="2" linked="0" offset="0.00000000" rate="44100" gain="1" pan="0">
+ <waveclip offset="0.00000000">
+ <sequence maxsamples="262144" sampleformat="262159" numsamples="1209">
+ <waveblock start="0">
+ <simpleblockfile filename="e0000efe.au" len="1209" min="-0.748553" max="0.748331" rms="0.065612"/>
+ </waveblock>
+ </sequence>
+ <envelope numpoints="0"/>
+ </waveclip>
+ </wavetrack>
+</project>
Property changes on: trunk/templates/data/sounds/click.aup
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/templates/data/sounds/click.txt
===================================================================
--- trunk/templates/data/sounds/click.txt (rev 0)
+++ trunk/templates/data/sounds/click.txt 2007-08-26 13:16:42 UTC (rev 674)
@@ -0,0 +1,11 @@
+neue monospur (44.100 Hz; 32 bit float)
+click track erzeugen (werte egal)
+einen der starken schallimpulse rausschneiden, rest l\xF6schen
+stille wegschneiden, alles wegschneiden was nicht zur sauberen sinuskurve geh\xF6rt, an den anfang der tonspur schieben
+2 volle wellen am anfang ausw\xE4hlen und fade in effekt anwenden
+2 volle wellen am ende ausw\xE4hlen und fade out effekt anwenden
+effekt "tonh\xF6he \xE4ndern" anwenden (-24 halbtonschritte)
+stille wegschneiden
+projekt speichern
+schlie\xDFen und wieder aufrufen (nutzlose dateien l\xF6schen lassen)
+sound exportieren (wave; 32 bit float; microsoft)
\ No newline at end of file
Property changes on: trunk/templates/data/sounds/click.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/templates/data/sounds/click_data/e00/d00/e0000efe.au
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/sounds/click_data/e00/d00/e0000efe.au
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-09-03 17:46:11
|
Revision: 714
http://opengate.svn.sourceforge.net/opengate/?rev=714&view=rev
Author: ultrasick
Date: 2007-09-03 10:46:13 -0700 (Mon, 03 Sep 2007)
Log Message:
-----------
moving blender and wings3d files from /data to /templates (step 1 of some)
+ setting background color of the apteryx texture map from transparent to black to reduce the file size
+ saving the texture map of the storm with optimized color table to reduce the file size
Modified Paths:
--------------
trunk/data/ships/octavius/apteryx/apteryx.png
trunk/data/ships/quantar/storm/storm.png
Added Paths:
-----------
trunk/templates/data/ECMs/
trunk/templates/data/ECMs/ghost.wings
trunk/templates/data/capacitors/
trunk/templates/data/capacitors/alembic.blend
trunk/templates/data/capacitors/deepol.blend
trunk/templates/data/capacitors/germ.blend
trunk/templates/data/capacitors/jar.blend
trunk/templates/data/capacitors/lifeline.blend
trunk/templates/data/capacitors/mantra.blend
trunk/templates/data/capacitors/outlet.blend
trunk/templates/data/capacitors/quadro.blend
trunk/templates/data/capacitors/sponge.blend
trunk/templates/data/capacitors/summoner.blend
trunk/templates/data/capacitors/t-c-15.blend
trunk/templates/data/capacitors/tank.blend
trunk/templates/data/commodities/aluminium.blend
trunk/templates/data/commodities/ammunition.blend
trunk/templates/data/commodities/antimony.blend
trunk/templates/data/commodities/armor.blend
trunk/templates/data/commodities/barium.blend
trunk/templates/data/commodities/cesium.blend
trunk/templates/data/commodities/chemicals.blend
trunk/templates/data/commodities/chromium.blend
trunk/templates/data/commodities/copper.blend
trunk/templates/data/commodities/cpus.blend
trunk/templates/data/commodities/fuel_cells.blend
trunk/templates/data/commodities/gold.blend
trunk/templates/data/commodities/helium.blend
trunk/templates/data/commodities/ice.blend
trunk/templates/data/commodities/iron.blend
trunk/templates/data/commodities/laser_components.blend
trunk/templates/data/commodities/magnetic_components.blend
trunk/templates/data/commodities/manufactured_foods.blend
trunk/templates/data/commodities/manufactured_foods_-_front.pspimage
trunk/templates/data/commodities/medical_supplies.blend
trunk/templates/data/commodities/nitrogen.blend
trunk/templates/data/commodities/octavia_light.blend
trunk/templates/data/commodities/organic_foods.blend
trunk/templates/data/commodities/organic_foods_-_label.pspimage
trunk/templates/data/commodities/plutonium.blend
trunk/templates/data/commodities/prostheses.blend
trunk/templates/data/commodities/ram.blend
trunk/templates/data/commodities/rubber.blend
trunk/templates/data/commodities/squadrok_biomass.blend
trunk/templates/data/commodities/tauseti_flashback.blend
trunk/templates/data/commodities/tauseti_flashback_-_glass.png
trunk/templates/data/commodities/tauseti_flashback_-_lable_-_bottom.pspimage
trunk/templates/data/commodities/tauseti_flashback_-_lable_-_top.pspimage
trunk/templates/data/commodities/unsigned_box.blend
trunk/templates/data/commodities/uranium.blend
trunk/templates/data/commodities/water.blend
trunk/templates/data/commodities/xenon.blend
trunk/templates/data/commodities/zinc.blend
trunk/templates/data/engines/
trunk/templates/data/engines/money.blend
trunk/templates/data/engines/t-e-15.blend
trunk/templates/data/guns/
trunk/templates/data/guns/bender.blend
trunk/templates/data/guns/duster.blend
trunk/templates/data/guns/excavator.blend
trunk/templates/data/guns/liar.blend
trunk/templates/data/guns/t-g-28.blend
trunk/templates/data/logos/amanath/
trunk/templates/data/logos/amanath/transparent_background.png
trunk/templates/data/logos/amanath/vectors.svg
trunk/templates/data/logos/hyperial/
trunk/templates/data/logos/hyperial/Color_codes.txt
trunk/templates/data/logos/hyperial/black_background.png
trunk/templates/data/logos/hyperial/transparent_background.png
trunk/templates/data/logos/hyperial/vectors.pspimage
trunk/templates/data/logos/octavius/
trunk/templates/data/logos/octavius/black_background.png
trunk/templates/data/logos/octavius/transparent_background.png
trunk/templates/data/logos/octavius/vectors.pspimage
trunk/templates/data/logos/opengate/
trunk/templates/data/logos/opengate/black_background.png
trunk/templates/data/logos/opengate/original.blend
trunk/templates/data/logos/opengate/transparent_background.png
trunk/templates/data/logos/quantar/
trunk/templates/data/logos/quantar/black_background.png
trunk/templates/data/logos/quantar/transparent_background.png
trunk/templates/data/logos/quantar/vectors.pspimage
trunk/templates/data/misc/beacon.blend
trunk/templates/data/misc/jumpgate.blend
trunk/templates/data/power_plants/
trunk/templates/data/power_plants/contender.blend
trunk/templates/data/power_plants/contender_xl.blend
trunk/templates/data/power_plants/contender_xpr.blend
trunk/templates/data/power_plants/gatherer.blend
trunk/templates/data/power_plants/spud.blend
trunk/templates/data/power_plants/t-p-16.blend
trunk/templates/data/radars/
trunk/templates/data/radars/cyclops.blend
trunk/templates/data/radars/hall_monitor.blend
trunk/templates/data/radars/knocker.blend
trunk/templates/data/radars/night_watchman.blend
trunk/templates/data/radars/outlook.blend
trunk/templates/data/radars/t-r-9.blend
trunk/templates/data/shields/
trunk/templates/data/shields/alpaa.blend
trunk/templates/data/shields/flatiron.blend
trunk/templates/data/shields/himelea.blend
trunk/templates/data/shields/kydango.blend
trunk/templates/data/shields/pod.blend
trunk/templates/data/shields/shelter.blend
trunk/templates/data/shields/t-s-13.blend
trunk/templates/data/ships/escape_capsule.blend
trunk/templates/data/stations/
trunk/templates/data/stations/interior/
trunk/templates/data/stations/interior/solrain/
trunk/templates/data/stations/interior/solrain/1st_floor_bottom_auv.png
trunk/templates/data/stations/interior/solrain/1st_floor_bottom_auv.svg
trunk/templates/data/stations/interior/solrain/floor_auv.png
trunk/templates/data/stations/interior/solrain/floor_auv.svg
trunk/templates/data/stations/interior/solrain/solrain.wings
trunk/templates/data/stations/interior/utils/
trunk/templates/data/stations/interior/utils/barrel/
trunk/templates/data/stations/interior/utils/barrel/utils_barrel.wings
trunk/templates/data/stations/interior/utils/barrel/utils_barrel_auv.png
trunk/templates/data/stations/interior/utils/barrel/utils_barrel_auv.svg
trunk/templates/data/stations/interior/utils/box/
trunk/templates/data/stations/interior/utils/box/utils_box.wings
trunk/templates/data/stations/interior/utils/box/utils_box_box_auv.png
trunk/templates/data/stations/interior/utils/box/utils_box_box_auv.svg
Removed Paths:
-------------
trunk/data/ECMs/ghost.wings
trunk/data/base_interior/
trunk/data/capacitors/alembic.blend
trunk/data/capacitors/deepol.blend
trunk/data/capacitors/germ.blend
trunk/data/capacitors/jar.blend
trunk/data/capacitors/lifeline.blend
trunk/data/capacitors/mantra.blend
trunk/data/capacitors/outlet.blend
trunk/data/capacitors/quadro.blend
trunk/data/capacitors/sponge.blend
trunk/data/capacitors/summoner.blend
trunk/data/capacitors/t-c-15.blend
trunk/data/capacitors/tank.blend
trunk/data/commodities/aluminium.blend
trunk/data/commodities/ammunition.blend
trunk/data/commodities/antimony.blend
trunk/data/commodities/armor.blend
trunk/data/commodities/barium.blend
trunk/data/commodities/cesium.blend
trunk/data/commodities/chemicals.blend
trunk/data/commodities/chromium.blend
trunk/data/commodities/copper.blend
trunk/data/commodities/cpus.blend
trunk/data/commodities/fuel_cells.blend
trunk/data/commodities/gold.blend
trunk/data/commodities/helium.blend
trunk/data/commodities/ice.blend
trunk/data/commodities/iron.blend
trunk/data/commodities/laser_components.blend
trunk/data/commodities/magnetic_components.blend
trunk/data/commodities/manufactured_foods.blend
trunk/data/commodities/medical_supplies.blend
trunk/data/commodities/nitrogen.blend
trunk/data/commodities/octavia_light.blend
trunk/data/commodities/organic_foods.blend
trunk/data/commodities/plutonium.blend
trunk/data/commodities/prostheses.blend
trunk/data/commodities/ram.blend
trunk/data/commodities/rubber.blend
trunk/data/commodities/squadrok_biomass.blend
trunk/data/commodities/tauseti_flashback.blend
trunk/data/commodities/unsigned_box.blend
trunk/data/commodities/uranium.blend
trunk/data/commodities/water.blend
trunk/data/commodities/xenon.blend
trunk/data/commodities/zinc.blend
trunk/data/engines/money.blend
trunk/data/engines/t-e-15.blend
trunk/data/guns/bender.blend
trunk/data/guns/duster.blend
trunk/data/guns/excavator.blend
trunk/data/guns/liar.blend
trunk/data/guns/t-g-28.blend
trunk/data/logos/
trunk/data/misc/beacon.blend
trunk/data/misc/jumpgate.blend
trunk/data/power_plants/contender.blend
trunk/data/power_plants/contender_xl.blend
trunk/data/power_plants/contender_xpr.blend
trunk/data/power_plants/gatherer.blend
trunk/data/power_plants/spud.blend
trunk/data/power_plants/t-p-16.blend
trunk/data/radars/cyclops.blend
trunk/data/radars/hall_monitor.blend
trunk/data/radars/knocker.blend
trunk/data/radars/night_watchman.blend
trunk/data/radars/outlook.blend
trunk/data/radars/t-r-9.blend
trunk/data/shields/alpaa.blend
trunk/data/shields/flatiron.blend
trunk/data/shields/himelea.blend
trunk/data/shields/kydango.blend
trunk/data/shields/pod.blend
trunk/data/shields/shelter.blend
trunk/data/shields/t-s-13.blend
trunk/data/ships/escape_capsule.blend
trunk/data/ships/octavius/apteryx/apteryx.mesh.xml
trunk/data/ships/octavius/apteryx/apteryx.wings
trunk/data/ships/octavius/condor/condor.wings
trunk/data/ships/octavius/phoenix/phoenix.blend
trunk/data/ships/octavius/phoenix/phoenix.wings
trunk/data/ships/quantar/storm/storm.mesh.xml
trunk/data/ships/quantar/storm/storm.wings
trunk/data/ships/quantar/thunder/
trunk/data/ships/quantar/typhoon/typhoon.blend
trunk/data/ships/quantar/typhoon/typhoon.wings
trunk/templates/data/commodities/manufactured_foods/
trunk/templates/data/commodities/organic_foods/
trunk/templates/data/commodities/tauseti_flashback/
Deleted: trunk/data/ECMs/ghost.wings
===================================================================
(Binary files differ)
Deleted: trunk/data/capacitors/alembic.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/capacitors/deepol.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/capacitors/germ.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/capacitors/jar.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/capacitors/lifeline.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/capacitors/mantra.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/capacitors/outlet.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/capacitors/quadro.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/capacitors/sponge.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/capacitors/summoner.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/capacitors/t-c-15.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/capacitors/tank.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/aluminium.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/ammunition.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/antimony.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/armor.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/barium.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/cesium.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/chemicals.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/chromium.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/copper.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/cpus.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/fuel_cells.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/gold.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/helium.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/ice.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/iron.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/laser_components.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/magnetic_components.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/manufactured_foods.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/medical_supplies.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/nitrogen.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/octavia_light.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/organic_foods.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/plutonium.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/prostheses.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/ram.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/rubber.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/squadrok_biomass.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/tauseti_flashback.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/unsigned_box.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/uranium.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/water.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/xenon.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/commodities/zinc.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/engines/money.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/engines/t-e-15.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/guns/bender.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/guns/duster.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/guns/excavator.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/guns/liar.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/guns/t-g-28.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/misc/beacon.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/misc/jumpgate.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/power_plants/contender.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/power_plants/contender_xl.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/power_plants/contender_xpr.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/power_plants/gatherer.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/power_plants/spud.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/power_plants/t-p-16.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/radars/cyclops.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/radars/hall_monitor.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/radars/knocker.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/radars/night_watchman.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/radars/outlook.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/radars/t-r-9.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/shields/alpaa.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/shields/flatiron.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/shields/himelea.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/shields/kydango.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/shields/pod.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/shields/shelter.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/shields/t-s-13.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/ships/escape_capsule.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/ships/octavius/apteryx/apteryx.mesh.xml
===================================================================
--- trunk/data/ships/octavius/apteryx/apteryx.mesh.xml 2007-09-03 17:06:51 UTC (rev 713)
+++ trunk/data/ships/octavius/apteryx/apteryx.mesh.xml 2007-09-03 17:46:13 UTC (rev 714)
@@ -1,1247 +0,0 @@
-<?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.55...
[truncated message content] |
|
From: <ult...@us...> - 2007-09-03 17:59:46
|
Revision: 715
http://opengate.svn.sourceforge.net/opengate/?rev=715&view=rev
Author: ultrasick
Date: 2007-09-03 10:59:48 -0700 (Mon, 03 Sep 2007)
Log Message:
-----------
moving blender and wings3d files from /data to /templates (step 2 of 2)
+ forgot to upload a few files from my first step
+ forgot to mention: I also deleted *.mesh.xml files because they aren't worth being stored (if I am right)
+ deleting the apteryx_auv.png in the templates dir because it already exists as "apteryx.png" in the data dir (if I am correct)
Added Paths:
-----------
trunk/templates/data/logos/tauseti/black_background.png
trunk/templates/data/logos/tauseti/original.blend
trunk/templates/data/logos/tauseti/transparent_background.png
trunk/templates/data/ships/octavius/apteryx/apteryx.wings
trunk/templates/data/ships/octavius/condor/
trunk/templates/data/ships/octavius/condor/condor.wings
trunk/templates/data/ships/octavius/phoenix/
trunk/templates/data/ships/octavius/phoenix/phoenix.blend
trunk/templates/data/ships/octavius/phoenix/phoenix.wings
trunk/templates/data/ships/squadrok/
trunk/templates/data/ships/squadrok/squid/
trunk/templates/data/ships/squadrok/squid/squid.blend
trunk/templates/data/ships/squadrok/squid/squid_attempt2.blend
trunk/templates/data/ships/squadrok/squid/squid_attempt3.blend
trunk/templates/data/ships/tauseti/catcher/
trunk/templates/data/ships/tauseti/catcher/catcher.blend
trunk/templates/data/ships/tauseti/intensity/
trunk/templates/data/ships/tauseti/intensity/intensity.blend
trunk/templates/data/ships/tauseti/intensity/intensity.wings
trunk/templates/data/ships/tauseti/lady_kickstart/lady_kickstart.blend
trunk/templates/data/ships/tauseti/pioneer/
trunk/templates/data/ships/tauseti/pioneer/pioneer.blend
trunk/templates/data/ships/tauseti/pioneer/pioneer.wings
trunk/templates/data/stations/octavius_core.blend
trunk/templates/data/stations/tauseti_core.blend
trunk/templates/data/stations/tauseti_wake.blend
trunk/templates/data/stations/tauseti_wake_2.blend
Removed Paths:
-------------
trunk/data/ships/squadrok/squid/squid.blend
trunk/data/ships/squadrok/squid/squid_attempt2.blend
trunk/data/ships/squadrok/squid/squid_attempt3.blend
trunk/data/ships/tauseti/catcher/
trunk/data/ships/tauseti/intensity/
trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.blend
trunk/data/ships/tauseti/pioneer/
trunk/data/stations/octavius_core.blend
trunk/data/stations/tauseti_core.blend
trunk/data/stations/tauseti_wake.blend
trunk/data/stations/tauseti_wake_2.blend
trunk/templates/data/ships/octavius/apteryx/apteryx_auv.png
Deleted: trunk/data/ships/squadrok/squid/squid.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/ships/squadrok/squid/squid_attempt2.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/ships/squadrok/squid/squid_attempt3.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/stations/octavius_core.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/stations/tauseti_core.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/stations/tauseti_wake.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/stations/tauseti_wake_2.blend
===================================================================
(Binary files differ)
Added: trunk/templates/data/logos/tauseti/black_background.png
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/logos/tauseti/black_background.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/logos/tauseti/original.blend
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/logos/tauseti/original.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/logos/tauseti/transparent_background.png
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/logos/tauseti/transparent_background.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/octavius/apteryx/apteryx.wings
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/octavius/apteryx/apteryx.wings
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/templates/data/ships/octavius/apteryx/apteryx_auv.png
===================================================================
(Binary files differ)
Added: trunk/templates/data/ships/octavius/condor/condor.wings
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/octavius/condor/condor.wings
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/octavius/phoenix/phoenix.blend
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/octavius/phoenix/phoenix.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/octavius/phoenix/phoenix.wings
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/octavius/phoenix/phoenix.wings
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/squadrok/squid/squid.blend
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/squadrok/squid/squid.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/squadrok/squid/squid_attempt2.blend
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/squadrok/squid/squid_attempt2.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/squadrok/squid/squid_attempt3.blend
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/squadrok/squid/squid_attempt3.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/catcher/catcher.blend
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/catcher/catcher.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/intensity/intensity.blend
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/intensity/intensity.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/intensity/intensity.wings
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/intensity/intensity.wings
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/lady_kickstart/lady_kickstart.blend
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/lady_kickstart/lady_kickstart.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/pioneer/pioneer.blend
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/pioneer/pioneer.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/ships/tauseti/pioneer/pioneer.wings
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/ships/tauseti/pioneer/pioneer.wings
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/stations/octavius_core.blend
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/stations/octavius_core.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/stations/tauseti_core.blend
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/stations/tauseti_core.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/stations/tauseti_wake.blend
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/stations/tauseti_wake.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/stations/tauseti_wake_2.blend
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/stations/tauseti_wake_2.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-09-15 08:48:07
|
Revision: 720
http://opengate.svn.sourceforge.net/opengate/?rev=720&view=rev
Author: ultrasick
Date: 2007-09-15 01:48:09 -0700 (Sat, 15 Sep 2007)
Log Message:
-----------
correcting file name in the license info file
+ uploading new sound track for quantar sectors: Saros - Consolation (the mp3 file is the original, the ogg is at reduced quality but necessary for the current client)
Added Paths:
-----------
trunk/data/sounds/sectors/quantar/
trunk/data/sounds/sectors/quantar/Saros_-_Consolation.mp3
trunk/data/sounds/sectors/quantar/Saros_-_Consolation.ogg
trunk/data/sounds/sectors/quantar/Saros_-_Consolation_-_License_information.txt
trunk/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop_-_License_information.txt
trunk/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike_-_License_information.txt
trunk/doc/data/sounds/sectors/quantar/
trunk/doc/data/sounds/sectors/quantar/Saros_-_Consolation_-_License_information.odt
trunk/doc/data/sounds/sectors/quantar/Saros_-_Consolation_-_License_information.pdf
trunk/doc/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop_-_License_information.odt
trunk/doc/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop_-_License_information.pdf
trunk/doc/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike_-_License_information.odt
trunk/doc/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike_-_License_information.pdf
Removed Paths:
-------------
trunk/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.txt
trunk/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.txt
trunk/doc/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.odt
trunk/doc/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.pdf
trunk/doc/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.odt
trunk/doc/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.pdf
Added: trunk/data/sounds/sectors/quantar/Saros_-_Consolation.mp3
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/sectors/quantar/Saros_-_Consolation.mp3
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sounds/sectors/quantar/Saros_-_Consolation.ogg
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/sectors/quantar/Saros_-_Consolation.ogg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sounds/sectors/quantar/Saros_-_Consolation_-_License_information.txt
===================================================================
--- trunk/data/sounds/sectors/quantar/Saros_-_Consolation_-_License_information.txt (rev 0)
+++ trunk/data/sounds/sectors/quantar/Saros_-_Consolation_-_License_information.txt 2007-09-15 08:48:09 UTC (rev 720)
@@ -0,0 +1 @@
+see [SVN]/trunk/doc/data/sounds/sectors/quantar/Saros_-_Consolation_-_License_information.pdf
\ No newline at end of file
Property changes on: trunk/data/sounds/sectors/quantar/Saros_-_Consolation_-_License_information.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Deleted: trunk/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.txt
===================================================================
--- trunk/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.txt 2007-09-10 16:56:54 UTC (rev 719)
+++ trunk/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.txt 2007-09-15 08:48:09 UTC (rev 720)
@@ -1 +0,0 @@
-see [SVN]/trunk/doc/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.pdf
\ No newline at end of file
Added: trunk/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop_-_License_information.txt
===================================================================
--- trunk/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop_-_License_information.txt (rev 0)
+++ trunk/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop_-_License_information.txt 2007-09-15 08:48:09 UTC (rev 720)
@@ -0,0 +1 @@
+see [SVN]/trunk/doc/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop_-_License_information.pdf
\ No newline at end of file
Property changes on: trunk/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop_-_License_information.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Deleted: trunk/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.txt
===================================================================
--- trunk/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.txt 2007-09-10 16:56:54 UTC (rev 719)
+++ trunk/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.txt 2007-09-15 08:48:09 UTC (rev 720)
@@ -1 +0,0 @@
-see [SVN]/trunk/doc/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.pdf
\ No newline at end of file
Added: trunk/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike_-_License_information.txt
===================================================================
--- trunk/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike_-_License_information.txt (rev 0)
+++ trunk/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike_-_License_information.txt 2007-09-15 08:48:09 UTC (rev 720)
@@ -0,0 +1 @@
+see [SVN]/trunk/doc/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike_-_License_information.pdf
\ No newline at end of file
Property changes on: trunk/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike_-_License_information.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/doc/data/sounds/sectors/quantar/Saros_-_Consolation_-_License_information.odt
===================================================================
(Binary files differ)
Property changes on: trunk/doc/data/sounds/sectors/quantar/Saros_-_Consolation_-_License_information.odt
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/data/sounds/sectors/quantar/Saros_-_Consolation_-_License_information.pdf
===================================================================
(Binary files differ)
Property changes on: trunk/doc/data/sounds/sectors/quantar/Saros_-_Consolation_-_License_information.pdf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/doc/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.odt
===================================================================
(Binary files differ)
Deleted: trunk/doc/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.pdf
===================================================================
(Binary files differ)
Added: trunk/doc/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop_-_License_information.odt
===================================================================
(Binary files differ)
Property changes on: trunk/doc/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop_-_License_information.odt
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop_-_License_information.pdf
===================================================================
(Binary files differ)
Property changes on: trunk/doc/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop_-_License_information.pdf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/doc/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.odt
===================================================================
(Binary files differ)
Deleted: trunk/doc/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.pdf
===================================================================
(Binary files differ)
Added: trunk/doc/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike_-_License_information.odt
===================================================================
(Binary files differ)
Property changes on: trunk/doc/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike_-_License_information.odt
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike_-_License_information.pdf
===================================================================
(Binary files differ)
Property changes on: trunk/doc/data/sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike_-_License_information.pdf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-09-16 18:36:18
|
Revision: 728
http://opengate.svn.sourceforge.net/opengate/?rev=728&view=rev
Author: ultrasick
Date: 2007-09-16 11:36:22 -0700 (Sun, 16 Sep 2007)
Log Message:
-----------
uploading test files for a 3d object
Added Paths:
-----------
trunk/data/misc/planets/atmosphere.png
trunk/data/misc/planets/venus/venus_-_specularity_map.png
trunk/data/misc/planets/venus/venus_-_texture_map.png
trunk/templates/data/misc/planets/plane_for_2x1_maps.blend
Added: trunk/data/misc/planets/atmosphere.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/planets/atmosphere.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/misc/planets/venus/venus_-_specularity_map.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/planets/venus/venus_-_specularity_map.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/misc/planets/venus/venus_-_texture_map.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/planets/venus/venus_-_texture_map.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/misc/planets/plane_for_2x1_maps.blend
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/misc/planets/plane_for_2x1_maps.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-09-22 21:08:11
|
Revision: 763
http://opengate.svn.sourceforge.net/opengate/?rev=763&view=rev
Author: egore
Date: 2007-09-22 14:08:15 -0700 (Sat, 22 Sep 2007)
Log Message:
-----------
remove remains of ogsector
Modified Paths:
--------------
trunk/README
trunk/configure.ac
trunk/ogre.cfg
trunk/resources.cfg
Modified: trunk/README
===================================================================
--- trunk/README 2007-09-22 21:02:43 UTC (rev 762)
+++ trunk/README 2007-09-22 21:08:15 UTC (rev 763)
@@ -26,7 +26,7 @@
sh genExternals.sh all
cd ..
-For building ogsector simple run:
+For building opengate simple run:
./bootstrap
./configure
make -j3
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-09-22 21:02:43 UTC (rev 762)
+++ trunk/configure.ac 2007-09-22 21:08:15 UTC (rev 763)
@@ -7,7 +7,7 @@
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION, [dist-bzip2])
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
-AM_INIT_AUTOMAKE(ogsector, 0.0.1)
+AM_INIT_AUTOMAKE(opengate, 0.0.1)
AC_ISC_POSIX
AC_LANG_CPLUSPLUS
Modified: trunk/ogre.cfg
===================================================================
--- trunk/ogre.cfg 2007-09-22 21:02:43 UTC (rev 762)
+++ trunk/ogre.cfg 2007-09-22 21:08:15 UTC (rev 763)
@@ -1,7 +1,7 @@
Render System=OpenGL Rendering Subsystem
[OpenGL Rendering Subsystem]
-FSAA=6
+FSAA=0
Full Screen=No
RTT Preferred Mode=FBO
-Video Mode=1280 x 1024
+Video Mode=640 x 480
Modified: trunk/resources.cfg
===================================================================
--- trunk/resources.cfg 2007-09-22 21:02:43 UTC (rev 762)
+++ trunk/resources.cfg 2007-09-22 21:08:15 UTC (rev 763)
@@ -1,25 +1,25 @@
# Resource locations to be added to the 'boostrap' path
# This also contains the minimum you need to use the Ogre example framework
[Bootstrap]
-FileSystem=../../trunk/data/startup
+FileSystem=./data/startup
# Resource locations to be added to the default path
[General]
-FileSystem=../../trunk/data/
-FileSystem=../../trunk/data/commodities
-FileSystem=../../trunk/data/capacitors
-FileSystem=../../trunk/data/engines
-FileSystem=../../trunk/data/radars
-FileSystem=../../trunk/data/shields
-FileSystem=../../trunk/data/ECMs
-FileSystem=../../trunk/data/power_plants
-FileSystem=../../trunk/data/guns
-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
-FileSystem=../../trunk/data/misc/asteroids
+FileSystem=./data/
+FileSystem=./data/commodities
+FileSystem=./data/capacitors
+FileSystem=./data/engines
+FileSystem=./data/radars
+FileSystem=./data/shields
+FileSystem=./data/ECMs
+FileSystem=./data/power_plants
+FileSystem=./data/guns
+FileSystem=./data/ships/octavius/apteryx
+FileSystem=./data/ships/quantar/storm
+FileSystem=./data/ships/tauseti/lady_kickstart
+FileSystem=./data/ships/squadrok/squid
+FileSystem=./data/stations
+FileSystem=./data/misc/asteroids
FileSystem=./data
FileSystem=./data/materials
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-09-22 21:13:12
|
Revision: 764
http://opengate.svn.sourceforge.net/opengate/?rev=764&view=rev
Author: egore
Date: 2007-09-22 14:13:16 -0700 (Sat, 22 Sep 2007)
Log Message:
-----------
Move news from README to NEWS
Modified Paths:
--------------
trunk/NEWS
trunk/README
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2007-09-22 21:08:15 UTC (rev 763)
+++ trunk/NEWS 2007-09-22 21:13:16 UTC (rev 764)
@@ -0,0 +1,20 @@
+0.0.3
+
+ * massive cleanup of autotools
+
+0.0.2 ("Not yet testet with other players, need test Nr.2")
+
+ * changed netprotocol to TCP (my router hangs with udp, I dont know why),
+ port: 1234
+ * add simple interpolation and extrapolation for smooth movement at higher
+ pings or packetloss
+ * (spawned ships still jiggle a bit)
+ * clear register/deregister of spawns and playerships
+ * add network protocol for: registering ships, ship status changed, ship hit
+ by ammo
+
+0.0.1 ("Initial work")
+
+ * do not fly online (At test Nr.1 my router died 2 times. Lost packets lead
+ to crazy behaviour of the vessels.)
+
Modified: trunk/README
===================================================================
--- trunk/README 2007-09-22 21:08:15 UTC (rev 763)
+++ trunk/README 2007-09-22 21:13:16 UTC (rev 764)
@@ -1,19 +1,4 @@
--- 0.0.2 --
-Not yet testet with other players
-need test Nr.2 ;)
-- changed netprotocol to TCP (my router hangs with udp, I dont know why), port: 1234
-- add simple interpolation and extrapolation for smooth movement at higher pings or packetloss
-(spawned ships still jiggle a bit)
-- clear register/deregister of spawns and playerships
-- add network protocol for: registering ships, ship status changed, ship hit by ammo
-
--- 0.0.1 --
-do not fly online
-At test Nr.1 my router died 2 times.
-Lost packets lead to crazy behaviour of the vessels.
-
------------------------------------------------------------------------
For installation:
you will need:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-09-22 21:23:53
|
Revision: 765
http://opengate.svn.sourceforge.net/opengate/?rev=765&view=rev
Author: egore
Date: 2007-09-22 14:23:57 -0700 (Sat, 22 Sep 2007)
Log Message:
-----------
Readd svn-ignore
Update my todo
Modified Paths:
--------------
trunk/TODO.cbrill
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
+ .anjuta
.tm_project*
.libs
.deps
.libs
.*swp
.nautilus-metafile.xml
*.autosave
*.pws
*.bak
*~
#*#
*.gladep
*.la
*.lo
*.log
*.o
*.class
*.pyc
aclocal.m4
autom4te.cache
config.h
config.h.in
config.log
config.status
configure
intltool-extract*
intltool-merge*
intltool-modules*
intltool-update*
libtool
prepare.sh
stamp-h*
ltmain.sh
mkinstalldirs
opengate.depend
config.guess
config.sub
Makefile
Makefile.in
Modified: trunk/TODO.cbrill
===================================================================
--- trunk/TODO.cbrill 2007-09-22 21:13:16 UTC (rev 764)
+++ trunk/TODO.cbrill 2007-09-22 21:23:57 UTC (rev 765)
@@ -1,6 +1,8 @@
before first release:
* use metaserver for servers to manage sectors
* remove ogre dependency from server
+ * write a console that does not depend on ogre
+ * think about a way to replace Ogre::Singleton
* remove ois dependency from server
* remove testopenalmanager once the client is done
* fix "make dist" with ogreopcode external stuff
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-09-23 13:16:46
|
Revision: 780
http://opengate.svn.sourceforge.net/opengate/?rev=780&view=rev
Author: egore
Date: 2007-09-23 06:16:50 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
move templates around
Added Paths:
-----------
trunk/templates/misc/
trunk/templates/misc/arrow.wings
Removed Paths:
-------------
trunk/data/wings/
Copied: trunk/templates/misc/arrow.wings (from rev 779, trunk/data/wings/arrow.wings)
===================================================================
(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-09-23 13:24:37
|
Revision: 782
http://opengate.svn.sourceforge.net/opengate/?rev=782&view=rev
Author: egore
Date: 2007-09-23 06:24:39 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
move skybox stuff around
Modified Paths:
--------------
trunk/resources.cfg
Added Paths:
-----------
trunk/data/skybox/buildSkyBox.sh
trunk/data/skybox/simpleSkybox.zip
trunk/data/skybox/skybox1.pov
trunk/data/skybox/skybox2.pov
Removed Paths:
-------------
trunk/data/povray/
trunk/data/simpleSkybox.zip
Deleted: trunk/data/simpleSkybox.zip
===================================================================
(Binary files differ)
Copied: trunk/data/skybox/buildSkyBox.sh (from rev 779, trunk/data/povray/buildSkyBox.sh)
===================================================================
--- trunk/data/skybox/buildSkyBox.sh (rev 0)
+++ trunk/data/skybox/buildSkyBox.sh 2007-09-23 13:24:39 UTC (rev 782)
@@ -0,0 +1,28 @@
+ALLPOVFILES='skybox1.pov skybox2.pov'
+
+#RESOLUTION=4096
+#RESOLUTION=2048
+#RESOLUTION=1024
+RESOLUTION=512
+for POVFILE in $ALLPOVFILES; do
+ OUT=${POVFILE%.pov}
+ OUTNAME=$OUT
+
+ for i in 0 1 2 3 4 5; do
+
+ case $i in
+ 0) EXTENSION="_fr";; # front
+ 1) EXTENSION="_rt";; # right
+ 2) EXTENSION="_bk";; # back
+ 3) EXTENSION="_lf";; # left
+ 4) EXTENSION="_up";; # up
+ 5) EXTENSION="_dn";; # down
+ esac
+
+ povray -I $POVFILE -H$RESOLUTION -W$RESOLUTION +FT -D32 -O$OUTNAME$EXTENSION.tga -K$i
+ convert -quality 100 $OUTNAME$EXTENSION.tga $OUTNAME$EXTENSION.png
+ rm $OUTNAME$EXTENSION.tga
+ done
+done
+zip sykbox_$RESOLUTION.zip *.png
+rm *.png
Copied: trunk/data/skybox/simpleSkybox.zip (from rev 779, trunk/data/simpleSkybox.zip)
===================================================================
(Binary files differ)
Copied: trunk/data/skybox/skybox1.pov (from rev 779, trunk/data/povray/skybox1.pov)
===================================================================
--- trunk/data/skybox/skybox1.pov (rev 0)
+++ trunk/data/skybox/skybox1.pov 2007-09-23 13:24:39 UTC (rev 782)
@@ -0,0 +1,58 @@
+// found here: http://www.ogre3d.org/wiki/index.php/POVRay_Skyboxes
+
+#include "colors.inc"
+
+camera {
+ location <0,0,0>
+ angle 90
+ right <1,0,0> up <0,1,0>
+// turn the cam based on the current frame=clock : [0-5]
+ #switch (clock)
+ #range (0,3)
+// first 4 frames : turn from left to right
+
+rotate (90*clock)*y
+ #break
+ #case (4)
+ // look at the sky
+ rotate -90*x
+ #break
+ #case (5)
+ // look at the ground
+ rotate 90*x
+ #break
+ #end // End of conditional part
+}
+
+background { color rgb <0,0,0> }
+// light_source { <100, 100, -200> color White }
+
+sphere { < 0, 0, 0>, 2
+ pigment { rgbt 1 } // surface of sphere is transparent
+
+ interior {
+ media {
+ emission 0.02
+ intervals 1
+ samples 25
+ method 3
+ density {
+ spherical
+ ramp_wave
+ translate 1.0*y
+ // replace 1.0 = t by time for animation
+ warp { turbulence 1.5 }
+ translate -1.0*y
+ // replace -1.0 = -t by time for animation
+ color_map {
+ [0.0 color rgb <0, 0, 0>]
+ [0.1 color rgb <1, 0, 0>]
+ [0.5 color rgb <1, 1, 0>]
+ [1.0 color rgb <1, 1, 0>]
+ }
+ }
+ }
+ }
+ scale 25
+ hollow
+}
Copied: trunk/data/skybox/skybox2.pov (from rev 779, trunk/data/povray/skybox2.pov)
===================================================================
--- trunk/data/skybox/skybox2.pov (rev 0)
+++ trunk/data/skybox/skybox2.pov 2007-09-23 13:24:39 UTC (rev 782)
@@ -0,0 +1,89 @@
+// found here: http://www.ogre3d.org/wiki/index.php/POVRay_Skyboxes
+
+#include "colors.inc"
+
+camera {
+ location <0,0,0>
+ angle 90
+ right <1,0,0> up <0,1,0>
+ // turn the cam based on the current frame=clock : [0-5]
+ #switch (clock)
+ #range (0,3)
+ // first 4 frames : turn from left to right
+ rotate (90*clock)*y
+ #break
+ #case (4)
+ // look at the sky
+ rotate -90*x
+ #break
+ #case (5)
+ // look at the ground
+ rotate 90*x
+ #break
+ #end // End of conditional part
+}
+
+background { color rgb <0,0,0> }
+
+// light_source { <100, 100, -200> color White }
+/*
+/usr/share/povray-3.5/include/stars.inc
+
+ sky_sphere {
+ pigment {
+ granite
+ color_map {
+ [ 0.000 0.270 color rgb < 0, 0, 0> color rgb < 0, 0, 0> ]
+ [ 0.270 0.280 color rgb <.5,.5,.4> color rgb <.8,.8,.4> ]
+ [ 0.280 0.470 color rgb < 0, 0, 0> color rgb < 0, 0, 0> ]
+ [ 0.470 0.480 color rgb <.4,.4,.5> color rgb <.4,.4,.8> ]
+ [ 0.480 0.680 color rgb < 0, 0, 0> color rgb < 0, 0, 0> ]
+ [ 0.680 0.690 color rgb <.5,.4,.4> color rgb <.8,.4,.4> ]
+ [ 0.690 0.880 color rgb < 0, 0, 0> color rgb < 0, 0, 0> ]
+ [ 0.880 0.890 color rgb <.5,.5,.5> color rgb < 1, 1, 1> ]
+ [ 0.890 1.000 color rgb < 0, 0, 0> color rgb < 0, 0, 0> ]
+ }
+ turbulence 1
+ sine_wave
+ scale .5
+ }
+
+ }
+ */
+
+sphere { < 0, 0, 0>, 2
+ pigment { rgbt 1 } // surface of sphere is transparent
+ interior {
+ media {
+ emission 0.02
+ intervals 1
+ samples 25
+ method 3
+ density {
+ spherical
+ ramp_wave
+ translate 1.0*y // replace 1.0 = t by time for animation
+ warp { turbulence 2.5 }
+ translate -1.0*y // replace -1.0 = -t by time for animation
+ color_map {
+ [0.0 color rgb <0, 0, 0> * 0.5]
+ [0.1 color rgb <0, 1, 0> * 0.5]
+ [0.5 color rgb <1, 1, 0> * 0.5]
+ [1.0 color rgb <1, 0, 0> * 0.5]
+ }
+ }
+ density {
+ spherical
+ ramp_wave
+ color_map {
+ [0.0 color rgb 1]
+ [0.2 color rgb 1]
+ [0.3 color rgb 0]
+ [1.0 color rgb 0]
+ }
+ }
+ }
+ }
+ scale 25
+ hollow
+}
Modified: trunk/resources.cfg
===================================================================
--- trunk/resources.cfg 2007-09-23 13:20:00 UTC (rev 781)
+++ trunk/resources.cfg 2007-09-23 13:24:39 UTC (rev 782)
@@ -29,7 +29,7 @@
FileSystem=./data/gui/schemes
FileSystem=./data/gui/looknfeel
-Zip=./data/simpleSkybox.zip
+Zip=./data/skybox/simpleSkybox.zip
Zip=./data/fonts.zip
FileSystem=./data/MediaFromOgre
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-09-23 13:27:10
|
Revision: 784
http://opengate.svn.sourceforge.net/opengate/?rev=784&view=rev
Author: egore
Date: 2007-09-23 06:27:13 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
remove empty directory
remove items from todo list
Modified Paths:
--------------
trunk/TODO.cbrill
Removed Paths:
-------------
trunk/data/misc/asteroids/
Modified: trunk/TODO.cbrill
===================================================================
--- trunk/TODO.cbrill 2007-09-23 13:25:57 UTC (rev 783)
+++ trunk/TODO.cbrill 2007-09-23 13:27:13 UTC (rev 784)
@@ -9,9 +9,6 @@
* remove data/MediaFromOgre
* remove data/menus/ogre_menu.zip
* remove data/ogre_menu.zip
- * move misc/skybox.zip -> data/skybox
- * move simpleSkybox.zip -> data/skybox
- * move povry -> data/skybox
* replace WAVs by ogg (where useful, size improvement should me measurable)
* remove testopenalmanager once the client is done
* fix "make dist" with ogreopcode external stuff
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-09-24 18:40:56
|
Revision: 789
http://opengate.svn.sourceforge.net/opengate/?rev=789&view=rev
Author: spom_spom
Date: 2007-09-24 11:40:56 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
moved/removed some stuff in the sense of the new order
Modified Paths:
--------------
trunk/data/materials/simpleHUD.material
trunk/ogre.cfg
trunk/resources.cfg
Added Paths:
-----------
trunk/data/gui/fonts/read_me.html
trunk/data/gui/fonts/simpleHUD.fontdef
trunk/data/gui/overlays/
trunk/data/gui/overlays/simpleHUD.overlay
trunk/data/misc/arrow.mesh
trunk/data/misc/explosion.particle
trunk/data/textures/Bullet.png
Removed Paths:
-------------
trunk/data/Bullet.png
trunk/data/arrow.mesh
trunk/data/explosion.particle
trunk/data/fonts.zip
trunk/data/mousePointer.overlay
trunk/data/simpleHUD.fontdef
trunk/data/simpleHUD.overlay
Deleted: trunk/data/Bullet.png
===================================================================
(Binary files differ)
Deleted: trunk/data/arrow.mesh
===================================================================
(Binary files differ)
Deleted: trunk/data/explosion.particle
===================================================================
--- trunk/data/explosion.particle 2007-09-23 14:43:47 UTC (rev 788)
+++ trunk/data/explosion.particle 2007-09-24 18:40:56 UTC (rev 789)
@@ -1,84 +0,0 @@
-OpenGate/Explosion
-{
- material OpenGate/Explosion/Flare
- particle_width 20
- particle_height 20
- cull_each false
- quota 1000
- billboard_type point
- sorted true
- iteration_interval 0.02
- nonvisible_update_timeout 0.1
-
- // Area emitter
- emitter Ellipsoid
- {
- angle 360
- colour_range_start 1 1.0 0
- colour_range_end 1 1.0 0.0
- emission_rate 100000
- duration 0.3
- time_to_live_min 0.3
- time_to_live_max 2
- direction 1 0 0
- velocity 500.1
- width 0.0
- height 0.0
- depth 0.0
- }
-
-// Fader
- affector ColourFader
- {
- alpha -1.0
- green -0.8
- }
-
- affector Scaler
- {
- rate -6.5
- }
-}
-
-OpenGate/ExplosionStart
-{
- material OpenGate/Explosion/Base
- particle_width 10
- particle_height 10
- cull_each false
- quota 500
- billboard_type point
- sorted true
- iteration_interval 0.02
- nonvisible_update_timeout 0.1
-
- // Area emitter
- emitter Ellipsoid
- {
- angle 360
- colour_range_start 1 1.0 0
- colour_range_end 1 1.0 0.0
- emission_rate 5000
- duration 0.3
- time_to_live_min 0.5
- time_to_live_max 1.0
- direction 1 0 0
- velocity 100.0
- width 0.0
- height 0.0
- depth 0.0
- }
-
-// Fader
- affector ColourFader
- {
- alpha -100.0
- green -1.8
- }
-
- affector Scaler
- {
- rate -9
- }
-}
-
Deleted: trunk/data/fonts.zip
===================================================================
(Binary files differ)
Added: trunk/data/gui/fonts/read_me.html
===================================================================
--- trunk/data/gui/fonts/read_me.html (rev 0)
+++ trunk/data/gui/fonts/read_me.html 2007-09-24 18:40:56 UTC (rev 789)
@@ -0,0 +1,2 @@
+<html><head><title>Larabie Fonts "read me" file, license and FAQ</title><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="keywords" content="typodermic,typo dermic,fonts,Larabie,Larabie Fonts,fontd,fotn,fnots,fons,fots,fnts,font,truetype,typefaces,typeface,logo,ttf,opentype,larbie,laribie,larby,larabee,lairby,larrabie,larraby,laraby,typography,Type1,postscript,macintosh,windows,design,lettering,type"><font face="Georgia"><h3>LARABIE FONTS \x93README.TXT\x94</h3><p>All Larabie Fonts in this file are free to use for personal and/or commercial purposes. No payment is necessary to use these fonts for personal or commercial use. For Software Products who want to include Larabie Fonts see the License Agreement below. You can add this font to a website but do not combine fonts into a single archive or alter them in any way.</p><p>All Larabie Fonts are free for commercial use but a sample of your product would be gratefully appreciated so I can see how the font looks in use. Contact <a href="http://www.larabiefonts.com/donation.html">www.larabiefonts.com/donation.html</a> for mailing information.</p><p>Some Larabie Fonts have enhanced and expanded families available for sale at <a href="http://www.typodermic.com">www.typodermic.com</a>.</p><p>If you'd like to make a voluntary donation to Larabie Fonts for the use of the free fonts in any amount please go to <a href="http://www.larabiefonts.com/donation.html">www.larabiefonts.com/donation.html</a></p><p>I accept CDs, magazines, t-shirts, a sample of your merchandise or anything featuring Larabie Fonts. Please remember to list your item as a \x91gift\x92 on the customs form or I will have to pay import duties and taxes on the item. Mailing information is provided at the link above.</p><p>Font installation help is available at <a href="http://www.larabiefonts.com/help.html">www.larabiefonts.com/help.html</a></p><h3>LARABIE FONTS FREQUENTLY ASKED QUESTIONS</h3><ul><li>Q: How do use these fonts in my favourite software?<li>A: In Windows, you take the fonts out of the ZIP archive and place them in your fonts folder which can be found in your Control Panel. The next time you run your software, the font will be available. For example: If you install a new font, the next time you run Microsoft Word, that font will be available in the menu under Format / Font. For anything more complicated, or Mac installation, visit <a href="http://www.larabiefonts.com/help.html">www.larabiefonts.com/help.html</a></ul><ul><li>Q: How can I use this font in <a href="http://www.aol.com/aim/">AOL Instant Messenger</a>, <a href="http://messenger.msn.com/">MSN Messenger</a>, <a href="http://www.microsoft.com/office/outlook/">Outlook</a>, <a href="http://www.microsoft.com/office/outlook/">Outlook Express</a>, <a href="http://www.eudora.com/">Euodora</a> or any other email software?<li>A: At the time of this writing (Feb 2004) you can\x92t. After installing one of my fonts, you may be able to select it in the above applications but the person at the other end won\x92t see that same thing unless they have the font installed. If you really want to use my fonts in these applications, make sure the people at the other end have the same fonts installed.</ul><ul><li>Q: How can I use these fonts on a web page?<li>A: If you\x92re creating a web page using Flash, it\x92s easy. Consult your Flash manual. If you\x92re using <a href="http://www.adobe.com/products/acrobat/">Acrobat</a>, make sure the font embedding settings are turned on. Consult your Acrobat manual. For anything else there are limitations: If you want to use one of my fonts as your main, text font you\x92re pretty much out of luck unless you explore a font embedding tool such as <a href="http://www.microsoft.com/typography/web/embedding/weft/">WEFT</a> but I don\x92t recommend it. To use my fonts as headings or titles, use image creation software such as <a href="http://www.gimp.org/">The Gimp</a>, <a href="http://www.adobe.com/products/photoshop/">Photoshop</a>, <a href="http://www.jasc.com/">Paint Shop Pro</a>, <a href="http://www.google.com/search?q=pixia">Pixia</a> etc. Save the images as GIF files and place them on your web page. There\x92s a lot more to it than can be explained here but there are countless books available on web page design.</ul><ul><li>Q: How can I make these fonts bigger?<li>A: All my fonts are infinitely scalable; the limitations are in your software. A common problem is scaling fonts in Microsoft Word. If you choose Format / Font you can type in any number you like under \x93size\x94.</ul><ul><li>Q: Are these fonts really free?<li>A: Yes they are. Some fonts such as <a href="http://www.typodermic.com/fonts/19.html">Neuropol</a> have expanded font families available for sale at <a href="http://www.typodermic.com">www.typodermic.com</a> but the version you downloaded at Larabie Fonts is free.</ul><ul><li>Q: Your licence agreement states that the fonts can\x92t be altered. Does that mean I can\x92t mess around with your fonts in Photoshop/Illustrator/Publisher etc?<li>A: Those license restrictions refer to altering the actual fonts themselves, not what you make with them. As long as you don\x92t alter the font files in font creation software such as FontLab or Fontographer you\x92re free to create anything you like with them.</ul><ul><li>Q: Can I use your fonts in a logo?<li>A: Yes. But check with a lawyer if you\x92re not sure. It\x92s okay with me if you use it but do so at your own risk.</ul><ul><li>Q: Can I send you a sample of the nifty thing I created with your fonts?<li>A: Of course. Check <a href="http://www.larabiefonts.com/donation.html">www.larabiefonts.com/donation.html</a> for my current email or mailing address.</ul><ul><li>Q: Can you make a custom font for me?<li>A: Possibly. Check <a href="http://typodermic.com/custom.html">typodermic.com/custom.html</a> for details. Keep in mind that making fonts is my full-time job so no freebies.</ul><ul><li>Q: I want to sell software that includes you font files.<li>A: Contact me first at <a href="http://www.larabiefonts.com/email.html">www.larabiefonts.com/email.html</a>.</ul><ul><li>Q: I want to sell rubber stamp alphabets, alphabet punches or stencil alphabets using your font designs.<li>A: Contact me first at <a href="http://www.larabiefonts.com/email.html">www.larabiefonts.com/email.html</a>.</ul><ul><li>Q: My software won\x92t let me embed one of your fonts.<li>A: You may have an old version of one of my fonts. Uninstall it and install a current version on Larabie Fonts.</ul><ul><li>Q: Can you help me find a font?<li>A: I really don\x92t have the time but if you send a donation, I can give it a try. If not. post your question on my font forum: <a href="http://www.larabiefonts.com/info.html">www.larabiefonts.com/info.html</a>.</ul><h3>LARABIE FONTS END-USER LICENSE AGREEMENT FOR SOFTWARE PRODUCTS</h3><h4>SOFTWARE PRODUCT LICENSE</h4><p>The SOFTWARE PRODUCT is protected by copyright laws and International copyright treaties, as well as other intellectual property laws and treaties. The SOFTWARE PRODUCT is licensed, not sold.</p><h5>1. GRANT OF LICENSE. This document grants you the following rights:</h5><p>- Installation and Use. You may install and use an unlimited number of copies of the SOFTWARE PRODUCT. You may copy and distribute unlimited copies of the SOFTWARE PRODUCT as you receive them, in any medium, provided that you publish on each copy an appropriate copyright notice. Keep intact all the notices that refer to this License and give any other recipients of the fonts a copy of this License along with the fonts.</p><h5>2. DESCRIPTION OF OTHER RIGHTS AND LIMITATIONS.</h5><p>- You may modify your copy or copies of the SOFTWARE PRODUCT or any portion of it, provided that you also meet all of these rules:</p><p>a) Do not alter in any way alphanumeric characters (A-Z, a-z, 1-9) contained in the font. An exception is converting between formats, here is allowed the nominal distortion that occurs during conversion from second order to third order quadratic curves (TrueType to Postscript) and vice versa.</p><p>b) Extra characters may be added; here it is allowed to use curves (shapes) from alphanumeric characters in fonts under same license.</p><p>c) It is allowed to modify and remove analpahbetics (punctuation, special characters, ligatures and symbols).</p><p>d) The original font name must be retained but can be augmented. (ie. a Font named Blue Highway can be renamed Blue Highway Cyrillic or Blue Highway ANSI, etc.)</p><p>e) Character mapping may be altered.</p><p>f) If the kerning information is altered or discarded it must be stated in the user notes or documentation.</p><p>g) All modifications must be released under this license.</p></p>LIMITED WARRANTY NO WARRANTIES. Larabie Fonts expressly disclaims any warranty for the SOFTWARE PRODUCT. The SOFTWARE PRODUCT and any related documentation is provided "as is" without warranty of any kind, either express or implied, including, without limitation, the implied warranties or merchantability, fitness for a particular purpose, or non-infringement. The entire risk arising out of use or performance of the SOFTWARE PRODUCT remains with you.</p><p>NO LIABILITY FOR CONSEQUENTIAL DAMAGES. In no event shall Larabie Fonts be liable for any damages whatsoever (including, without limitation, damages for loss of business profits, business interruption, loss of business information, or any other pecuniary loss) arising out of the use of or inability to use this product, even if Larabie Fonts has been advised of the possibility of such damages.</p><h5>3. MISCELLANEOUS</h5><p>Should you have any questions concerning this document, or if you desire to contact Larabie Fonts for any reason, please email <a href="http://www.larabiefonts.com/email.html">www.larabiefonts.com/email.html</a>.</p></font></BODY></HTML>
+
Copied: trunk/data/gui/fonts/simpleHUD.fontdef (from rev 788, trunk/data/simpleHUD.fontdef)
===================================================================
--- trunk/data/gui/fonts/simpleHUD.fontdef (rev 0)
+++ trunk/data/gui/fonts/simpleHUD.fontdef 2007-09-24 18:40:56 UTC (rev 789)
@@ -0,0 +1,21 @@
+Console
+{
+ type truetype
+ source BlueHighway.ttf
+ size 32
+ resolution 55
+ antialias_colour false
+ code_points 33-255
+}
+
+
+BlueHighway
+{
+ type truetype
+ source BlueHighway.ttf
+ size 32
+ resolution 55
+ antialias_colour false
+ code_points 33-255
+}
+
Copied: trunk/data/gui/overlays/simpleHUD.overlay (from rev 788, trunk/data/simpleHUD.overlay)
===================================================================
--- trunk/data/gui/overlays/simpleHUD.overlay (rev 0)
+++ trunk/data/gui/overlays/simpleHUD.overlay 2007-09-24 18:40:56 UTC (rev 789)
@@ -0,0 +1,295 @@
+Radar
+{
+ zorder 501
+ container Panel(Radar/Map)
+ {
+ left 0.4
+ top 0.84
+ width 0.2
+ height 0.15
+ material OpenGate/Radar/Background
+ }
+// container Panel(Radar/Dot)
+// {
+// material Radar/Dot
+// }
+}
+
+SimpleHUD
+{
+ zorder 500
+// container Panel(SimpleHUD/Console)
+// {
+// left 0.01
+// top 0.01
+// width 0.98
+// height 0.5
+//// material OpenGate/Console/Background
+//
+// element TextArea(SimpleHUD/Console/TextArea)
+// {
+// left 0.01
+// top 0.01
+// width 0.98
+// height 0.5
+// font_name Console
+// char_height 0.02
+// colour_top 1 1 1
+// colour_bottom 1 1 1
+// }
+// }
+//
+// container Panel(SimpleHUD/ConsoleShort)
+// {
+// left 0.01
+// top 0.01
+// width 0.98
+// height 0.075
+//// material OpenGate/Console/Background
+//
+// element TextArea(SimpleHUD/ConsoleShort/TextArea)
+// {
+// left 0.01
+// top 0.01
+// width 0.98
+// height 0.075
+// font_name Console
+// char_height 0.02
+// colour_top 1.0 1.0 1.0
+// colour_bottom 1.0 1.0 1.0
+// }
+// }
+//
+// container Panel(SimpleHUD/ChatIn)
+// {
+// left 0.01
+// top 0.52
+// width 0.98
+// height 0.025
+// material OpenGate/Console/Background
+//
+// element TextArea(SimpleHUD/ChatIn/TextArea)
+// {
+// left 0.01
+// top 0.005
+// width 0.9
+// height 0.025
+// font_name Console
+// char_height 0.02
+// colour_top 1.0 1.0 1.0
+// colour_bottom 1.0 1.0 1.0
+// }
+// }
+//
+// container Panel(SimpleHUD/CenterPointer)
+// {
+// metrics_mode pixels
+// top 0
+// left 0
+// width 48
+// height 48
+// material SimpleHUD/CenterPointer
+// }
+//
+ container Panel(SimpleHUD/FlightCursor)
+ {
+ metrics_mode pixels
+ top 0
+ left 0
+ width 32
+ height 32
+// material SimpleHUD/FlightCursor
+ }
+//
+// container Panel(SimpleHUD/TargetPointer)
+// {
+// metrics_mode pixels
+// top 0
+// left 0
+// width 32
+// height 32
+// material SimpleHUD/TargetPointer
+// }
+//
+// container Panel(SimpleHUD/DuelistPilotPointer)
+// {
+// metrics_mode pixels
+// top 0
+// left 0
+// width 32
+// height 32
+// material SimpleHUD/DuelistPilotPointer
+// }
+//
+// container Panel(SimpleHUD/DuelistTargetPointer)
+// {
+// metrics_mode pixels
+// top 0
+// left 0
+// width 32
+// height 32
+// material SimpleHUD/DuelistTargetPointer
+// }
+
+ container Panel(SimpleHUD/MainPanel)
+ {
+ left 0
+ top 0
+ width 1.0
+ height 1.0
+
+ element TextArea(SimpleHUD/MainPanel/StatsTextArea)
+ {
+ left 0.8
+ top 0.01
+ width 0.2
+ height 0.03
+ caption FPS:
+ font_name BlueHighway
+ char_height 0.02
+ colour_top 1 1 0.7
+ colour_bottom 1 1 0.7
+ }
+//
+// element TextArea(SimpleHUD/MainPanel/TextVelocity)
+// {
+// left 0.25
+// top 0.3
+// width 0.1
+// height 0.03
+// caption Vel:
+// font_name BlueHighway
+// char_height 0.02
+// colour_top 0.5 0.7 0.5
+// colour_bottom 0.3 0.5 0.3
+// }
+// element TextArea(SimpleHUD/MainPanel/TextVelocityMax)
+// {
+// left 0.31
+// top 0.3
+// width 0.1
+// height 0.03
+// caption /
+// font_name BlueHighway
+// char_height 0.02
+// colour_top 0.5 0.7 0.5
+// colour_bottom 0.3 0.5 0.3
+// }
+// element TextArea(SimpleHUD/MainPanel/TextThr)
+// {
+// left 0.25
+// top 0.33
+// width 0.1
+// height 0.03
+// caption Thr:
+// font_name BlueHighway
+// char_height 0.02
+// colour_top 0.5 0.7 0.5
+// colour_bottom 0.3 0.5 0.3
+// }
+// element TextArea(SimpleHUD/MainPanel/TextAcc)
+// {
+// left 0.25
+// top 0.36
+// width 0.03
+// height 0.1
+// caption Current Acc:
+// font_name BlueHighway
+// char_height 0.022
+// colour_top 0.5 0.7 0.5
+// colour_bottom 0.3 0.5 0.3
+// }
+// element TextArea(SimpleHUD/MainPanel/TextShield)
+// {
+// left 0.25
+// top 0.39
+// width 0.1
+// height 0.03
+// font_name BlueHighway
+// char_height 0.02
+// colour_top 0.5 0.7 0.5
+// colour_bottom 0.3 0.5 0.3
+// }
+// element TextArea(SimpleHUD/MainPanel/TextArmor)
+// {
+// left 0.25
+// top 0.42
+// width 0.1
+// height 0.03
+// font_name BlueHighway
+// char_height 0.02
+// colour_top 0.5 0.7 0.5
+// colour_bottom 0.3 0.5 0.3
+// }
+// element TextArea(SimpleHUD/MainPanel/TextPosition)
+// {
+// left 0.25
+// top 0.45
+// width 0.1
+// height 0.1
+// caption Current Pos:
+// font_name BlueHighway
+// char_height 0.02
+// colour_top 0.5 0.7 0.5
+// colour_bottom 0.3 0.5 0.3
+// }
+//
+ element TextArea(SimpleHUD/MainPanel/TextTargetName)
+ {
+ left 0.015
+ top 0.80
+ width 0.1
+ height 0.02
+ font_name BlueHighway
+ char_height 0.02
+ colour_top 0.5 0.7 0.5
+ colour_bottom 0.3 0.5 0.3
+ }
+ element TextArea(SimpleHUD/MainPanel/TextTargetDistance)
+ {
+ left 0.015
+ top 0.82
+ width 0.1
+ height 0.02
+ font_name BlueHighway
+ char_height 0.02
+ colour_top 0.5 0.7 0.5
+ colour_bottom 0.3 0.5 0.3
+ }
+ element TextArea(SimpleHUD/MainPanel/TextTargetVelocity)
+ {
+ left 0.17
+ top 0.84
+ width 0.1
+ height 0.02
+ font_name BlueHighway
+ char_height 0.02
+ colour_top 0.5 0.7 0.5
+ colour_bottom 0.3 0.5 0.3
+ }
+
+ element TextArea(SimpleHUD/MainPanel/TextTargetShield)
+ {
+ left 0.17
+ top 0.86
+ width 0.1
+ height 0.02
+ font_name BlueHighway
+ char_height 0.02
+ colour_top 0.5 0.7 0.5
+ colour_bottom 0.3 0.5 0.3
+ }
+ element TextArea(SimpleHUD/MainPanel/TextTargetArmor)
+ {
+ left 0.17
+ top 0.88
+ width 0.1
+ height 0.02
+ font_name BlueHighway
+ char_height 0.02
+ colour_top 0.5 0.7 0.5
+ colour_bottom 0.3 0.5 0.3
+ }
+ }
+}
+
Modified: trunk/data/materials/simpleHUD.material
===================================================================
--- trunk/data/materials/simpleHUD.material 2007-09-23 14:43:47 UTC (rev 788)
+++ trunk/data/materials/simpleHUD.material 2007-09-24 18:40:56 UTC (rev 789)
@@ -9,7 +9,7 @@
texture_unit
{
- texture GUI/docked/base/station_backgrounds/solrain.png
+ texture gui/docked/base/station_backgrounds/solrain.png
}
}
}
Copied: trunk/data/misc/arrow.mesh (from rev 788, trunk/data/arrow.mesh)
===================================================================
(Binary files differ)
Copied: trunk/data/misc/explosion.particle (from rev 788, trunk/data/explosion.particle)
===================================================================
--- trunk/data/misc/explosion.particle (rev 0)
+++ trunk/data/misc/explosion.particle 2007-09-24 18:40:56 UTC (rev 789)
@@ -0,0 +1,84 @@
+OpenGate/Explosion
+{
+ material OpenGate/Explosion/Flare
+ particle_width 20
+ particle_height 20
+ cull_each false
+ quota 1000
+ billboard_type point
+ sorted true
+ iteration_interval 0.02
+ nonvisible_update_timeout 0.1
+
+ // Area emitter
+ emitter Ellipsoid
+ {
+ angle 360
+ colour_range_start 1 1.0 0
+ colour_range_end 1 1.0 0.0
+ emission_rate 100000
+ duration 0.3
+ time_to_live_min 0.3
+ time_to_live_max 2
+ direction 1 0 0
+ velocity 500.1
+ width 0.0
+ height 0.0
+ depth 0.0
+ }
+
+// Fader
+ affector ColourFader
+ {
+ alpha -1.0
+ green -0.8
+ }
+
+ affector Scaler
+ {
+ rate -6.5
+ }
+}
+
+OpenGate/ExplosionStart
+{
+ material OpenGate/Explosion/Base
+ particle_width 10
+ particle_height 10
+ cull_each false
+ quota 500
+ billboard_type point
+ sorted true
+ iteration_interval 0.02
+ nonvisible_update_timeout 0.1
+
+ // Area emitter
+ emitter Ellipsoid
+ {
+ angle 360
+ colour_range_start 1 1.0 0
+ colour_range_end 1 1.0 0.0
+ emission_rate 5000
+ duration 0.3
+ time_to_live_min 0.5
+ time_to_live_max 1.0
+ direction 1 0 0
+ velocity 100.0
+ width 0.0
+ height 0.0
+ depth 0.0
+ }
+
+// Fader
+ affector ColourFader
+ {
+ alpha -100.0
+ green -1.8
+ }
+
+ affector Scaler
+ {
+ rate -9
+ }
+}
+
Deleted: trunk/data/mousePointer.overlay
===================================================================
--- trunk/data/mousePointer.overlay 2007-09-23 14:43:47 UTC (rev 788)
+++ trunk/data/mousePointer.overlay 2007-09-24 18:40:56 UTC (rev 789)
@@ -1,13 +0,0 @@
-//OpenGate/MousePointer
-//{
-// zorder 502
-// container Panel(OpenGate/MousePointer/Pointer)
-// {
-// metrics_mode pixels
-// top 0
-// left 0
-// width 32
-// height 32
-// material OpenGate/MousePointer
-// }
-//}
\ No newline at end of file
Deleted: trunk/data/simpleHUD.fontdef
===================================================================
--- trunk/data/simpleHUD.fontdef 2007-09-23 14:43:47 UTC (rev 788)
+++ trunk/data/simpleHUD.fontdef 2007-09-24 18:40:56 UTC (rev 789)
@@ -1,21 +0,0 @@
-Console
-{
- type truetype
- source bluehigh.ttf
- size 32
- resolution 55
- antialias_colour false
- code_points 33-255
-}
-
-
-BlueHighway
-{
- type truetype
- source bluehigh.ttf
- size 32
- resolution 55
- antialias_colour false
- code_points 33-255
-}
-
Deleted: trunk/data/simpleHUD.overlay
===================================================================
--- trunk/data/simpleHUD.overlay 2007-09-23 14:43:47 UTC (rev 788)
+++ trunk/data/simpleHUD.overlay 2007-09-24 18:40:56 UTC (rev 789)
@@ -1,295 +0,0 @@
-Radar
-{
- zorder 501
- container Panel(Radar/Map)
- {
- left 0.4
- top 0.84
- width 0.2
- height 0.15
- material OpenGate/Radar/Background
- }
-// container Panel(Radar/Dot)
-// {
-// material Radar/Dot
-// }
-}
-
-SimpleHUD
-{
- zorder 500
-// container Panel(SimpleHUD/Console)
-// {
-// left 0.01
-// top 0.01
-// width 0.98
-// height 0.5
-//// material OpenGate/Console/Background
-//
-// element TextArea(SimpleHUD/Console/TextArea)
-// {
-// left 0.01
-// top 0.01
-// width 0.98
-// height 0.5
-// font_name Console
-// char_height 0.02
-// colour_top 1 1 1
-// colour_bottom 1 1 1
-// }
-// }
-//
-// container Panel(SimpleHUD/ConsoleShort)
-// {
-// left 0.01
-// top 0.01
-// width 0.98
-// height 0.075
-//// material OpenGate/Console/Background
-//
-// element TextArea(SimpleHUD/ConsoleShort/TextArea)
-// {
-// left 0.01
-// top 0.01
-// width 0.98
-// height 0.075
-// font_name Console
-// char_height 0.02
-// colour_top 1.0 1.0 1.0
-// colour_bottom 1.0 1.0 1.0
-// }
-// }
-//
-// container Panel(SimpleHUD/ChatIn)
-// {
-// left 0.01
-// top 0.52
-// width 0.98
-// height 0.025
-// material OpenGate/Console/Background
-//
-// element TextArea(SimpleHUD/ChatIn/TextArea)
-// {
-// left 0.01
-// top 0.005
-// width 0.9
-// height 0.025
-// font_name Console
-// char_height 0.02
-// colour_top 1.0 1.0 1.0
-// colour_bottom 1.0 1.0 1.0
-// }
-// }
-//
-// container Panel(SimpleHUD/CenterPointer)
-// {
-// metrics_mode pixels
-// top 0
-// left 0
-// width 48
-// height 48
-// material SimpleHUD/CenterPointer
-// }
-//
- container Panel(SimpleHUD/FlightCursor)
- {
- metrics_mode pixels
- top 0
- left 0
- width 32
- height 32
-// material SimpleHUD/FlightCursor
- }
-//
-// container Panel(SimpleHUD/TargetPointer)
-// {
-// metrics_mode pixels
-// top 0
-// left 0
-// width 32
-// height 32
-// material SimpleHUD/TargetPointer
-// }
-//
-// container Panel(SimpleHUD/DuelistPilotPointer)
-// {
-// metrics_mode pixels
-// top 0
-// left 0
-// width 32
-// height 32
-// material SimpleHUD/DuelistPilotPointer
-// }
-//
-// container Panel(SimpleHUD/DuelistTargetPointer)
-// {
-// metrics_mode pixels
-// top 0
-// left 0
-// width 32
-// height 32
-// material SimpleHUD/DuelistTargetPointer
-// }
-
- container Panel(SimpleHUD/MainPanel)
- {
- left 0
- top 0
- width 1.0
- height 1.0
-
- element TextArea(SimpleHUD/MainPanel/StatsTextArea)
- {
- left 0.8
- top 0.01
- width 0.2
- height 0.03
- caption FPS:
- font_name BlueHighway
- char_height 0.02
- colour_top 1 1 0.7
- colour_bottom 1 1 0.7
- }
-//
-// element TextArea(SimpleHUD/MainPanel/TextVelocity)
-// {
-// left 0.25
-// top 0.3
-// width 0.1
-// height 0.03
-// caption Vel:
-// font_name BlueHighway
-// char_height 0.02
-// colour_top 0.5 0.7 0.5
-// colour_bottom 0.3 0.5 0.3
-// }
-// element TextArea(SimpleHUD/MainPanel/TextVelocityMax)
-// {
-// left 0.31
-// top 0.3
-// width 0.1
-// height 0.03
-// caption /
-// font_name BlueHighway
-// char_height 0.02
-// colour_top 0.5 0.7 0.5
-// colour_bottom 0.3 0.5 0.3
-// }
-// element TextArea(SimpleHUD/MainPanel/TextThr)
-// {
-// left 0.25
-// top 0.33
-// width 0.1
-// height 0.03
-// caption Thr:
-// font_name BlueHighway
-// char_height 0.02
-// colour_top 0.5 0.7 0.5
-// colour_bottom 0.3 0.5 0.3
-// }
-// element TextArea(SimpleHUD/MainPanel/TextAcc)
-// {
-// left 0.25
-// top 0.36
-// width 0.03
-// height 0.1
-// caption Current Acc:
-// font_name BlueHighway
-// char_height 0.022
-// colour_top 0.5 0.7 0.5
-// colour_bottom 0.3 0.5 0.3
-// }
-// element TextArea(SimpleHUD/MainPanel/TextShield)
-// {
-// left 0.25
-// top 0.39
-// width 0.1
-// height 0.03
-// font_name BlueHighway
-// char_height 0.02
-// colour_top 0.5 0.7 0.5
-// colour_bottom 0.3 0.5 0.3
-// }
-// element TextArea(SimpleHUD/MainPanel/TextArmor)
-// {
-// left 0.25
-// top 0.42
-// width 0.1
-// height 0.03
-// font_name BlueHighway
-// char_height 0.02
-// colour_top 0.5 0.7 0.5
-// colour_bottom 0.3 0.5 0.3
-// }
-// element TextArea(SimpleHUD/MainPanel/TextPosition)
-// {
-// left 0.25
-// top 0.45
-// width 0.1
-// height 0.1
-// caption Current Pos:
-// font_name BlueHighway
-// char_height 0.02
-// colour_top 0.5 0.7 0.5
-// colour_bottom 0.3 0.5 0.3
-// }
-//
- element TextArea(SimpleHUD/MainPanel/TextTargetName)
- {
- left 0.015
- top 0.80
- width 0.1
- height 0.02
- font_name BlueHighway
- char_height 0.02
- colour_top 0.5 0.7 0.5
- colour_bottom 0.3 0.5 0.3
- }
- element TextArea(SimpleHUD/MainPanel/TextTargetDistance)
- {
- left 0.015
- top 0.82
- width 0.1
- height 0.02
- font_name BlueHighway
- char_height 0.02
- colour_top 0.5 0.7 0.5
- colour_bottom 0.3 0.5 0.3
- }
- element TextArea(SimpleHUD/MainPanel/TextTargetVelocity)
- {
- left 0.17
- top 0.84
- width 0.1
- height 0.02
- font_name BlueHighway
- char_height 0.02
- colour_top 0.5 0.7 0.5
- colour_bottom 0.3 0.5 0.3
- }
-
- element TextArea(SimpleHUD/MainPanel/TextTargetShield)
- {
- left 0.17
- top 0.86
- width 0.1
- height 0.02
- font_name BlueHighway
- char_height 0.02
- colour_top 0.5 0.7 0.5
- colour_bottom 0.3 0.5 0.3
- }
- element TextArea(SimpleHUD/MainPanel/TextTargetArmor)
- {
- left 0.17
- top 0.88
- width 0.1
- height 0.02
- font_name BlueHighway
- char_height 0.02
- colour_top 0.5 0.7 0.5
- colour_bottom 0.3 0.5 0.3
- }
- }
-}
-
Copied: trunk/data/textures/Bullet.png (from rev 788, trunk/data/Bullet.png)
===================================================================
(Binary files differ)
Modified: trunk/ogre.cfg
===================================================================
--- trunk/ogre.cfg 2007-09-23 14:43:47 UTC (rev 788)
+++ trunk/ogre.cfg 2007-09-24 18:40:56 UTC (rev 789)
@@ -4,4 +4,4 @@
FSAA=0
Full Screen=No
RTT Preferred Mode=FBO
-Video Mode=640 x 480
+Video Mode=1024 x 768
Modified: trunk/resources.cfg
===================================================================
--- trunk/resources.cfg 2007-09-23 14:43:47 UTC (rev 788)
+++ trunk/resources.cfg 2007-09-24 18:40:56 UTC (rev 789)
@@ -22,16 +22,16 @@
FileSystem=./data/materials
FileSystem=./data/textures
FileSystem=./data/asteroids
+FileSystem=./data/misc
FileSystem=./data/gui
FileSystem=./data/gui/fonts
FileSystem=./data/gui/layouts
FileSystem=./data/gui/imagesets
-FileSystem=./data/gui/schemes
+FileSystem=./data/gui/schemes
FileSystem=./data/gui/looknfeel
+FileSystem=./data/gui/overlays
Zip=./data/skybox/simpleSkybox.zip
-Zip=./data/fonts.zip
FileSystem=./data/MediaFromOgre
FileSystem=./data/MediaFromOgre/AdvancedMaterials
-#FileSystem=./data/local/astro
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-09-24 20:40:38
|
Revision: 792
http://opengate.svn.sourceforge.net/opengate/?rev=792&view=rev
Author: egore
Date: 2007-09-24 13:40:42 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
2007-09-24 Christoph Brill <eg...@us...>
* src/common.cpp, src/common.h: add method to split strings with a
given delimiter
* src/metaserver.cpp, src/metaserver.h: add API for the metaserver
* src/opengateserver.cpp: register and unregister game server against
the metaserver
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/common.cpp
trunk/src/common.h
trunk/src/metaserver.cpp
trunk/src/metaserver.h
trunk/src/opengateserver.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-09-24 20:03:30 UTC (rev 791)
+++ trunk/ChangeLog 2007-09-24 20:40:42 UTC (rev 792)
@@ -0,0 +1,6 @@
+2007-09-24 Christoph Brill <eg...@us...>
+ * src/common.cpp, src/common.h: add method to split strings with a
+ given delimiter
+ * src/metaserver.cpp, src/metaserver.h: add API for the metaserver
+ * src/opengateserver.cpp: register and unregister game server against
+ the metaserver
Modified: trunk/src/common.cpp
===================================================================
--- trunk/src/common.cpp 2007-09-24 20:03:30 UTC (rev 791)
+++ trunk/src/common.cpp 2007-09-24 20:40:42 UTC (rev 792)
@@ -99,3 +99,24 @@
dumpSceneNodes( ss, n, 0 );
return ss.str();
}
+
+int split(const std::string& input, const std::string& delimiter, std::list<std::string>& results) {
+ int pos = 0;
+ int offset = 0;
+ int lengthDelimiter = (int)delimiter.size();
+ int lengthInput = (int)input.size();
+
+ if ( ( lengthInput == 0 ) || ( lengthDelimiter == 0 ) ) {
+ return 0;
+ }
+
+ while (pos = input.find (delimiter, offset)) {
+ results.push_back(input.substr(offset, pos-offset));
+ if (pos == (int)std::string::npos) {
+ break;
+ }
+ offset = pos+1;
+ }
+
+ return results.size();
+}
Modified: trunk/src/common.h
===================================================================
--- trunk/src/common.h 2007-09-24 20:03:30 UTC (rev 791)
+++ trunk/src/common.h 2007-09-24 20:40:42 UTC (rev 792)
@@ -215,4 +215,6 @@
enum watchstate {undefined,halted,running} state;
};
+int split(const std::string& input, const std::string& delimiter, std::list<std::string>& results);
+
#endif // _OPENGATE_COMMON__H
Modified: trunk/src/metaserver.cpp
===================================================================
--- trunk/src/metaserver.cpp 2007-09-24 20:03:30 UTC (rev 791)
+++ trunk/src/metaserver.cpp 2007-09-24 20:40:42 UTC (rev 792)
@@ -48,9 +48,9 @@
socket_.connect( *endpoint_iterator++, asio::assign_error( error ) );
}
} catch ( asio::error & e) {
- log_->fatal( e.what() );
+ log_->fatal( std::string( "asio::error: " ) + e.what() );
} catch ( std::exception & e) {
- log_->fatal( std::string( "Exception: " ) + e.what() );
+ log_->fatal( std::string( "std::exception: " ) + e.what() );
} catch (...) {
log_->fatal( "Unkown exception occured while resolving the metaserver" );
}
@@ -88,7 +88,7 @@
if (returncode > 0) {
return returncode;
} else {
- log_->warn ( std::string ("unkown return code for login ") + toStr( returncode ) );
+ log_->warn ( std::string ("unkown return code for") + parameters + toStr( returncode ) );
return -4;
}
}
@@ -96,10 +96,10 @@
} catch ( asio::error & e) {
- log_->fatal( e.what() );
+ log_->fatal( std::string( "asio::error: " ) + e.what() );
return -5;
} catch ( std::exception & e) {
- log_->fatal( std::string( "Exception: " ) + e.what() );
+ log_->fatal( std::string( "std::exception: " ) + e.what() );
return -5;
} catch (...) {
log_->fatal( "Unkown exception occured while resolving the server" );
@@ -136,17 +136,17 @@
if (returncode > 0) {
return returncode;
} else {
- log_->warn ( std::string ("unkown return code for version check ") + toStr( returncode ) );
+ log_->warn ( std::string ("unkown return code for") + parameters + toStr( returncode ) );
return -4;
}
}
}
} catch ( asio::error & e) {
- log_->fatal( std::string( "check_version: ASIO: " ) + e.what() );
+ log_->fatal( std::string( "asio::error: " ) + e.what() );
return -5;
} catch ( std::exception & e) {
- log_->fatal( std::string( "check_version: Exception: " ) + e.what() );
+ log_->fatal( std::string( "std::exception: " ) + e.what() );
return -5;
} catch (...) {
log_->fatal( "check_version: Unkown exception occured while resolving the server" );
@@ -155,6 +155,192 @@
return 1;
}
+int MetaConnection::logout( int user_id ) {
+
+ try {
+
+ asio::streambuf response;
+ std::string parameters( "logout&user_id=" + toStr(user_id) + "&user_ip=" + "123.123.123.123"); // FIXME: determine IP or think of other way to handle this
+ int retval = request(parameters, response);
+ if (retval < 0) {
+ return retval;
+ }
+
+ // We got a usefull body. The body is an int, lets use it.
+ if (response.size() > 0) {
+ std::ostringstream stream;
+ stream << &response;
+ int returncode = toInt( stream.str() );
+ switch (returncode) {
+ case -101: log_->warn ( std::string ("no action given") ); return -3;
+ case -102: log_->warn ( std::string ("action given but unknown") ); return -3;
+ case -103: log_->warn ( std::string ("database is not available") ); return -3;
+ case -1: log_->warn ( std::string ("no user_id given") ); return -3;
+ case -2: log_->warn ( std::string ("no user_ip given") ); return -3;
+ case -3: log_->warn ( std::string ("user_id doesn't exist") ); return -3;
+ case -4: log_->warn ( std::string ("password incorrect") ); return -3;
+ case -5: log_->warn ( std::string ("user was already offline") ); return -3;
+ default:
+ if (returncode > 0) {
+ return returncode;
+ } else {
+ log_->warn ( std::string ("unkown return code for") + parameters + toStr( returncode ) );
+ return -4;
+ }
+ }
+ }
+
+
+ } catch ( asio::error & e) {
+ log_->fatal( std::string( "asio::error: " ) + e.what() );
+ return -5;
+ } catch ( std::exception & e) {
+ log_->fatal( std::string( "std::exception: " ) + e.what() );
+ return -5;
+ } catch (...) {
+ log_->fatal( "Unkown exception occured while resolving the server" );
+ return -5;
+ }
+ return 1;
+}
+
+int MetaConnection::add_game_server() {
+
+ try {
+
+ asio::streambuf response;
+ std::string parameters( "add_game_server" );
+ int retval = request(parameters, response);
+ if (retval < 0) {
+ return retval;
+ }
+
+ // We got a usefull body. The body is an int, lets use it.
+ if (response.size() > 0) {
+ std::ostringstream stream;
+ stream << &response;
+ int returncode = toInt( stream.str() );
+ switch (returncode) {
+ case -101: log_->warn ( std::string ("no action given") ); return -3;
+ case -102: log_->warn ( std::string ("action given but unknown") ); return -3;
+ case -103: log_->warn ( std::string ("database is not available") ); return -3;
+ case -12: log_->warn ( std::string ("no additional server possible") ); return -3;
+ case -13: log_->warn ( std::string ("ip is already a server") ); return -3;
+ default:
+ if (returncode > 0) {
+ return returncode;
+ } else {
+ log_->warn ( std::string ("unkown return code for") + parameters + toStr( returncode ) );
+ return -4;
+ }
+ }
+ }
+
+
+ } catch ( asio::error & e) {
+ log_->fatal( std::string( "asio::error: " ) + e.what() );
+ return -5;
+ } catch ( std::exception & e) {
+ log_->fatal( std::string( "std::exception: " ) + e.what() );
+ return -5;
+ } catch (...) {
+ log_->fatal( "Unkown exception occured while resolving the server" );
+ return -5;
+ }
+ return 1;
+}
+
+std::list<std::string> MetaConnection::list_game_server() {
+
+ std::list<std::string> mylist;
+ try {
+
+ asio::streambuf response;
+ std::string parameters( "list_game_server" );
+ int retval = request(parameters, response);
+ if (retval < 0) {
+ return mylist;
+ }
+
+ // We got a usefull body. The body is an int, lets use it.
+ if (response.size() > 0) {
+ std::ostringstream stream;
+ stream << &response;
+ int returncode = toInt( stream.str() );
+ switch (returncode) {
+ case -101: log_->warn ( std::string ("no action given") ); return mylist;
+ case -102: log_->warn ( std::string ("action given but unknown") ); return mylist;
+ case -103: log_->warn ( std::string ("database is not available") ); return mylist;
+ case -15: log_->warn ( std::string ("no game server available") ); return mylist;
+ default:
+
+ if (stream.str().length() > 5) {
+ split(stream.str(), " ", mylist);
+ } else {
+ log_->warn ( std::string ("unkown return code for ") + parameters + toStr( returncode ) );
+ return mylist;
+ }
+ }
+ }
+
+ } catch ( asio::error & e) {
+ log_->fatal( std::string( "asio::error: " ) + e.what() );
+ return mylist;
+ } catch ( std::exception & e) {
+ log_->fatal( std::string( "std::exception: " ) + e.what() );
+ return mylist;
+ } catch (...) {
+ log_->fatal( "Unkown exception occured while resolving the server" );
+ return mylist;
+ }
+ return mylist;
+}
+
+int MetaConnection::remove_game_server() {
+
+ try {
+
+ asio::streambuf response;
+ std::string parameters( "remove_game_server" );
+ int retval = request(parameters, response);
+ if (retval < 0) {
+ return retval;
+ }
+
+ // We got a usefull body. The body is an int, lets use it.
+ if (response.size() > 0) {
+ std::ostringstream stream;
+ stream << &response;
+ int returncode = toInt( stream.str() );
+ switch (returncode) {
+ case -101: log_->warn ( std::string ("no action given") ); return -3;
+ case -102: log_->warn ( std::string ("action given but unknown") ); return -3;
+ case -103: log_->warn ( std::string ("database is not available") ); return -3;
+ case -14: log_->warn ( std::string ("ip was not a server") ); return -3;
+ default:
+ if (returncode > 0) {
+ return returncode;
+ } else {
+ log_->warn ( std::string ("unkown return code for ") + parameters + toStr( returncode ) );
+ return -4;
+ }
+ }
+ }
+
+
+ } catch ( asio::error & e) {
+ log_->fatal( std::string( "asio::error: " ) + e.what() );
+ return -5;
+ } catch ( std::exception & e) {
+ log_->fatal( std::string( "std::exception: " ) + e.what() );
+ return -5;
+ } catch (...) {
+ log_->fatal( "Unkown exception occured while resolving the server" );
+ return -5;
+ }
+ return 1;
+}
+
int MetaConnection::request( const std::string & parameters, asio::streambuf & response ) {
// Form the request. We specify the "Connection: close" header so that the
// server will close the socket after transmitting the response. This will
Modified: trunk/src/metaserver.h
===================================================================
--- trunk/src/metaserver.h 2007-09-24 20:03:30 UTC (rev 791)
+++ trunk/src/metaserver.h 2007-09-24 20:40:42 UTC (rev 792)
@@ -35,7 +35,12 @@
int login( const std::string & userName, const std::string & passwd = "" );
int check_version( int user_id );
+ int logout( int user_id );
+ int add_game_server();
+ std::list<std::string> list_game_server();
+ int remove_game_server();
+
private:
LogManager *log_;
Modified: trunk/src/opengateserver.cpp
===================================================================
--- trunk/src/opengateserver.cpp 2007-09-24 20:03:30 UTC (rev 791)
+++ trunk/src/opengateserver.cpp 2007-09-24 20:40:42 UTC (rev 792)
@@ -29,6 +29,7 @@
#include "common.h"
#include "networkServer.h"
#include "LogManager.h"
+#include "metaserver.h"
using namespace OpenGate;
@@ -38,12 +39,18 @@
LogManager *logMgr = NULL;
asio::io_service *io_servicePtr = NULL;
Server *serverPtr = NULL;
+OpenGate::MetaConnection *metaPtr = NULL;
void server_shutdown() {
- serverPtr->shutdown();
+ if ( metaPtr ) {
+ logMgr->info("Remove server from server list!");
+ int error = 0;
+ if ((error = metaPtr->remove_game_server()) < 0) {
+ logMgr->warn( std::string("Could not remove game server " + toStr (error)) );
+ }
+ }
if ( serverPtr ) {
- //** no new operator so we need no delete. ;)
- // delete( serverPtr );
+ serverPtr->shutdown();
}
if ( io_servicePtr ) {
io_servicePtr->interrupt();
@@ -63,6 +70,7 @@
}
int main( int argc, char *argv[] ) {
+
logMgr = new LogManager( );
logMgr->setLogFile( "OGserver.log" );
logMgr->setChatLogFile( "OGserverChat.log" );
@@ -74,6 +82,13 @@
try {
asio::io_service io_service;
io_servicePtr = &io_service;
+
+ OpenGate::MetaConnection meta( io_service );
+ metaPtr = &meta;
+ int error = 0;
+ if ((error = meta.add_game_server()) < 0) {
+ logMgr->warn( std::string("Could not add game server " + toStr (error) ) );
+ }
tcp::endpoint endpoint( tcp::v4(), OG_PORT );
Server server( io_service, endpoint );
serverPtr = &server;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-09-25 20:05:33
|
Revision: 794
http://opengate.svn.sourceforge.net/opengate/?rev=794&view=rev
Author: spom_spom
Date: 2007-09-25 13:05:32 -0700 (Tue, 25 Sep 2007)
Log Message:
-----------
Fixed a server related segfault
Modified Paths:
--------------
trunk/configure.ac
trunk/src/commonWithOgre.h
trunk/src/networkProtocol.cpp
trunk/src/networkProtocol.h
trunk/src/networkServer.cpp
trunk/src/opengateserver.cpp
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-09-24 22:15:55 UTC (rev 793)
+++ trunk/configure.ac 2007-09-25 20:05:32 UTC (rev 794)
@@ -74,10 +74,14 @@
exit 1
],[])
-AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -I$OGSECTOR_EXTERNALS_PATH/include"])
-AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -I$OGSECTOR_EXTERNALS_PATH/ogreopcode/include"])
-AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -I$OGSECTOR_EXTERNALS_PATH/ogreopcode/opcode132"])
-AC_SUBST([LDFLAGS], ["${LDFLAGS} -L$OGSECTOR_EXTERNALS_PATH/lib/ -lOpcode -lOgreOpcode"])
+#AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -I$OGSECTOR_EXTERNALS_PATH/include"])
+#AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -I$OGSECTOR_EXTERNALS_PATH/ogreopcode/include"])
+#AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -I$OGSECTOR_EXTERNALS_PATH/ogreopcode/opcode132"])
+#AC_SUBST([LDFLAGS], ["${LDFLAGS} -L$OGSECTOR_EXTERNALS_PATH/lib/ -lOpcode -lOgreOpcode"])
+
+AC_SUBST([OgreOpcode_CFLAGS], ["-I$OGSECTOR_EXTERNALS_PATH/include -I$OGSECTOR_EXTERNALS_PATH/ogreopcode/include -I$OGSECTOR_EXTERNALS_PATH/ogreopcode/opcode132"])
+AC_SUBST([OgreOpcode_LIBS], ["-L$OGSECTOR_EXTERNALS_PATH/lib/ -lOpcode -lOgreOpcode"])
+
# TODO: end fix
AC_OUTPUT([
Modified: trunk/src/commonWithOgre.h
===================================================================
--- trunk/src/commonWithOgre.h 2007-09-24 22:15:55 UTC (rev 793)
+++ trunk/src/commonWithOgre.h 2007-09-25 20:05:32 UTC (rev 794)
@@ -33,25 +33,20 @@
#define _OPENGATE_COMMONWITHOGRE__H
#include "common.h"
+#include "networkProtocol.h"
#include <OgrePrerequisites.h>
#include <OgreVector3.h>
#include <OgreQuaternion.h>
-inline Ogre::Vector3 toOgreVec( const std::vector < float > & vec ){
- if ( vec.size() == 3 ){
- return Ogre::Vector3( &vec[ 0 ] );
- } else {
- return Ogre::Vector3::ZERO;
- }
+namespace OpenGate{
+
+inline Ogre::Vector3 toOgreVec( const struct FVector3 & vec ){
+ return Ogre::Vector3( vec.v );
}
-inline Ogre::Quaternion toOgreQuat( const std::vector < float > & vec ){
- if ( vec.size() == 4 ){
- return Ogre::Quaternion( (Ogre::Real*)&vec[ 0 ] );
- } else {
- return Ogre::Quaternion::ZERO;
- }
+inline Ogre::Quaternion toOgreQuat( const struct FVector4 & vec ){
+ return Ogre::Quaternion( (Ogre::Real*)vec.v );
}
/*! For debugging purposes dump scene node tree to a string */
@@ -60,6 +55,8 @@
// /*! For debugging purposes dump scene node tree to a string */
std::string dumpSceneNodes( Ogre::Node * n );
+} // namespace OpenGate
+
#endif
Modified: trunk/src/networkProtocol.cpp
===================================================================
--- trunk/src/networkProtocol.cpp 2007-09-24 22:15:55 UTC (rev 793)
+++ trunk/src/networkProtocol.cpp 2007-09-25 20:05:32 UTC (rev 794)
@@ -28,14 +28,15 @@
MessageBodyShipRegister::MessageBodyShipRegister( const Uint32 senderID, const Uint8 childID, const std::string & name,
const Float * pos, Uint16 vesselID,
Uint32 mass, Uint32 maxShield, Uint32 maxThrust )
- : MessageBodyShipBase( childID ), name_( name ), pos_( 3 ), vesselID_( vesselID ),
+ : MessageBodyShipBase( childID ), name_( name ), vesselID_( vesselID ),
mass_( mass ), maxShield_( maxShield ), maxThrust_( maxThrust ){
senderID_ = senderID;
type_ = (Uint8)PROTO_SHIP_REGISTER;
- pos_[ 0 ] = pos[ 0 ]; pos_[ 1 ] = pos[ 1 ]; pos_[ 2 ] = pos[ 2 ];
+ pos_.v[ 0 ] = pos[ 0 ]; pos_.v[ 1 ] = pos[ 1 ]; pos_.v[ 2 ] = pos[ 2 ];
}
-MessageBodyShipRegister::MessageBodyShipRegister( const char * data ) : MessageBodyShipBase( data ){
+ MessageBodyShipRegister::MessageBodyShipRegister( const char * data )
+ : MessageBodyShipBase( data ){
int count = MessageBodyShipBase::dataSize();
readFromData( nameLength_, data, count );
@@ -70,13 +71,12 @@
MessageBodyShipMovement::MessageBodyShipMovement( Uint8 childID, const Float * pos,
const Float * vel, const Float * orient,
Uint32 thrust, float yaw, float pitch, float roll, int seq )
- : MessageBodyShipBase( childID ), pos_( 3 ), vel_( 3 ), orient_( 4 ),
- thrust_( thrust ), yaw_( yaw ), pitch_( pitch ), roll_( roll ), seqNr_( seq ) {
+ : MessageBodyShipBase( childID ), thrust_( thrust ), yaw_( yaw ), pitch_( pitch ), roll_( roll ), seqNr_( seq ) {
type_ = (Uint8)PROTO_SHIP_MOVEMENT;
- pos_[ 0 ] = pos[ 0 ]; pos_[ 1 ] = pos[ 1 ]; pos_[ 2 ] = pos[ 2 ];
- vel_[ 0 ] = vel[ 0 ]; vel_[ 1 ] = vel[ 1 ]; vel_[ 2 ] = vel[ 2 ];
- orient_[ 0 ] = orient[ 0 ]; orient_[ 1 ] = orient[ 1 ];
- orient_[ 2 ] = orient[ 2 ]; orient_[ 3 ] = orient[ 3 ];
+ pos_.v[ 0 ] = pos[ 0 ]; pos_.v[ 1 ] = pos[ 1 ]; pos_.v[ 2 ] = pos[ 2 ];
+ vel_.v[ 0 ] = vel[ 0 ]; vel_.v[ 1 ] = vel[ 1 ]; vel_.v[ 2 ] = vel[ 2 ];
+ orient_.v[ 0 ] = orient[ 0 ]; orient_.v[ 1 ] = orient[ 1 ];
+ orient_.v[ 2 ] = orient[ 2 ]; orient_.v[ 3 ] = orient[ 3 ];
}
MessageBodyShipMovement::MessageBodyShipMovement( const char * data ) : MessageBodyShipBase( data ){
@@ -120,11 +120,10 @@
MessageBodyShipProjectileFired::MessageBodyShipProjectileFired( Uint8 childID, Uint16 shotCount, const Float * pos,
const Float * vel, Uint32 damage, Float liveTime )
- : MessageBodyShipBase( childID ), shotCount_( shotCount ), pos_( 3 ), vel_( 3 ),
- damage_( damage ), liveTime_( liveTime ) {
+ : MessageBodyShipBase( childID ), shotCount_( shotCount ), damage_( damage ), liveTime_( liveTime ) {
type_ = (Uint8)PROTO_SHIP_PROJECTILEFIRED;
- pos_[ 0 ] = pos[ 0 ]; pos_[ 1 ] = pos[ 1 ]; pos_[ 2 ] = pos[ 2 ];
- vel_[ 0 ] = vel[ 0 ]; vel_[ 1 ] = vel[ 1 ]; vel_[ 2 ] = vel[ 2 ];
+ pos_.v[ 0 ] = pos[ 0 ]; pos_.v[ 1 ] = pos[ 1 ]; pos_.v[ 2 ] = pos[ 2 ];
+ vel_.v[ 0 ] = vel[ 0 ]; vel_.v[ 1 ] = vel[ 1 ]; vel_.v[ 2 ] = vel[ 2 ];
}
Modified: trunk/src/networkProtocol.h
===================================================================
--- trunk/src/networkProtocol.h 2007-09-24 22:15:55 UTC (rev 793)
+++ trunk/src/networkProtocol.h 2007-09-25 20:05:32 UTC (rev 794)
@@ -34,15 +34,28 @@
// typedef Ogre::Vector3 FVector3;
// typedef Ogre::Quaternion FVector4;
// typedef Ogre::Real Float;
-typedef std::vector< float > FVector3;
-typedef std::vector< float > FVector4;
+// typedef std::vector< float > FVector3;
+// typedef std::vector< float > FVector4;
typedef float Float;
-inline std::ostream & operator << ( std::ostream & str, const std::vector< float > & vec ){
- for ( int i = 0; i < vec.size(); i ++ ) str << vec[ i ] << " ";
+struct FVector3{
+ Float v[ 3 ];
+};
+
+struct FVector4{
+ Float v[ 4 ];
+};
+
+inline std::ostream & operator << ( std::ostream & str, const FVector3 & vec ){
+ for ( int i = 0; i < 3; i ++ ) str << vec.v[ i ] << " ";
return str;
}
+inline std::ostream & operator << ( std::ostream & str, const FVector4 & vec ){
+ for ( int i = 0; i < 4; i ++ ) str << vec.v[ i ] << " ";
+ return str;
+}
+
#define OG_PORT 1234
#define PROTO_BASE 1
Modified: trunk/src/networkServer.cpp
===================================================================
--- trunk/src/networkServer.cpp 2007-09-24 22:15:55 UTC (rev 793)
+++ trunk/src/networkServer.cpp 2007-09-25 20:05:32 UTC (rev 794)
@@ -172,7 +172,7 @@
FVector3 pos( msgIn.position() );
log_->info( std::string( "receiveShipRegister from " ) + toStr( senderID ) + " " + name + " " +
- " " + toStr( vesselID ) );
+ " " + toStr( vesselID ) + " at: " + toStr( pos ) );
UserObject *obj;
obj = createUserObject( user, name, userID, childID, vesselID );
@@ -198,7 +198,7 @@
log_->info( std::string( "\tSend register: " ) + obj->userName() + " <- " + it->second->name() );
MessageBodyShipRegister msg( it->second->userID(), it->second->childID(),
- it->second->name(), &it->second->position()[0],
+ it->second->name(), it->second->position().v,
it->second->vesselID(),
it->second->mass(), it->second->maxShield(), it->second->maxThrust() );
obj->parent()->send( msg );
@@ -206,7 +206,7 @@
}
//** second register the new object to all existing objects in range;
- MessageBodyShipRegister msg( obj->userID(), obj->childID(), obj->name(), &obj->position()[ 0 ], obj->vesselID(),
+ MessageBodyShipRegister msg( obj->userID(), obj->childID(), obj->name(), obj->position().v, obj->vesselID(),
obj->mass(), obj->maxShield(), obj->maxThrust() );
// ** atm just global;
for ( std::map < long, UserObject * >::iterator it = userObjects_.begin(); it != userObjects_.end(); it ++ ){
Modified: trunk/src/opengateserver.cpp
===================================================================
--- trunk/src/opengateserver.cpp 2007-09-24 22:15:55 UTC (rev 793)
+++ trunk/src/opengateserver.cpp 2007-09-25 20:05:32 UTC (rev 794)
@@ -76,17 +76,24 @@
signal( SIGTERM, signal_term );
signal( SIGINT, signal_interrupt );
+ //** das k\xF6nnte mal vielleicht als option rausreichen, das man wie beim clienten die Wahl hat;
+ //** -M = (withMetaServer = true);
+ bool withMetaServer = false;
+
try {
asio::io_service io_service;
io_servicePtr = &io_service;
- OpenGate::MetaConnection meta( io_service, *logMgr );
+ if ( withMetaServer ){
+ OpenGate::MetaConnection meta( io_service, *logMgr );
metaPtr = &meta;
- int error = 0;
- if ((error = meta.add_game_server()) < 0) {
- logMgr->warn( std::string("Could not add game server " + toStr (error) ) );
+ int error = 0;
+ if ((error = meta.add_game_server()) < 0) {
+ logMgr->warn( std::string("Could not add game server " + toStr (error) ) );
+ }
}
tcp::endpoint endpoint( tcp::v4(), OG_PORT );
+
Server server( io_service, endpoint, *logMgr );
serverPtr = &server;
io_service.run();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-09-25 21:38:57
|
Revision: 796
http://opengate.svn.sourceforge.net/opengate/?rev=796&view=rev
Author: spom_spom
Date: 2007-09-25 14:38:54 -0700 (Tue, 25 Sep 2007)
Log Message:
-----------
win compatibility commit
Modified Paths:
--------------
trunk/resources.cfg
trunk/win32/ogsectorclient/ogsectorclient.cbp
trunk/win32/ogsectorclient/ogsectorclient.exe
trunk/win32/ogsectorclient/resources.cfg
Modified: trunk/resources.cfg
===================================================================
--- trunk/resources.cfg 2007-09-25 20:44:19 UTC (rev 795)
+++ trunk/resources.cfg 2007-09-25 21:38:54 UTC (rev 796)
@@ -1,9 +1,6 @@
-# Resource locations to be added to the 'boostrap' path
-# This also contains the minimum you need to use the Ogre example framework
[Bootstrap]
FileSystem=./data/startup
-# Resource locations to be added to the default path
[General]
FileSystem=./data/
FileSystem=./data/commodities
Modified: trunk/win32/ogsectorclient/ogsectorclient.cbp
===================================================================
--- trunk/win32/ogsectorclient/ogsectorclient.cbp 2007-09-25 20:44:19 UTC (rev 795)
+++ trunk/win32/ogsectorclient/ogsectorclient.cbp 2007-09-25 21:38:54 UTC (rev 796)
@@ -16,8 +16,8 @@
<Add option="-O2" />
<Add option="-DNDEBUG" />
<Add option="-D_WIN32_WINNT=0x0500" />
- <Add directory="..\..\..\..\..\asio-0.3.7\include" />
- <Add directory="..\..\..\..\..\boost_1_33_1" />
+ <Add directory="..\..\..\..\asio-0.3.7\include" />
+ <Add directory="..\..\..\..\boost_1_33_1" />
<Add directory="C:\OgreSDK\include\CEGUI" />
<Add directory="C:\Programme\OpenAL 1.1 SDK\include" />
<Add directory="include" />
@@ -80,10 +80,14 @@
<Unit filename="..\..\src\GameState.h" />
<Unit filename="..\..\src\GameStateManager.cpp" />
<Unit filename="..\..\src\GameStateManager.h" />
+ <Unit filename="..\..\src\InitState.cpp" />
+ <Unit filename="..\..\src\InitState.h" />
<Unit filename="..\..\src\InputManager.cpp" />
<Unit filename="..\..\src\InputManager.h" />
<Unit filename="..\..\src\LogManager.cpp" />
<Unit filename="..\..\src\LogManager.h" />
+ <Unit filename="..\..\src\LogManagerBase.cpp" />
+ <Unit filename="..\..\src\LogManagerBase.h" />
<Unit filename="..\..\src\MarketDialog.cpp" />
<Unit filename="..\..\src\MarketDialog.h" />
<Unit filename="..\..\src\OpcodeWrapper.cpp" />
@@ -110,6 +114,8 @@
<Unit filename="..\..\src\VesselManager.h" />
<Unit filename="..\..\src\common.cpp" />
<Unit filename="..\..\src\common.h" />
+ <Unit filename="..\..\src\commonWithOgre.cpp" />
+ <Unit filename="..\..\src\commonWithOgre.h" />
<Unit filename="..\..\src\metaserver.cpp" />
<Unit filename="..\..\src\metaserver.h" />
<Unit filename="..\..\src\networkClient.cpp" />
Modified: trunk/win32/ogsectorclient/ogsectorclient.exe
===================================================================
(Binary files differ)
Modified: trunk/win32/ogsectorclient/resources.cfg
===================================================================
--- trunk/win32/ogsectorclient/resources.cfg 2007-09-25 20:44:19 UTC (rev 795)
+++ trunk/win32/ogsectorclient/resources.cfg 2007-09-25 21:38:54 UTC (rev 796)
@@ -1,38 +1,34 @@
[Bootstrap]
-FileSystem=../../../../trunk/data/startup
+FileSystem=../../data/startup
-# Resource locations to be added to the default path
[General]
-FileSystem=./
-FileSystem=../../data
+FileSystem=../../data/
+FileSystem=../../data/commodities
+FileSystem=../../data/capacitors
+FileSystem=../../data/engines
+FileSystem=../../data/radars
+FileSystem=../../data/shields
+FileSystem=../../data/ecms
+FileSystem=../../data/power_plants
+FileSystem=../../data/guns
+FileSystem=../../data/ships/octavius/apteryx
+FileSystem=../../data/ships/quantar/storm
+FileSystem=../../data/ships/tauseti/lady_kickstart
+FileSystem=../../data/ships/squadrok/squid
+FileSystem=../../data/stations
FileSystem=../../data/materials
FileSystem=../../data/textures
FileSystem=../../data/asteroids
-Zip=../../data/simpleSkybox.zip
-FileSystem=../../data/MediaFromOgre
-FileSystem=../../data/MediaFromOgre/AdvancedMaterials
+FileSystem=../../data/misc
FileSystem=../../data/gui
-FileSystem=../../data/gui/fonts/
-FileSystem=../../data/gui/layouts/
-FileSystem=../../data/gui/imagesets/
-FileSystem=../../data/gui/schemes/
-FileSystem=../../data/gui/looknfeel/
+FileSystem=../../data/gui/fonts
+FileSystem=../../data/gui/layouts
+FileSystem=../../data/gui/imagesets
+FileSystem=../../data/gui/schemes
+FileSystem=../../data/gui/looknfeel
+FileSystem=../../data/gui/overlays
-Zip=../../data/fonts.zip
-FileSystem=../../../../trunk/data/
-FileSystem=../../../../trunk/data/misc
-FileSystem=../../../../trunk/data/misc/asteroids
-FileSystem=../../../../trunk/data/commodities
-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/engines
-FileSystem=../../../../trunk/data/capacitors
-FileSystem=../../../../trunk/data/radars
-FileSystem=../../../../trunk/data/shields
-FileSystem=../../../../trunk/data/ECMs
-FileSystem=../../../../trunk/data/power_plants
-FileSystem=../../../../trunk/data/guns
-FileSystem=../../../../trunk/data/stations
-FileSystem=../../../../trunk/data/sounds
+Zip=../../data/skybox/simpleSkybox.zip
+
+FileSystem=../../data/MediaFromOgre
+FileSystem=../../data/MediaFromOgre/AdvancedMaterials
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-09-26 20:29:05
|
Revision: 797
http://opengate.svn.sourceforge.net/opengate/?rev=797&view=rev
Author: egore
Date: 2007-09-26 13:28:50 -0700 (Wed, 26 Sep 2007)
Log Message:
-----------
2007-09-26 Christoph Brill <eg...@us...>
* src/metaserver.cpp: beautify the log and indent the ifdefs
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/metaserver.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-09-25 21:38:54 UTC (rev 796)
+++ trunk/ChangeLog 2007-09-26 20:28:50 UTC (rev 797)
@@ -1,3 +1,6 @@
+2007-09-26 Christoph Brill <eg...@us...>
+ * src/metaserver.cpp: beautify the log and indent the ifdefs
+
2007-09-24 Christoph Brill <eg...@us...>
* src/common.cpp, src/common.h: add method to split strings with a
given delimiter
Modified: trunk/src/metaserver.cpp
===================================================================
--- trunk/src/metaserver.cpp 2007-09-25 21:38:54 UTC (rev 796)
+++ trunk/src/metaserver.cpp 2007-09-26 20:28:50 UTC (rev 797)
@@ -57,6 +57,7 @@
}
MetaConnection::~MetaConnection() {
+ log_->info ( "Shutting down metaserver connection " );
// asio doesn't need a cleanup, right?
}
@@ -230,7 +231,7 @@
if (returncode > 0) {
return returncode;
} else {
- log_->warn ( std::string ("unkown return code for") + parameters + toStr( returncode ) );
+ log_->warn ( std::string ("unkown return code for ") + parameters + toStr( returncode ) );
return -4;
}
}
@@ -357,13 +358,12 @@
// Read the response status line.
#ifdef WIN32
- // we dont have boost:regex within win32, i will fix this later (carsten)
-//asio::read_until(socket_, response, "\n");
- #else
+ // we dont have boost:regex within win32, i will fix this later (carsten)
+ //asio::read_until(socket_, response, "\n");
+#else
asio::read_until(socket_, response, boost::regex("\r\n"));
- #endif
+#endif
-
// Check that response is OK.
std::istream response_stream(&response);
std::string http_version;
@@ -382,12 +382,12 @@
}
// Read the response headers, which are terminated by a blank line.
- #ifdef WIN32
- // we dont have boost:regex within win32, i will fix this later (carsten)
-//asio::read_until(socket_, response, "\n");
- #else
+#ifdef WIN32
+ // we dont have boost:regex within win32, i will fix this later (carsten)
+ //asio::read_until(socket_, response, "\n");
+#else
asio::read_until(socket_, response, boost::regex("\r\n\r\n"));
- #endif
+#endif
// Process the response headers. (to get the crap of the response before reading the body!)
std::string header;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-11-14 19:30:09
|
Revision: 836
http://opengate.svn.sourceforge.net/opengate/?rev=836&view=rev
Author: spom_spom
Date: 2007-11-14 11:30:12 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
add: Screenshot support (Print key), fixed: laser shoot looks better, fixed: connection to metaserver seams to work now.
Modified Paths:
--------------
trunk/data/materials/advancedMaterials.material
trunk/data/misc/sounds.xml
trunk/src/Console.cpp
trunk/src/Projectile.cpp
trunk/src/Projectile.h
trunk/src/UnDockedState.cpp
trunk/src/metaserver.cpp
trunk/src/metaserver.h
trunk/src/networkServer.cpp
trunk/src/opengateserver.cpp
Modified: trunk/data/materials/advancedMaterials.material
===================================================================
--- trunk/data/materials/advancedMaterials.material 2007-10-30 23:16:31 UTC (rev 835)
+++ trunk/data/materials/advancedMaterials.material 2007-11-14 19:30:12 UTC (rev 836)
@@ -11,9 +11,10 @@
{
// base colours, not needed for rendering, but as information
// to lighting pass categorisation routine
- ambient 1 1 1
- diffuse 0 0 0
- specular 0 0 0 0
+// ambient 1 1 1
+// diffuse 0 0 9
+// specular 0 0 1 1
+// emissive 0 0 1 1
// Really basic vertex program
// NB we don't use fixed function here because GL does not like
// mixing fixed function and vertex programs, depth fighting can
@@ -31,12 +32,11 @@
{
// base colours, not needed for rendering, but as information
// to lighting pass categorisation routine
- ambient 0 0 0
+ ambient 0 0 1
// do this for each light
iteration once_per_light
-
scene_blend add
// Vertex program reference
Modified: trunk/data/misc/sounds.xml
===================================================================
--- trunk/data/misc/sounds.xml 2007-10-30 23:16:31 UTC (rev 835)
+++ trunk/data/misc/sounds.xml 2007-11-14 19:30:12 UTC (rev 836)
@@ -15,10 +15,10 @@
</sound>
<sound>
<name>sounds/docked/defaultMusic</name>
- <file>sounds/stations/quantar/Sarin_Sunday_-_Lonely_hike.ogg</file>
+ <file>sounds/stations/quantar/sarin_sunday_-_lonely_hike.ogg</file>
</sound>
<sound>
<name>sounds/undocked/defaultMusic</name>
- <file>sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.ogg</file>
+ <file>sounds/sectors/tauseti/simon_mahler_-_hipdahop.ogg</file>
</sound>
-</container>
\ No newline at end of file
+</container>
Modified: trunk/src/Console.cpp
===================================================================
--- trunk/src/Console.cpp 2007-10-30 23:16:31 UTC (rev 835)
+++ trunk/src/Console.cpp 2007-11-14 19:30:12 UTC (rev 836)
@@ -24,6 +24,7 @@
#include "LogManager.h"
#include "networkClient.h"
+#include <OgreRenderWindow.h>
#include <CEGUI/elements/CEGUIEditbox.h>
#include <CEGUI/elements/CEGUIListbox.h>
#include <CEGUI/elements/CEGUIListboxTextItem.h>
@@ -125,6 +126,12 @@
if ( e.key == OIS::KC_LSHIFT) resources_->setGlobalKeyModifier( KEY_SHIFT );
if ( e.key == OIS::KC_RSHIFT) resources_->setGlobalKeyModifier( KEY_SHIFT );
+ //** Create one screenshot;
+ if ( e.key == OIS::KC_SYSRQ ) {
+ std::string tmp( "screenshot" + LogManager::getSingleton().timeStamp() + ".png" );
+ ResourceManager::getSingleton().renderWindow->writeContentsToFile( tmp.c_str() );
+ LogManager::getSingleton().info( "wrote: " + tmp );
+ }
return true;
}
Modified: trunk/src/Projectile.cpp
===================================================================
--- trunk/src/Projectile.cpp 2007-10-30 23:16:31 UTC (rev 835)
+++ trunk/src/Projectile.cpp 2007-11-14 19:30:12 UTC (rev 836)
@@ -26,6 +26,7 @@
#include <OgreManualObject.h>
#include <OgreBillboard.h>
#include <OgreBillboardSet.h>
+#include <OgreRibbonTrail.h>
namespace OpenGate{
@@ -39,11 +40,24 @@
beam_ = NULL;
bullet_ = NULL;
shape_ = NULL;
+ trail_ = NULL;
Ogre::Quaternion direction( parent_->mainNode()->getOrientation() );
Ogre::Vector3 relGunPos( ( gun.sceneNode().getParentSceneNode()->getOrientation() * gun.sceneNode().getPosition() ) *
gun.sceneNode().getParentSceneNode()->getParentSceneNode()->getScale() );
+
+ maxRange_ = gun.gun()->speed() * maxLifeTime_;
+
+ mainNode_->setOrientation( direction );
+ mainNode_->setPosition( gun.sceneNode().getWorldPosition() - direction.zAxis() * relGunPos[ 2 ] );
+ mainNode_->_update( true, true );
+
+ lifeTime_ = 0.0;
+ oldTime_ = 0.0;
+ ammoHit_ = false;
+ vel_ = gun.gun()->speed() * -direction.zAxis().normalisedCopy() + parent->velocity();
+
switch ( gun.gun()->type() ){
case BULLET:{
int maxBB = 20;
@@ -64,28 +78,36 @@
mainNode_->attachObject( bullet_ );
} break;
case LASER:{
- beam_ = sceneMgr_->createManualObject( bulletName + "_ManualObj" );
-
- Ogre::Real width = 0.25;
- beam_->begin( "BeamGreen", Ogre::RenderOperation::OT_TRIANGLE_LIST);
- beam_->position( 0.0, -width, 0.0 ); beam_->textureCoord( 0, 0 );
- beam_->position( 0.0, width, 0.0 ); beam_->textureCoord( 1, 0 );
- beam_->position( 0.0, width, 1.0 ); beam_->textureCoord( 1, 1 );
- beam_->position( 0.0, -width, 1.0 ); beam_->textureCoord( 0, 1 );
- beam_->quad( 0, 1, 2, 3 );
- beam_->quad( 0, 3, 2, 1 );
- beam_->end();
-
+ bool manuObject = false;
shape_ = mainNode_->createChildSceneNode( bulletName + "_transform" );
- shape_->attachObject( beam_ );
-
if ( fabs( relGunPos[ 0 ] ) > 1e-3 ){
shape_->roll( Ogre::Degree( 0.0 ) );
} else {
shape_->roll( Ogre::Radian( atan( relGunPos[ 1 ] / relGunPos[ 0 ] ) ) );
}
- mainNode_->setOrientation( direction );
+ if ( manuObject ){
+ beam_ = sceneMgr_->createManualObject( bulletName + "_ManualObj" );
+ Ogre::Real width = 0.25;
+ beam_->begin( "BeamGreen", Ogre::RenderOperation::OT_TRIANGLE_LIST);
+ beam_->position( 0.0, -width, 0.0 ); beam_->textureCoord( 0, 0 );
+ beam_->position( 0.0, width, 0.0 ); beam_->textureCoord( 1, 0 );
+ beam_->position( 0.0, width, 1.0 ); beam_->textureCoord( 1, 1 );
+ beam_->position( 0.0, -width, 1.0 ); beam_->textureCoord( 0, 1 );
+ beam_->quad( 0, 1, 2, 3 );
+ beam_->quad( 0, 3, 2, 1 );
+ beam_->end();
+ shape_->attachObject( beam_ );
+ } else {
+ trail_ = sceneMgr_->createRibbonTrail( bulletName + "_RibbonTrail");
+ trail_->setMaterialName( "BeamGreen" );
+ trail_->setTrailLength( maxRange_ / 2.0 );
+ trail_->setWidthChange( 0, 2.0 );
+ trail_->setMaxChainElements( 1000 );
+ trail_->setInitialWidth( 0, 1.0 );
+ trail_->addNode( shape_ );
+ sceneMgr_->getRootSceneNode()->createChildSceneNode()->attachObject( trail_ );
+ }
} break;
case MININGLASER: {
} break;
@@ -93,47 +115,7 @@
LogManager::getSingleton().warn( "guntype unknown: " + toStr( gun.gun()->type() ) + " Forced bullet." );
}break;
- } // switch gun.gun()->type()
-
-// 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( gun.sceneNode().getWorldPosition() - direction.zAxis() * relGunPos[ 2 ] );
-
- lifeTime_ = 0.0;
- oldTime_ = 0.0;
-
- vel_ = gun.gun()->speed() * -direction.zAxis().normalisedCopy() + parent->velocity();
- ammoHit_ = false;
+ }
}
Projectile::~Projectile() {
@@ -150,6 +132,13 @@
}
sceneMgr_->destroyManualObject( beam_ );
}
+ if ( trail_ ) {
+ if ( shape_ ) {
+ mainNode_->removeAndDestroyChild( shape_->getName() );
+ }
+ sceneMgr_->destroyRibbonTrail( trail_ );
+ }
+
// mainNode_->detachObject( chain_ );
// sceneMgr_->destroyBillboardChain( chain_ );
}
@@ -182,27 +171,29 @@
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 );
- Ogre::Real beamLength = min( (vel_ * lifeTime_).length(), 300.0f );
+ mainNode_->translate( vel_ * elapsedTime );
+ Ogre::Real beamLength = min( (vel_ * lifeTime_).length(), maxRange_ / 2.0f );
+ Ogre::Real beamWidthScale = 1.0;
- Ogre::Real beamWidthScale = 1.0;
+ if ( beam_ ){
// if ( beamLength > 299.0f ) beamWidthScale = 1;
-
shape_->scale( 1.0, beamWidthScale, beamLength / shape_->getScale()[2] );
}
+ if ( trail_ ){
+ // trail_->setTrailLength( beamLength );
+ }
}
} else {
- if ( beam_ ){
- Ogre::Real beamLength = min( (vel_ * lifeTime_).length(), 300.0f );
- beamLength -= ( parent_->mainNode()->getWorldPosition() + ( vel_ * lifeTime_ ) -
- mainNode_->getWorldPosition() ).length();
+ Ogre::Real beamLength = min( (vel_ * lifeTime_).length(), maxRange_ / 2.0f );
+ beamLength -= ( parent_->mainNode()->getWorldPosition() + ( vel_ * lifeTime_ ) -
+ mainNode_->getWorldPosition() ).length();
+ if ( beam_ ){
if ( beamLength > 0 ){
shape_->scale( 1.0, 1.0, beamLength / shape_->getScale()[ 2 ] );
}
+ } else if ( trail_ ){
+ trail_->setTrailLength( beamLength );
}
}
}
Modified: trunk/src/Projectile.h
===================================================================
--- trunk/src/Projectile.h 2007-10-30 23:16:31 UTC (rev 835)
+++ trunk/src/Projectile.h 2007-11-14 19:30:12 UTC (rev 836)
@@ -58,12 +58,14 @@
// Ogre::BillboardChain * chain_;
Ogre::BillboardSet * bullet_;
Ogre::ManualObject * beam_;
+ Ogre::RibbonTrail * trail_;
Ogre::Vector3 vel_;
Ogre::SceneNode * shape_;
Ogre::Real maxLifeTime_;
Ogre::Real oldTime_;
+ Ogre::Real maxRange_;
bool ammoHit_;
};
Modified: trunk/src/UnDockedState.cpp
===================================================================
--- trunk/src/UnDockedState.cpp 2007-10-30 23:16:31 UTC (rev 835)
+++ trunk/src/UnDockedState.cpp 2007-11-14 19:30:12 UTC (rev 836)
@@ -473,13 +473,6 @@
//** Toggle through camera modes;
if ( e.key == OIS::KC_6 ) { toggleNextCamera_(); }
- //** Create one screenshot;
- if ( e.key == OIS::KC_SYSRQ ) {
- char tmp[ 20 ];
- sprintf(tmp, "screenshot.png" );
- window_->writeContentsToFile(tmp);
- // window_->setDebugText(String("Wrote ") + tmp);
- }
if ( e.key == OIS::KC_R ) {
sceneDetailIndex_ = ( sceneDetailIndex_ + 1) % 3;
switch( sceneDetailIndex_ ) {
Modified: trunk/src/metaserver.cpp
===================================================================
--- trunk/src/metaserver.cpp 2007-10-30 23:16:31 UTC (rev 835)
+++ trunk/src/metaserver.cpp 2007-11-14 19:30:12 UTC (rev 836)
@@ -29,54 +29,58 @@
namespace OpenGate{
-MetaConnection::MetaConnection(asio::io_service & io_service, LogManagerBase & log ) :
+MetaConnection::MetaConnection( asio::io_service & io_service, LogManagerBase & log ) :
io_service_( io_service ), socket_( io_service ), resolver_( io_service ), log_( &log ) {
+ isConnected_ = true;
hostname_ = std::string( "opacma.ontheserver.de" );
-
log_->info( std::string( "Querying " ) + hostname_);
- asio::error error = asio::error::host_not_found;
- try{
- tcp::resolver::query query(hostname_, "http");
- tcp::resolver::iterator endpoint_iterator = resolver_.resolve(query);
- tcp::resolver::iterator end;
+// asio::error error = asio::error::host_not_found;
+// try{
+// tcp::resolver::query query( hostname_, "http" );
+// tcp::resolver::iterator endpoint_iterator = resolver_.resolve( query );
+// tcp::resolver::iterator end;
- while ( error && endpoint_iterator != end ) {
- socket_.close();
- socket_.connect( *endpoint_iterator++, asio::assign_error( error ) );
- }
- } catch ( asio::error & e) {
- log_->fatal( std::string( "asio::error: " ) + e.what() );
- } catch ( std::exception & e) {
- log_->fatal( std::string( "std::exception: " ) + e.what() );
- } catch (...) {
- log_->fatal( "Unkown exception occured while resolving the metaserver" );
- }
+// while ( error && endpoint_iterator != end ) {
+// socket_.close();
+// socket_.connect( *endpoint_iterator++, asio::assign_error( error ) );
+// }
+// } catch ( asio::error & e) {
+// log_->fatal( std::string( "resolving meta server: asio::error: " ) + e.what() );
+// isConnected_ = false;
+// } catch ( std::exception & e) {
+// log_->fatal( std::string( "resolving meta server: std::exception: " ) + e.what() );
+// isConnected_ = false;
+// } catch (...) {
+// log_->fatal( "resolving meta server: unkown exception occured" );
+// isConnected_ = false;
+// }
}
MetaConnection::~MetaConnection() {
- log_->info ( "Shutting down metaserver connection " );
+ if ( isConnected_ ) {
+ log_->info ( "Shutting down metaserver connection " );
+ }
// asio doesn't need a cleanup, right?
}
int MetaConnection::login( const std::string & userName, const std::string & passwd ) {
-
- try {
-
- asio::streambuf response;
- std::string parameters( "login&username=" + userName + "&password=" + passwd);
- int retval = request(parameters, response);
- if (retval < 0) {
- return retval;
- }
-
- // We got a usefull body. The body is an int, lets use it.
- if (response.size() > 0) {
- std::ostringstream stream;
- stream << &response;
- int returncode = toInt( stream.str() );
- switch (returncode) {
+ if ( isConnected_ ) {
+ try {
+ asio::streambuf response;
+ std::string parameters( "login&username=" + userName + "&password=" + passwd);
+ int retval = request(parameters, response);
+ if (retval < 0) {
+ return retval;
+ }
+
+ // We got a usefull body. The body is an int, lets use it.
+ if (response.size() > 0) {
+ std::ostringstream stream;
+ stream << &response;
+ int returncode = toInt( stream.str() );
+ switch (returncode) {
case -101: log_->warn ( std::string ("no action given") ); return -3;
case -102: log_->warn ( std::string ("action given but unknown") ); return -3;
case -103: log_->warn ( std::string ("database is not available") ); return -3;
@@ -91,40 +95,42 @@
log_->warn ( std::string ("unkown return code for") + parameters + toStr( returncode ) );
return -4;
}
+ }
+ } else {
+ log_->fatal( std::string( "meta server login: we got no response " ) );
}
+ } catch ( asio::error & e) {
+ log_->fatal( std::string( "meta server login: asio::error: " ) + e.what() );
+ return -5;
+ } catch ( std::exception & e) {
+ log_->fatal( std::string( "meta server login: std::exception: " ) + e.what() );
+ return -5;
+ } catch (...) {
+ log_->fatal( "meta server login: unkown exception occured" );
+ return -5;
}
-
-
- } catch ( asio::error & e) {
- log_->fatal( std::string( "asio::error: " ) + e.what() );
- return -5;
- } catch ( std::exception & e) {
- log_->fatal( std::string( "std::exception: " ) + e.what() );
- return -5;
- } catch (...) {
- log_->fatal( "Unkown exception occured while resolving the server" );
- return -5;
+ return 1;
}
- return 1;
+ return META_NOT_CONNECTED;
}
int MetaConnection::check_version( int user_id ) {
-
- try {
-
- asio::streambuf response;
- std::string parameters("check_version&version=" + std::string(PACKAGE_VERSION) + "&user_id=" + toStr(user_id));
- int retval = request(parameters, response);
- if (retval < 0) {
- return retval;
- }
-
- // We got a usefull body. The body is an int, lets use it.
- if (response.size() > 0) {
- std::ostringstream stream;
- stream << &response;
- int returncode = toInt( stream.str() );
- switch (returncode) {
+ if ( isConnected_ ) {
+
+ try {
+ asio::streambuf response;
+ std::string parameters("check_version&version=" + std::string(PACKAGE_VERSION) + "&user_id=" + toStr(user_id));
+ int retval = request(parameters, response);
+ if (retval < 0) {
+ return retval;
+ }
+
+ // We got a usefull body. The body is an int, lets use it.
+ if (response.size() > 0) {
+ std::ostringstream stream;
+ stream << &response;
+ int returncode = toInt( stream.str() );
+ switch (returncode) {
case -101: log_->warn ( std::string ("no action given") ); return -3;
case -102: log_->warn ( std::string ("action given but unknown") ); return -3;
case -103: log_->warn ( std::string ("database is not available") ); return -3;
@@ -139,93 +145,98 @@
log_->warn ( std::string ("unkown return code for") + parameters + toStr( returncode ) );
return -4;
}
+ }
+ } else {
+ log_->fatal( std::string( "meta server check_version: we got no response " ) );
}
+ } catch ( asio::error & e) {
+ log_->fatal( std::string( "meta server check_version: asio::error: " ) + e.what() );
+ return -5;
+ } catch ( std::exception & e) {
+ log_->fatal( std::string( "meta server check_version: std::exception: " ) + e.what() );
+ return -5;
+ } catch (...) {
+ log_->fatal( "meta server check_version: unkown exception occured" );
+ return -5;
}
-
- } catch ( asio::error & e) {
- log_->fatal( std::string( "asio::error: " ) + e.what() );
- return -5;
- } catch ( std::exception & e) {
- log_->fatal( std::string( "std::exception: " ) + e.what() );
- return -5;
- } catch (...) {
- log_->fatal( "check_version: Unkown exception occured while resolving the server" );
- return -5;
+ return 1;
}
- return 1;
+ return META_NOT_CONNECTED;
}
int MetaConnection::logout( int user_id ) {
-
- try {
-
- asio::streambuf response;
- std::string parameters( "logout&user_id=" + toStr(user_id) + "&user_ip=" + "123.123.123.123"); // FIXME: determine IP or think of other way to handle this
- int retval = request(parameters, response);
- if (retval < 0) {
- return retval;
- }
-
- // We got a usefull body. The body is an int, lets use it.
- if (response.size() > 0) {
- std::ostringstream stream;
- stream << &response;
- int returncode = toInt( stream.str() );
- switch (returncode) {
+ if ( isConnected_ ) {
+
+ try {
+
+ asio::streambuf response;
+ std::string parameters( "logout&user_id=" + toStr(user_id) + "&user_ip=" + "123.123.123.123"); // FIXME: determine IP or think of other way to handle this
+ int retval = request(parameters, response);
+ if (retval < 0) {
+ return retval;
+ }
+
+ // We got a usefull body. The body is an int, lets use it.
+ if (response.size() > 0) {
+ std::ostringstream stream;
+ stream << &response;
+ int returncode = toInt( stream.str() );
+ switch (returncode) {
case -101: log_->warn ( std::string ("no action given") ); return -3;
case -102: log_->warn ( std::string ("action given but unknown") ); return -3;
case -103: log_->warn ( std::string ("database is not available") ); return -3;
- case -1: log_->warn ( std::string ("no user_id given") ); return -3;
- case -2: log_->warn ( std::string ("no user_ip given") ); return -3;
- case -3: log_->warn ( std::string ("user_id doesn't exist") ); return -3;
- case -4: log_->warn ( std::string ("user_ip incorrect") ); return -3;
- case -5: log_->warn ( std::string ("user was already offline") ); return 1;
+ case -1: log_->warn ( std::string ("no user_id given") ); return -3;
+ case -2: log_->warn ( std::string ("no user_ip given") ); return -3;
+ case -3: log_->warn ( std::string ("user_id doesn't exist") ); return -3;
+ case -4: log_->warn ( std::string ("user_ip incorrect") ); return -3;
+ case -5: log_->warn ( std::string ("user was already offline") ); return 1;
default:
if (returncode > 0) {
return returncode;
- } else {
- log_->warn ( std::string ("unkown return code for") + parameters + toStr( returncode ) );
- return -4;
}
+ log_->warn ( std::string ("unkown return code for") + parameters + toStr( returncode ) );
+ return -4;
+ }
+ } else {
+ log_->fatal( std::string( "meta server logout: we got no response " ) );
}
+ } catch ( asio::error & e) {
+ log_->fatal( std::string( "meta server logout: asio::error: " ) + e.what() );
+ return -5;
+ } catch ( std::exception & e) {
+ log_->fatal( std::string( "meta server logout: std::exception: " ) + e.what() );
+ return -5;
+ } catch (...) {
+ log_->fatal( "meta server logout: unkown exception occured" );
+ return -5;
}
-
-
- } catch ( asio::error & e) {
- log_->fatal( std::string( "asio::error: " ) + e.what() );
- return -5;
- } catch ( std::exception & e) {
- log_->fatal( std::string( "std::exception: " ) + e.what() );
- return -5;
- } catch (...) {
- log_->fatal( "Unkown exception occured while resolving the server" );
- return -5;
+ return 1;
}
- return 1;
+ return META_NOT_CONNECTED;
}
int MetaConnection::add_game_server() {
-
- try {
-
- asio::streambuf response;
- std::string parameters( "add_game_server" );
- int retval = request(parameters, response);
- if (retval < 0) {
- return retval;
- }
-
- // We got a usefull body. The body is an int, lets use it.
- if (response.size() > 0) {
- std::ostringstream stream;
- stream << &response;
- int returncode = toInt( stream.str() );
- switch (returncode) {
+ if ( isConnected_ ) {
+
+ try {
+ asio::streambuf response;
+ std::string parameters( "add_game_server" );
+ int retval = request( parameters, response );
+ if ( retval < 0 ) {
+ return retval;
+ }
+
+ // We got a usefull body. The body is an int, lets use it.
+ if ( response.size() > 0 ) {
+ std::ostringstream stream;
+ stream << &response;
+ int returncode = toInt( stream.str() );
+ switch (returncode) {
case -101: log_->warn ( std::string ("no action given") ); return -3;
case -102: log_->warn ( std::string ("action given but unknown") ); return -3;
case -103: log_->warn ( std::string ("database is not available") ); return -3;
- case -12: log_->warn ( std::string ("no additional server possible") ); return -3;
- case -13: log_->warn ( std::string ("ip is already a server") ); return -3;
+ case -12: log_->warn ( std::string ("no additional server possible") ); return -3;
+ case -13: log_->warn ( std::string ("ip is already a server") ); return -3;
default:
if (returncode > 0) {
return returncode;
@@ -233,85 +244,89 @@
log_->warn ( std::string ("unkown return code for ") + parameters + toStr( returncode ) );
return -4;
}
+ }
+ } else {
+ log_->fatal( std::string( "meta server add game server: we got no response " ) );
}
+ } catch ( asio::error & e) {
+ log_->fatal( std::string( "meta server add game server: asio::error: " ) + e.what() );
+ return -5;
+ } catch ( std::exception & e) {
+ log_->fatal( std::string( "meta server add game server: std::exception: " ) + e.what() );
+ return -5;
+ } catch (...) {
+ log_->fatal( "meta server add game server: unkown exception occured" );
+ return -5;
}
-
- } catch ( asio::error & e) {
- log_->fatal( std::string( "asio::error: " ) + e.what() );
- return -5;
- } catch ( std::exception & e) {
- log_->fatal( std::string( "std::exception: " ) + e.what() );
- return -5;
- } catch (...) {
- log_->fatal( "Unkown exception occured while resolving the server" );
- return -5;
+ return 1;
}
- return 1;
}
std::list<std::string> MetaConnection::list_game_server() {
-
std::list<std::string> mylist;
- try {
-
- asio::streambuf response;
- std::string parameters( "list_game_server" );
- int retval = request(parameters, response);
- if (retval < 0) {
- return mylist;
- }
-
- // We got a usefull body. The body is an int, lets use it.
- if (response.size() > 0) {
- std::ostringstream stream;
- stream << &response;
- int returncode = toInt( stream.str() );
- switch (returncode) {
- case -101: log_->warn ( std::string ("no action given") ); return mylist;
- case -102: log_->warn ( std::string ("action given but unknown") ); return mylist;
- case -103: log_->warn ( std::string ("database is not available") ); return mylist;
- case -15: log_->warn ( std::string ("no game server available") ); return mylist;
+ if ( isConnected_ ) {
+ try {
+ asio::streambuf response;
+ //** typo, server oder servers?
+ std::string parameters( "list_game_servers" );
+ int retval = request(parameters, response);
+ if ( retval < 0 ) {
+ return mylist;
+ }
+
+ // We got a usefull body. The body is an int, lets use it.
+ if ( response.size() > 0 ) {
+ std::ostringstream stream;
+ stream << &response;
+ int returncode = toInt( stream.str() );
+ switch (returncode) {
+ case -101: log_->warn ( std::string ("no action given -101") ); return mylist;
+ case -102: log_->warn ( std::string ("action given but unknown -102") ); return mylist;
+ case -103: log_->warn ( std::string ("database is not available -103") ); return mylist;
+ case -15: log_->warn ( std::string ("no game server available -15") ); return mylist;
default:
-
- if (stream.str().length() > 5) {
+ if ( stream.str().length() > 5 ) {
split(stream.str(), " ", mylist);
} else {
log_->warn ( std::string ("unkown return code for ") + parameters + toStr( returncode ) );
return mylist;
}
+ }
+ } else {
+ log_->fatal( std::string( "meta server list game server: we got no response " ) );
}
+ } catch ( asio::error & e) {
+ log_->fatal( std::string( "meta server list game server: asio::error: " ) + e.what() );
+ return mylist;
+ } catch ( std::exception & e) {
+ log_->fatal( std::string( "meta server list game server: std::exception: " ) + e.what() );
+ return mylist;
+ } catch (...) {
+ log_->fatal( "meta server list game server: unkown exception occured" );
+ return mylist;
}
-
- } catch ( asio::error & e) {
- log_->fatal( std::string( "asio::error: " ) + e.what() );
return mylist;
- } catch ( std::exception & e) {
- log_->fatal( std::string( "std::exception: " ) + e.what() );
- return mylist;
- } catch (...) {
- log_->fatal( "Unkown exception occured while resolving the server" );
- return mylist;
}
return mylist;
}
int MetaConnection::remove_game_server() {
-
- try {
-
- asio::streambuf response;
- std::string parameters( "remove_game_server" );
- int retval = request(parameters, response);
- if (retval < 0) {
- return retval;
- }
-
- // We got a usefull body. The body is an int, lets use it.
- if (response.size() > 0) {
- std::ostringstream stream;
- stream << &response;
- int returncode = toInt( stream.str() );
- switch (returncode) {
+ if ( isConnected_ ) {
+
+ try {
+ asio::streambuf response;
+ std::string parameters( "remove_game_server" );
+ int retval = request(parameters, response);
+ if (retval < 0) {
+ return retval;
+ }
+
+ // We got a usefull body. The body is an int, lets use it.
+ if (response.size() > 0) {
+ std::ostringstream stream;
+ stream << &response;
+ int returncode = toInt( stream.str() );
+ switch (returncode) {
case -101: log_->warn ( std::string ("no action given") ); return -3;
case -102: log_->warn ( std::string ("action given but unknown") ); return -3;
case -103: log_->warn ( std::string ("database is not available") ); return -3;
@@ -323,47 +338,70 @@
log_->warn ( std::string ("unkown return code for ") + parameters + toStr( returncode ) );
return -4;
}
+ }
+ } else {
+ log_->fatal( std::string( "meta server remove game server: we got no response " ) );
}
+
+ } catch ( asio::error & e) {
+ log_->fatal( std::string( "meta server remove game server: asio::error: " ) + e.what() );
+ return -5;
+ } catch ( std::exception & e) {
+ log_->fatal( std::string( "meta server remove game server: std::exception: " ) + e.what() );
+ return -5;
+ } catch (...) {
+ log_->fatal( "meta server remove game server: unkown exception occured" );
+ return -5;
}
+ return 1;
+ }
+}
+int MetaConnection::request( const std::string & parameters, asio::streambuf & response ) {
+ // Form the request. We specify the "Connection: close" header so that the
+ // server will close the socket after transmitting the response. This will
+ // allow us to treat all data up until the EOF as the content.
+ asio::error error = asio::error::host_not_found;
+ try{
+ tcp::resolver::query query( hostname_, "http" );
+ tcp::resolver::iterator endpoint_iterator = resolver_.resolve( query );
+ tcp::resolver::iterator end;
+ while ( error && endpoint_iterator != end ) {
+ socket_.close();
+ socket_.connect( *endpoint_iterator++, asio::assign_error( error ) );
+ }
} catch ( asio::error & e) {
- log_->fatal( std::string( "asio::error: " ) + e.what() );
- return -5;
+ log_->fatal( std::string( "resolving meta server: asio::error: " ) + e.what() );
+ isConnected_ = false;
} catch ( std::exception & e) {
- log_->fatal( std::string( "std::exception: " ) + e.what() );
- return -5;
+ log_->fatal( std::string( "resolving meta server: std::exception: " ) + e.what() );
+ isConnected_ = false;
} catch (...) {
- log_->fatal( "Unkown exception occured while resolving the server" );
- return -5;
+ log_->fatal( "resolving meta server: unkown exception occured" );
+ isConnected_ = false;
}
- return 1;
-}
-int MetaConnection::request( const std::string & parameters, asio::streambuf & response ) {
- // Form the request. We specify the "Connection: close" header so that the
- // server will close the socket after transmitting the response. This will
- // allow us to treat all data up until the EOF as the content.
asio::streambuf request;
std::ostream request_stream(&request);
request_stream << "GET " << "/script/schnittstelle/?action=" << parameters << " HTTP/1.0\r\n";
request_stream << "Host: " << hostname_ << "\r\n";
request_stream << "Accept: */*\r\n";
request_stream << "Connection: close\r\n\r\n";
-
+
// Send the request.
- asio::write(socket_, request);
-
+ asio::write( socket_, request );
+
// Read the response status line.
#ifdef WIN32
- // we dont have boost:regex within win32, i will fix this later (carsten)
-//asio::read_until(socket_, response, "\n");
+ // we dont have boost:regex within win32, i will fix this later (carsten)
+ //asio::read_until(socket_, response, "\n");
#else
- asio::read_until(socket_, response, boost::regex("\r\n"));
+ asio::read_until( socket_, response, boost::regex("\r\n") );
#endif
-
+
// Check that response is OK.
- std::istream response_stream(&response);
+ std::istream response_stream( &response );
std::string http_version;
response_stream >> http_version;
unsigned int status_code;
@@ -374,7 +412,7 @@
std::cout << "Invalid response\n";
return -51;
}
- if (status_code != 200) {
+ if ( status_code != 200 ) {
std::cout << "Response returned with status code " << status_code << "\n";
return -52;
}
@@ -384,24 +422,25 @@
// we dont have boost:regex within win32, i will fix this later (carsten)
//asio::read_until(socket_, response, "\n");
#else
- asio::read_until(socket_, response, boost::regex("\r\n\r\n"));
+ asio::read_until( socket_, response, boost::regex( "\r\n\r\n" ) );
#endif
// Process the response headers. (to get the crap of the response before reading the body!)
std::string header;
- while (std::getline(response_stream, header) && header != "\r");
-
- asio::error error = asio::error::eof;
- // Read until EOF, writing data to output as we go.
- while (asio::read(socket_, response,
- asio::transfer_at_least(1),
- asio::assign_error(error)))
- std::cout << &response;
- if (error != asio::error::eof)
- throw error;
-
+ // std::cout << "header: " << std::endl;
+ while ( std::getline(response_stream, header) && header != "\r"){
+ // std::cout << header << std::endl;
+ }
+
+ error = asio::error::eof;
+ // Read until EOF, writing data to output as we go.
+ // std::cout << "response: " <<std::endl;
+ while ( asio::read( socket_, response, asio::transfer_at_least( 1 ), asio::assign_error( error ) ) ){
+ // std::cout << &response << std::endl;
+ }
+
+ if ( error != asio::error::eof ) throw error;
return 1;
}
-
} // namespace OpenGate
Modified: trunk/src/metaserver.h
===================================================================
--- trunk/src/metaserver.h 2007-10-30 23:16:31 UTC (rev 835)
+++ trunk/src/metaserver.h 2007-11-14 19:30:12 UTC (rev 836)
@@ -25,6 +25,8 @@
using asio::ip::tcp;
+#define META_NOT_CONNECTED -1
+
namespace OpenGate{
class LogManagerBase;
@@ -42,10 +44,13 @@
std::list<std::string> list_game_server();
int remove_game_server();
+ bool isConnected() const { return isConnected_; }
+
private:
LogManagerBase *log_;
std::string hostname_;
+ bool isConnected_;
asio::io_service & io_service_;
tcp::socket socket_;
Modified: trunk/src/networkServer.cpp
===================================================================
--- trunk/src/networkServer.cpp 2007-10-30 23:16:31 UTC (rev 835)
+++ trunk/src/networkServer.cpp 2007-11-14 19:30:12 UTC (rev 836)
@@ -123,10 +123,10 @@
userNames_.erase( name );
}
- // delete user;
log_->info( std::string( "DISCONNECTED: " ) + name );
- delete user;
+ //** this will possible cause segfault if multiple users discos at the same time
+ // delete user;
}
void Server::receiveChat( UserSession * user, const MessageBodyChat & msg ){
Modified: trunk/src/opengateserver.cpp
===================================================================
--- trunk/src/opengateserver.cpp 2007-10-30 23:16:31 UTC (rev 835)
+++ trunk/src/opengateserver.cpp 2007-11-14 19:30:12 UTC (rev 836)
@@ -33,25 +33,29 @@
using namespace OpenGate;
-LogManagerBase *logMgr = NULL;
-asio::io_service *io_servicePtr = NULL;
-Server *serverPtr = NULL;
-OpenGate::MetaConnection *metaPtr = NULL;
+LogManagerBase *logMgr = NULL;
+asio::io_service *io_servicePtr = NULL;
+Server *serverPtr = NULL;
+OpenGate::MetaConnection *metaPtr = NULL;
void server_shutdown() {
- if ( metaPtr ) {
- logMgr->info("Remove server from server list!");
- int error = 0;
- if ( (error = metaPtr->remove_game_server() ) < 0) {
- logMgr->warn( std::string("Could not remove game server " + toStr ( error ) ) );
- }
- }
if ( serverPtr ) {
serverPtr->shutdown();
+ delete serverPtr;
}
if ( io_servicePtr ) {
io_servicePtr->interrupt();
}
+ if ( metaPtr ) {
+ if ( metaPtr->isConnected() ){
+ logMgr->info("Remove server from server list!");
+ int error = 0;
+ if ( (error = metaPtr->remove_game_server() ) < 0) {
+ logMgr->warn( std::string("Could not remove game server " + toStr ( error ) ) );
+ }
+ }
+ delete metaPtr;
+ }
}
void signal_term( int singal ) {
@@ -74,8 +78,9 @@
logMgr->info( std::string("Starting up server ") + PACKAGE_STRING );
signal( SIGTERM, signal_term );
- signal( SIGINT, signal_interrupt );
+ signal( SIGINT, signal_interrupt );
+ //** ein bissle mehr verbose output, kommt sp\xE4ter wieder weg.;
//** das k\xF6nnte mal vielleicht als option rausreichen, das man wie beim clienten die Wahl hat;
//** -M = (withMetaServer = true);
bool withMetaServer = true;
@@ -85,34 +90,32 @@
io_servicePtr = &io_service;
if ( withMetaServer ){
- OpenGate::MetaConnection meta( io_service, *logMgr );
- metaPtr = &meta;
+ metaPtr = new OpenGate::MetaConnection( io_service, *logMgr );
int error = 0;
- if ((error = meta.add_game_server()) < 0) {
- logMgr->warn( std::string("Could not add game server " + toStr (error) ) );
- }
- //** ein bissle mehr verbose output, kommt sp\xE4ter wieder weg.;
- std::list< std::string > serverOnline( meta.list_game_server() );
- copy( serverOnline.begin(), serverOnline.end(), std::ostream_iterator< std::string >( std::cout, " " ) );
+ if ( ( error = metaPtr->add_game_server() ) < 0 ) {
+ logMgr->warn( std::string( "Could not add game server " + toStr ( error ) ) );
+ } else {
+ logMgr->info( std::string( "server added to meta server " ) );
+ }
+
+ logMgr->info( std::string( "Request game server from meta server: " ) );
+ std::list< std::string > serverOnline( metaPtr->list_game_server() );
+ copy( serverOnline.begin(), serverOnline.end(), std::ostream_iterator< std::string >( std::cout, "\n" ) );
}
tcp::endpoint endpoint( tcp::v4(), OG_PORT );
- Server server( io_service, endpoint, *logMgr );
- serverPtr = &server;
+ serverPtr = new Server( io_service, endpoint, *logMgr );
io_service.run();
- }
- catch ( asio::error & e ) {
- logMgr->fatal( e.what() );
+ } catch ( asio::error & e ) {
+ logMgr->fatal( std::string("opengateserver asio exception: " )+ e.what() );
server_shutdown();
return EXIT_FAILURE;
- }
- catch ( std::exception & e ) {
- logMgr->fatal( std::string("Exception: ") + e.what() );
+ } catch ( std::exception & e ) {
+ logMgr->fatal( std::string("opengateserver std exception: ") + e.what() );
server_shutdown();
return EXIT_FAILURE;
}
-
return EXIT_SUCCESS;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-11-14 20:48:53
|
Revision: 837
http://opengate.svn.sourceforge.net/opengate/?rev=837&view=rev
Author: egore
Date: 2007-11-14 12:48:44 -0800 (Wed, 14 Nov 2007)
Log Message:
-----------
2007-11-14 hristoph Brill <eg...@us...>
* src/networkServerUser.h: fix build with boost 1.34
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/networkServerUser.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-11-14 19:30:12 UTC (rev 836)
+++ trunk/ChangeLog 2007-11-14 20:48:44 UTC (rev 837)
@@ -1,3 +1,6 @@
+2007-11-14 hristoph Brill <eg...@us...>
+ * src/networkServerUser.h: fix build with boost 1.34
+
2007-09-26 Christoph Brill <eg...@us...>
* src/metaserver.cpp: beautify the log and indent the ifdefs
Modified: trunk/src/networkServerUser.h
===================================================================
--- trunk/src/networkServerUser.h 2007-11-14 19:30:12 UTC (rev 836)
+++ trunk/src/networkServerUser.h 2007-11-14 20:48:44 UTC (rev 837)
@@ -23,6 +23,7 @@
#include <deque>
#include <string>
+#include <set>
#include <asio.hpp>
#include "networkProtocol.h"
#include "common.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-11-17 19:07:20
|
Revision: 841
http://opengate.svn.sourceforge.net/opengate/?rev=841&view=rev
Author: spom_spom
Date: 2007-11-17 11:07:16 -0800 (Sat, 17 Nov 2007)
Log Message:
-----------
add keymap
Modified Paths:
--------------
trunk/ogre.cfg
trunk/src/Console.cpp
trunk/src/Console.h
trunk/src/GameStateManager.cpp
trunk/src/Makefile.am
trunk/src/MarketDialog.cpp
trunk/src/ResourceManager.cpp
trunk/src/ResourceManager.h
trunk/src/SectorObjects.cpp
trunk/src/SectorObjects.h
trunk/src/UnDockedState.cpp
trunk/src/UnDockedState.h
trunk/src/metaserver.cpp
trunk/src/opengateserver.cpp
Added Paths:
-----------
trunk/src/KeyMap.cpp
trunk/src/KeyMap.h
Modified: trunk/ogre.cfg
===================================================================
--- trunk/ogre.cfg 2007-11-16 23:16:40 UTC (rev 840)
+++ trunk/ogre.cfg 2007-11-17 19:07:16 UTC (rev 841)
@@ -1,7 +1,7 @@
Render System=OpenGL Rendering Subsystem
[OpenGL Rendering Subsystem]
-FSAA=0
+FSAA=6
Full Screen=No
RTT Preferred Mode=FBO
Video Mode=1024 x 768
Modified: trunk/src/Console.cpp
===================================================================
--- trunk/src/Console.cpp 2007-11-16 23:16:40 UTC (rev 840)
+++ trunk/src/Console.cpp 2007-11-17 19:07:16 UTC (rev 841)
@@ -23,6 +23,7 @@
#include "Console.h"
#include "LogManager.h"
#include "networkClient.h"
+#include "KeyMap.h"
#include <OgreRenderWindow.h>
#include <CEGUI/elements/CEGUIEditbox.h>
@@ -123,28 +124,42 @@
CEGUI::System::getSingleton().injectKeyDown( e.key );
CEGUI::System::getSingleton().injectChar( e.text );
- if ( e.key == OIS::KC_LCONTROL) resources_->setGlobalKeyModifier( KEY_LCONTROL );
- if ( e.key == OIS::KC_LSHIFT) resources_->setGlobalKeyModifier( KEY_SHIFT );
- if ( e.key == OIS::KC_RSHIFT) resources_->setGlobalKeyModifier( KEY_SHIFT );
+ //** for testings
+ if ( e.key == OIS::KC_BACK && resources_->keymap()->globalKeyModifier( ) == KEY_LCONTROL ){
+ resources_->renderWindow->setFullscreen( true,
+ resources_->renderWindow->getWidth(),
+ resources_->renderWindow->getHeight() );
+ // resources_->renderWindow->resize( 1280, 1024 );
+ std::cout << "Fullscreen: " << resources_->renderWindow->isFullScreen() << std::endl;
+ }
+
+ if ( e.key == OIS::KC_LCONTROL) resources_->keymap()->setGlobalKeyModifier( KEY_LCONTROL );
+ if ( e.key == OIS::KC_LSHIFT) resources_->keymap()->setGlobalKeyModifier( KEY_SHIFT );
+ if ( e.key == OIS::KC_RSHIFT) resources_->keymap()->setGlobalKeyModifier( KEY_SHIFT );
- //** Create one screenshot;
- if ( e.key == OIS::KC_SYSRQ ) {
- std::string tmp( "screenshot" + LogManager::getSingleton().timeStamp() + ".png" );
- ResourceManager::getSingleton().renderWindow->writeContentsToFile( tmp.c_str() );
- LogManager::getSingleton().info( "wrote: " + tmp );
- }
+ if ( (this->*resources_->keymap()->consoleKeyAction( e ))( true ) ) return true;
+
return true;
}
bool Console::keyReleased( const OIS::KeyEvent & e ){
CEGUI::System::getSingleton().injectKeyUp( e.key );
- if ( e.key == OIS::KC_LCONTROL ) resources_->setGlobalKeyModifier( KEY_NONE );
- if ( e.key == OIS::KC_LSHIFT) resources_->setGlobalKeyModifier( KEY_NONE );
- if ( e.key == OIS::KC_RSHIFT) resources_->setGlobalKeyModifier( KEY_NONE );
+ if ( e.key == OIS::KC_LCONTROL ) resources_->keymap()->setGlobalKeyModifier( KEY_NONE );
+ if ( e.key == OIS::KC_LSHIFT ) resources_->keymap()->setGlobalKeyModifier( KEY_NONE );
+ if ( e.key == OIS::KC_RSHIFT ) resources_->keymap()->setGlobalKeyModifier( KEY_NONE );
+
return true;
}
+bool Console::keyActionScreenshot( bool pressed ){
+ if ( pressed ){
+ std::string tmp( "screenshot" + LogManager::getSingleton().timeStamp() + ".png" );
+ ResourceManager::getSingleton().renderWindow->writeContentsToFile( tmp.c_str() );
+ LogManager::getSingleton().info( "wrote: " + tmp );
+ } return true;
+}
+
void Console::print( const std::string & t ){
CEGUI::colour col(1.0, 1.0, 1.0, 1.0);
if ( t.find( "INFO:" ) == 0 ){
Modified: trunk/src/Console.h
===================================================================
--- trunk/src/Console.h 2007-11-16 23:16:40 UTC (rev 840)
+++ trunk/src/Console.h 2007-11-17 19:07:16 UTC (rev 841)
@@ -62,13 +62,16 @@
void printHelp( );
bool handleResize( const CEGUI::EventArgs & args );
+
+ bool keyActionDoNothing( bool pressed = true ) { return false; }
+ bool keyActionScreenshot( bool pressed = true );
+
private:
bool handleEditTextAccepted( const CEGUI::EventArgs & args );
-
CEGUI::Window * rootWindow_;
- ResourceManager * resources_;
+ ResourceManager * resources_;
CEGUI::Editbox * editBox_;
CEGUI::Listbox * listBox_;
Modified: trunk/src/GameStateManager.cpp
===================================================================
--- trunk/src/GameStateManager.cpp 2007-11-16 23:16:40 UTC (rev 840)
+++ trunk/src/GameStateManager.cpp 2007-11-17 19:07:16 UTC (rev 841)
@@ -444,11 +444,11 @@
resources_.ogreRoot->addFrameListener( resources_.console );
LogManager::getSingleton().setConsole( resources_.console );
- resources_.console->addCommand( "/q", &GameStateManager::CMD_shutdown, "Shutting down the client. Shortcut for /quit" );
+ resources_.console->addCommand( "/q", &GameStateManager::CMD_shutdown, "Shutting down the client. Shortcut for /quit" );
resources_.console->addCommand( "/quit", &GameStateManager::CMD_shutdown, "Shutting down the client" );
- resources_.console->addCommand( "/help", &GameStateManager::CMD_printHelp, "Show this help" );
- resources_.console->addCommand( "/time", &GameStateManager::CMD_printTime, "Show current system time" );
- resources_.console->addCommand( "/ai", &GameStateManager::CMD_spawnAi, "[name] Spawn ai subject. /ai help show all available ships." );
+ resources_.console->addCommand( "/help", &GameStateManager::CMD_printHelp,"Show this help" );
+ resources_.console->addCommand( "/time", &GameStateManager::CMD_printTime,"Show current system time" );
+ resources_.console->addCommand( "/ai", &GameStateManager::CMD_spawnAi, "[name] Spawn ai subject. /ai help show all available ships." );
return true;
}
Added: trunk/src/KeyMap.cpp
===================================================================
--- trunk/src/KeyMap.cpp (rev 0)
+++ trunk/src/KeyMap.cpp 2007-11-17 19:07:16 UTC (rev 841)
@@ -0,0 +1,103 @@
+/***************************************************************************
+ * Copyright (C) 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 "UnDockedState.h"
+#include "KeyMap.h"
+#include "InputManager.h"
+#include "Console.h"
+
+namespace OpenGate{
+
+KeyMap::KeyMap() : modifier_( KEY_NONE ){
+}
+
+void KeyMap::setDefaults(){
+ /*! Actions for undocked state */
+ unDockedActionMap_[ keycode( 70 ) ] = &UnDockedState::keyActionSwitchMinMaxConsole;
+
+ unDockedActionMap_[ keycode( OIS::KC_A ) ] = &UnDockedState::keyActionAvatarIncreaseYaw;
+ unDockedActionMap_[ keycode( OIS::KC_NUMPAD4 ) ] = &UnDockedState::keyActionAvatarIncreaseYaw;
+ unDockedActionMap_[ keycode( OIS::KC_D ) ] = &UnDockedState::keyActionAvatarDecreaseYaw;
+ unDockedActionMap_[ keycode( OIS::KC_NUMPAD6 ) ] = &UnDockedState::keyActionAvatarDecreaseYaw;
+
+ unDockedActionMap_[ keycode( OIS::KC_W ) ] = &UnDockedState::keyActionAvatarIncreasePitch;
+ unDockedActionMap_[ keycode( OIS::KC_NUMPAD8 ) ] = &UnDockedState::keyActionAvatarIncreasePitch;
+ unDockedActionMap_[ keycode( OIS::KC_S ) ] = &UnDockedState::keyActionAvatarDecreasePitch;
+ unDockedActionMap_[ keycode( OIS::KC_NUMPAD2 ) ] = &UnDockedState::keyActionAvatarDecreasePitch;
+
+ unDockedActionMap_[ keycode( 181 ) ] = &UnDockedState::keyActionAvatarIncreaseRoll;
+ unDockedActionMap_[ keycode( OIS::KC_NUMPAD0 ) ] = &UnDockedState::keyActionAvatarIncreaseRoll;
+ unDockedActionMap_[ keycode( 55 ) ] = &UnDockedState::keyActionAvatarDecreaseRoll;
+ unDockedActionMap_[ keycode( OIS::KC_NUMPADCOMMA ) ] = &UnDockedState::keyActionAvatarDecreaseRoll;
+
+ unDockedActionMap_[ keycode( OIS::KC_NUMPAD5 ) ] = &UnDockedState::keyActionAvatarCenter;
+
+ unDockedActionMap_[ keycode( OIS::KC_NUMPAD7 ) ] = &UnDockedState::keyActionAvatarIncrementThrust;
+ unDockedActionMap_[ keycode( OIS::KC_NUMPAD1 ) ] = &UnDockedState::keyActionAvatarDecrementThrust;
+ unDockedActionMap_[ keycode( OIS::KC_NUMPAD3 ) ] = &UnDockedState::keyActionAvatarBreakPressed;
+ unDockedActionMap_[ keycode( OIS::KC_NUMPAD9 ) ] = &UnDockedState::keyActionAvatarAfterburnerPressed;
+
+ unDockedActionMap_[ keycode( OIS::KC_N ) ] = &UnDockedState::keyActionSelectTextTarget;
+ unDockedActionMap_[ keycode( OIS::KC_P ) ] = &UnDockedState::keyActionSelectPreviousTarget;
+
+ unDockedActionMap_[ keycode( OIS::KC_1 ) ] = &UnDockedState::keyActionCameraNormal;
+ unDockedActionMap_[ keycode( OIS::KC_2 ) ] = &UnDockedState::keyActionCameraLeft;
+ unDockedActionMap_[ keycode( OIS::KC_3 ) ] = &UnDockedState::keyActionCameraRight;
+ unDockedActionMap_[ keycode( OIS::KC_4 ) ] = &UnDockedState::keyActionCameraUp;
+ unDockedActionMap_[ keycode( OIS::KC_5 ) ] = &UnDockedState::keyActionCameraDown;
+ unDockedActionMap_[ keycode( OIS::KC_6 ) ] = &UnDockedState::keyActionCameraToggle;
+
+ /*! Actions for console. */
+ consoleActionMap_[ keycode( OIS::KC_SYSRQ ) ] = &Console::keyActionScreenshot;
+
+ /*! Actions for development, will removed later. */
+ unDockedActionMap_[ keycode( OIS::KC_F ) ] = &UnDockedState::keyActionToggleFiltering_DEV;
+ unDockedActionMap_[ keycode( OIS::KC_R ) ] = &UnDockedState::keyActionTogglePolygonMode_DEV;
+
+ unDockedActionMap_[ keycode( OIS::KC_L, KEY_SHIFT ) ] = &UnDockedState::keyActionIncreaseAmbientLight_DEV;
+ unDockedActionMap_[ keycode( OIS::KC_L ) ] = &UnDockedState::keyActionDecreaseAmbientLight_DEV;
+
+ unDockedActionMap_[ keycode( OIS::KC_O, KEY_SHIFT ) ] = &UnDockedState::keyActionIncreaseShaderScheme_DEV;
+ unDockedActionMap_[ keycode( OIS::KC_O ) ] = &UnDockedState::keyActionDecreaseShaderScheme_DEV;
+
+ unDockedActionMap_[ keycode( OIS::KC_F5 ) ] = &UnDockedState::keyActionAvatarSwitchDuelistPilot_DEV;
+ unDockedActionMap_[ keycode( OIS::KC_F6 ) ] = &UnDockedState::keyActionAvatarSwitchDuelistTarget_DEV;
+ unDockedActionMap_[ keycode( OIS::KC_F4 ) ] = &UnDockedState::keyActionAvatarChangeDockedState_DEV;
+ unDockedActionMap_[ keycode( OIS::KC_F8 ) ] = &UnDockedState::keyActionAvatarSelfDestruct_DEV;
+}
+
+bool(UnDockedState::*KeyMap::unDockedKeyAction( const OIS::KeyEvent & e ))(bool) {
+ uint key = keycode( e.key, modifier_ );
+ if ( unDockedActionMap_.count( key ) > 0 ) return unDockedActionMap_[ key ];
+ return &UnDockedState::keyActionDoNothing;
+}
+
+bool(Console::*KeyMap::consoleKeyAction( const OIS::KeyEvent & e ))(bool) {
+ uint key = keycode( e.key, modifier_ );
+ if ( consoleActionMap_.count( key ) > 0 ) return consoleActionMap_[ key ];
+ return &Console::keyActionDoNothing;
+}
+
+uint KeyMap::keycode( uint key, GlobalKeyModifier modifier ){
+ return modifier * 65565 + key;
+}
+
+} // namespace OpenGate
+
Added: trunk/src/KeyMap.h
===================================================================
--- trunk/src/KeyMap.h (rev 0)
+++ trunk/src/KeyMap.h 2007-11-17 19:07:16 UTC (rev 841)
@@ -0,0 +1,79 @@
+/***************************************************************************
+ * 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_KEYMAP__H
+#define _OPENGATE_KEYMAP__H
+
+#include <map>
+// #include "InputManager.h"
+ #include "UnDockedState.h"
+
+namespace OpenGate{
+
+class UnDockedState;
+class Console;
+
+// namespace OIS{
+// class KeyEvent;
+// }
+
+template < class Object, typename returnT, typename Args > class memberBind {
+public:
+ typedef returnT( Object::*F )( Args );
+ memberBind( F function, Object * object) : function_( function ), object_( object ) {}
+
+ returnT operator()( Args args ) const { return ( object_->*function_ )( args ); }
+protected:
+ F function_;
+ Object object_;
+};
+
+enum GlobalKeyModifier{KEY_NONE, KEY_LCONTROL, KEY_SHIFT};
+
+class KeyMap{
+public:
+
+ KeyMap();
+
+ void setDefaults();
+
+ bool (UnDockedState::*unDockedKeyAction( const OIS::KeyEvent & e ))( bool );
+
+ bool (Console::*consoleKeyAction( const OIS::KeyEvent & e ))( bool );
+
+ void setGlobalKeyModifier( GlobalKeyModifier modifier ){ modifier_ = modifier; }
+
+ GlobalKeyModifier globalKeyModifier( ) const { return modifier_; }
+
+ uint keycode( uint key, GlobalKeyModifier modifier = KEY_NONE );
+
+protected:
+
+ std::map< uint, bool (UnDockedState::*)( bool ) > unDockedActionMap_;
+ std::map< uint, bool (Console::*)( bool ) > consoleActionMap_;
+
+ GlobalKeyModifier modifier_;
+
+};
+
+} // namespace OpenGate
+
+
+#endif // _OPENGATE_KEYMAP__H
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2007-11-16 23:16:40 UTC (rev 840)
+++ trunk/src/Makefile.am 2007-11-17 19:07:16 UTC (rev 841)
@@ -1,7 +1,7 @@
bin_PROGRAMS = \
opengateclient \
- opengateserver \
- testopenalmanager
+ opengateserver
+# testopenalmanager
opengateclient_SOURCES = \
opengateclient.cpp \
@@ -39,6 +39,8 @@
InputManager.cpp \
InitState.h \
InitState.cpp \
+ KeyMap.h \
+ KeyMap.cpp \
LogManager.h \
LogManager.cpp \
LogManagerBase.h \
@@ -107,44 +109,46 @@
opengateserver_CXXFLAGS =
# $(OGRE_CFLAGS)
-testopenalmanager_SOURCES = \
- testopenalmanager.cpp \
- common.h \
- common.cpp \
- tinyxml/tinyxml.h \
- tinyxml/tinyxml.cpp \
- tinyxml/tinyxmlerror.cpp \
- tinyxml/tinyxmlparser.cpp \
- networkProtocol.h \
- networkProtocol.cpp \
- networkClient.h \
- networkClient.cpp \
- Console.h \
- Console.cpp \
- Entity.h \
- Entity.cpp \
- LogManager.h \
- LogManager.cpp \
- LogManagerBase.h \
- LogManagerBase.cpp \
- InputManager.h \
- InputManager.cpp \
- OpenALSoundManager.h \
- OpenALSoundManager.cpp \
- ResourceManager.h \
- ResourceManager.cpp
+#testopenalmanager_SOURCES = \
+# testopenalmanager.cpp \
+# common.h \
+# common.cpp \
+# tinyxml/tinyxml.h \
+# tinyxml/tinyxml.cpp \
+# tinyxml/tinyxmlerror.cpp \
+# tinyxml/tinyxmlparser.cpp \
+# networkProtocol.h \
+# networkProtocol.cpp \
+# networkClient.h \
+# networkClient.cpp \
+# Console.h \
+# Console.cpp \
+# Entity.h \
+# Entity.cpp \
+# LogManager.h \
+# LogManager.cpp \
+# LogManagerBase.h \
+# LogManagerBase.cpp \
+# KeyMap.h \
+# KeyMap.cpp \
+# InputManager.h \
+# InputManager.cpp \
+# OpenALSoundManager.h \
+# OpenALSoundManager.cpp \
+# ResourceManager.h \
+# ResourceManager.cpp
-testopenalmanager_LDFLAGS = \
- $(OGRE_LIBS) \
- $(CEGUI_LIBS) \
- $(CEGUIOGRE_LIBS) \
- $(freealut_LIBS) \
- $(vorbisfile_LIBS) \
- $(OIS_LIBS)
+#testopenalmanager_LDFLAGS = \
+# $(OGRE_LIBS) \
+# $(CEGUI_LIBS) \
+# $(CEGUIOGRE_LIBS) \
+# $(freealut_LIBS) \
+# $(vorbisfile_LIBS) \
+# $(OIS_LIBS)
-testopenalmanager_CXXFLAGS = \
- $(OGRE_CFLAGS) \
- $(CEGUI_CFLAGS)
+#testopenalmanager_CXXFLAGS = \
+# $(OGRE_CFLAGS) \
+# $(CEGUI_CFLAGS)
distclean: maintainer-clean
rm -rf *~ \
Modified: trunk/src/MarketDialog.cpp
===================================================================
--- trunk/src/MarketDialog.cpp 2007-11-16 23:16:40 UTC (rev 840)
+++ trunk/src/MarketDialog.cpp 2007-11-17 19:07:16 UTC (rev 841)
@@ -25,6 +25,7 @@
#include "Entity.h"
#include "Avatar.h"
#include "Vessel.h"
+#include "KeyMap.h"
#include <OgreRenderWindow.h>
#include <CEGUI/elements/CEGUIEditbox.h>
@@ -465,7 +466,7 @@
if ( item ){
buyMode_ = true;
- if ( ResourceManager::getSingleton().globalKeyModifier() == KEY_LCONTROL ){
+ if ( ResourceManager::getSingleton().keymap()->globalKeyModifier() == KEY_LCONTROL ){
buyItems( item, 1 );
} else {
CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"MarketWindow")->hide();
@@ -487,7 +488,7 @@
if ( item ){
buyMode_ = false;
- if ( ResourceManager::getSingleton().globalKeyModifier() == KEY_LCONTROL ){
+ if ( ResourceManager::getSingleton().keymap()->globalKeyModifier() == KEY_LCONTROL ){
sellItems( item, 1 );
} else {
CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"MarketWindow")->hide();
Modified: trunk/src/ResourceManager.cpp
===================================================================
--- trunk/src/ResourceManager.cpp 2007-11-16 23:16:40 UTC (rev 840)
+++ trunk/src/ResourceManager.cpp 2007-11-17 19:07:16 UTC (rev 841)
@@ -24,6 +24,7 @@
#include "Station.h"
#include "Entity.h"
+#include "KeyMap.h"
#include <OgreArchiveManager.h>
#include <OgreFileSystem.h>
@@ -32,7 +33,7 @@
template<> ResourceManager * Ogre::Singleton< ResourceManager >::ms_Singleton = 0;
-ResourceManager::ResourceManager( ) : modifier_( KEY_NONE ){
+ResourceManager::ResourceManager( ){
log_ = LogManager::getSingletonPtr();
ogreRoot = NULL;
@@ -45,12 +46,15 @@
network = NULL;
gameStateRoot = NULL;
avatar = NULL;
+ keymap_ = new KeyMap();
+ keymap_->setDefaults();
languageSuffix_ = "en";
mapping_ = true;
}
ResourceManager::~ResourceManager( ) {
+ delete keymap_;
}
std::string ResourceManager::factionName( int id ) {
Modified: trunk/src/ResourceManager.h
===================================================================
--- trunk/src/ResourceManager.h 2007-11-16 23:16:40 UTC (rev 840)
+++ trunk/src/ResourceManager.h 2007-11-17 19:07:16 UTC (rev 841)
@@ -48,9 +48,8 @@
class Console;
class Entity;
class Station;
+class KeyMap;
-enum GlobalKeyModifier{KEY_NONE, KEY_LCONTROL, KEY_SHIFT};
-
class ResourceManager : public Ogre::Singleton< ResourceManager > {
public:
Ogre::Root * ogreRoot;
@@ -74,9 +73,6 @@
/*! This method return a pointer to the single instance of the LogManager */
static ResourceManager * getSingletonPtr( void );
- void setGlobalKeyModifier( GlobalKeyModifier modifier ){ modifier_ = modifier; }
- GlobalKeyModifier globalKeyModifier( ) const { return modifier_; }
-
std::string languageSuffix() const { return languageSuffix_; }
std::string className( int id ) const { return "unknown"; }
@@ -107,6 +103,7 @@
std::set < std::string > & resourcePaths() { return resourcePaths_; }
void setMappingCapability( bool mapping ) { mapping_ = mapping; }
+
bool mappingCapability() const { return mapping_; }
void load( const std::string & resourceName );
@@ -115,12 +112,14 @@
Station * station( const std::string & fileName );
+ KeyMap * keymap() { return keymap_; }
+
protected:
LogManager * log_;
+ KeyMap * keymap_;
bool mapping_;
- GlobalKeyModifier modifier_;
std::string languageSuffix_;
std::map< int, std::string > factionIDs_;
Modified: trunk/src/SectorObjects.cpp
===================================================================
--- trunk/src/SectorObjects.cpp 2007-11-16 23:16:40 UTC (rev 840)
+++ trunk/src/SectorObjects.cpp 2007-11-17 19:07:16 UTC (rev 841)
@@ -771,6 +771,7 @@
targetArrowNode_ = NULL;
flightArrowNode_ = NULL;
forceMovement_ = false;
+ thrustChange_ = 0.0;
targetArrowNode_ = mainNode_->createChildSceneNode( name_ + "_TargetArrow" );
Ogre::SceneNode * targetArrowTrans = targetArrowNode_->createChildSceneNode( name_ + "_TargetArrow_trans" );
@@ -834,8 +835,30 @@
}
}
+void SectorObjectAvatar::decrementThrust( bool pressed ){
+ if ( pressed ){
+ thrustChange_ = -1.0;
+ } else {
+ thrustChange_ = 0.0;
+ }
+}
+
+void SectorObjectAvatar::incrementThrust( bool pressed ){
+ if ( pressed ){
+ thrustChange_ = 1.0;
+ } else {
+ thrustChange_ = 0.0;
+ }
+}
+
bool SectorObjectAvatar::update( Ogre::Real elapsedTime ){
updatePowerGrid( elapsedTime );
+
+ thrustRate_ += (thrustChange_ *0.5f*elapsedTime);
+ thrustRate_ = max( thrustRate_, 0.0f );
+ thrustRate_ = min( 1.0f, thrustRate_ );
+ if ( thrustChange_ != 0.0 ) updateThruster();
+
if ( soundListener_ ){
soundListener_->setPosition( mainNode_->getWorldPosition() );
soundListener_->setVelocity( vel_ );
Modified: trunk/src/SectorObjects.h
===================================================================
--- trunk/src/SectorObjects.h 2007-11-16 23:16:40 UTC (rev 840)
+++ trunk/src/SectorObjects.h 2007-11-17 19:07:16 UTC (rev 841)
@@ -452,8 +452,8 @@
Ogre::SceneNode * targetArrow() { return targetArrowNode_; }
Ogre::SceneNode * flightArrow() { return flightArrowNode_; }
- inline void decrementThrust(){ thrustRate_ = max( thrustRate_ - 0.1f, 0.0f ); updateThruster(); }
- inline void incrementThrust(){ thrustRate_ = min( thrustRate_ + 0.1f, 1.0f ); updateThruster(); }
+ void decrementThrust( bool pressed );
+ void incrementThrust( bool pressed );
virtual Uint32 thrust() const {
double thrust = thrust_;
@@ -462,12 +462,12 @@
return (Uint32)rint( thrust );
}
-
virtual bool isChild() const { return false; }
inline Ogre::Real capacityRate() const { if ( maxCapacity_ > 0 ) return (float)capacity_ / maxCapacity_; else return 0; }
protected:
+ Ogre::Real thrustChange_;
Ogre::SceneNode * targetArrowNode_;
Ogre::SceneNode * flightArrowNode_;
Ogre::SceneNode * lightNode_;
Modified: trunk/src/UnDockedState.cpp
===================================================================
--- trunk/src/UnDockedState.cpp 2007-11-16 23:16:40 UTC (rev 840)
+++ trunk/src/UnDockedState.cpp 2007-11-17 19:07:16 UTC (rev 841)
@@ -26,6 +26,7 @@
#include "InputManager.h"
#include "Console.h"
#include "ConfigDialog.h"
+#include "KeyMap.h"
#include <iostream>
@@ -36,6 +37,7 @@
#include <OgreViewport.h>
#include <OgreOverlayManager.h>
#include <OgreStringConverter.h>
+#include <OgreMaterialManager.h>
#include <CEGUI/elements/CEGUIPushButton.h>
@@ -215,6 +217,9 @@
schemeIdx_ = 0;
setScheme_();
+ aniso_ = 1;
+ filtering_ = Ogre::TFO_BILINEAR;
+
// targetPointer_ = mainCamera_->getSceneManager()->getRootSceneNode()->createChildSceneNode( "TargetPointer" );
// BillboardSet* mySet = mainCamera_->getSceneManager()->createBillboardSet("mySet");
// targetPointerBB_ = mySet->createBillboard( Vector3(0, 0, 0) );
@@ -245,9 +250,6 @@
// particleNode_->attachObject( spaceDustParticle_ );
// statsOn_ = true;
-// numScreenShots_ = 0;
-// aniso_ = 1;
-// filtering_ = TFO_BILINEAR;
sector_->createAvatarObject( *resources_->avatar );
@@ -392,96 +394,13 @@
}
if ( !chatMode_ && !configMode_ ){
-
- if ( e.key == 70 ){ // 70 == Roll
- if ( !consoleMax_ ){
- maximiseConsole();
- } else {
- minimiseConsole();
- }
- }
-
- if ( e.key == OIS::KC_RETURN) {
+ if ( (this->*resources_->keymap()->unDockedKeyAction( e ))( true ) ) return true;
+
+ if ( e.key == OIS::KC_RETURN ) {
CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"ConsoleEdit")->activate();
// hudOverlay_->getChild( overlayName_ + "/ChatIn" )->show( );
chatMode_ = true;
}
-
- if ( e.key == OIS::KC_L && resources_->globalKeyModifier( ) != KEY_SHIFT ) { decreaseAmbientLight(); }
- if ( e.key == OIS::KC_L && resources_->globalKeyModifier( ) == KEY_SHIFT ) { increaseAmbientLight(); }
-
- if ( e.key == OIS::KC_O && resources_->globalKeyModifier( ) != KEY_SHIFT ) { decreaseScheme(); }
- if ( e.key == OIS::KC_O && resources_->globalKeyModifier( ) == KEY_SHIFT ) { increaseScheme(); }
-
-
- if ( sector_->avatarObject() != NULL ){
- //** Avatar yaw LEFT;
- if ( e.key == OIS::KC_A || e.key == OIS::KC_NUMPAD4 ) { sector_->avatarObject()->setScaledYaw( 1.0 ); }
-
- //** Avatar yaw RIGHT;
- if ( e.key == OIS::KC_D || e.key == OIS::KC_NUMPAD6 ) { sector_->avatarObject()->setScaledYaw( -1.0 ); }
-
- //** Avatar pitch DOWN;
- if ( e.key == OIS::KC_W || e.key == OIS::KC_NUMPAD8 ) { sector_->avatarObject()->setScaledPitch( -1.0 ); }
-
- //** Avatar pitch UP;
- if ( e.key == OIS::KC_S || e.key == OIS::KC_NUMPAD2 ) { sector_->avatarObject()->setScaledPitch( 1.0 ); }
-
- //** Avatar roll (181 == NUM/);
- if ( e.key == OIS::KC_NUMPAD0 || e.key == 181 ) { sector_->avatarObject()->setScaledRoll( 1.0 ); }
-
- //** Avatar roll (55 == NUM*);
- if ( e.key == OIS::KC_NUMPADCOMMA || e.key == 55 ) { sector_->avatarObject()->setScaledRoll( -1.0 ); }
-
- //** Avatar increase thrust by 10%;
- if ( e.key == OIS::KC_NUMPAD7 ) { sector_->avatarObject()->incrementThrust(); }
-
- //** Avatar increase thrust by 10%;
- if ( e.key == OIS::KC_NUMPAD1 ) { sector_->avatarObject()->decrementThrust(); }
-
- //** Avatar press break;
- if ( e.key == OIS::KC_NUMPAD3 ) { sector_->avatarObject()->setBreakPressed( true ); }
-
- //** Avatar press afterburner;
- if ( e.key == OIS::KC_NUMPAD9 ) { sector_->avatarObject()->setAfterburnerPressed( true ); }
-
- //** Avatar centering;
- if ( e.key == OIS::KC_NUMPAD5 ) {
- sector_->avatarObject()->setScaledYaw( 0.0 );
- sector_->avatarObject()->setScaledPitch( 0.0 );
- sector_->avatarObject()->setScaledRoll( 0.0 );
- }
- //** selfdestruct and eject;
- if ( e.key == OIS::KC_F4 ) { changeToDockedState(); return true; }
- if ( e.key == OIS::KC_F5 ) { duelistPilot_ = !duelistPilot_; }
- if ( e.key == OIS::KC_F6 ) { duelistTarget_ = !duelistTarget_; }
- if ( e.key == OIS::KC_F8 ) { sector_->avatarObject()->deathSequence( 0 ); }
- } // if avatar;
-
- //** next Target;
- if ( e.key == OIS::KC_N ) { setTarget( sector_->nextTarget() ); }
-
- //** prev Target;
- if ( e.key == OIS::KC_P ) { setTarget( sector_->prevTarget() ); }
-
- if ( e.key == OIS::KC_1 ) { if ( cameraMode_ == 0 ) showHud(); cameraViewKey_ = 1; }
- if ( e.key == OIS::KC_2 ) { hideHud(); cameraViewKey_ = 2; }
- if ( e.key == OIS::KC_3 ) { hideHud(); cameraViewKey_ = 3; }
- if ( e.key == OIS::KC_4 ) { hideHud(); cameraViewKey_ = 4; }
- if ( e.key == OIS::KC_5 ) { hideHud(); cameraViewKey_ = 5; }
-
- //** Toggle through camera modes;
- if ( e.key == OIS::KC_6 ) { toggleNextCamera_(); }
-
- if ( e.key == OIS::KC_R ) {
- sceneDetailIndex_ = ( sceneDetailIndex_ + 1) % 3;
- switch( sceneDetailIndex_ ) {
- case 0: mainCamera_->setPolygonMode( Ogre::PM_SOLID ); break;
- case 1: mainCamera_->setPolygonMode( Ogre::PM_WIREFRAME ); break;
- case 2: mainCamera_->setPolygonMode( Ogre::PM_POINTS ); break;
- }
- }
-
} else { // ** chatmode
if ( e.key == OIS::KC_RETURN) {
CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"ConsoleEdit")->deactivate();
@@ -489,37 +408,13 @@
}
}
-// if ( e.key == OIS::KC_T ) {
-// switch( filtering_ ) {
-// case TFO_BILINEAR:
-// filtering_ = TFO_TRILINEAR;
-// aniso_ = 1;
-// break;
-// case TFO_TRILINEAR:
-// filtering_ = TFO_ANISOTROPIC;
-// aniso_ = 8;
-// break;
-// case TFO_ANISOTROPIC:
-// filtering_ = TFO_BILINEAR;
-// aniso_ = 1;
-// break;
-// default:
-// break;
-// }
-// MaterialManager::getSingleton().setDefaultTextureFiltering( filtering_ );
-// MaterialManager::getSingleton().setDefaultAnisotropy( aniso_ );
-// }
-return true;
+ return true;
}
bool UnDockedState::keyReleased( const OIS::KeyEvent & e ){
if (!configMode_){
if ( sector_->avatarObject() != NULL ){
- // Avatar release break
- if ( e.key == OIS::KC_NUMPAD3 ) { sector_->avatarObject()->setBreakPressed( false ); }
-
- // Avatar release afterburner
- if ( e.key == OIS::KC_NUMPAD9 ) { sector_->avatarObject()->setAfterburnerPressed( false ); }
+ if ( (this->*resources_->keymap()->unDockedKeyAction( e ))( false ) ) return true;
}
}
return true;
@@ -1149,7 +1044,7 @@
}
bool UnDockedState::projectionPosAndSize_( Ogre::Camera * cam, const Ogre::Vector3 & pos, const Ogre::Real rad,
- Ogre::Real & x, Ogre::Real & y, Ogre::Real & cx, Ogre::Real & cy ){
+ Ogre::Real & x, Ogre::Real & y, Ogre::Real & cx, Ogre::Real & cy ){
Ogre::Vector3 eyeSpacePos = cam->getViewMatrix( true ) * pos;
// z < 0 means in front of cam
@@ -1173,6 +1068,259 @@
}
}
+void UnDockedState::spawnAI( const std::string & name ){
+ sector_->spawnAiObject( name );
+}
+
+bool UnDockedState::keyActionSwitchMinMaxConsole( bool pressed ){
+ if ( pressed ){
+ if ( !consoleMax_ ){
+ maximiseConsole();
+ } else {
+ minimiseConsole();
+ }
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionAvatarIncreaseYaw( bool pressed ){
+ if ( pressed ){
+ if ( sector_->avatarObject() != NULL ){
+ sector_->avatarObject()->setScaledYaw( 1.0 );
+ }
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionAvatarDecreaseYaw( bool pressed ){
+ if ( pressed ){
+ if ( sector_->avatarObject() != NULL ){
+ sector_->avatarObject()->setScaledYaw( -1.0 );
+ }
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionAvatarIncreasePitch( bool pressed ){
+ if ( pressed ){
+ if ( sector_->avatarObject() != NULL ){
+ sector_->avatarObject()->setScaledPitch( 1.0 );
+ }
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionAvatarDecreasePitch( bool pressed ){
+ if ( pressed ){
+ if ( sector_->avatarObject() != NULL ){
+ sector_->avatarObject()->setScaledPitch( -1.0 );
+ }
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionAvatarIncreaseRoll( bool pressed ){
+ if ( pressed ){
+ if ( sector_->avatarObject() != NULL ){
+ sector_->avatarObject()->setScaledRoll( 1.0 );
+ }
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionAvatarDecreaseRoll( bool pressed ){
+ if ( pressed ){
+ if ( sector_->avatarObject() != NULL ){
+ sector_->avatarObject()->setScaledRoll( -1.0 );
+ }
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionAvatarIncrementThrust( bool pressed ){
+ if ( sector_->avatarObject() != NULL ){
+ sector_->avatarObject()->incrementThrust( pressed );
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionAvatarDecrementThrust( bool pressed ){
+ if ( sector_->avatarObject() != NULL ){
+ sector_->avatarObject()->decrementThrust( pressed );
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionAvatarBreakPressed( bool pressed ){
+ if ( sector_->avatarObject() != NULL ){
+ sector_->avatarObject()->setBreakPressed( pressed );
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionAvatarAfterburnerPressed( bool pressed ){
+ if ( sector_->avatarObject() != NULL ){
+ sector_->avatarObject()->setAfterburnerPressed( pressed );
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionAvatarCenter( bool pressed ){
+ if ( pressed ){
+ if ( sector_->avatarObject() != NULL ){
+ sector_->avatarObject()->setScaledYaw( 0.0 );
+ sector_->avatarObject()->setScaledPitch( 0.0 );
+ sector_->avatarObject()->setScaledRoll( 0.0 );
+ }
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionSelectTextTarget( bool pressed ){
+ if ( pressed ) setTarget( sector_->nextTarget() );
+ return true;
+}
+
+bool UnDockedState::keyActionSelectPreviousTarget( bool pressed ){
+ if ( pressed ) setTarget( sector_->prevTarget() );
+ return true;
+}
+
+bool UnDockedState::keyActionCameraNormal( bool pressed ){
+ if ( pressed ){
+ if ( cameraMode_ == 0 ) showHud();
+ cameraViewKey_ = 1;
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionCameraLeft( bool pressed ){
+ if ( pressed ){
+ hideHud();
+ cameraViewKey_ = 2;
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionCameraRight( bool pressed ){
+ if ( pressed ){
+ hideHud();
+ cameraViewKey_ = 3;
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionCameraUp( bool pressed ){
+ if ( pressed ){
+ hideHud();
+ cameraViewKey_ = 4;
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionCameraDown( bool pressed ){
+ if ( pressed ){
+ hideHud();
+ cameraViewKey_ = 5;
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionCameraToggle( bool pressed ){
+ if ( pressed ){
+ toggleNextCamera_();
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionToggleFiltering_DEV( bool pressed ){
+ if ( pressed ){
+ switch( filtering_ ) {
+ case Ogre::TFO_BILINEAR:
+ filtering_ = Ogre::TFO_TRILINEAR;
+ aniso_ = 1;
+ break;
+ case Ogre::TFO_TRILINEAR:
+ filtering_ = Ogre::TFO_ANISOTROPIC;
+ aniso_ = 8;
+ break;
+ case Ogre::TFO_ANISOTROPIC:
+ filtering_ = Ogre::TFO_BILINEAR;
+ aniso_ = 1;
+ break;
+ default:
+ break;
+ }
+ Ogre::MaterialManager::getSingleton().setDefaultTextureFiltering( filtering_ );
+ Ogre::MaterialManager::getSingleton().setDefaultAnisotropy( aniso_ );
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionTogglePolygonMode_DEV( bool pressed ){
+ if ( pressed ){
+ sceneDetailIndex_ = ( sceneDetailIndex_ + 1) % 3;
+ switch( sceneDetailIndex_ ) {
+ case 0: mainCamera_->setPolygonMode( Ogre::PM_SOLID ); break;
+ case 1: mainCamera_->setPolygonMode( Ogre::PM_WIREFRAME ); break;
+ case 2: mainCamera_->setPolygonMode( Ogre::PM_POINTS ); break;
+ }
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionIncreaseAmbientLight_DEV( bool pressed ){
+ if ( pressed ){
+ ambientLight_ = min( ambientLight_ + 1, 10 );
+ setAmbientLight_();
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionDecreaseAmbientLight_DEV( bool pressed ){
+ if ( pressed ){
+ ambientLight_ = max( ambientLight_ - 1, 0 );
+ setAmbientLight_();
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionIncreaseShaderScheme_DEV( bool pressed ){
+ if ( pressed ){
+ schemeIdx_ = min( schemeIdx_ + 1, 2 );
+ setScheme_();
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionDecreaseShaderScheme_DEV( bool pressed ){
+ if ( pressed ){
+ schemeIdx_ = max( schemeIdx_ - 1, 0 );
+ setScheme_();
+ }
+ return true;
+}
+
+bool UnDockedState::keyActionAvatarSwitchDuelistPilot_DEV( bool pressed ){
+ if ( pressed ) duelistPilot_ = !duelistPilot_;
+ return true;
+}
+
+bool UnDockedState::keyActionAvatarSwitchDuelistTarget_DEV( bool pressed ){
+ if ( pressed ) duelistTarget_ = !duelistTarget_;
+ return true;
+}
+
+bool UnDockedState::keyActionAvatarChangeDockedState_DEV( bool pressed ){
+ if ( pressed ) changeToDockedState();
+ return true;
+}
+
+bool UnDockedState::keyActionAvatarSelfDestruct_DEV( bool pressed ){
+ if ( pressed ) sector_->avatarObject()->deathSequence( 0 );
+ return true;
+}
+
bool UnDockedState::maximiseConsole( ){
if ( overlayRootWindow_ ){
CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"UnDocked/MainWindow/ConsoleFrame")->
@@ -1191,38 +1339,13 @@
return true;
}
-void UnDockedState::spawnAI( const std::string & name ){
- sector_->spawnAiObject( name );
-}
-
-void UnDockedState::increaseAmbientLight(){
- ambientLight_ = min( ambientLight_ + 1, 10 );
- setAmbientLight_();
-}
-
-void UnDockedState::decreaseAmbientLight(){
- ambientLight_ = max( ambientLight_ - 1, 0 );
- setAmbientLight_();
-}
-
void UnDockedState::setAmbientLight_(){
-
std::cout << ambientLight_ << std::endl;
sceneMgr_->setAmbientLight( Ogre::ColourValue( (double)ambientLight_/10.0,
(double)ambientLight_/10.0,
(double)ambientLight_/10.0 ) );
}
-void UnDockedState::increaseScheme(){
- schemeIdx_ = min( schemeIdx_ + 1, 2 );
- setScheme_();
-}
-
-void UnDockedState::decreaseScheme(){
- schemeIdx_ = max( schemeIdx_ - 1, 0 );
- setScheme_();
-}
-
void UnDockedState::setScheme_(){
for ( uint i = 0; i < window_->getNumViewports(); i ++ ){
Modified: trunk/src/UnDockedState.h
===================================================================
--- trunk/src/UnDockedState.h 2007-11-16 23:16:40 UTC (rev 840)
+++ trunk/src/UnDockedState.h 2007-11-17 19:07:16 UTC (rev 841)
@@ -89,12 +89,53 @@
void showHud();
void hideHud();
- void increaseAmbientLight();
- void decreaseAmbientLight();
+ bool keyActionDoNothing( bool pressed = true ) { return false; }
+ bool keyActionSwitchMinMaxConsole( bool pressed = true );
- void increaseScheme();
- void decreaseScheme();
+ bool keyActionAvatarIncreaseYaw( bool pressed = true );
+ bool keyActionAvatarDecreaseYaw( bool pressed = true );
+ bool keyActionAvatarIncreasePitch( bool pressed = true );
+ bool keyActionAvatarDecreasePitch( bool pressed = true );
+ bool keyActionAvatarIncreaseRoll( bool pressed = true );
+ bool keyActionAvatarDecreaseRoll( bool pressed = true );
+ bool keyActionSelectTextTarget( bool pressed = true );
+ bool keyActionSelectPreviousTarget( bool pressed = true );
+
+ bool keyActionCameraNormal( bool pressed = true );
+ bool keyActionCameraLeft( bool pressed = true );
+ bool keyActionCameraRight( bool pressed = true );
+ bool keyActionCameraUp( bool pressed = true );
+ bool keyActionCameraDown( bool pressed = true );
+ bool keyActionCameraToggle( bool pressed = true );
+
+ /*! center avatar stop yaw/pitch/roll */
+ bool keyActionAvatarCenter( bool pressed = true );
+
+ /*! Avatar increase thrust by 10% */
+ bool keyActionAvatarIncrementThrust( bool pressed = true );
+
+ /*! Avatar decrease thrust by 10% */
+ bool keyActionAvatarDecrementThrust( bool pressed = true );
+
+ bool keyActionAvatarBreakPressed( bool pressed = true );
+ bool keyActionAvatarAfterburnerPressed( bool pressed = true );
+
+ /*! Actions for development, will removed later. */
+ bool keyActionTogglePolygonMode_DEV( bool pressed = true );
+ bool keyActionToggleFiltering_DEV( bool pressed = true );
+
+ bool keyActionIncreaseAmbientLight_DEV( bool pressed = true );
+ bool keyActionDecreaseAmbientLight_DEV( bool pressed = true );
+
+ bool keyActionIncreaseShaderScheme_DEV( bool pressed = true );
+ bool keyActionDecreaseShaderScheme_DEV( bool pressed = true );
+
+ bool keyActionAvatarSwitchDuelistPilot_DEV( bool pressed = true );
+ bool keyActionAvatarSwitchDuelistTarget_DEV( bool pressed = true );
+ bool keyActionAvatarChangeDockedState_DEV( bool pressed = true );
+ bool keyActionAvatarSelfDestruct_DEV( bool pressed = true );
+
protected:
UnDockedState( );
virtual ~UnDockedState( ){}
@@ -210,10 +251,12 @@
bool duelistTarget_;
int sceneDetailIndex_ ;
-
int ambientLight_;
int schemeIdx_;
+ Ogre::TextureFilterOptions filtering_;
+ int aniso_;
+
OpenALSoundSource * soundBackround_;
};
Modified: trunk/src/metaserver.cpp
===================================================================
--- trunk/src/metaserver.cpp 2007-11-16 23:16:40 UTC (rev 840)
+++ trunk/src/metaserver.cpp 2007-11-17 19:07:16 UTC (rev 841)
@@ -223,16 +223,13 @@
std::string parameters( "add_game_server" );
if ( servername.length() > 0 ) parameters += "&comment="+strReplaceBlankWithUnderscore(servername);
-
+// tempor\xE4r: Serverbeschreibung solange hin und wieder mehr als ein Server vom meta weitergereicht wird
// kay, max 256 zeichen, gameserver einf\xFCgen mit opacma.ontheserver.de/script/schnittstelle/?action=add_game_server&comment=blablabla
-
// http://opacma.ontheserver.de/script/schnittstelle/?action=list_game_servers
// ausgabeformat ist
-
// reset($IPs);
// while(current($IPs)){
// $Output .= current($IPs) . ',' . $Kommentare[current($IPs)] . ';';
-
// next($IPs);
// }
Modified: trunk/src/opengateserver.cpp
===================================================================
--- trunk/src/opengateserver.cpp 2007-11-16 23:16:40 UTC (rev 840)
+++ trunk/src/opengateserver.cpp 2007-11-17 19:07:16 UTC (rev 841)
@@ -83,7 +83,7 @@
//** ein bissle mehr verbose output, kommt sp\xE4ter wieder weg.;
//** das k\xF6nnte mal vielleicht als option rausreichen, das man wie beim clienten die Wahl hat;
//** -M = (withMetaServer = true);
- bool withMetaServer = true;
+ bool withMetaServer = false;
std::string servername( "testserver Sim 1" );
try {
asio::io_service io_service;
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