Menu
▾
▴
opengate-svn — List for Subversion commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(11) |
Apr
(47) |
May
(14) |
Jun
|
Jul
(73) |
Aug
(4) |
Sep
(2) |
Oct
(60) |
Nov
(48) |
Dec
(66) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
(1) |
Mar
(27) |
Apr
(82) |
May
(89) |
Jun
(91) |
Jul
(44) |
Aug
(53) |
Sep
(113) |
Oct
(20) |
Nov
(37) |
Dec
(10) |
| 2008 |
Jan
|
Feb
(2) |
Mar
|
Apr
(2) |
May
(21) |
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2009 |
Jan
(76) |
Feb
(89) |
Mar
(52) |
Apr
(11) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
(27) |
| 2010 |
Jan
(11) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(9) |
Sep
|
Oct
|
Nov
|
Dec
(14) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(11) |
Oct
(3) |
Nov
|
Dec
|
| 2013 |
Jan
(4) |
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <Ult...@us...> - 2009-01-25 14:38:05
|
Revision: 976
http://opengate.svn.sourceforge.net/opengate/?rev=976&view=rev
Author: Ultrasick
Date: 2009-01-25 14:37:53 +0000 (Sun, 25 Jan 2009)
Log Message:
-----------
fixed a rendering setting
Modified Paths:
--------------
templates/data/startup/open_source.blend
Modified: templates/data/startup/open_source.blend
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ult...@us...> - 2009-01-25 14:37:15
|
Revision: 975
http://opengate.svn.sourceforge.net/opengate/?rev=975&view=rev
Author: Ultrasick
Date: 2009-01-25 14:37:01 +0000 (Sun, 25 Jan 2009)
Log Message:
-----------
uploading some status bar templates
Added Paths:
-----------
templates/data/gui/screens/station/surrounding/bottom/status_bar/
templates/data/gui/screens/station/surrounding/bottom/status_bar/create_width_list.py
templates/data/gui/screens/station/surrounding/bottom/status_bar/status_bar.pspimage
templates/data/gui/screens/station/surrounding/bottom/status_bar/width_list.txt
Added: templates/data/gui/screens/station/surrounding/bottom/status_bar/create_width_list.py
===================================================================
--- templates/data/gui/screens/station/surrounding/bottom/status_bar/create_width_list.py (rev 0)
+++ templates/data/gui/screens/station/surrounding/bottom/status_bar/create_width_list.py 2009-01-25 14:37:01 UTC (rev 975)
@@ -0,0 +1,16 @@
+# -*- coding: cp1252 -*-
+
+width = 26
+
+print 'status bar width | frame #'
+print '-----------------|--------'
+
+for i in range(0, 40):
+ # calculate width
+ width += -1.785 * abs(i - 20) + 35.7
+ width_text = str(int(round(width)))
+
+ while len(width_text)<16:
+ width_text += ' '
+
+ print width_text , '|' , i
\ No newline at end of file
Property changes on: templates/data/gui/screens/station/surrounding/bottom/status_bar/create_width_list.py
___________________________________________________________________
Added: svn:eol-style
+ native
Added: templates/data/gui/screens/station/surrounding/bottom/status_bar/status_bar.pspimage
===================================================================
(Binary files differ)
Property changes on: templates/data/gui/screens/station/surrounding/bottom/status_bar/status_bar.pspimage
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: templates/data/gui/screens/station/surrounding/bottom/status_bar/width_list.txt
===================================================================
--- templates/data/gui/screens/station/surrounding/bottom/status_bar/width_list.txt (rev 0)
+++ templates/data/gui/screens/station/surrounding/bottom/status_bar/width_list.txt 2009-01-25 14:37:01 UTC (rev 975)
@@ -0,0 +1,42 @@
+status bar width | frame #
+-----------------|--------
+26 | 0
+28 | 1
+31 | 2
+37 | 3
+44 | 4
+53 | 5
+63 | 6
+76 | 7
+90 | 8
+106 | 9
+124 | 10
+144 | 11
+165 | 12
+188 | 13
+213 | 14
+240 | 15
+269 | 16
+299 | 17
+331 | 18
+365 | 19
+401 | 20
+435 | 21
+467 | 22
+497 | 23
+526 | 24
+553 | 25
+578 | 26
+601 | 27
+622 | 28
+642 | 29
+660 | 30
+676 | 31
+690 | 32
+703 | 33
+713 | 34
+722 | 35
+729 | 36
+735 | 37
+738 | 38
+740 | 39
\ No newline at end of file
Property changes on: templates/data/gui/screens/station/surrounding/bottom/status_bar/width_list.txt
___________________________________________________________________
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ult...@us...> - 2009-01-24 20:20:29
|
Revision: 974
http://opengate.svn.sourceforge.net/opengate/?rev=974&view=rev
Author: Ultrasick
Date: 2009-01-24 20:20:26 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
removed another small part because it is covered
Modified Paths:
--------------
trunk/data/gui/docked/base/station_backgrounds/solrain.png
Modified: trunk/data/gui/docked/base/station_backgrounds/solrain.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ult...@us...> - 2009-01-24 20:16:00
|
Revision: 973
http://opengate.svn.sourceforge.net/opengate/?rev=973&view=rev
Author: Ultrasick
Date: 2009-01-24 20:15:56 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
some more file moving
Added Paths:
-----------
templates/data/gui/screens/station/backgrounds/
templates/data/gui/screens/station/backgrounds/station.PspSelection
Removed Paths:
-------------
templates/data/gui/screens/station/base_background.PspSelection
Added: templates/data/gui/screens/station/backgrounds/station.PspSelection
===================================================================
(Binary files differ)
Property changes on: templates/data/gui/screens/station/backgrounds/station.PspSelection
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: templates/data/gui/screens/station/base_background.PspSelection
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ult...@us...> - 2009-01-24 20:12:41
|
Revision: 972
http://opengate.svn.sourceforge.net/opengate/?rev=972&view=rev
Author: Ultrasick
Date: 2009-01-24 20:12:38 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
fixed file name
Added Paths:
-----------
templates/doc/how_the_economy_works.pspimage
Removed Paths:
-------------
templates/doc/how_the_economy_works.odt.pspimage
Deleted: templates/doc/how_the_economy_works.odt.pspimage
===================================================================
(Binary files differ)
Added: templates/doc/how_the_economy_works.pspimage
===================================================================
(Binary files differ)
Property changes on: templates/doc/how_the_economy_works.pspimage
___________________________________________________________________
Added: 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...> - 2009-01-24 20:03:56
|
Revision: 971
http://opengate.svn.sourceforge.net/opengate/?rev=971&view=rev
Author: Ultrasick
Date: 2009-01-24 20:03:51 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
final step of the directory motion
Added Paths:
-----------
templates/data/logos/
templates/data/misc/
templates/data/missiles/
templates/data/rankings/
templates/data/shields/
templates/data/ships/
templates/data/skybox/
templates/data/sounds/
templates/data/startup/
Removed Paths:
-------------
templates/logos/
templates/misc/
templates/missiles/
templates/rankings/
templates/shields/
templates/ships/
templates/skybox/
templates/sounds/
templates/startup/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ult...@us...> - 2009-01-24 19:56:52
|
Revision: 970
http://opengate.svn.sourceforge.net/opengate/?rev=970&view=rev
Author: Ultrasick
Date: 2009-01-24 19:56:49 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
more directory moving
Added Paths:
-----------
templates/data/guns/
templates/data/power_plants/
templates/data/radars/
templates/data/stations/
Removed Paths:
-------------
templates/guns/
templates/power_plants/
templates/radars/
templates/stations/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ult...@us...> - 2009-01-24 19:54:00
|
Revision: 969
http://opengate.svn.sourceforge.net/opengate/?rev=969&view=rev
Author: Ultrasick
Date: 2009-01-24 19:53:57 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
more directory moving
Added Paths:
-----------
templates/data/ecms/
templates/data/engines/
templates/data/gui/
Removed Paths:
-------------
templates/ecms/
templates/engines/
templates/gui/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ult...@us...> - 2009-01-24 19:50:48
|
Revision: 968
http://opengate.svn.sourceforge.net/opengate/?rev=968&view=rev
Author: Ultrasick
Date: 2009-01-24 19:50:39 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
starting to move existing templates into "data" dir like they are in "trunk"
+ adding a "doc" dir for templates regarding the documentation files
+ adding a template file of the diagramm for the documentation file which is about the economy
Added Paths:
-----------
templates/data/
templates/data/capacitors/
templates/data/commodities/
templates/data/commodities/magnetic_components.blend
templates/doc/
templates/doc/how_the_economy_works.odt.pspimage
Removed Paths:
-------------
templates/capacitors/
templates/commodities/
templates/data/commodities/magnetic_components.blend
Deleted: templates/data/commodities/magnetic_components.blend
===================================================================
(Binary files differ)
Copied: templates/data/commodities/magnetic_components.blend (from rev 943, templates/commodities/magnetic_components.blend)
===================================================================
(Binary files differ)
Added: templates/doc/how_the_economy_works.odt.pspimage
===================================================================
(Binary files differ)
Property changes on: templates/doc/how_the_economy_works.odt.pspimage
___________________________________________________________________
Added: 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...> - 2009-01-24 19:44:08
|
Revision: 967
http://opengate.svn.sourceforge.net/opengate/?rev=967&view=rev
Author: Ultrasick
Date: 2009-01-24 19:44:06 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
added some info how to take influence on the price
Modified Paths:
--------------
doc/how_the_economy_works.odt
doc/how_the_economy_works.pdf
Modified: doc/how_the_economy_works.odt
===================================================================
(Binary files differ)
Modified: doc/how_the_economy_works.pdf
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ult...@us...> - 2009-01-24 19:42:57
|
Revision: 966
http://opengate.svn.sourceforge.net/opengate/?rev=966&view=rev
Author: Ultrasick
Date: 2009-01-24 19:42:44 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
fixed base background selection template file
+ moved to it's new directory
Added Paths:
-----------
templates/gui/screens/station/base_background.PspSelection
Removed Paths:
-------------
templates/gui/docked/base/base background.PspSelection
Deleted: templates/gui/docked/base/base background.PspSelection
===================================================================
(Binary files differ)
Added: templates/gui/screens/station/base_background.PspSelection
===================================================================
(Binary files differ)
Property changes on: templates/gui/screens/station/base_background.PspSelection
___________________________________________________________________
Added: 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...> - 2009-01-24 17:09:12
|
Revision: 965
http://opengate.svn.sourceforge.net/opengate/?rev=965&view=rev
Author: Ultrasick
Date: 2009-01-24 17:08:58 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
adding documentation how to request a political status of the player
Modified Paths:
--------------
doc/meta_server/global_error_code_overview.odt
doc/meta_server/global_error_code_overview.pdf
Added Paths:
-----------
doc/meta_server/how_to_request_a_political_status.odt
doc/meta_server/how_to_request_a_political_status.pdf
Modified: doc/meta_server/global_error_code_overview.odt
===================================================================
(Binary files differ)
Modified: doc/meta_server/global_error_code_overview.pdf
===================================================================
(Binary files differ)
Added: doc/meta_server/how_to_request_a_political_status.odt
===================================================================
(Binary files differ)
Property changes on: doc/meta_server/how_to_request_a_political_status.odt
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: doc/meta_server/how_to_request_a_political_status.pdf
===================================================================
(Binary files differ)
Property changes on: doc/meta_server/how_to_request_a_political_status.pdf
___________________________________________________________________
Added: 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...> - 2009-01-24 16:36:03
|
Revision: 964
http://opengate.svn.sourceforge.net/opengate/?rev=964&view=rev
Author: Ultrasick
Date: 2009-01-24 16:35:54 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
adding width, height and length values for the GUI to show some information in the ship buying screen
Modified Paths:
--------------
trunk/data/ships/squadrok/squid_1/squid_1.xml
trunk/data/ships/squadrok/squid_2/squid_2.xml
trunk/data/ships/squadrok/squid_3/squid_3.xml
Modified: trunk/data/ships/squadrok/squid_1/squid_1.xml
===================================================================
--- trunk/data/ships/squadrok/squid_1/squid_1.xml 2009-01-24 16:27:52 UTC (rev 963)
+++ trunk/data/ships/squadrok/squid_1/squid_1.xml 2009-01-24 16:35:54 UTC (rev 964)
@@ -15,4 +15,7 @@
<gun_slot_size_1>0.018243 -2.967243 0.121664</gun_slot_size_1>
<maximum_deflection>4500</maximum_deflection>
<child_id>870</child_id>
+ <length>30</length>
+ <width>13</width>
+ <height>10.2</height>
</container>
\ No newline at end of file
Modified: trunk/data/ships/squadrok/squid_2/squid_2.xml
===================================================================
--- trunk/data/ships/squadrok/squid_2/squid_2.xml 2009-01-24 16:27:52 UTC (rev 963)
+++ trunk/data/ships/squadrok/squid_2/squid_2.xml 2009-01-24 16:35:54 UTC (rev 964)
@@ -15,4 +15,7 @@
<gun_slot_size_1>0.018243 -2.967243 0.121664</gun_slot_size_1>
<maximum_deflection>4500</maximum_deflection>
<child_id>871</child_id>
+ <length>30</length>
+ <width>13</width>
+ <height>10.2</height>
</container>
\ No newline at end of file
Modified: trunk/data/ships/squadrok/squid_3/squid_3.xml
===================================================================
--- trunk/data/ships/squadrok/squid_3/squid_3.xml 2009-01-24 16:27:52 UTC (rev 963)
+++ trunk/data/ships/squadrok/squid_3/squid_3.xml 2009-01-24 16:35:54 UTC (rev 964)
@@ -15,4 +15,7 @@
<armor>220</armor>
<maximum_deflection>5000</maximum_deflection>
<child_id>872</child_id>
+ <length>30</length>
+ <width>13</width>
+ <height>10.2</height>
</container>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ult...@us...> - 2009-01-24 16:27:56
|
Revision: 963
http://opengate.svn.sourceforge.net/opengate/?rev=963&view=rev
Author: Ultrasick
Date: 2009-01-24 16:27:52 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
scaling ship to be 0.01 blender unit = 1 meter
Modified Paths:
--------------
templates/ships/squadrok/squid/squid.blend
Modified: templates/ships/squadrok/squid/squid.blend
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ult...@us...> - 2009-01-24 15:48:06
|
Revision: 962
http://opengate.svn.sourceforge.net/opengate/?rev=962&view=rev
Author: Ultrasick
Date: 2009-01-24 15:48:03 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
uploading values for scaling
Added Paths:
-----------
templates/misc/scaling.txt
Added: templates/misc/scaling.txt
===================================================================
--- templates/misc/scaling.txt (rev 0)
+++ templates/misc/scaling.txt 2009-01-24 15:48:03 UTC (rev 962)
@@ -0,0 +1,3 @@
+1.) multiply 1.0022 with the length of Netdevils direct x models to recieve the length in meters
+
+2.) multiply 0.01 with the length in meters to recieve the length in blender units for the Opengate files
\ No newline at end of file
Property changes on: templates/misc/scaling.txt
___________________________________________________________________
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ult...@us...> - 2009-01-24 15:47:10
|
Revision: 961
http://opengate.svn.sourceforge.net/opengate/?rev=961&view=rev
Author: Ultrasick
Date: 2009-01-24 15:47:00 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
we still got pioneer.blend
Removed Paths:
-------------
templates/ships/tauseti/pioneer/pioneer.wings
Deleted: templates/ships/tauseti/pioneer/pioneer.wings
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ult...@us...> - 2009-01-24 15:13:28
|
Revision: 960
http://opengate.svn.sourceforge.net/opengate/?rev=960&view=rev
Author: Ultrasick
Date: 2009-01-24 15:13:26 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
scaling ship to be 0.01 blender unit = 1 meter
Modified Paths:
--------------
templates/ships/tauseti/lady_kickstart/lady_kickstart.blend
Modified: templates/ships/tauseti/lady_kickstart/lady_kickstart.blend
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ult...@us...> - 2009-01-24 15:12:37
|
Revision: 959
http://opengate.svn.sourceforge.net/opengate/?rev=959&view=rev
Author: Ultrasick
Date: 2009-01-24 15:12:28 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
removing tauseti_wake.blend
+ renaming tauseti_wake_2.blend to tauseti_wake.blend
+ scaling station to be 0.01 blender unit = 1 meter
Modified Paths:
--------------
templates/stations/tauseti_wake.blend
Removed Paths:
-------------
templates/stations/tauseti_wake_2.blend
Modified: templates/stations/tauseti_wake.blend
===================================================================
(Binary files differ)
Deleted: templates/stations/tauseti_wake_2.blend
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ult...@us...> - 2009-01-24 09:12:07
|
Revision: 958
http://opengate.svn.sourceforge.net/opengate/?rev=958&view=rev
Author: Ultrasick
Date: 2009-01-24 09:12:05 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
thrown out frame #1 because there was no visible motion
I hope this is the final list
Modified Paths:
--------------
templates/gui/screens/station/surrounding/bottom/air_lock/layer_position_list.txt
Modified: templates/gui/screens/station/surrounding/bottom/air_lock/layer_position_list.txt
===================================================================
--- templates/gui/screens/station/surrounding/bottom/air_lock/layer_position_list.txt 2009-01-24 09:06:13 UTC (rev 957)
+++ templates/gui/screens/station/surrounding/bottom/air_lock/layer_position_list.txt 2009-01-24 09:12:05 UTC (rev 958)
@@ -10,21 +10,13 @@
-----------|------------------------
frame: 1
-----------|------------------------
-oben - * | 0 0
-unten - * | 0 0
-links | -1 0
-rechts | 1 0
-Universum | 0 0
------------|------------------------
-frame: 2
------------|------------------------
oben - * | 0 -1
unten - * | 0 1
links | -1 0
rechts | 1 0
Universum | 0 0
-----------|------------------------
-frame: 3
+frame: 2
-----------|------------------------
oben - * | 0 -1
unten - * | 0 1
@@ -32,7 +24,7 @@
rechts | 2 0
Universum | 0 0
-----------|------------------------
-frame: 4
+frame: 3
-----------|------------------------
oben - * | 0 -1
unten - * | 0 1
@@ -40,7 +32,7 @@
rechts | 3 0
Universum | 0 0
-----------|------------------------
-frame: 5
+frame: 4
-----------|------------------------
oben - * | 0 -2
unten - * | 0 2
@@ -48,7 +40,7 @@
rechts | 4 0
Universum | 0 0
-----------|------------------------
-frame: 6
+frame: 5
-----------|------------------------
oben - * | 0 -2
unten - * | 0 2
@@ -56,7 +48,7 @@
rechts | 5 0
Universum | 0 0
-----------|------------------------
-frame: 7
+frame: 6
-----------|------------------------
oben - * | 0 -3
unten - * | 0 2
@@ -64,7 +56,7 @@
rechts | 6 0
Universum | 0 0
-----------|------------------------
-frame: 8
+frame: 7
-----------|------------------------
oben - * | 0 -3
unten - * | 0 3
@@ -72,7 +64,7 @@
rechts | 7 0
Universum | 0 0
-----------|------------------------
-frame: 9
+frame: 8
-----------|------------------------
oben - * | 0 -4
unten - * | 0 4
@@ -80,7 +72,7 @@
rechts | 8 0
Universum | 0 0
-----------|------------------------
-frame: 10
+frame: 9
-----------|------------------------
oben - * | 0 -4
unten - * | 0 4
@@ -88,7 +80,7 @@
rechts | 10 0
Universum | 0 0
-----------|------------------------
-frame: 11
+frame: 10
-----------|------------------------
oben - * | 0 -5
unten - * | 0 5
@@ -96,7 +88,7 @@
rechts | 11 0
Universum | 0 0
-----------|------------------------
-frame: 12
+frame: 11
-----------|------------------------
oben - * | 0 -6
unten - * | 0 6
@@ -104,7 +96,7 @@
rechts | 13 0
Universum | 0 0
-----------|------------------------
-frame: 13
+frame: 12
-----------|------------------------
oben - * | 0 -7
unten - * | 0 7
@@ -112,7 +104,7 @@
rechts | 15 0
Universum | 0 0
-----------|------------------------
-frame: 14
+frame: 13
-----------|------------------------
oben - * | 0 -8
unten - * | 0 7
@@ -120,7 +112,7 @@
rechts | 17 0
Universum | 0 0
-----------|------------------------
-frame: 15
+frame: 14
-----------|------------------------
oben - * | 0 -9
unten - * | 0 8
@@ -128,7 +120,7 @@
rechts | 19 0
Universum | 0 0
-----------|------------------------
-frame: 16
+frame: 15
-----------|------------------------
oben - * | 0 -10
unten - * | 0 9
@@ -136,7 +128,7 @@
rechts | 21 0
Universum | 0 0
-----------|------------------------
-frame: 17
+frame: 16
-----------|------------------------
oben - * | 0 -11
unten - * | 0 10
@@ -144,7 +136,7 @@
rechts | 24 0
Universum | 0 0
-----------|------------------------
-frame: 18
+frame: 17
-----------|------------------------
oben - * | 0 -12
unten - * | 0 12
@@ -152,7 +144,7 @@
rechts | 26 0
Universum | 0 0
-----------|------------------------
-frame: 19
+frame: 18
-----------|------------------------
oben - * | 0 -13
unten - * | 0 13
@@ -160,7 +152,7 @@
rechts | 29 0
Universum | 0 0
-----------|------------------------
-frame: 20
+frame: 19
-----------|------------------------
oben - * | 0 -14
unten - * | 0 14
@@ -168,7 +160,7 @@
rechts | 31 0
Universum | 0 0
-----------|------------------------
-frame: 21
+frame: 20
-----------|------------------------
oben - * | 0 -15
unten - * | 0 15
@@ -176,7 +168,7 @@
rechts | 33 0
Universum | 0 0
-----------|------------------------
-frame: 22
+frame: 21
-----------|------------------------
oben - * | 0 -16
unten - * | 0 15
@@ -184,7 +176,7 @@
rechts | 35 0
Universum | 0 0
-----------|------------------------
-frame: 23
+frame: 22
-----------|------------------------
oben - * | 0 -17
unten - * | 0 16
@@ -192,7 +184,7 @@
rechts | 37 0
Universum | 0 0
-----------|------------------------
-frame: 24
+frame: 23
-----------|------------------------
oben - * | 0 -18
unten - * | 0 17
@@ -200,7 +192,7 @@
rechts | 39 0
Universum | 0 0
-----------|------------------------
-frame: 25
+frame: 24
-----------|------------------------
oben - * | 0 -19
unten - * | 0 18
@@ -208,7 +200,7 @@
rechts | 40 0
Universum | 0 0
-----------|------------------------
-frame: 26
+frame: 25
-----------|------------------------
oben - * | 0 -19
unten - * | 0 18
@@ -216,7 +208,7 @@
rechts | 42 0
Universum | 0 0
-----------|------------------------
-frame: 27
+frame: 26
-----------|------------------------
oben - * | 0 -20
unten - * | 0 19
@@ -224,7 +216,7 @@
rechts | 43 0
Universum | 0 0
-----------|------------------------
-frame: 28
+frame: 27
-----------|------------------------
oben - * | 0 -20
unten - * | 0 20
@@ -232,7 +224,7 @@
rechts | 44 0
Universum | 0 0
-----------|------------------------
-frame: 29
+frame: 28
-----------|------------------------
oben - * | 0 -21
unten - * | 0 20
@@ -240,7 +232,7 @@
rechts | 46 0
Universum | 0 0
-----------|------------------------
-frame: 30
+frame: 29
-----------|------------------------
oben - * | 0 -21
unten - * | 0 20
@@ -248,7 +240,7 @@
rechts | 47 0
Universum | 0 0
-----------|------------------------
-frame: 31
+frame: 30
-----------|------------------------
oben - * | 0 -22
unten - * | 0 21
@@ -256,7 +248,7 @@
rechts | 47 0
Universum | 0 0
-----------|------------------------
-frame: 32
+frame: 31
-----------|------------------------
oben - * | 0 -22
unten - * | 0 21
@@ -264,7 +256,7 @@
rechts | 48 0
Universum | 0 0
-----------|------------------------
-frame: 33
+frame: 32
-----------|------------------------
oben - * | 0 -22
unten - * | 0 21
@@ -272,7 +264,7 @@
rechts | 49 0
Universum | 0 0
-----------|------------------------
-frame: 34
+frame: 33
-----------|------------------------
oben - * | 0 -23
unten - * | 0 22
@@ -280,7 +272,7 @@
rechts | 49 0
Universum | 0 0
-----------|------------------------
-frame: 35
+frame: 34
-----------|------------------------
oben - * | 0 -23
unten - * | 0 22
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ult...@us...> - 2009-01-24 09:06:16
|
Revision: 957
http://opengate.svn.sourceforge.net/opengate/?rev=957&view=rev
Author: Ultrasick
Date: 2009-01-24 09:06:13 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
truncated layer position list to throw out thouse frames at the beginning and the end which show no motion
Modified Paths:
--------------
templates/gui/screens/station/surrounding/bottom/air_lock/layer_position_list.txt
Modified: templates/gui/screens/station/surrounding/bottom/air_lock/layer_position_list.txt
===================================================================
--- templates/gui/screens/station/surrounding/bottom/air_lock/layer_position_list.txt 2009-01-24 08:59:10 UTC (rev 956)
+++ templates/gui/screens/station/surrounding/bottom/air_lock/layer_position_list.txt 2009-01-24 09:06:13 UTC (rev 957)
@@ -12,27 +12,11 @@
-----------|------------------------
oben - * | 0 0
unten - * | 0 0
-links | 0 0
-rechts | 0 0
-Universum | 0 0
------------|------------------------
-frame: 2
------------|------------------------
-oben - * | 0 0
-unten - * | 0 0
-links | 0 0
-rechts | 0 0
-Universum | 0 0
------------|------------------------
-frame: 3
------------|------------------------
-oben - * | 0 0
-unten - * | 0 0
links | -1 0
rechts | 1 0
Universum | 0 0
-----------|------------------------
-frame: 4
+frame: 2
-----------|------------------------
oben - * | 0 -1
unten - * | 0 1
@@ -40,7 +24,7 @@
rechts | 1 0
Universum | 0 0
-----------|------------------------
-frame: 5
+frame: 3
-----------|------------------------
oben - * | 0 -1
unten - * | 0 1
@@ -48,7 +32,7 @@
rechts | 2 0
Universum | 0 0
-----------|------------------------
-frame: 6
+frame: 4
-----------|------------------------
oben - * | 0 -1
unten - * | 0 1
@@ -56,7 +40,7 @@
rechts | 3 0
Universum | 0 0
-----------|------------------------
-frame: 7
+frame: 5
-----------|------------------------
oben - * | 0 -2
unten - * | 0 2
@@ -64,7 +48,7 @@
rechts | 4 0
Universum | 0 0
-----------|------------------------
-frame: 8
+frame: 6
-----------|------------------------
oben - * | 0 -2
unten - * | 0 2
@@ -72,7 +56,7 @@
rechts | 5 0
Universum | 0 0
-----------|------------------------
-frame: 9
+frame: 7
-----------|------------------------
oben - * | 0 -3
unten - * | 0 2
@@ -80,7 +64,7 @@
rechts | 6 0
Universum | 0 0
-----------|------------------------
-frame: 10
+frame: 8
-----------|------------------------
oben - * | 0 -3
unten - * | 0 3
@@ -88,7 +72,7 @@
rechts | 7 0
Universum | 0 0
-----------|------------------------
-frame: 11
+frame: 9
-----------|------------------------
oben - * | 0 -4
unten - * | 0 4
@@ -96,7 +80,7 @@
rechts | 8 0
Universum | 0 0
-----------|------------------------
-frame: 12
+frame: 10
-----------|------------------------
oben - * | 0 -4
unten - * | 0 4
@@ -104,7 +88,7 @@
rechts | 10 0
Universum | 0 0
-----------|------------------------
-frame: 13
+frame: 11
-----------|------------------------
oben - * | 0 -5
unten - * | 0 5
@@ -112,7 +96,7 @@
rechts | 11 0
Universum | 0 0
-----------|------------------------
-frame: 14
+frame: 12
-----------|------------------------
oben - * | 0 -6
unten - * | 0 6
@@ -120,7 +104,7 @@
rechts | 13 0
Universum | 0 0
-----------|------------------------
-frame: 15
+frame: 13
-----------|------------------------
oben - * | 0 -7
unten - * | 0 7
@@ -128,7 +112,7 @@
rechts | 15 0
Universum | 0 0
-----------|------------------------
-frame: 16
+frame: 14
-----------|------------------------
oben - * | 0 -8
unten - * | 0 7
@@ -136,7 +120,7 @@
rechts | 17 0
Universum | 0 0
-----------|------------------------
-frame: 17
+frame: 15
-----------|------------------------
oben - * | 0 -9
unten - * | 0 8
@@ -144,7 +128,7 @@
rechts | 19 0
Universum | 0 0
-----------|------------------------
-frame: 18
+frame: 16
-----------|------------------------
oben - * | 0 -10
unten - * | 0 9
@@ -152,7 +136,7 @@
rechts | 21 0
Universum | 0 0
-----------|------------------------
-frame: 19
+frame: 17
-----------|------------------------
oben - * | 0 -11
unten - * | 0 10
@@ -160,7 +144,7 @@
rechts | 24 0
Universum | 0 0
-----------|------------------------
-frame: 20
+frame: 18
-----------|------------------------
oben - * | 0 -12
unten - * | 0 12
@@ -168,7 +152,7 @@
rechts | 26 0
Universum | 0 0
-----------|------------------------
-frame: 21
+frame: 19
-----------|------------------------
oben - * | 0 -13
unten - * | 0 13
@@ -176,7 +160,7 @@
rechts | 29 0
Universum | 0 0
-----------|------------------------
-frame: 22
+frame: 20
-----------|------------------------
oben - * | 0 -14
unten - * | 0 14
@@ -184,7 +168,7 @@
rechts | 31 0
Universum | 0 0
-----------|------------------------
-frame: 23
+frame: 21
-----------|------------------------
oben - * | 0 -15
unten - * | 0 15
@@ -192,7 +176,7 @@
rechts | 33 0
Universum | 0 0
-----------|------------------------
-frame: 24
+frame: 22
-----------|------------------------
oben - * | 0 -16
unten - * | 0 15
@@ -200,7 +184,7 @@
rechts | 35 0
Universum | 0 0
-----------|------------------------
-frame: 25
+frame: 23
-----------|------------------------
oben - * | 0 -17
unten - * | 0 16
@@ -208,7 +192,7 @@
rechts | 37 0
Universum | 0 0
-----------|------------------------
-frame: 26
+frame: 24
-----------|------------------------
oben - * | 0 -18
unten - * | 0 17
@@ -216,7 +200,7 @@
rechts | 39 0
Universum | 0 0
-----------|------------------------
-frame: 27
+frame: 25
-----------|------------------------
oben - * | 0 -19
unten - * | 0 18
@@ -224,7 +208,7 @@
rechts | 40 0
Universum | 0 0
-----------|------------------------
-frame: 28
+frame: 26
-----------|------------------------
oben - * | 0 -19
unten - * | 0 18
@@ -232,7 +216,7 @@
rechts | 42 0
Universum | 0 0
-----------|------------------------
-frame: 29
+frame: 27
-----------|------------------------
oben - * | 0 -20
unten - * | 0 19
@@ -240,7 +224,7 @@
rechts | 43 0
Universum | 0 0
-----------|------------------------
-frame: 30
+frame: 28
-----------|------------------------
oben - * | 0 -20
unten - * | 0 20
@@ -248,7 +232,7 @@
rechts | 44 0
Universum | 0 0
-----------|------------------------
-frame: 31
+frame: 29
-----------|------------------------
oben - * | 0 -21
unten - * | 0 20
@@ -256,7 +240,7 @@
rechts | 46 0
Universum | 0 0
-----------|------------------------
-frame: 32
+frame: 30
-----------|------------------------
oben - * | 0 -21
unten - * | 0 20
@@ -264,7 +248,7 @@
rechts | 47 0
Universum | 0 0
-----------|------------------------
-frame: 33
+frame: 31
-----------|------------------------
oben - * | 0 -22
unten - * | 0 21
@@ -272,7 +256,7 @@
rechts | 47 0
Universum | 0 0
-----------|------------------------
-frame: 34
+frame: 32
-----------|------------------------
oben - * | 0 -22
unten - * | 0 21
@@ -280,7 +264,7 @@
rechts | 48 0
Universum | 0 0
-----------|------------------------
-frame: 35
+frame: 33
-----------|------------------------
oben - * | 0 -22
unten - * | 0 21
@@ -288,7 +272,7 @@
rechts | 49 0
Universum | 0 0
-----------|------------------------
-frame: 36
+frame: 34
-----------|------------------------
oben - * | 0 -23
unten - * | 0 22
@@ -296,26 +280,10 @@
rechts | 49 0
Universum | 0 0
-----------|------------------------
-frame: 37
+frame: 35
-----------|------------------------
oben - * | 0 -23
unten - * | 0 22
links | -43 0
rechts | 50 0
-Universum | 0 0
------------|------------------------
-frame: 38
------------|------------------------
-oben - * | 0 -23
-unten - * | 0 22
-links | -43 0
-rechts | 50 0
-Universum | 0 0
------------|------------------------
-frame: 39
------------|------------------------
-oben - * | 0 -23
-unten - * | 0 22
-links | -43 0
-rechts | 50 0
Universum | 0 0
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ult...@us...> - 2009-01-24 08:59:18
|
Revision: 956
http://opengate.svn.sourceforge.net/opengate/?rev=956&view=rev
Author: Ultrasick
Date: 2009-01-24 08:59:10 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
created some more templates for the air lock
Added Paths:
-----------
templates/gui/screens/station/surrounding/bottom/air_lock/
templates/gui/screens/station/surrounding/bottom/air_lock/air_lock.pspimage
templates/gui/screens/station/surrounding/bottom/air_lock/create_layer_position_list.py
templates/gui/screens/station/surrounding/bottom/air_lock/layer_position_list.txt
Removed Paths:
-------------
templates/gui/screens/station/surrounding/bottom/air_lock.pspimage
Added: templates/gui/screens/station/surrounding/bottom/air_lock/air_lock.pspimage
===================================================================
(Binary files differ)
Property changes on: templates/gui/screens/station/surrounding/bottom/air_lock/air_lock.pspimage
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: templates/gui/screens/station/surrounding/bottom/air_lock/create_layer_position_list.py
===================================================================
--- templates/gui/screens/station/surrounding/bottom/air_lock/create_layer_position_list.py (rev 0)
+++ templates/gui/screens/station/surrounding/bottom/air_lock/create_layer_position_list.py 2009-01-24 08:59:10 UTC (rev 956)
@@ -0,0 +1,32 @@
+# -*- coding: cp1252 -*-
+
+oben = 0
+unten = 0
+links = 0
+rechts = 0
+
+print 'layer name | relative position (x y)'
+
+for i in range(0, 40):
+ print '-----------|------------------------'
+ print 'frame:', i
+ print '-----------|------------------------'
+
+ # oben
+ oben -= -0.0575 * abs(i - 20) + 0.0575 * 20
+ print 'oben - * | 0' , int(round(oben))
+
+ # unten
+ unten += -0.055 * abs(i - 20) + 0.055 * 20
+ print 'unten - * | 0' , int(round(unten))
+
+ # links
+ links -= -0.1075 * abs(i - 20) + 0.1075 * 20
+ print 'links |' , int(round(links)) , '0'
+
+ # rechts
+ rechts += -0.125 * abs(i - 20) + 0.125 * 20
+ print 'rechts |' , int(round(rechts)) , '0'
+
+ # Universum
+ print 'Universum | 0 0'
\ No newline at end of file
Property changes on: templates/gui/screens/station/surrounding/bottom/air_lock/create_layer_position_list.py
___________________________________________________________________
Added: svn:eol-style
+ native
Added: templates/gui/screens/station/surrounding/bottom/air_lock/layer_position_list.txt
===================================================================
--- templates/gui/screens/station/surrounding/bottom/air_lock/layer_position_list.txt (rev 0)
+++ templates/gui/screens/station/surrounding/bottom/air_lock/layer_position_list.txt 2009-01-24 08:59:10 UTC (rev 956)
@@ -0,0 +1,321 @@
+layer name | relative position (x y)
+-----------|------------------------
+frame: 0
+-----------|------------------------
+oben - * | 0 0
+unten - * | 0 0
+links | 0 0
+rechts | 0 0
+Universum | 0 0
+-----------|------------------------
+frame: 1
+-----------|------------------------
+oben - * | 0 0
+unten - * | 0 0
+links | 0 0
+rechts | 0 0
+Universum | 0 0
+-----------|------------------------
+frame: 2
+-----------|------------------------
+oben - * | 0 0
+unten - * | 0 0
+links | 0 0
+rechts | 0 0
+Universum | 0 0
+-----------|------------------------
+frame: 3
+-----------|------------------------
+oben - * | 0 0
+unten - * | 0 0
+links | -1 0
+rechts | 1 0
+Universum | 0 0
+-----------|------------------------
+frame: 4
+-----------|------------------------
+oben - * | 0 -1
+unten - * | 0 1
+links | -1 0
+rechts | 1 0
+Universum | 0 0
+-----------|------------------------
+frame: 5
+-----------|------------------------
+oben - * | 0 -1
+unten - * | 0 1
+links | -2 0
+rechts | 2 0
+Universum | 0 0
+-----------|------------------------
+frame: 6
+-----------|------------------------
+oben - * | 0 -1
+unten - * | 0 1
+links | -2 0
+rechts | 3 0
+Universum | 0 0
+-----------|------------------------
+frame: 7
+-----------|------------------------
+oben - * | 0 -2
+unten - * | 0 2
+links | -3 0
+rechts | 4 0
+Universum | 0 0
+-----------|------------------------
+frame: 8
+-----------|------------------------
+oben - * | 0 -2
+unten - * | 0 2
+links | -4 0
+rechts | 5 0
+Universum | 0 0
+-----------|------------------------
+frame: 9
+-----------|------------------------
+oben - * | 0 -3
+unten - * | 0 2
+links | -5 0
+rechts | 6 0
+Universum | 0 0
+-----------|------------------------
+frame: 10
+-----------|------------------------
+oben - * | 0 -3
+unten - * | 0 3
+links | -6 0
+rechts | 7 0
+Universum | 0 0
+-----------|------------------------
+frame: 11
+-----------|------------------------
+oben - * | 0 -4
+unten - * | 0 4
+links | -7 0
+rechts | 8 0
+Universum | 0 0
+-----------|------------------------
+frame: 12
+-----------|------------------------
+oben - * | 0 -4
+unten - * | 0 4
+links | -8 0
+rechts | 10 0
+Universum | 0 0
+-----------|------------------------
+frame: 13
+-----------|------------------------
+oben - * | 0 -5
+unten - * | 0 5
+links | -10 0
+rechts | 11 0
+Universum | 0 0
+-----------|------------------------
+frame: 14
+-----------|------------------------
+oben - * | 0 -6
+unten - * | 0 6
+links | -11 0
+rechts | 13 0
+Universum | 0 0
+-----------|------------------------
+frame: 15
+-----------|------------------------
+oben - * | 0 -7
+unten - * | 0 7
+links | -13 0
+rechts | 15 0
+Universum | 0 0
+-----------|------------------------
+frame: 16
+-----------|------------------------
+oben - * | 0 -8
+unten - * | 0 7
+links | -15 0
+rechts | 17 0
+Universum | 0 0
+-----------|------------------------
+frame: 17
+-----------|------------------------
+oben - * | 0 -9
+unten - * | 0 8
+links | -16 0
+rechts | 19 0
+Universum | 0 0
+-----------|------------------------
+frame: 18
+-----------|------------------------
+oben - * | 0 -10
+unten - * | 0 9
+links | -18 0
+rechts | 21 0
+Universum | 0 0
+-----------|------------------------
+frame: 19
+-----------|------------------------
+oben - * | 0 -11
+unten - * | 0 10
+links | -20 0
+rechts | 24 0
+Universum | 0 0
+-----------|------------------------
+frame: 20
+-----------|------------------------
+oben - * | 0 -12
+unten - * | 0 12
+links | -23 0
+rechts | 26 0
+Universum | 0 0
+-----------|------------------------
+frame: 21
+-----------|------------------------
+oben - * | 0 -13
+unten - * | 0 13
+links | -25 0
+rechts | 29 0
+Universum | 0 0
+-----------|------------------------
+frame: 22
+-----------|------------------------
+oben - * | 0 -14
+unten - * | 0 14
+links | -27 0
+rechts | 31 0
+Universum | 0 0
+-----------|------------------------
+frame: 23
+-----------|------------------------
+oben - * | 0 -15
+unten - * | 0 15
+links | -28 0
+rechts | 33 0
+Universum | 0 0
+-----------|------------------------
+frame: 24
+-----------|------------------------
+oben - * | 0 -16
+unten - * | 0 15
+links | -30 0
+rechts | 35 0
+Universum | 0 0
+-----------|------------------------
+frame: 25
+-----------|------------------------
+oben - * | 0 -17
+unten - * | 0 16
+links | -32 0
+rechts | 37 0
+Universum | 0 0
+-----------|------------------------
+frame: 26
+-----------|------------------------
+oben - * | 0 -18
+unten - * | 0 17
+links | -33 0
+rechts | 39 0
+Universum | 0 0
+-----------|------------------------
+frame: 27
+-----------|------------------------
+oben - * | 0 -19
+unten - * | 0 18
+links | -35 0
+rechts | 40 0
+Universum | 0 0
+-----------|------------------------
+frame: 28
+-----------|------------------------
+oben - * | 0 -19
+unten - * | 0 18
+links | -36 0
+rechts | 42 0
+Universum | 0 0
+-----------|------------------------
+frame: 29
+-----------|------------------------
+oben - * | 0 -20
+unten - * | 0 19
+links | -37 0
+rechts | 43 0
+Universum | 0 0
+-----------|------------------------
+frame: 30
+-----------|------------------------
+oben - * | 0 -20
+unten - * | 0 20
+links | -38 0
+rechts | 44 0
+Universum | 0 0
+-----------|------------------------
+frame: 31
+-----------|------------------------
+oben - * | 0 -21
+unten - * | 0 20
+links | -39 0
+rechts | 46 0
+Universum | 0 0
+-----------|------------------------
+frame: 32
+-----------|------------------------
+oben - * | 0 -21
+unten - * | 0 20
+links | -40 0
+rechts | 47 0
+Universum | 0 0
+-----------|------------------------
+frame: 33
+-----------|------------------------
+oben - * | 0 -22
+unten - * | 0 21
+links | -41 0
+rechts | 47 0
+Universum | 0 0
+-----------|------------------------
+frame: 34
+-----------|------------------------
+oben - * | 0 -22
+unten - * | 0 21
+links | -41 0
+rechts | 48 0
+Universum | 0 0
+-----------|------------------------
+frame: 35
+-----------|------------------------
+oben - * | 0 -22
+unten - * | 0 21
+links | -42 0
+rechts | 49 0
+Universum | 0 0
+-----------|------------------------
+frame: 36
+-----------|------------------------
+oben - * | 0 -23
+unten - * | 0 22
+links | -42 0
+rechts | 49 0
+Universum | 0 0
+-----------|------------------------
+frame: 37
+-----------|------------------------
+oben - * | 0 -23
+unten - * | 0 22
+links | -43 0
+rechts | 50 0
+Universum | 0 0
+-----------|------------------------
+frame: 38
+-----------|------------------------
+oben - * | 0 -23
+unten - * | 0 22
+links | -43 0
+rechts | 50 0
+Universum | 0 0
+-----------|------------------------
+frame: 39
+-----------|------------------------
+oben - * | 0 -23
+unten - * | 0 22
+links | -43 0
+rechts | 50 0
+Universum | 0 0
\ No newline at end of file
Property changes on: templates/gui/screens/station/surrounding/bottom/air_lock/layer_position_list.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Deleted: templates/gui/screens/station/surrounding/bottom/air_lock.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...> - 2009-01-24 08:24:19
|
Revision: 955
http://opengate.svn.sourceforge.net/opengate/?rev=955&view=rev
Author: Ultrasick
Date: 2009-01-24 08:24:18 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
packing all air lock images into 1 air lock template file
+ moving air lock template file into it's new directory
Added Paths:
-----------
templates/gui/screens/station/surrounding/
templates/gui/screens/station/surrounding/bottom/
templates/gui/screens/station/surrounding/bottom/air_lock.pspimage
Removed Paths:
-------------
templates/gui/docked/base/surrounding/bottom/air_lock/
Added: templates/gui/screens/station/surrounding/bottom/air_lock.pspimage
===================================================================
(Binary files differ)
Property changes on: templates/gui/screens/station/surrounding/bottom/air_lock.pspimage
___________________________________________________________________
Added: 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...> - 2009-01-24 08:23:21
|
Revision: 954
http://opengate.svn.sourceforge.net/opengate/?rev=954&view=rev
Author: Ultrasick
Date: 2009-01-24 08:23:12 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
fixed engines template image
Modified Paths:
--------------
templates/gui/docked/base/market/icos/categories/engines.pspimage
Modified: templates/gui/docked/base/market/icos/categories/engines.pspimage
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2009-01-21 18:21:07
|
Revision: 953
http://opengate.svn.sourceforge.net/opengate/?rev=953&view=rev
Author: spom_spom
Date: 2009-01-21 18:21:01 +0000 (Wed, 21 Jan 2009)
Log Message:
-----------
next steps of reorganization done. (launching and docking)
Modified Paths:
--------------
trunk/data/stations/tauseti_wake.xml
trunk/src/Makefile.am
trunk/src/OpcodeWrapper.cpp
trunk/src/Opengate.h
trunk/src/Sector.cpp
trunk/src/Sector.h
trunk/src/SectorBeaconObject.cpp
trunk/src/SectorBeaconObject.h
trunk/src/SectorCollisionObject.h
trunk/src/SectorMovableObject.cpp
trunk/src/SectorStationObject.cpp
trunk/src/SectorStationObject.h
trunk/src/UnDockedState.cpp
Added Paths:
-----------
trunk/src/SectorBeaconPadObject.cpp
trunk/src/SectorBeaconPadObject.h
trunk/src/SectorChildObject.cpp
trunk/src/SectorChildObject.h
trunk/src/SectorPadObject.cpp
trunk/src/SectorPadObject.h
trunk/src/SectorStationPadObject.cpp
trunk/src/SectorStationPadObject.h
Modified: trunk/data/stations/tauseti_wake.xml
===================================================================
(Binary files differ)
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2009-01-19 23:53:11 UTC (rev 952)
+++ trunk/src/Makefile.am 2009-01-21 18:21:01 UTC (rev 953)
@@ -84,14 +84,22 @@
SectorBaseObject.cpp \
SectorBeaconObject.h \
SectorBeaconObject.cpp \
+ SectorBeaconPadObject.h \
+ SectorBeaconPadObject.cpp \
+ SectorChildObject.h \
+ SectorChildObject.cpp \
SectorCollisionObject.h \
SectorCollisionObject.cpp \
SectorMeshObject.h \
SectorMeshObject.cpp \
SectorMovableObject.h \
SectorMovableObject.cpp \
+ SectorPadObject.h \
+ SectorPadObject.cpp \
SectorStationObject.h \
SectorStationObject.cpp \
+ SectorStationPadObject.h \
+ SectorStationPadObject.cpp \
SectorVesselObject.h \
SectorVesselObject.cpp \
SectorObject.h \
Modified: trunk/src/OpcodeWrapper.cpp
===================================================================
--- trunk/src/OpcodeWrapper.cpp 2009-01-19 23:53:11 UTC (rev 952)
+++ trunk/src/OpcodeWrapper.cpp 2009-01-21 18:21:01 UTC (rev 953)
@@ -52,7 +52,7 @@
collisionManager_->addCollClass( "DockPad" );
collisionManager_->addCollClass( "Bullet" );
- collisionManager_->addCollType( "Bullet", "Bullet", OgreOpcode::COLLTYPE_IGNORE );
+ collisionManager_->addCollType( "Bullet", "Bullet", OgreOpcode::COLLTYPE_IGNORE );
collisionManager_->addCollType( "SectorObject", "Bullet", OgreOpcode::COLLTYPE_EXACT );
collisionManager_->addCollType( "SectorObject", "SectorObject", OgreOpcode::COLLTYPE_EXACT );
collisionManager_->addCollType( "Station", "SectorObject", OgreOpcode::COLLTYPE_EXACT );
Modified: trunk/src/Opengate.h
===================================================================
--- trunk/src/Opengate.h 2009-01-19 23:53:11 UTC (rev 952)
+++ trunk/src/Opengate.h 2009-01-21 18:21:01 UTC (rev 953)
@@ -35,14 +35,18 @@
namespace OpenGate{
-#define SECTOR_AVATAR_OBJECT_RTTI 1
-#define SECTOR_BASE_OBJECT_RTTI 2
-#define SECTOR_BEACON_OBJECT_RTTI 3
-#define SECTOR_COLLISION_OBJECT_RTTI 4
-#define SECTOR_MESH_OBJECT_RTTI 5
-#define SECTOR_MOVABLE_OBJECT_RTTI 6
-#define SECTOR_STATION_OBJECT_RTTI 7
-#define SECTOR_VESSEL_OBJECT_RTTI 8
+#define SECTOR_AVATAR_OBJECT_RTTI 1
+#define SECTOR_BASE_OBJECT_RTTI 2
+#define SECTOR_BEACON_OBJECT_RTTI 3
+#define SECTOR_BEACON_PAD_OBJECT_RTTI 4
+#define SECTOR_CHILD_OBJECT_RTTI 5
+#define SECTOR_COLLISION_OBJECT_RTTI 6
+#define SECTOR_MESH_OBJECT_RTTI 7
+#define SECTOR_MOVABLE_OBJECT_RTTI 8
+#define SECTOR_PAD_OBJECT_RTTI 9
+#define SECTOR_STATION_OBJECT_RTTI 10
+#define SECTOR_STATION_PAD_OBJECT_RTTI 11
+#define SECTOR_VESSEL_OBJECT_RTTI 12
#define SECTOROBJECTENVIRONMENT_RTTI 1000010
#define PROJECTILE_RTTI 100001
@@ -77,10 +81,14 @@
class SectorAvatarObject;
class SectorBaseObject;
class SectorBeaconObject;
+class SectorBeaconPadObject;
+class SectorChildObject;
class SectorCollisionObject;
class SectorMeshObject;
class SectorMovableObject;
+class SectorPadObject;
class SectorStationObject;
+class SectorStationPadObject;
class SectorVesselObject;
class SectorObject;
Modified: trunk/src/Sector.cpp
===================================================================
--- trunk/src/Sector.cpp 2009-01-19 23:53:11 UTC (rev 952)
+++ trunk/src/Sector.cpp 2009-01-21 18:21:01 UTC (rev 953)
@@ -34,8 +34,9 @@
#include "SectorCollisionObject.h"
#include "SectorMeshObject.h"
#include "SectorStationObject.h"
+#include "SectorStationPadObject.h"
+#include "UnDockedState.h"
-
#include <OgreEntity.h>
#include <OgreSceneManager.h>
#include <OgreSubEntity.h>
@@ -47,6 +48,7 @@
log_ = LogManager::getSingletonPtr();
name_ = "unknown";
+ listener_ = NULL;
avatar_ = NULL;
}
@@ -185,14 +187,38 @@
sectorObjects_.insert( avatar_ );
avatar_->reset();
- log_->info( std::string( "launch avatar from free position " ) );
- avatar_->mainNode()->setPosition( 0.0, 0.0, 0.0 );
- avatar_->mainNode()->setDirection( Ogre::Vector3( 0.0, 0.0, -1.0 ) );
- avatar_->setVelocity( Ogre::Vector3( 0.0, 0.0, 0.0 ) );
-
+ bool hasStation = false;
+ if ( !sectorStations_.empty() ){
+ SectorStationObject *station = dynamic_cast< SectorStationObject* >( *sectorStations_.begin() );
+ log_->info( std::string( "launch avatar from station " ) );
+ if ( station->launchPad() ){
+ avatar_->mainNode()->setPosition( station->launchPad()->position( true ) + station->launchPad()->direction( true ) * 5.0);
+ avatar_->mainNode()->setDirection( station->launchPad()->direction( true ) );
+ avatar_->setVelocity( station->launchPad()->direction( true ) * 20.0 );
+ hasStation = true;
+ } else {
+ log_->warn( std::string( "Station " + station->name() + " has no launch pad" ) );
+ }
+ }
+ if ( !hasStation ) {
+ log_->info( std::string( "launch avatar from free position " ) );
+ avatar_->mainNode()->setPosition( 0.0, 0.0, 0.0 );
+ avatar_->mainNode()->setDirection( Ogre::Vector3( 0.0, 0.0, -1.0 ) );
+ avatar_->setVelocity( Ogre::Vector3( 0.0, 0.0, 0.0 ) );
+ }
avatar_->mainNode()->setVisible( false );
}
+void Sector::objectDocked( SectorMovableObject * obj, SectorStationObject * station ){
+ std::cout << obj->name() << " docked at " << station->name() << std::endl;
+ switch ( obj->rtti() ){
+ case SECTOR_AVATAR_OBJECT_RTTI:
+ if ( listener_ ) listener_->changeToDockedState();
+ break;
+ default: break;
+ }
+}
+
#else
#include "Sector.h"
Modified: trunk/src/Sector.h
===================================================================
--- trunk/src/Sector.h 2009-01-19 23:53:11 UTC (rev 952)
+++ trunk/src/Sector.h 2009-01-21 18:21:01 UTC (rev 953)
@@ -41,6 +41,10 @@
/*! Return a ptr to the associated Ogre::SceneManager */
inline Ogre::SceneManager * sceneManager() { return sceneMgr_; }
+ inline void setListener( UnDockedState * listener ){ listener_ = listener; }
+
+ inline UnDockedState * listener( ){ return listener_; }
+
/*! Main update function, that will be called every frame from listener. These call update all associated objects. */
bool update( Ogre::Real elapsedTime );
@@ -71,6 +75,9 @@
/*! Return handle to the avatarObject */
inline SectorAvatarObject * avatarObject() { return avatar_; }
+ /*! Someone has docked */
+ void objectDocked( SectorMovableObject * obj, SectorStationObject * station );
+
protected:
Ogre::SceneManager * sceneMgr_;
NetworkClient * network_;
Modified: trunk/src/SectorBeaconObject.cpp
===================================================================
--- trunk/src/SectorBeaconObject.cpp 2009-01-19 23:53:11 UTC (rev 952)
+++ trunk/src/SectorBeaconObject.cpp 2009-01-21 18:21:01 UTC (rev 953)
@@ -23,6 +23,7 @@
#include "LogManager.h"
#include "ResourceManager.h"
#include "Sector.h"
+#include "SectorBeaconPadObject.h"
#include <OgreEntity.h>
#include <OgreSceneManager.h>
@@ -33,8 +34,11 @@
SectorBeaconObject::SectorBeaconObject( const std::string & name, Sector * sector, Ogre::SceneNode * parentNode )
: SectorMeshObject( name, sector, parentNode ) {
- this->setMesh( "beacon.mesh" );
+ entryPad_ = NULL;
+ exitPad_ = NULL;
+
+ setMesh( "beacon.mesh" );
entityScaleNode_->scale( 20.0, 20.0, 20.0 );
for ( uint i = 0; i < entity()->getNumSubEntities(); i ++ ){
@@ -49,24 +53,25 @@
if ( entity()->getSubEntity( i )->getMaterialName() == "beacon/pad_mount_0" ){
entity()->getSubEntity( i )->setMaterialName( "singleColor" );
entity()->getSubEntity( i )->setCustomParameter( 0, Ogre::Vector4( 0.5, 0.5, 0.5, 1.0 ) );
-// entryPad_ = new BeaconPad( "EntryPad", this, entity()->getSubEntity( i ) );
-// entryPad_->changeEntity( "beacon_pad.mesh" );
-// entryPad_->entity()->setMaterialName( "singleColor" );
-// entryPad_->entity()->getSubEntity( 0 )->setCustomParameter( 0, Ogre::Vector4( 0.8, 0.0, 0.0, 0.2 ) );
+ entryPad_ = new SectorBeaconPadObject( "EntryPad", this, entity()->getSubEntity( i ) );
+ entryPad_->changeEntity( "beacon_pad.mesh" );
+ entryPad_->entity()->setMaterialName( "singleColor" );
+ entryPad_->entity()->getSubEntity( 0 )->setCustomParameter( 0, Ogre::Vector4( 0.8, 0.0, 0.0, 0.2 ) );
}
if ( entity()->getSubEntity( i )->getMaterialName() == "beacon/pad_mount_1" ){
entity()->getSubEntity( i )->setMaterialName( "singleColor" );
entity()->getSubEntity( i )->setCustomParameter( 0, Ogre::Vector4( 0.5, 0.5, 0.5, 1.0 ) );
-// exitPad_ = new BeaconPad( "ExitPad", this, entity()->getSubEntity( i ) );
-// exitPad_->changeEntity( "beacon_pad.mesh" );
-// exitPad_->entity()->setMaterialName( "singleColor" );
-// exitPad_->entity()->getSubEntity( 0 )->setCustomParameter( 0, Ogre::Vector4( 0.8, 0.0, 0.0, 0.2 ) );
+ exitPad_ = new SectorBeaconPadObject( "ExitPad", this, entity()->getSubEntity( i ) );
+ exitPad_->changeEntity( "beacon_pad.mesh" );
+ exitPad_->entity()->setMaterialName( "singleColor" );
+ exitPad_->entity()->getSubEntity( 0 )->setCustomParameter( 0, Ogre::Vector4( 0.8, 0.0, 0.0, 0.2 ) );
}
}
}
SectorBeaconObject::~SectorBeaconObject( ){
-
+ if ( entryPad_ ) delete entryPad_;
+ if ( exitPad_ ) delete exitPad_;
}
}
Modified: trunk/src/SectorBeaconObject.h
===================================================================
--- trunk/src/SectorBeaconObject.h 2009-01-19 23:53:11 UTC (rev 952)
+++ trunk/src/SectorBeaconObject.h 2009-01-21 18:21:01 UTC (rev 953)
@@ -39,11 +39,20 @@
/*! Abstract method for runtime identification */
virtual int rtti( ) const { return SECTOR_BEACON_OBJECT_RTTI; }
+ inline virtual std::string collisionClass() const { return "Station"; }
+
/*! Update function */
virtual bool update( Ogre::Real elapsedTime ) { return true; }
+ /*! Return ptr to the entry pad */
+ SectorBeaconPadObject * entryPad() { return entryPad_; }
+
+ /*! Return ptr to the exit pad */
+ SectorBeaconPadObject * exitPad() { return exitPad_; }
+
protected:
-
+ SectorBeaconPadObject * entryPad_;
+ SectorBeaconPadObject * exitPad_;
};
} //namespace OpenGate
Added: trunk/src/SectorBeaconPadObject.cpp
===================================================================
--- trunk/src/SectorBeaconPadObject.cpp (rev 0)
+++ trunk/src/SectorBeaconPadObject.cpp 2009-01-21 18:21:01 UTC (rev 953)
@@ -0,0 +1,76 @@
+/***************************************************************************
+ * Copyright (C) 2009 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 "SectorBeaconPadObject.h"
+
+#include "OpcodeWrapper.h"
+#include "ResourceManager.h"
+#include "Sector.h"
+#include "SectorBeaconObject.h"
+
+#include <OgreEntity.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+
+namespace OpenGate{
+
+SectorBeaconPadObject::SectorBeaconPadObject( const std::string & name, SectorBeaconObject * parent, Ogre::SubEntity * parentSubEntity )
+ : SectorPadObject( name, parent, parentSubEntity ){
+
+ if ( ResourceManager::getSingleton().collisionManager ){
+ ResourceManager::getSingleton().collisionManager->create( this );
+ }
+}
+
+SectorBeaconPadObject::~SectorBeaconPadObject( ){
+ if ( ResourceManager::getSingleton().collisionManager ){
+ ResourceManager::getSingleton().collisionManager->destroy( this );
+ }
+}
+
+bool SectorBeaconPadObject::update( Ogre::Real elapsedTime ) {
+ return true;
+}
+
+void SectorBeaconPadObject::collide( SectorCollisionObject * obj ){
+ std::cout << "SectorBeaconPadObject: " << this->name() << " collide with "
+ << obj->rtti() << " " << obj->name() << std::endl;
+}
+
+SectorBeaconObject * SectorBeaconPadObject::beacon() {
+ return dynamic_cast < SectorBeaconObject * >( parent_ );
+}
+
+void SectorBeaconPadObject::changeEntity( const std::string & meshname ){
+ if ( ResourceManager::getSingleton().collisionManager ){
+ ResourceManager::getSingleton().collisionManager->destroy( this );
+ }
+ mainNode_->detachObject( entity_ );
+ sector_->sceneManager()->destroyEntity( entity_ );
+ entity_ = sector_->sceneManager()->createEntity( name_ + "/Entity", meshname );
+ mainNode_->attachObject( entity_ );
+ mainNode_->translate( position_ );
+
+ if ( ResourceManager::getSingleton().collisionManager ){
+ ResourceManager::getSingleton().collisionManager->create( this );
+ }
+}
+
+}
Added: trunk/src/SectorBeaconPadObject.h
===================================================================
--- trunk/src/SectorBeaconPadObject.h (rev 0)
+++ trunk/src/SectorBeaconPadObject.h 2009-01-21 18:21:01 UTC (rev 953)
@@ -0,0 +1,61 @@
+/***************************************************************************
+ * Copyright (C) 2009 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_SECTORBEACONPADOBJECT__H
+#define _OPENGATE_SECTORBEACONPADOBJECT__H
+
+#include "Opengate.h"
+#include "SectorPadObject.h"
+
+namespace OpenGate{
+
+/*! Baseclass for Child SectorObjects that contains to any parent SectorCollisionObject. i.e. projectile, pads. */
+class SectorBeaconPadObject : public SectorPadObject {
+public:
+ /*! Construct SectorPadObject */
+ SectorBeaconPadObject( const std::string & name, SectorBeaconObject * parent, Ogre::SubEntity * parentSubEntity );
+
+ /*! Default destructor */
+ virtual ~SectorBeaconPadObject( );
+
+ /*! Abstract method for runtime identification */
+ virtual int rtti( ) const { return SECTOR_BEACON_PAD_OBJECT_RTTI; }
+
+ /*! Update function will called from parents update loop. */
+ virtual bool update( Ogre::Real elapsedTime );
+
+ /*! Start docking procedure */
+ virtual void collide( SectorCollisionObject * object );
+
+ /*! Return ptr to parent SectorStationObject */
+ SectorBeaconObject * beacon();
+
+ /*! Change the entity of this object, maybee there is a good place in any parent class */
+ void changeEntity( const std::string & meshname );
+
+protected:
+
+};
+
+} //namespace OpenGate
+
+#endif //_OPENGATE_SECTORBEACONPADOBJECT__H
+
+
Added: trunk/src/SectorChildObject.cpp
===================================================================
--- trunk/src/SectorChildObject.cpp (rev 0)
+++ trunk/src/SectorChildObject.cpp 2009-01-21 18:21:01 UTC (rev 953)
@@ -0,0 +1,36 @@
+/***************************************************************************
+ * Copyright (C) 2009 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 "SectorChildObject.h"
+
+#include "Sector.h"
+#include "SectorMeshObject.h"
+
+namespace OpenGate{
+
+SectorChildObject::SectorChildObject( const std::string & name, SectorMeshObject * parent )
+ : SectorCollisionObject( name, parent->sector(), parent->rotNode() ), parent_( parent ){
+}
+
+SectorChildObject::~SectorChildObject( ){
+
+}
+
+}
Added: trunk/src/SectorChildObject.h
===================================================================
--- trunk/src/SectorChildObject.h (rev 0)
+++ trunk/src/SectorChildObject.h 2009-01-21 18:21:01 UTC (rev 953)
@@ -0,0 +1,58 @@
+/***************************************************************************
+ * Copyright (C) 2009 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_SECTORCHILDOBJECT__H
+#define _OPENGATE_SECTORCHILDOBJECT__H
+
+#include "Opengate.h"
+#include "SectorCollisionObject.h"
+
+namespace OpenGate{
+
+/*! Baseclass for Child SectorObjects that contains to any parent SectorCollisionObject. i.e. projectile, pads. */
+class SectorChildObject : public SectorCollisionObject {
+public:
+ /*! Construct SectorObjectBase, */
+ SectorChildObject( const std::string & name, SectorMeshObject * parent );
+
+ /*! Default destructor */
+ virtual ~SectorChildObject( );
+
+ /*! Abstract method for runtime identification */
+ virtual int rtti( ) const { return SECTOR_CHILD_OBJECT_RTTI; }
+
+ /*! Set a new parent for this object */
+ inline void setParent( SectorCollisionObject * parent ) { parent_ = parent; }
+
+ /*! Return a ptr to the parent SectorCollisionObject */
+ inline SectorCollisionObject * parent() { return parent_; }
+
+protected:
+ SectorCollisionObject * parent_;
+};
+
+ class SectorProjectileObject : public SectorChildObject {
+ };
+
+} //namespace OpenGate
+
+#endif //_OPENGATE_SECTORCHILDOBJECT__H
+
+
Modified: trunk/src/SectorCollisionObject.h
===================================================================
--- trunk/src/SectorCollisionObject.h 2009-01-19 23:53:11 UTC (rev 952)
+++ trunk/src/SectorCollisionObject.h 2009-01-21 18:21:01 UTC (rev 953)
@@ -63,17 +63,6 @@
Ogre::Entity * entity_;
};
- /*! Special child SectorObject that is assiciated to any parent SectorObject.*/
- class SectorChildObject : public SectorCollisionObject {
- };
- class SectorPadObject : public SectorChildObject {
- };
- class SectorProjectileObject : public SectorChildObject {
- };
- class SectorStationPadObject : public SectorPadObject {
- };
- class SectorBeaconPadObject : public SectorPadObject {
- };
} //namespace OpenGate
#endif //_OPENGATE_SECTORCOLLISIONOBJECT__H
Modified: trunk/src/SectorMovableObject.cpp
===================================================================
--- trunk/src/SectorMovableObject.cpp 2009-01-19 23:53:11 UTC (rev 952)
+++ trunk/src/SectorMovableObject.cpp 2009-01-21 18:21:01 UTC (rev 953)
@@ -69,9 +69,6 @@
}
void SectorMovableObject::collide( SectorCollisionObject * obj ){
- std::cout << "SectorMovableObject: " << this->name() << " collide with "
- << obj->rtti() << " " << obj->name() << std::endl;
-
if ( this != obj ){
switch( obj->rtti( ) ){
case SECTOR_AVATAR_OBJECT_RTTI:
@@ -87,6 +84,9 @@
// case SECTOROBJECTMISSILE_RTTI:
// hitByAmmo( dynamic_cast < SectorObjectMissile *>( obj )->missile()->damage() );
// break;
+ default:
+ std::cout << "SectorMovableObject: " << this->name() << " collide with "
+ << obj->rtti() << " " << obj->name() << std::endl;
}
}
}
Added: trunk/src/SectorPadObject.cpp
===================================================================
--- trunk/src/SectorPadObject.cpp (rev 0)
+++ trunk/src/SectorPadObject.cpp 2009-01-21 18:21:01 UTC (rev 953)
@@ -0,0 +1,105 @@
+/***************************************************************************
+ * Copyright (C) 2009 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 "SectorPadObject.h"
+
+#include "commonWithOgre.h"
+
+#include "Sector.h"
+
+#include <OgreEntity.h>
+#include <OgreManualObject.h>
+#include <OgreMeshManager.h>
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include <OgreSubEntity.h>
+
+
+namespace OpenGate{
+
+SectorPadObject::SectorPadObject( const std::string & name, SectorMeshObject * parent, Ogre::SubEntity * parentSubEntity )
+ : SectorChildObject( name, parent ){
+
+ manualObject_ = sector_->sceneManager()->createManualObject( this->name() + "/ManualObject" );
+
+ std::vector < Ogre::Vector3 > verts;
+ std::vector < Triangle > tris;
+ readSubEntity( parentSubEntity, verts, tris );
+
+ //padManualObject_->begin( "BaseWhiteNoLighting", Ogre::RenderOperation::OT_TRIANGLE_LIST );
+ manualObject_->begin( parentSubEntity->getMaterialName(), Ogre::RenderOperation::OT_TRIANGLE_LIST );
+
+ Ogre::Real xmin( 9e99 ), xmax( -9e99 ), ymin( 9e99 ), ymax( -9e99 ), zmin( 9e99 ), zmax( -9e99 );
+ position_ = Ogre::Vector3::ZERO;
+
+ for( uint i = 0; i < verts.size(); i++ ){
+ position_ += verts[ i ];
+
+ xmin = min( xmin, verts[ i ][ 0 ] ); xmax = max( xmax, verts[ i ][ 0 ] );
+ ymin = min( ymin, verts[ i ][ 1 ] ); ymax = max( ymax, verts[ i ][ 1 ] );
+ zmin = min( zmin, verts[ i ][ 2 ] ); zmax = max( zmax, verts[ i ][ 2 ] );
+ manualObject_->position( verts[ i ] ); //pReal[ 0 ], pReal[ 1 ], pReal[ 2 ] );
+ }
+
+ position_ /= verts.size();
+ radius_ = max( xmax-xmin, ymax-ymin );
+ radius_ = max( radius_, zmax - zmin );
+ radius_ /= 2.0;
+
+ direction_ = Ogre::Vector3::ZERO;
+ for ( uint i = 0; i < tris.size(); i++ ) {
+ manualObject_->triangle( tris[ i ].a, tris[ i ].b, tris[ i ].c );
+ direction_ += ( ( verts[ tris[ i ].b ] - verts[ tris[ i ].a ] )
+ .crossProduct( verts[ tris[ i ].c ] - verts[ tris[ i ].a ] ) ).normalisedCopy();
+ }
+
+ direction_ /= tris.size();
+ manualObject_->end();
+
+ mesh_ = manualObject_->convertToMesh( manualObject_->getName() + "/Mesh" );
+
+ entity_ = sector_->sceneManager()->createEntity( mesh_->getName() + "/Entity", mesh_->getName() );
+
+ mainNode_->attachObject( entity_ );
+ mainNode_->translate( direction_.normalisedCopy() * 0.1 );
+}
+
+SectorPadObject::~SectorPadObject( ){
+ mainNode_->detachObject( entity_ );
+ sector_->sceneManager()->destroyEntity( entity_ );
+ Ogre::MeshManager::getSingleton().remove( mesh_->getName() );
+ sector_->sceneManager()->destroyManualObject( manualObject_ );
+}
+
+Ogre::Vector3 SectorPadObject::position( bool world ) const {
+ if ( world ){
+ return mainNode_->getParent()->_getFullTransform() * position_;
+ }
+ return position_;
+}
+
+Ogre::Vector3 SectorPadObject::direction( bool world ) const {
+ if ( world ){
+ return mainNode_->getParent()->_getDerivedOrientation() * direction_;
+ }
+ return direction_;
+}
+
+}
Added: trunk/src/SectorPadObject.h
===================================================================
--- trunk/src/SectorPadObject.h (rev 0)
+++ trunk/src/SectorPadObject.h 2009-01-21 18:21:01 UTC (rev 953)
@@ -0,0 +1,69 @@
+/***************************************************************************
+ * Copyright (C) 2009 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_SECTORPADOBJECT__H
+#define _OPENGATE_SECTORPADOBJECT__H
+
+#include "Opengate.h"
+
+#include "SectorChildObject.h"
+
+#include <OgreMesh.h>
+
+namespace OpenGate{
+
+/*! Baseclass for Pads, mainly a face that is copied from a subentity of the parents mesh */
+class SectorPadObject : public SectorChildObject {
+public:
+ /*! Construct SectorPadObject */
+ SectorPadObject( const std::string & name, SectorMeshObject * parent, Ogre::SubEntity * parentSubEntity );
+
+ /*! Default destructor */
+ virtual ~SectorPadObject( );
+
+ /*! Abstract method for runtime identification */
+ virtual int rtti( ) const { return SECTOR_PAD_OBJECT_RTTI; }
+
+ inline virtual std::string collisionClass() const { return "DockPad"; }
+
+ /*! Return position the middle position of this pad relative to the parent node or in absolute world coordinates */
+ Ogre::Vector3 position( bool world = false ) const;
+
+ /*! Return direction perpendicular to the pads face relative to the parent main node or in absolute world coordinates */
+ Ogre::Vector3 direction( bool world = false ) const;
+
+ /*! Radius of the pad */
+ Ogre::Real radius() const { return radius_; }
+
+protected:
+
+ Ogre::ManualObject * manualObject_;
+ Ogre::MeshPtr mesh_;
+
+ Ogre::Vector3 position_;
+ Ogre::Vector3 direction_;
+ Ogre::Real radius_;
+};
+
+} //namespace OpenGate
+
+#endif //_OPENGATE_SECTORPADOBJECT__H
+
+
Modified: trunk/src/SectorStationObject.cpp
===================================================================
--- trunk/src/SectorStationObject.cpp 2009-01-19 23:53:11 UTC (rev 952)
+++ trunk/src/SectorStationObject.cpp 2009-01-21 18:21:01 UTC (rev 953)
@@ -20,9 +20,16 @@
#include "SectorStationObject.h"
+#include "commonWithOgre.h"
+
#include "Entity.h"
+#include "Sector.h"
+#include "SectorStationPadObject.h"
+#include <OgreBillboard.h>
+#include <OgreBillboardSet.h>
#include <OgreEntity.h>
+#include <OgreManualObject.h>
#include <OgreSceneManager.h>
#include <OgreSceneNode.h>
#include <OgreSubEntity.h>
@@ -34,10 +41,126 @@
setMesh( station_->meshName() );
setBaseSize( station_->baseSize() );
+
+ dockPad_ = NULL;
+ launchPad_ = NULL;
+ flashLights_ = NULL;
+ ringNode_ = NULL;
+
+ for ( uint i = 0; i < entity()->getNumSubEntities(); i ++ ){
+ std::cout << entity()->getSubEntity( i )->getMaterialName() << " Techniques: "
+ << entity()->getSubEntity( i )->getMaterial()->getNumTechniques() << " used: "
+ << entity()->getSubEntity( i )->getTechnique()->getName() << std::endl;
+
+// for ( uint j = 0; j < entity()->getSubEntity( i )->getMaterial()->getNumTechniques(); j ++ ){
+// std::cout << entity()->getSubEntity( i )->getMaterial()->getTechnique( j )->getName() << std::endl;
+// }
+
+ if ( entity()->getSubEntity( i )->getMaterialName() == "Flashlight/Red" ){
+ createFlashLights_( entity()->getSubEntity( i ) );
+ }
+ if ( entity()->getSubEntity( i )->getMaterialName() == "Station/DockPad" ){
+ dockPad_ = new SectorStationPadObject( name_ + "DockPad", this, entity()->getSubEntity( i ), true );
+ }
+ if ( entity()->getSubEntity( i )->getMaterialName() == "Station/LaunchPad.001" ){
+ launchPad_ = new SectorStationPadObject( name_ + "LaunchPad", this, entity()->getSubEntity( i ), false );
+ }
+ }
+
+ if ( dockPad_ ){
+ createRings( dockPad_->position(), dockPad_->radius(), dockPad_->direction() );
+ ringNode_->setVisible( true );
+ }
}
SectorStationObject::~SectorStationObject( ){
+ if ( launchPad_ ) delete launchPad_;
+ if ( dockPad_ ) delete dockPad_;
+
+ if ( ringNode_ ){
+ ringNode_->detachObject( ringEntity_ );
+ sector_->sceneManager()->destroyManualObject( ringEntity_ );
+ entityRotNode_->removeAndDestroyChild( ringNode_->getName() );
+ }
+
+ if ( flashLights_ ){
+ entityRotNode_->detachObject( flashLights_ );
+ sector_->sceneManager()->destroyBillboardSet( flashLights_ );
+ }
}
+void SectorStationObject::createRings( const Ogre::Vector3 & position, Ogre::Real rMin, const Ogre::Vector3 & direction ){
+ Ogre::Vector3 targetDir( direction );
+ if ( targetDir == Ogre::Vector3::ZERO ) targetDir = entityRotNode_->getOrientation().zAxis();
+
+ Ogre::String name = name_+ "/Rings";
+
+ ringNode_ = entityRotNode_->createChildSceneNode( name );
+ ringEntity_ = sector_->sceneManager()->createManualObject( name + "shape" );
+
+ Ogre::Real radius = rMin;
+ Ogre::Real thickness = rMin / 5.0; // Of course this must be less than the radius value.
+ Ogre::Real nSegments = 6;
+ Ogre::Real dPhi = 2.0 * 3.141592 / nSegments;
+ Ogre::Real length = 20;
+ int nRings = 20;
+
+ unsigned point_index = 0;
+
+ for ( int i = 0; i < nRings; i ++ ){
+ radius = rMin + i * 10 * rMin / nRings ;
+
+ ringEntity_->begin( "shader/gradient", Ogre::RenderOperation::OT_TRIANGLE_LIST);
+ ringEntity_->getSection( i )->setCustomParameter( 0, Ogre::Vector4( 0.0, 1.0-(double)i/nRings, (double)i/nRings, 0.4 ) );
+ ringEntity_->getSection( i )->setCustomParameter( 1, Ogre::Vector4( radius, 0, 0, 0 ) );
+
+ for ( int segment = 0; segment < nSegments; segment++ ) {
+ Ogre::Real theta = segment * dPhi + dPhi/2.0;
+
+ ringEntity_->position( radius * cos( theta ), i * ( length / nRings ),
+ radius * sin( theta ) );
+ ringEntity_->position( (radius - thickness) * cos( theta ), i * ( length / nRings ),
+ (radius - thickness) * sin( theta ) );
+ if ( segment > 0 ){
+ point_index = (segment+1)*2-1;
+ ringEntity_->quad( point_index, point_index-1, point_index-3, point_index-2 );
+ ringEntity_->quad( point_index, point_index-2, point_index-3, point_index-1 );
+ }
+ }
+ ringEntity_->quad( 1, 0, (uint)nSegments*2-2, (uint)nSegments*2-1 );
+ ringEntity_->quad( 1, (uint)nSegments*2-1, (uint)nSegments*2-2, 0 );
+ ringEntity_->end();
+ }
+
+ Ogre::Quaternion rot = Ogre::Vector3( 0.0, 1.0, 0.0 ).getRotationTo( targetDir );
+
+ ringNode_->rotate( rot );
+ ringNode_->translate( position );
+ ringNode_->attachObject( ringEntity_ );
}
+
+void SectorStationObject::createFlashLights_( Ogre::SubEntity * entity ){
+
+ entity->setVisible( false );
+ std::vector< Ogre::Vector3 > verts;
+ std::vector< Triangle > tris;
+ readSubEntity( entity, verts, tris );
+
+ uint nLights = tris.size() / 2;
+
+ flashLights_ = sector_->sceneManager()->createBillboardSet( name_ + "_BBS", nLights );
+ flashLights_->setMaterialName( entity->getMaterialName() );
+
+ Ogre::Billboard *bb;
+
+ for ( uint i = 0; i < nLights; i ++ ){
+ bb = flashLights_->createBillboard( Ogre::Vector3::ZERO, Ogre::ColourValue( 1.0f, 0.0f, 0.0f, 1.0f) );
+ bb->setDimensions( (verts[ i * 4 + 1 ] - verts[ i * 4 ] ).length(),
+ (verts[ i * 4 + 1 ] - verts[ i * 4 ] ).length() );
+ bb->setPosition( ( verts[ i * 4 ] + verts[ i * 4 + 1 ] + verts[ i * 4 + 2 ] + verts[ i * 4 + 3] ) / 4.0 );
+ }
+ entityRotNode_->attachObject( flashLights_ );
+}
+
+}
Modified: trunk/src/SectorStationObject.h
===================================================================
--- trunk/src/SectorStationObject.h 2009-01-19 23:53:11 UTC (rev 952)
+++ trunk/src/SectorStationObject.h 2009-01-21 18:21:01 UTC (rev 953)
@@ -39,15 +39,37 @@
/*! Abstract method for runtime identification */
virtual int rtti( ) const { return SECTOR_STATION_OBJECT_RTTI; }
+ inline virtual std::string collisionClass() const { return "Station"; }
+
/*! Update function */
virtual bool update( Ogre::Real elapsedTime ) { return true; }
/*! Return ptr to station entity */
Station * station(){ return station_; }
+ /*! Return ptr to the docking pad */
+ SectorStationPadObject * dockPad() { return dockPad_; }
+
+ /*! Return ptr to the launching pad */
+ SectorStationPadObject * launchPad() { return launchPad_; }
+
+ /*! Create docking rings */
+ void createRings( const Ogre::Vector3 & position, Ogre::Real rMin, const Ogre::Vector3 & direction );
+
protected:
- Station * station_;
+ /*! Create some fancy flash lights, based on mesh infos */
+ void createFlashLights_( Ogre::SubEntity * entity );
+
+ Station * station_;
+
+ Ogre::SceneNode * ringNode_;
+ Ogre::ManualObject * ringEntity_;
+
+ Ogre::BillboardSet * flashLights_;
+ SectorStationPadObject * dockPad_;
+ SectorStationPadObject * launchPad_;
+
};
} //namespace OpenGate
Added: trunk/src/SectorStationPadObject.cpp
===================================================================
--- trunk/src/SectorStationPadObject.cpp (rev 0)
+++ trunk/src/SectorStationPadObject.cpp 2009-01-21 18:21:01 UTC (rev 953)
@@ -0,0 +1,75 @@
+/***************************************************************************
+ * Copyright (C) 2009 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 "SectorStationPadObject.h"
+
+#include "OpcodeWrapper.h"
+#include "ResourceManager.h"
+#include "Sector.h"
+#include "SectorMovableObject.h"
+#include "SectorStationObject.h"
+
+
+#include <OgreSubEntity.h>
+
+namespace OpenGate{
+
+SectorStationPadObject::SectorStationPadObject( const std::string & name, SectorStationObject * parent, Ogre::SubEntity * padSubEntity, bool isDockPad )
+ : SectorPadObject( name, parent, padSubEntity ), isDockPad_( isDockPad ){
+
+ if ( isDockPad_ ){
+ if ( ResourceManager::getSingleton().collisionManager ){
+ ResourceManager::getSingleton().collisionManager->create( this );
+ }
+ }
+}
+
+SectorStationPadObject::~SectorStationPadObject( ){
+ if ( ResourceManager::getSingleton().collisionManager ){
+ ResourceManager::getSingleton().collisionManager->destroy( this );
+ }
+}
+
+bool SectorStationPadObject::update( Ogre::Real elapsedTime ) {
+ return true;
+}
+
+void SectorStationPadObject::collide( SectorCollisionObject * obj ){
+ if ( this != obj ){
+ if ( isDockPad_ ) {
+ switch( obj->rtti( ) ){
+ case SECTOR_AVATAR_OBJECT_RTTI:
+ case SECTOR_MOVABLE_OBJECT_RTTI:
+ case SECTOR_VESSEL_OBJECT_RTTI:
+ sector_->objectDocked( dynamic_cast< SectorMovableObject * >( obj ), this->station() );
+ break;
+ default:
+ std::cout << "SectorMovableObject: " << this->name() << " collide with "
+ << obj->rtti() << " " << obj->name() << std::endl;
+ }
+ }
+ }
+}
+
+SectorStationObject * SectorStationPadObject::station() {
+ return dynamic_cast < SectorStationObject * >( parent_ );
+}
+
+}
Added: trunk/src/SectorStationPadObject.h
===================================================================
--- trunk/src/SectorStationPadObject.h (rev 0)
+++ trunk/src/SectorStationPadObject.h 2009-01-21 18:21:01 UTC (rev 953)
@@ -0,0 +1,62 @@
+/***************************************************************************
+ * Copyright (C) 2009 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_SECTORSTATIONPADOBJECT__H
+#define _OPENGATE_SECTORSTATIONPADOBJECT__H
+
+#include "Opengate.h"
+#include "SectorPadObject.h"
+
+namespace OpenGate{
+
+/*! Baseclass for Child SectorObjects that contains to any parent SectorCollisionObject. i.e. projectile, pads. */
+class SectorStationPadObject : public SectorPadObject {
+public:
+ /*! Construct SectorPadObject */
+ SectorStationPadObject( const std::string & name, SectorStationObject * parent, Ogre::SubEntity * padSubEntity, bool isDockPad );
+
+ /*! Default destructor */
+ virtual ~SectorStationPadObject( );
+
+ /*! Abstract method for runtime identification */
+ virtual int rtti( ) const { return SECTOR_STATION_PAD_OBJECT_RTTI; }
+
+ /*! Update function will called from parents update loop. */
+ virtual bool update( Ogre::Real elapsedTime );
+
+ /*! Start docking procedure */
+ virtual void collide( SectorCollisionObject * object );
+
+ /*! Return ptr to parent SectorStationObject */
+ SectorStationObject * station();
+
+ /*! Return true if the pad is suitable for docking */
+ inline bool isDockPad( ) const { return isDockPad_; }
+
+protected:
+ bool isDockPad_;
+
+};
+
+} //namespace OpenGate
+
+#endif //_OPENGATE_SECTORSTATIONPADOBJECT__H
+
+
Modified: trunk/src/UnDockedState.cpp
===================================================================
--- trunk/src/UnDockedState.cpp 2009-01-19 23:53:11 UTC (rev 952)
+++ trunk/src/UnDockedState.cpp 2009-01-21 18:21:01 UTC (rev 953)
@@ -112,6 +112,7 @@
sector_ = new Sector( sceneMgr_, network_ );
sector_->populate( "test.sector" );
sector_->createAvatarObject( *resources_->avatar );
+ sector_->setListener( this );
hud_ = new Hud( overlayRootWindow_, sector_->avatarObject() );
@@ -120,8 +121,7 @@
} catch( ... ){
LogManager::getSingleton().warn( "UnDockedState::enter() -- Unknown exception" );
}
- // sector_->setListener( this );
-
+
// CEGUI::MouseCursor::getSingleton().hide();
windowsWidth_ = resources_->renderWindow->getWidth( );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2009-01-19 23:53:22
|
Revision: 952
http://opengate.svn.sourceforge.net/opengate/?rev=952&view=rev
Author: egore
Date: 2009-01-19 23:53:11 +0000 (Mon, 19 Jan 2009)
Log Message:
-----------
Update to reflect changes to the data structure and cleanup
Modified Paths:
--------------
trunk/data/Makefile.am
Modified: trunk/data/Makefile.am
===================================================================
--- trunk/data/Makefile.am 2009-01-19 23:50:05 UTC (rev 951)
+++ trunk/data/Makefile.am 2009-01-19 23:53:11 UTC (rev 952)
@@ -86,8 +86,9 @@
commodities/armor.xml \
commodities/armor_big.png \
commodities/armor_small.png \
- commodities/barium.png \
commodities/barium.xml \
+ commodities/barium_big.png \
+ commodities/barium_small.png \
commodities/boron.xml \
commodities/boron_big.png \
commodities/boron_small.png \
@@ -133,8 +134,9 @@
commodities/lumber.xml \
commodities/lumber_big.png \
commodities/lumber_small.png \
- commodities/magnetic_components.png \
commodities/magnetic_components.xml \
+ commodities/magnetic_components_big.png \
+ commodities/magnetic_components_small.png \
commodities/manufactured_foods.xml \
commodities/manufactured_foods_big.png \
commodities/manufactured_foods_small.png \
@@ -193,8 +195,7 @@
capacitorsdir = \
$(pkgdatadir)/capacitors
-ecms_DATA = \
- ecms/ghost.xml
+ecms_DATA =
engines_DATA = \
engines/money.xml\
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
