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...> - 2007-06-03 23:54:05
|
Revision: 526
http://svn.sourceforge.net/opengate/?rev=526&view=rev
Author: ultrasick
Date: 2007-06-03 16:54:05 -0700 (Sun, 03 Jun 2007)
Log Message:
-----------
uploading mainly the new xml files from the exporter and some other stuff
Modified Paths:
--------------
trunk/data/capacitors/deepol.xml
trunk/data/capacitors/mantra.xml
trunk/data/capacitors/outlet.xml
trunk/data/capacitors/sponge.xml
trunk/data/capacitors/tank.xml
trunk/data/commodities/aluminium.xml
trunk/data/commodities/antimony.xml
trunk/data/commodities/barium.xml
trunk/data/commodities/cesium.xml
trunk/data/commodities/chemicals.xml
trunk/data/commodities/chromium.xml
trunk/data/commodities/copper.xml
trunk/data/commodities/cpu.xml
trunk/data/commodities/fuel_cells.xml
trunk/data/commodities/gold.xml
trunk/data/commodities/helium.xml
trunk/data/commodities/ice.xml
trunk/data/commodities/iron.xml
trunk/data/commodities/laser_components.xml
trunk/data/commodities/medical_supplies.xml
trunk/data/commodities/nitrogen.xml
trunk/data/commodities/octavia_light.xml
trunk/data/commodities/rubber.xml
trunk/data/commodities/xenon.xml
trunk/data/power_plants/contender.xml
trunk/data/power_plants/contender_xl.xml
trunk/data/power_plants/spud.xml
trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml
Added Paths:
-----------
trunk/data/capacitors/summoner.xml
trunk/data/capacitors/t-c-15.xml
trunk/data/commodities/ammunition.xml
trunk/data/commodities/armor.xml
trunk/data/commodities/conflux_biomass.xml
trunk/data/commodities/magnetic_components.blend
trunk/data/commodities/magnetic_components.xml
trunk/data/commodities/manufactured_foods.xml
trunk/data/commodities/organic_foods.xml
trunk/data/commodities/plutonium.xml
trunk/data/commodities/tauseti_flashback.xml
trunk/data/commodities/water.xml
trunk/data/engines/money.xml
trunk/data/engines/t-e-15.xml
trunk/data/power_plants/contender_xpr.xml
trunk/data/radars/
trunk/data/radars/cyclops.blend
trunk/data/radars/cyclops.xml
trunk/data/radars/hall_monitor.blend
trunk/data/radars/hall_monitor.xml
trunk/data/radars/outlook.blend
trunk/data/radars/outlook.xml
trunk/data/radars/t-r-9.blend
trunk/data/radars/t-r-9.xml
trunk/data/rankings/tauseti/
trunk/data/rankings/tauseti/agent.xml
trunk/data/rankings/tauseti/apprentice.xml
trunk/data/rankings/tauseti/arbiter.xml
trunk/data/rankings/tauseti/associate.xml
trunk/data/rankings/tauseti/baron.xml
trunk/data/rankings/tauseti/baronet.xml
trunk/data/rankings/tauseti/cambist.xml
trunk/data/rankings/tauseti/chief_coordinator.xml
trunk/data/rankings/tauseti/chief_executive.xml
trunk/data/rankings/tauseti/chief_regulator.xml
trunk/data/rankings/tauseti/contractor.xml
trunk/data/rankings/tauseti/coordinator.xml
trunk/data/rankings/tauseti/director.xml
trunk/data/rankings/tauseti/duke.xml
trunk/data/rankings/tauseti/financier.xml
trunk/data/rankings/tauseti/first_associate.xml
trunk/data/rankings/tauseti/first_merchant.xml
trunk/data/rankings/tauseti/first_provisioner.xml
trunk/data/rankings/tauseti/junior_executive.xml
trunk/data/rankings/tauseti/lead_agent.xml
trunk/data/rankings/tauseti/lead_contractor.xml
trunk/data/rankings/tauseti/magnate.xml
trunk/data/rankings/tauseti/master_associate.xml
trunk/data/rankings/tauseti/master_cambist.xml
trunk/data/rankings/tauseti/master_financier.xml
trunk/data/rankings/tauseti/master_magnate.xml
trunk/data/rankings/tauseti/master_merchant.xml
trunk/data/rankings/tauseti/master_provisioner.xml
trunk/data/rankings/tauseti/master_specialist.xml
trunk/data/rankings/tauseti/master_tycoon.xml
trunk/data/rankings/tauseti/merchant.xml
trunk/data/rankings/tauseti/porter.xml
trunk/data/rankings/tauseti/president.xml
trunk/data/rankings/tauseti/provisioner.xml
trunk/data/rankings/tauseti/recruit.xml
trunk/data/rankings/tauseti/regulator.xml
trunk/data/rankings/tauseti/senior_agent.xml
trunk/data/rankings/tauseti/senior_associate.xml
trunk/data/rankings/tauseti/senior_cambist.xml
trunk/data/rankings/tauseti/senior_contractor.xml
trunk/data/rankings/tauseti/senior_financier.xml
trunk/data/rankings/tauseti/senior_magnate.xml
trunk/data/rankings/tauseti/senior_merchant.xml
trunk/data/rankings/tauseti/senior_provisioner.xml
trunk/data/rankings/tauseti/senior_regulator.xml
trunk/data/rankings/tauseti/senior_tycoon.xml
trunk/data/rankings/tauseti/specialist.xml
trunk/data/rankings/tauseti/tauseti_alterion.xml
trunk/data/rankings/tauseti/tauseti_optimus.xml
trunk/data/rankings/tauseti/tycoon.xml
trunk/data/rankings/tauseti/vice_president.xml
trunk/data/shields/alpaa.xml
trunk/data/shields/flatiron.xml
trunk/data/shields/himelea.xml
trunk/data/shields/kydango.xml
trunk/data/shields/pod.xml
trunk/data/shields/shelter.xml
trunk/data/shields/t-s-13.xml
trunk/data/ships/squadrok/squid/s-1.xml
trunk/data/ships/squadrok/squid/s-2.xml
trunk/data/ships/squadrok/squid/s-3.xml
trunk/data/stations/tauseti/tauseti_wake.xml
Removed Paths:
-------------
trunk/data/radar/
Property Changed:
----------------
trunk/data/commodities/aluminium.xml
trunk/data/commodities/antimony.xml
trunk/data/commodities/barium.xml
trunk/data/commodities/cesium.xml
trunk/data/commodities/chemicals.xml
trunk/data/commodities/chromium.xml
trunk/data/commodities/copper.xml
trunk/data/commodities/cpu.xml
trunk/data/commodities/fuel_cells.xml
trunk/data/commodities/gold.xml
trunk/data/commodities/helium.xml
trunk/data/commodities/ice.xml
trunk/data/commodities/iron.xml
trunk/data/commodities/laser_components.xml
trunk/data/commodities/medical_supplies.xml
trunk/data/commodities/nitrogen.xml
trunk/data/commodities/octavia_light.xml
trunk/data/commodities/xenon.xml
trunk/data/power_plants/spud.xml
trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml
Modified: trunk/data/capacitors/deepol.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/mantra.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/outlet.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/sponge.xml
===================================================================
(Binary files differ)
Added: trunk/data/capacitors/summoner.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/summoner.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/capacitors/t-c-15.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/t-c-15.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Modified: trunk/data/capacitors/tank.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/aluminium.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/aluminium.xml
___________________________________________________________________
Name: svn:mime-type
- text/plain
+ application/xml
Added: trunk/data/commodities/ammunition.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/ammunition.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Modified: trunk/data/commodities/antimony.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/antimony.xml
___________________________________________________________________
Name: svn:mime-type
- text/plain
+ application/xml
Added: trunk/data/commodities/armor.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/armor.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Modified: trunk/data/commodities/barium.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/barium.xml
___________________________________________________________________
Name: svn:mime-type
- text/plain
+ application/xml
Modified: trunk/data/commodities/cesium.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/cesium.xml
___________________________________________________________________
Name: svn:mime-type
- text/plain
+ application/xml
Modified: trunk/data/commodities/chemicals.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/chemicals.xml
___________________________________________________________________
Name: svn:mime-type
- text/plain
+ application/xml
Modified: trunk/data/commodities/chromium.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/chromium.xml
___________________________________________________________________
Name: svn:mime-type
- text/plain
+ application/xml
Added: trunk/data/commodities/conflux_biomass.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/conflux_biomass.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Modified: trunk/data/commodities/copper.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/copper.xml
___________________________________________________________________
Name: svn:mime-type
- text/plain
+ application/xml
Modified: trunk/data/commodities/cpu.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/cpu.xml
___________________________________________________________________
Name: svn:mime-type
- text/plain
+ application/xml
Modified: trunk/data/commodities/fuel_cells.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/fuel_cells.xml
___________________________________________________________________
Name: svn:mime-type
- text/plain
+ application/xml
Modified: trunk/data/commodities/gold.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/gold.xml
___________________________________________________________________
Name: svn:mime-type
- text/plain
+ application/xml
Modified: trunk/data/commodities/helium.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/helium.xml
___________________________________________________________________
Name: svn:mime-type
- text/plain
+ application/xml
Modified: trunk/data/commodities/ice.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/ice.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Modified: trunk/data/commodities/iron.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/iron.xml
___________________________________________________________________
Name: svn:mime-type
- text/plain
+ application/xml
Modified: trunk/data/commodities/laser_components.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/laser_components.xml
___________________________________________________________________
Name: svn:mime-type
- text/plain
+ application/xml
Added: trunk/data/commodities/magnetic_components.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/magnetic_components.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/commodities/magnetic_components.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/magnetic_components.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/commodities/manufactured_foods.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/manufactured_foods.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Modified: trunk/data/commodities/medical_supplies.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/medical_supplies.xml
___________________________________________________________________
Name: svn:mime-type
- text/plain
+ application/xml
Modified: trunk/data/commodities/nitrogen.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/nitrogen.xml
___________________________________________________________________
Name: svn:mime-type
- text/plain
+ application/xml
Modified: trunk/data/commodities/octavia_light.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/octavia_light.xml
___________________________________________________________________
Name: svn:mime-type
- text/plain
+ application/xml
Added: trunk/data/commodities/organic_foods.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/organic_foods.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/commodities/plutonium.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/plutonium.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Modified: trunk/data/commodities/rubber.xml
===================================================================
(Binary files differ)
Added: trunk/data/commodities/tauseti_flashback.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/tauseti_flashback.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/commodities/water.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/water.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Modified: trunk/data/commodities/xenon.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/xenon.xml
___________________________________________________________________
Name: svn:mime-type
- text/plain
+ application/xml
Added: trunk/data/engines/money.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/engines/money.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/engines/t-e-15.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/engines/t-e-15.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Modified: trunk/data/power_plants/contender.xml
===================================================================
(Binary files differ)
Modified: trunk/data/power_plants/contender_xl.xml
===================================================================
(Binary files differ)
Added: trunk/data/power_plants/contender_xpr.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/power_plants/contender_xpr.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Modified: trunk/data/power_plants/spud.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/power_plants/spud.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Added: trunk/data/radars/cyclops.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/radars/cyclops.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/radars/cyclops.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/radars/cyclops.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Added: trunk/data/radars/hall_monitor.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/radars/hall_monitor.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/radars/hall_monitor.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/radars/hall_monitor.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Added: trunk/data/radars/outlook.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/radars/outlook.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/radars/outlook.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/radars/outlook.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Added: trunk/data/radars/t-r-9.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/radars/t-r-9.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/radars/t-r-9.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/radars/t-r-9.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Added: trunk/data/rankings/tauseti/agent.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/agent.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/apprentice.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/apprentice.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/arbiter.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/arbiter.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/associate.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/associate.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/baron.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/baron.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/baronet.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/baronet.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/cambist.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/cambist.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/chief_coordinator.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/chief_coordinator.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/chief_executive.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/chief_executive.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/chief_regulator.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/chief_regulator.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/contractor.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/contractor.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/coordinator.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/coordinator.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/director.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/director.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/duke.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/duke.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/financier.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/financier.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/first_associate.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/first_associate.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/first_merchant.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/first_merchant.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/first_provisioner.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/first_provisioner.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/junior_executive.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/junior_executive.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/lead_agent.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/lead_agent.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/lead_contractor.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/lead_contractor.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/magnate.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/magnate.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/master_associate.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/master_associate.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/master_cambist.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/master_cambist.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/master_financier.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/master_financier.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/master_magnate.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/master_magnate.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/master_merchant.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/master_merchant.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/master_provisioner.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/master_provisioner.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/master_specialist.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/master_specialist.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/master_tycoon.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/master_tycoon.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/merchant.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/merchant.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/porter.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/porter.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/president.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/president.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/provisioner.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/provisioner.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/recruit.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/recruit.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/regulator.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/regulator.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/senior_agent.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/senior_agent.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/senior_associate.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/senior_associate.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/senior_cambist.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/senior_cambist.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/senior_contractor.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/senior_contractor.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/senior_financier.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/senior_financier.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/senior_magnate.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/senior_magnate.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/senior_merchant.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/senior_merchant.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/senior_provisioner.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/senior_provisioner.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/senior_regulator.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/senior_regulator.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/senior_tycoon.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/senior_tycoon.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/specialist.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/specialist.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/tauseti_alterion.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/tauseti_alterion.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/tauseti_optimus.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/tauseti_optimus.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/tycoon.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/tycoon.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/rankings/tauseti/vice_president.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/rankings/tauseti/vice_president.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/shields/alpaa.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/shields/alpaa.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/shields/flatiron.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/shields/flatiron.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/shields/himelea.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/shields/himelea.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/shields/kydango.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/shields/kydango.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/shields/pod.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/shields/pod.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/shields/shelter.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/shields/shelter.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/shields/t-s-13.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/shields/t-s-13.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/ships/squadrok/squid/s-1.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/squadrok/squid/s-1.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/ships/squadrok/squid/s-2.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/squadrok/squid/s-2.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/ships/squadrok/squid/s-3.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/squadrok/squid/s-3.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Modified: trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Added: trunk/data/stations/tauseti/tauseti_wake.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/stations/tauseti/tauseti_wake.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-06-03 19:59:08
|
Revision: 525
http://svn.sourceforge.net/opengate/?rev=525&view=rev
Author: ultrasick
Date: 2007-06-03 12:59:08 -0700 (Sun, 03 Jun 2007)
Log Message:
-----------
huh!? looks like this file was missing in svn
Added Paths:
-----------
trunk/data/power_plants/contender_xpr.blend
Added: trunk/data/power_plants/contender_xpr.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/power_plants/contender_xpr.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-06-02 22:44:18
|
Revision: 524
http://svn.sourceforge.net/opengate/?rev=524&view=rev
Author: ultrasick
Date: 2007-06-02 15:44:20 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
activating file compression
Modified Paths:
--------------
trunk/data/capacitors/mantra.blend
Modified: trunk/data/capacitors/mantra.blend
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-06-02 22:41:44
|
Revision: 523
http://svn.sourceforge.net/opengate/?rev=523&view=rev
Author: ultrasick
Date: 2007-06-02 15:41:46 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
renaming s-c-15 to t-c-15 (solrain -> tauseti)
+ activating file compression
Added Paths:
-----------
trunk/data/capacitors/t-c-15.blend
Removed Paths:
-------------
trunk/data/capacitors/s_c_15.blend
trunk/data/capacitors/s_c_15.xml
Deleted: trunk/data/capacitors/s_c_15.blend
===================================================================
(Binary files differ)
Deleted: trunk/data/capacitors/s_c_15.xml
===================================================================
--- trunk/data/capacitors/s_c_15.xml 2007-06-02 21:16:37 UTC (rev 522)
+++ trunk/data/capacitors/s_c_15.xml 2007-06-02 22:41:46 UTC (rev 523)
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE equipment SYSTEM "http://opengate.sourceforge.net/opengate.dtd">
-
-<equipment type="Capacitor">
- <!-- Naming -->
- <faction>Tauseti</faction>
- <name>S-C-15</name>
-
- <!-- Generic Data -->
- <class>Energy Storage Device</class>
- <techlevel>0</techlevel>
- <size>1</size>
- <mass>1000</mass>
-
- <!-- Additional Data -->
- <description>The S-C-15 is Solrain's stock equipment capacitor, and is basically a modified Mantra. All Solrain pilots are given this as part of their starter package. TRI subsidizes production of this model, and therefore it cannot be legally traded or sold for much value.</description>
- <image>s_c_15.jpg</image>
- <model>s_c_15.blend</model>
- <mesh>s_c_15.mesh</mesh>
-
- <!-- Specific data -->
- <efficiency>80</efficiency>
- <capacity>1100000</capacity>
-
- <!-- Production Data -->
- <manufacturer>T&P Systems</manufacturer>
- <production-center>Solrain Core</production-center>
- <production-center>Solrain Wake</production-center>
- <production-center>Solrain Cornea</production-center>
-
- <!-- Building Data -->
- <required-component>Aluminium</required-component>
- <required-component>Lithium</required-component>
- <required-component>Magnesium</required-component>
- <required-component>Chemicals</required-component>
- <required-component>Rubber</required-component>
-
-</equipment>
Added: trunk/data/capacitors/t-c-15.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/t-c-15.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-06-02 21:16:39
|
Revision: 522
http://svn.sourceforge.net/opengate/?rev=522&view=rev
Author: ultrasick
Date: 2007-06-02 14:16:37 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
added faction_id 4-6 (4 = squadrok, 5 = amanath, 6 = hyperial). maybe thouse faction ids will never be used for player accounts. but thouse faction ids are beeing used internal and beeing exported by the xml exporter of commodities, shields and so on
Modified Paths:
--------------
trunk/doc/meta_server/login.odt
trunk/doc/meta_server/login.pdf
Modified: trunk/doc/meta_server/login.odt
===================================================================
(Binary files differ)
Modified: trunk/doc/meta_server/login.pdf
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-06-02 16:14:11
|
Revision: 521
http://svn.sourceforge.net/opengate/?rev=521&view=rev
Author: spom_spom
Date: 2007-06-02 09:14:07 -0700 (Sat, 02 Jun 2007)
Log Message:
-----------
The marketdialog now support equipment.
Modified Paths:
--------------
branches/ogsector/data/equipment.xml
branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout
branches/ogsector/ogre.cfg
branches/ogsector/resources.cfg
branches/ogsector/src/Avatar.cpp
branches/ogsector/src/Avatar.h
branches/ogsector/src/Entity.h
branches/ogsector/src/EntityManager.cpp
branches/ogsector/src/EntityManager.h
branches/ogsector/src/MarketDialog.cpp
branches/ogsector/src/MarketDialog.h
branches/ogsector/src/VesselManager.cpp
Modified: branches/ogsector/data/equipment.xml
===================================================================
--- branches/ogsector/data/equipment.xml 2007-06-02 02:36:57 UTC (rev 520)
+++ branches/ogsector/data/equipment.xml 2007-06-02 16:14:07 UTC (rev 521)
@@ -3,4 +3,5 @@
<equipment>
<Resource id="1" location="../../trunk/data/capacitors/s_c_15.xml" />
<Resource id="2" location="../../trunk/data/ECMs/ghost.xml" />
+ <Resource id="3" location="../../trunk/data/capacitors/deepol.xml" />
</equipment>
Modified: branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout
===================================================================
--- branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout 2007-06-02 02:36:57 UTC (rev 520)
+++ branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout 2007-06-02 16:14:07 UTC (rev 521)
@@ -242,25 +242,35 @@
<Property Name="FrameEnabled" Value="False" />
<Property Name="RiseOnClick" Value="False" />
<Property Name="Image" Value="set:opengate image:StaticGreenBottom"/>
- <Window Type="opengate/StaticLabel" Name="ItemDescription/InventoryChipCargoLabel">
- <Property Name="UnifiedPosition" Value="{{0.0, 0},{0.0, 11}}" />
- <Property Name="UnifiedSize" Value="{{0.0, 50},{0.0, 15}}" />
+ <Window Type="opengate/StaticLabel" Name="ItemDescription/InventoryShipCargoLabel">
+ <Property Name="UnifiedPosition" Value="{{0.0, 0},{0.0, 11}}" />
+ <Property Name="UnifiedSize" Value="{{0.5, 0},{0.0, 15}}" />
<Property Name="Text" Value="Ship cargo:"/>
<Property Name="Font" Value="BlueHighway-10"/>
+ <Window Type="opengate/StaticLabel" Name="InventoryShipCargo/Text">
+ <Property Name="UnifiedPosition" Value="{{0.0, 50},{0.0, 0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 20},{1.0, 0}}" />
+ <Property Name="Font" Value="BlueHighway-10"/>
+ </Window>
+ <Window Type="opengate/StaticLabel" Name="InventoryShipCargoTextSeparator">
+ <Property Name="UnifiedPosition" Value="{{0.0, 71},{0.0, 0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 10},{1.0, 0}}" />
+ <Property Name="Text" Value="/"/>
+ <Property Name="Font" Value="BlueHighway-10"/>
+ </Window>
+ <Window Type="opengate/StaticLabel" Name="InventoryShipCargoMax/Text">
+ <Property Name="UnifiedPosition" Value="{{0.0, 81},{0.0, 0}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, -81},{1.0, 0}}" />
+ <Property Name="Font" Value="BlueHighway-10"/>
+ </Window>
</Window>
- <Window Type="opengate/StaticLabel" Name="InventoryChipCargoText">
- <Property Name="UnifiedPosition" Value="{{0.0, 53},{0.0, 11}}" />
- <Property Name="UnifiedSize" Value="{{0.0, 50},{0.0, 15}}" />
- <Property Name="Text" Value="0.0000/4"/>
- <Property Name="Font" Value="BlueHighway-10"/>
- </Window>
<Window Type="opengate/StaticLabel" Name="ItemDescription/InventoryStorageLabel">
<Property Name="UnifiedPosition" Value="{{1.0, -60},{0.0, 11}}" />
<Property Name="UnifiedSize" Value="{{0.0, 25},{0.0, 15}}" />
<Property Name="Font" Value="BlueHighway-10"/>
<Property Name="Text" Value="Floor:"/>
</Window>
- <Window Type="opengate/StaticLabel" Name="InventoryStorageText">
+ <Window Type="opengate/StaticLabel" Name="InventoryFloorSize/Text">
<Property Name="UnifiedPosition" Value="{{1.0, -30},{0.0, 11}}" />
<Property Name="UnifiedSize" Value="{{0.0, 25},{0.0, 15}}" />
<Property Name="Text" Value="0000"/>
@@ -435,62 +445,52 @@
<Window Type="opengate/MarketButton" Name="CategoriePowerPlants">
<Property Name="UnifiedPosition" Value="{{0,10},{0.0,56}}" />
<Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
- <Property Name="Disabled" Value="True" />
<Property Name="Text" Value="Power Plants" />
</Window>
<Window Type="opengate/MarketButton" Name="CategorieEngines">
<Property Name="UnifiedPosition" Value="{{0,10},{0.0,85}}" />
<Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
- <Property Name="Disabled" Value="True" />
<Property Name="Text" Value="Engines" />
</Window>
<Window Type="opengate/MarketButton" Name="CategorieRadars">
<Property Name="UnifiedPosition" Value="{{0,10},{0.0,114}}" />
<Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
- <Property Name="Disabled" Value="True" />
<Property Name="Text" Value="Radars" />
</Window>
<Window Type="opengate/MarketButton" Name="CategorieECM">
<Property Name="UnifiedPosition" Value="{{0,10},{0.0,143}}" />
<Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
- <Property Name="Disabled" Value="True" />
<Property Name="Text" Value="ECM" />
</Window>
<Window Type="opengate/MarketButton" Name="CategorieCapacitors">
<Property Name="UnifiedPosition" Value="{{0,10},{0.0,172}}" />
<Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
- <Property Name="Disabled" Value="True" />
<Property Name="Text" Value="Capacitors" />
</Window>
<Window Type="opengate/MarketButton" Name="CategorieShields">
<Property Name="UnifiedPosition" Value="{{0,10},{0.0,201}}" />
<Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
- <Property Name="Disabled" Value="True" />
<Property Name="Text" Value="Shields" />
</Window>
<Window Type="opengate/MarketButton" Name="CategorieGuns">
<Property Name="UnifiedPosition" Value="{{0,10},{0.0,230}}" />
<Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
- <Property Name="Disabled" Value="True" />
<Property Name="Text" Value="Guns" />
</Window>
<Window Type="opengate/MarketButton" Name="CategorieMissiles">
<Property Name="UnifiedPosition" Value="{{0,10},{0.0,259}}" />
<Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
- <Property Name="Disabled" Value="True" />
<Property Name="Text" Value="Missiles" />
</Window>
<Window Type="opengate/MarketButton" Name="CategorieMODx">
<Property Name="UnifiedPosition" Value="{{0,10},{0.0,288}}" />
<Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
- <Property Name="Disabled" Value="True" />
<Property Name="Text" Value="MODx" />
</Window>
- <Window Type="opengate/MarketButton" Name="CategorieStorage">
+ <Window Type="opengate/MarketButton" Name="CategorieAll">
<Property Name="UnifiedPosition" Value="{{0,10},{0.0,317}}" />
<Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
- <Property Name="Disabled" Value="True" />
- <Property Name="Text" Value="Storage" />
+ <Property Name="Text" Value="All" />
</Window>
</Window>
<!-- ********************* -->
@@ -579,7 +579,6 @@
<Property Name="NormalImage" Value="set:opengate image:MarketItemSortRankNormal" />
<Property Name="HoverImage" Value="set:opengate image:MarketItemSortRankHover" />
<Property Name="PushedImage" Value="set:opengate image:MarketItemSortRankHover" />
- <Property Name="Disabled" Value="True" />
</Window>
<Window Type="opengate/EmptyButton" Name="MarketItemSortAmountAscend">
<Property Name="UnifiedPosition" Value="{{0.0,172},{0.0,8}}" />
Modified: branches/ogsector/ogre.cfg
===================================================================
--- branches/ogsector/ogre.cfg 2007-06-02 02:36:57 UTC (rev 520)
+++ branches/ogsector/ogre.cfg 2007-06-02 16:14:07 UTC (rev 521)
@@ -5,4 +5,4 @@
Full Screen=No
RTT Preferred Mode=FBO
Refresh Rate=Not applicable
-Video Mode=1024 x 768
+Video Mode=800 x 600
Modified: branches/ogsector/resources.cfg
===================================================================
--- branches/ogsector/resources.cfg 2007-06-02 02:36:57 UTC (rev 520)
+++ branches/ogsector/resources.cfg 2007-06-02 16:14:07 UTC (rev 521)
@@ -22,6 +22,7 @@
#
FileSystem=../../trunk/data/
FileSystem=../../trunk/data/commodities
+FileSystem=../../trunk/data/capacitors
FileSystem=../../trunk/data/ships/octavius/apteryx
FileSystem=../../trunk/data/ships/quantar/storm
FileSystem=../../trunk/data/ships/tauseti/lady_kickstart
Modified: branches/ogsector/src/Avatar.cpp
===================================================================
--- branches/ogsector/src/Avatar.cpp 2007-06-02 02:36:57 UTC (rev 520)
+++ branches/ogsector/src/Avatar.cpp 2007-06-02 16:14:07 UTC (rev 521)
@@ -25,6 +25,7 @@
Avatar::Avatar( const std::string & name, int ID ): name_( name ), id_( ID ) {
setVessel( *VesselManager::getSingleton().vessel( "apteryx" ) );
+ cargoHold_ = 0;
}
Avatar::~Avatar( ){
@@ -42,13 +43,28 @@
if ( items.size() > 0 ){
for ( std::list< std::deque< Entity * > >::iterator it = floorCargo_.begin(); it != floorCargo_.end(); it ++ ){
if ( (*it)[ 0 ]->id() == items[ 0 ]->id() ){
- // if ( int i = 0; i < items.size(); i ++ ) (*it).push_back( items.begin(), items.end() );
- (*it).insert( (*it).end(), items.begin(), items.end() );
+ for ( int i = 0; i < items.size(); i ++ ) {
+ if ( ( maxCargoHold_ - cargoHold_ ) >= items[ i ]->size() ){
+ (*it).push_back( items[ i ] );
+ cargoHold_ += items[ i ]->size();
+ } else {
+ return;
+ }
+ }
return;
}
}
- std::deque< Entity * > newItem( items.begin(), items.end() );
- floorCargo_.push_back( newItem );
+ std::deque< Entity * > newItem;
+
+ for ( int i = 0; i < items.size(); i ++ ) {
+ if ( ( maxCargoHold_ - cargoHold_ ) >= items[ i ]->size() ){
+ newItem.push_back( items[ i ] );
+ cargoHold_ += items[ i ]->size();
+ } else {
+ return;
+ }
+ }
+ if ( newItem.size() > 0 ) floorCargo_.push_back( newItem );
}
}
@@ -56,8 +72,9 @@
if ( items.size() > 0 ){
for ( std::list< std::deque< Entity * > >::iterator it = floorCargo_.begin(); it != floorCargo_.end(); it ++ ){
if ( (*it)[ 0 ]->id() == items[ 0 ]->id() ){
- for ( int i = 0; i < items.size(); i ++ ) {
+ for ( unsigned int i = 0; i < items.size(); i ++ ) {
(*it).pop_back( );
+ cargoHold_ -= items[ i ]->size();
if ( (*it).size() == 0 ) {
floorCargo_.erase( it );
return;
Modified: branches/ogsector/src/Avatar.h
===================================================================
--- branches/ogsector/src/Avatar.h 2007-06-02 02:36:57 UTC (rev 520)
+++ branches/ogsector/src/Avatar.h 2007-06-02 16:14:07 UTC (rev 521)
@@ -49,7 +49,8 @@
void addCargoToFloor( const std::vector < Entity * > & item );
void delCargoToFloor( const std::vector < Entity * > & item );
- int maxCargoHold( ) const { return maxCargoHold_; }
+ int cargoHoldMax( ) const { return maxCargoHold_; }
+ int cargoHold( ) const { return cargoHold_; }
std::list< std::deque < Entity * > > * floorCargo() { return & floorCargo_; }
Modified: branches/ogsector/src/Entity.h
===================================================================
--- branches/ogsector/src/Entity.h 2007-06-02 02:36:57 UTC (rev 520)
+++ branches/ogsector/src/Entity.h 2007-06-02 16:14:07 UTC (rev 521)
@@ -41,6 +41,8 @@
* \author Christoph Brill <eg...@us...>
*/
+enum EntityType{ENTITY,VESSEL,COMMODITY,POWERPLANT,ENGINE,RADAR,ECM,CAPACITOR,SHIELD,GUN,MISSILE,MODX};
+
class Entity{
public:
@@ -51,11 +53,13 @@
techLevel_ = 0;
mass_ = 0;
size_ = 0;
+ rtti_ = ENTITY;
}
- virtual ~Entity(){
- }
+ virtual ~Entity(){ }
+ virtual EntityType entityType() const { return rtti_; }
+
inline void setFactionName( const std::string & name ) { factionName_ = name; }
inline std::string factionName( ) const { return factionName_; }
@@ -105,6 +109,9 @@
long mass_;
/*! The amount of slots necessary to plug in such a device. */
int size_;
+
+ /*! For runtime identification of an entity item. */
+ EntityType rtti_;
};
/**
@@ -117,7 +124,8 @@
*
* \author Christoph Brill <eg...@us...>
*/
-class EquipmentTemplate : public Entity{
+
+class Equipment : public Entity{
public:
inline void setManufacturer( const std::string & manufacturer ) { manufacturer_ = manufacturer; }
@@ -130,17 +138,18 @@
inline std::set < Commodity * > requieredComponents( ) const { return requieredComponents_; }
protected:
- EquipmentTemplate(): Entity(), manufacturer_( "unkown" ) {
+ Equipment() : Entity(), manufacturer_( "unkown" ) {
size_ = 0;
}
+ virtual ~Equipment() { }
+
/*! Name of the company that produces this equipment */
std::string manufacturer_;
/*! The places where this part of equipment is built */
std::set < std::string > productionCenter_;
/*! The components required to build this equipment part */
std::set < Commodity * > requieredComponents_;
-
};
/*!
@@ -151,12 +160,13 @@
* is a component that is plugged into the ship.
* \author Christoph Brill <eg...@us...>
*/
-class Capacitor : public EquipmentTemplate{
+class Capacitor : public Equipment{
public:
- Capacitor(): EquipmentTemplate() {
+ Capacitor() : Equipment() {
efficiency_ = 0;
capacity_ = 0;
+ rtti_ = CAPACITOR;
}
inline void setEfficiency( long efficiency ) { efficiency_ = efficiency; }
@@ -173,19 +183,20 @@
};
/*!
- * \brief This class stores the basical information of an ECM (Evasion and Counter Measures)
+ * \brief This class stores the basical information of an Ecm (Evasion and Counter Measures)
*
* This class, like all other equipment classes, is filled by loading the
- * information from an XML file. It defines the details for a ECM, which
+ * information from an XML file. It defines the details for a Ecm, which
* is a component that is plugged into the ship.
* \author Christoph Brill <eg...@us...>
*/
-class ECM : public EquipmentTemplate{
+class Ecm : public Equipment{
public:
- ECM(): EquipmentTemplate() {
+ Ecm() : Equipment() {
sensorLevel_ = 0;
powerConsumption_ = 0;
+ rtti_ = ECM;
}
inline void setSensorLevel( short sensorLevel ) { sensorLevel_ = sensorLevel; }
@@ -195,9 +206,9 @@
inline long powerConsumption( ) { return powerConsumption_; }
private:
- /*! Stores the sensorlevel of this ECM */
+ /*! Stores the sensorlevel of this Ecm */
short sensorLevel_;
- /*! Stores the power consumption of this ECM */
+ /*! Stores the power consumption of this Ecm */
long powerConsumption_;
};
@@ -209,12 +220,13 @@
* is a component that is plugged into the ship.
* \author Christoph Brill <eg...@us...>
*/
-class Engine : public EquipmentTemplate {
+class Engine : public Equipment {
public:
- Engine(): EquipmentTemplate() {
+ Engine(): Equipment() {
efficiency_ = 0.0;
maxThrust_ = 0;
+ rtti_ = ENGINE;
}
inline void setEfficiency( double efficiency ) { efficiency_ = efficiency; }
@@ -245,6 +257,7 @@
meltingPoint_ = 0;
size_ = 0;
graviticSig_ = 0.0;
+ rtti_ = COMMODITY;
}
inline void setProductionCenters( const std::set < std::string > & productionCenters ) { productionCenters_ = productionCenters; }
Modified: branches/ogsector/src/EntityManager.cpp
===================================================================
--- branches/ogsector/src/EntityManager.cpp 2007-06-02 02:36:57 UTC (rev 520)
+++ branches/ogsector/src/EntityManager.cpp 2007-06-02 16:14:07 UTC (rev 521)
@@ -99,7 +99,6 @@
TiXmlHandle docHandle( &doc );
TiXmlElement* pElem;
- TiXmlNode* pNode;
TiXmlHandle hRoot( 0 );
//** block: equipment;
@@ -116,76 +115,94 @@
return NULL;
}
- EquipmentTemplate *entity = 0;
- bool isCapacitor = false, isECM = false; //!< \todo Check if that is really necessary, seems hackish. should be somehow done in subclasses or something
+ Equipment * entity = 0;
std::string equipmentType = pElem->Attribute("type");
- /*! \TODO add check, if type was found */
-#if 0
- if ( equipmentType ) {
+
+ if ( equipmentType == "Engine" ) entity = new Engine();
+ else if ( equipmentType == "ECM" ) entity = new Ecm();
+ else if ( equipmentType == "Capacitor" ) entity = new Capacitor();
+ else {
log_->fatal( fileName + " has no type of equipment defined" );
return NULL;
}
-#endif
- // Found capacitor
- if ( strcmp( "Capacitor", equipmentType.c_str() ) == 0 ){
- entity = new Capacitor();
- isCapacitor = true;
- } else if ( strcmp( "ECM", equipmentType.c_str() ) == 0 ){
- entity = new ECM();
- isECM = true;
+ //** Mandatory elements;
+ pElem = hRoot.ChildElement( "name", 0 ).Element();
+ if ( pElem ) {
+ entity->setName( pElem->FirstChild()->Value() );
} else {
- //! \todo Add logic for things other than capacitor and ECMs
- log_->warn( fileName + " has unknown equipment type (mandatory)." );
+ log_->fatal( fileName + " has no name (mandatory)." );
return NULL;
}
-
- // Naming
pElem = hRoot.ChildElement( "faction", 0 ).Element();
if ( pElem ) {
entity->setFactionName( pElem->FirstChild()->Value() );
} else {
- log_->fatal( fileName + " has no mandatory factionname (mandatory)." );
+ log_->fatal( fileName + " has no factionname (mandatory)." );
return NULL;
}
- pElem = hRoot.ChildElement( "name", 0 ).Element();
- if ( pElem ) {
- entity->setName( pElem->FirstChild()->Value() );
- } else {
- log_->fatal( fileName + " has no name (mandatory)." );
- return NULL;
- }
- // Generic Data
+ //** Generic elements
pElem = hRoot.ChildElement( "class", 0 ).Element();
if ( pElem ) entity->setClassName( pElem->FirstChild()->Value() );
+
pElem = hRoot.ChildElement( "techlevel", 0 ).Element();
if ( pElem ) entity->setTechLevel( toInt( pElem->FirstChild()->Value() ) );
+
pElem = hRoot.ChildElement( "size", 0 ).Element();
if ( pElem ) entity->setSize( toInt( pElem->FirstChild()->Value() ) );
+
pElem = hRoot.ChildElement( "mass", 0 ).Element();
if ( pElem ) entity->setMass( toInt( pElem->FirstChild()->Value() ) );
- // Specific Data
- if ( isCapacitor ) {
+ pElem = hRoot.ChildElement( "description", 0 ).Element();
+ if ( pElem ) entity->setDescription( pElem->FirstChild()->Value() );
+
+ pElem = hRoot.ChildElement( "image", 0 ).Element();
+ if ( pElem ) entity->setImageName( pElem->FirstChild()->Value() );
+
+
+ //** Specific elements;
+ switch ( entity->entityType() ){
+ case POWERPLANT:
+ break;
+ case ENGINE:
+ break;
+ case RADAR:
+ break;
+ case ECM:
+ pElem = hRoot.ChildElement( "sensorlevel", 0 ).Element();
+ if ( pElem ) static_cast<Ecm*>(entity)->setSensorLevel( toInt( pElem->FirstChild()->Value() ) );
+
+ pElem = hRoot.ChildElement( "power", 0 ).Element();
+ if ( pElem ) static_cast<Ecm*>(entity)->setPowerConsumption( toInt( pElem->FirstChild()->Value() ) );
+ break;
+ case CAPACITOR:
pElem = hRoot.ChildElement( "efficiency", 0 ).Element();
if ( pElem ) static_cast<Capacitor*>(entity)->setEfficiency( toInt( pElem->FirstChild()->Value() ) );
+
pElem = hRoot.ChildElement( "capacity", 0 ).Element();
if ( pElem ) static_cast<Capacitor*>(entity)->setCapacity( toInt( pElem->FirstChild()->Value() ) );
- } else if ( isECM ) {
- pElem = hRoot.ChildElement( "sensorlevel", 0 ).Element();
- if ( pElem ) static_cast<ECM*>(entity)->setSensorLevel( toInt( pElem->FirstChild()->Value() ) );
- pElem = hRoot.ChildElement( "power", 0 ).Element();
- if ( pElem ) static_cast<ECM*>(entity)->setPowerConsumption( toInt( pElem->FirstChild()->Value() ) );
- } else {
- //! \todo Add logic for things other than capacitors and ECMs
+ break;
+ case SHIELD:
+ break;
+ case GUN:
+ break;
+ case MISSILE:
+ break;
+ case MODX:
+ break;
+ default:
+ break;
}
- // Production Data
+ //** Additonal elements;
+ //** Production Data;
std::set < std::string > productionCenters;
for ( pElem = hRoot.FirstChild( "production-center" ).Element(); pElem != 0; pElem = pElem->NextSiblingElement() ) {
productionCenters.insert( pElem->FirstChild()->Value() ); //!< \todo check return value!
}
+
entity->setProductionCenters( productionCenters );
CommodityManager* commodityMgr = CommodityManager::getSingletonPtr();
if ( !commodityMgr ) {
@@ -249,7 +266,6 @@
TiXmlHandle docHandle( &doc );
TiXmlElement* pElem;
- TiXmlNode* pNode;
TiXmlHandle hRoot( 0 );
//** block: equipment;
Modified: branches/ogsector/src/EntityManager.h
===================================================================
--- branches/ogsector/src/EntityManager.h 2007-06-02 02:36:57 UTC (rev 520)
+++ branches/ogsector/src/EntityManager.h 2007-06-02 16:14:07 UTC (rev 521)
@@ -31,6 +31,7 @@
* something from an XML file.
* \author Christoph Brill <eg...@us...>
*/
+
class EntityManager{
public:
/*! \brief This method loads equipment and stores it in an interal storage.
@@ -44,6 +45,36 @@
inline std::set < std::string > factionNames( ) const { return factions_; }
+ EntityType categoryType( const std::string & category ){
+ if ( category == "Commodity" || category == "Commoditys" ||
+ category == "commodity" || category == "commoditys" ) return COMMODITY;
+ else if ( category == "Power Plant" || category == "Power Plants" ||
+ category == "Powerplant" || category == "Powerplants" ||
+ category == "Power plant" || category == "Power plants" ||
+ category == "powerplant" || category == "powerplants" ) return POWERPLANT;
+ else if ( category == "Engine" || category == "Engines" ||
+ category == "engine" || category == "engines" ) return ENGINE;
+ else if ( category == "Radar" || category == "Radars" ||
+ category == "radar" || category == "radars" ) return RADAR;
+ else if ( category == "ECM" || category == "ECMs" ||
+ category == "Ecm" || category == "Ecms" ||
+ category == "ecm" || category == "ecms" ) return ECM;
+ else if ( category == "Capacitor" || category == "Capacitors" ||
+ category == "capacitor" || category == "capacitors" ) return CAPACITOR;
+ else if ( category == "Shield" || category == "Shields" ||
+ category == "shield" || category == "shields" ) return SHIELD;
+ else if ( category == "Gun" || category == "Guns" ||
+ category == "gun" || category == "guns" ) return GUN;
+ else if ( category == "Missile" || category == "Missiles" ||
+ category == "missile" || category == "missiles" ) return MISSILE;
+ else if ( category == "MODX" || category == "MODXs" ||
+ category == "MODx" || category == "MODxs" ||
+ category == "modx" || category == "modxs" ) return MODX;
+
+ LogManager::getSingleton().warn("Request entity rtti for " + category + " unknown" );
+ return ENTITY;
+ }
+
protected:
/*! \brief This loads enities from there definition files, called from load()
@@ -90,6 +121,17 @@
virtual Entity * loadAndCreate( int id, const std::string & filename );
+ std::vector < Entity * > allByCategory( const std::string & category ){
+ EntityType rtti = categoryType( category );
+ std::vector < Entity * > items;
+ for ( std::map < std::string, Entity * >::iterator it = templatesByName_.begin(); it != templatesByName_.end(); it ++ ){
+ if ( ( category == "All" ) || ( it->second->entityType() == rtti ) ){
+ items.push_back( it->second );
+ }
+ }
+ return items;
+ }
+
};
/*!
@@ -124,13 +166,12 @@
}
}
- std::vector < Commodity * > allCommodities(){
- std::vector < Commodity * > comms;
-
+ std::vector < Entity * > allCommodities(){
+ std::vector < Entity * > items;
for ( std::map < std::string, Entity * >::iterator it = templatesByName_.begin(); it != templatesByName_.end(); it ++ ){
- comms.push_back( static_cast<Commodity *>(it->second) );
+ items.push_back( it->second );
}
- return comms;
+ return items;
}
};
Modified: branches/ogsector/src/MarketDialog.cpp
===================================================================
--- branches/ogsector/src/MarketDialog.cpp 2007-06-02 02:36:57 UTC (rev 520)
+++ branches/ogsector/src/MarketDialog.cpp 2007-06-02 16:14:07 UTC (rev 521)
@@ -80,9 +80,27 @@
CEGUI::WindowManager& wmgr = CEGUI::WindowManager::getSingleton();
BIND_CEGUI_EVENT( wmgr.getWindow( (CEGUI::utf8*)"CategorieCommodities"),
- CEGUI::PushButton::EventClicked, MarketDialog::handleCategorieCommodities );
+ CEGUI::PushButton::EventClicked, MarketDialog::handleCategorieChanged );
+ BIND_CEGUI_EVENT( wmgr.getWindow( (CEGUI::utf8*)"CategoriePowerPlants"),
+ CEGUI::PushButton::EventClicked, MarketDialog::handleCategorieChanged );
+ BIND_CEGUI_EVENT( wmgr.getWindow( (CEGUI::utf8*)"CategorieEngines"),
+ CEGUI::PushButton::EventClicked, MarketDialog::handleCategorieChanged );
+ BIND_CEGUI_EVENT( wmgr.getWindow( (CEGUI::utf8*)"CategorieRadars"),
+ CEGUI::PushButton::EventClicked, MarketDialog::handleCategorieChanged );
+ BIND_CEGUI_EVENT( wmgr.getWindow( (CEGUI::utf8*)"CategorieECM"),
+ CEGUI::PushButton::EventClicked, MarketDialog::handleCategorieChanged );
BIND_CEGUI_EVENT( wmgr.getWindow( (CEGUI::utf8*)"CategorieCapacitors"),
- CEGUI::PushButton::EventClicked, MarketDialog::handleCategorieCapacitors );
+ CEGUI::PushButton::EventClicked, MarketDialog::handleCategorieChanged );
+ BIND_CEGUI_EVENT( wmgr.getWindow( (CEGUI::utf8*)"CategorieShields"),
+ CEGUI::PushButton::EventClicked, MarketDialog::handleCategorieChanged );
+ BIND_CEGUI_EVENT( wmgr.getWindow( (CEGUI::utf8*)"CategorieGuns"),
+ CEGUI::PushButton::EventClicked, MarketDialog::handleCategorieChanged );
+ BIND_CEGUI_EVENT( wmgr.getWindow( (CEGUI::utf8*)"CategorieMissiles"),
+ CEGUI::PushButton::EventClicked, MarketDialog::handleCategorieChanged );
+ BIND_CEGUI_EVENT( wmgr.getWindow( (CEGUI::utf8*)"CategorieMODx"),
+ CEGUI::PushButton::EventClicked, MarketDialog::handleCategorieChanged );
+ BIND_CEGUI_EVENT( wmgr.getWindow( (CEGUI::utf8*)"CategorieAll"),
+ CEGUI::PushButton::EventClicked, MarketDialog::handleCategorieChanged );
BIND_CEGUI_EVENT( wmgr.getWindow( (CEGUI::utf8*)"MarketItemSortAlphaAscend"),
CEGUI::PushButton::EventClicked, MarketDialog::handleMarketItemSortAlphaAscend );
@@ -148,15 +166,17 @@
}
}
-bool lesserMass( const Commodity * l, const Commodity * r ) { return ( l->mass() < r->mass() ); }
-bool greaterMass( const Commodity * l, const Commodity * r ) { return ( l->mass() > r->mass() ); }
+bool lesserMass( const Entity * l, const Entity * r ) { return ( l->mass() < r->mass() ); }
+bool greaterMass( const Entity * l, const Entity * r ) { return ( l->mass() > r->mass() ); }
-bool lesserName( const Commodity * l, const Commodity * r ) { return ( l->name() < r->name() ); }
-bool greaterName( const Commodity * l, const Commodity * r ) { return ( l->name() > r->name() ); }
+bool lesserName( const Entity * l, const Entity * r ) { return ( l->name() < r->name() ); }
+bool greaterName( const Entity * l, const Entity * r ) { return ( l->name() > r->name() ); }
-bool lesserSize( const Commodity * l, const Commodity * r ) { return ( l->size() < r->size() ); }
-bool greaterSize( const Commodity * l, const Commodity * r ) { return ( l->size() > r->size() ); }
+bool lesserSize( const Entity * l, const Entity * r ) { return ( l->size() < r->size() ); }
+bool greaterSize( const Entity * l, const Entity * r ) { return ( l->size() > r->size() ); }
+bool lesserRank( const Entity * l, const Entity * r ) { return ( l->techLevel() < r->techLevel() ); }
+bool greaterRank( const Entity * l, const Entity * r ) { return ( l->techLevel() > r->techLevel() ); }
void MarketDialog::updateMarketView(){
@@ -166,56 +186,65 @@
} else {
CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"MarketItemWindow/UpButton")->show();
}
-
+
+ std::vector < Entity * > items;
+
if ( selectedCategory_ == "Commodities" ){
- std::vector < Commodity * > commodites = CommodityManager::getSingleton().allCommodities();
-
- switch ( sortBy_ ){
- case Alphanumeric:
- if ( sortAscending_ ) sort( commodites.begin(), commodites.end(), &OpenGate::lesserName );
- else sort( commodites.begin(), commodites.end(), &OpenGate::greaterName );
- break;
- case Cost:
- break;
- case Size:
- if ( sortAscending_ ) sort( commodites.begin(), commodites.end(), &OpenGate::lesserSize );
- else sort( commodites.begin(), commodites.end(), &OpenGate::greaterSize );
- break;
- case Rank:
- break;
- case Amount:
- break;
- }
-
- int maxRow = (int)floor( commodites.size() / marketItemWindowRow_ )+1;
- marketOffsetRow_ = min( marketOffsetRow_, maxRow );
-
- if ( (marketOffsetRow_+1) > ( maxRow - marketItemWindowRow_ ) ){
- CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"MarketItemWindow/DownButton")->hide();
- } else {
- CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"MarketItemWindow/DownButton")->show();
- }
-
- for ( int i = 0; i < marketItemWindowRow_; i ++ ){
- for ( int j = 0; j < marketItemWindowCol_; j ++ ){
- int widgetCount = i * marketItemWindowCol_ + j;
- int commodCount = ( i + marketOffsetRow_ ) * marketItemWindowCol_ + j;
-
- if ( commodCount >= commodites.size() ) {
- fillShortItemWindow( marketItems_[ widgetCount ] );
- } else {
- fillShortItemWindow( marketItems_[ widgetCount ], commodites[ commodCount ], 1000, 1 );
- }
+ items = CommodityManager::getSingleton().allCommodities();
+ } else {
+ items = EquipmentManager::getSingleton().allByCategory( selectedCategory_ );
+ }
+
+ switch ( sortBy_ ){
+ case Alphanumeric:
+ if ( sortAscending_ ) sort( items.begin(), items.end(), &OpenGate::lesserName );
+ else sort( items.begin(), items.end(), &OpenGate::greaterName );
+ break;
+ case Cost:
+ break;
+ case Size:
+ if ( sortAscending_ ) sort( items.begin(), items.end(), &OpenGate::lesserSize );
+ else sort( items.begin(), items.end(), &OpenGate::greaterSize );
+ break;
+ case Rank:
+ if ( sortAscending_ ) sort( items.begin(), items.end(), &OpenGate::lesserRank );
+ else sort( items.begin(), items.end(), &OpenGate::greaterRank );
+ break;
+ case Amount:
+ break;
+ }
+
+ int maxRow = (int)floor( items.size() / marketItemWindowRow_ )+1;
+ marketOffsetRow_ = min( marketOffsetRow_, maxRow );
+
+ if ( ( marketOffsetRow_ + 1 ) > ( maxRow - marketItemWindowRow_ ) ){
+ CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"MarketItemWindow/DownButton")->hide();
+ } else {
+ CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"MarketItemWindow/DownButton")->show();
+ }
+
+ for ( int i = 0; i < marketItemWindowRow_; i ++ ){
+ for ( int j = 0; j < marketItemWindowCol_; j ++ ){
+ int widgetCount = i * marketItemWindowCol_ + j;
+ int itemCount = ( i + marketOffsetRow_ ) * marketItemWindowCol_ + j;
+
+ if ( itemCount >= items.size() ) {
+ fillShortItemWindow( marketItems_[ widgetCount ] );
+ } else {
+ fillShortItemWindow( marketItems_[ widgetCount ], items[ itemCount ], 1000, 1 );
}
}
}
}
+
void MarketDialog::updateInventView(){
- CEGUI::WindowManager::getSingleton().getWindow( "InventoryChipCargoText" )
- ->setProperty( "Text", CEGUI::String( "0000" ) + "/" + toStr( DeviceManager::getSingleton().avatar->vessel().cargoSize() ) );
- CEGUI::WindowManager::getSingleton().getWindow( "InventoryStorageText" )
- ->setProperty( "Text", toStr( DeviceManager::getSingleton().avatar->maxCargoHold() ) );
+ CEGUI::WindowManager::getSingleton().getWindow( "InventoryShipCargo/Text" )
+ ->setProperty( "Text", CEGUI::String( toStr( DeviceManager::getSingleton().avatar->cargoHold() ) ) );
+ CEGUI::WindowManager::getSingleton().getWindow( "InventoryShipCargoMax/Text" )
+ ->setProperty( "Text", CEGUI::String( toStr( DeviceManager::getSingleton().avatar->vessel().cargoSize() ) ) );
+ CEGUI::WindowManager::getSingleton().getWindow( "InventoryFloorSize/Text" )
+ ->setProperty( "Text", toStr( DeviceManager::getSingleton().avatar->cargoHoldMax() ) );
inventOffsetRow_ = max( 0, inventOffsetRow_ );
@@ -227,7 +256,7 @@
std::list< std::deque < Entity * > > * floorCargo = DeviceManager::getSingleton().avatar->floorCargo();
- int maxRow = (int)floor( floorCargo->size() / inventItemWindowCol_ )+1;
+ int maxRow = (int)floor( floorCargo->size() / inventItemWindowCol_ ) + 1;
inventOffsetRow_ = min( inventOffsetRow_, maxRow );
if ( ( inventOffsetRow_ + 1 ) > ( maxRow - inventItemWindowRow_ ) ){
@@ -374,22 +403,19 @@
}
}
-bool MarketDialog::handleCategorieCommodities( const CEGUI::EventArgs & e ){
- CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"CategorieHighlight")->setPosition(
- CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"CategorieCommodities")->getPosition() );
- selectedCategory_ = "Commodities";
- updateMarketView();
- return true;
-}
+bool MarketDialog::handleCategorieChanged( const CEGUI::EventArgs & e ){
+ const CEGUI::WindowEventArgs & we = static_cast< const CEGUI::WindowEventArgs & >( e );
+ selectedCategory_ = we.window->getText().c_str();
-bool MarketDialog::handleCategorieCapacitors( const CEGUI::EventArgs & e ){
CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"CategorieHighlight")->setPosition(
- CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"CategorieCapacitors")->getPosition() );
- selectedCategory_ = "Capacitors";
+ we.window->getPosition() );
+
+ marketOffsetRow_ = 0;
updateMarketView();
return true;
}
+
bool MarketDialog::handleMarketItemMouseEnters( const CEGUI::EventArgs & e ){
const CEGUI::WindowEventArgs & we = static_cast< const CEGUI::WindowEventArgs & >( e );
@@ -480,35 +506,51 @@
void MarketDialog::fillMarketItemDetailedView( CEGUI::Window * itemWindow ){
CEGUI::String amountText( CEGUI::WindowManager::getSingleton().getWindow( itemWindow->getName() + "MarketShortItemAmount" )->getText() );
- if ( buyMode_ ){
- CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/Top/Title")
- ->setProperty("Text", CEGUI::String( "Would you like to purchase this item?" ) );
- } else {
- CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/Top/Title")
- ->setProperty("Text", CEGUI::String( "Would you like to sell this item?" ) );
- }
+ Entity * item = ( Entity * )itemWindow->getUserData();
+ if ( item ){
- CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView")->setUserData( itemWindow->getUserData() );
+ int amount = 1;
+ if ( buyMode_ ){
+ CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/Top/Title")
+ ->setProperty("Text", CEGUI::String( "Would you like to purchase this item?" ) );
+
+ amount = min( amount,
+ ( toInt( CEGUI::WindowManager::getSingleton().getWindow( "InventoryFloorSize/Text" )->getText( ).c_str() ) -
+ toInt( CEGUI::WindowManager::getSingleton().getWindow( "InventoryShipCargo/Text" )->getText( ).c_str() ) )
+ / item->size() );
+ if ( amount == 0 ){
+ CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/AcceptButton" )->hide();
+ CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/AcceptButton/Highlight" )->hide();
+ } else {
+ CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/AcceptButton" )->show();
+ CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/AcceptButton/Highlight" )->show();
+ }
-
- Entity * item = ( Entity * )itemWindow->getUserData();
-
- CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/Amount" )
- ->setProperty("Text", CEGUI::String( toStr( 1 ) ) );
- CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/Image" )
- ->setProperty("Image", item->ceguiImageName() );
- CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/TextFrame/Name/Text" )
- ->setProperty("Text", item->name() );
- CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/TextFrame/Size/Text" )
- ->setProperty("Text", CEGUI::String( toStr( item->size() ) ) );
- CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/TextFrame/Mass/Text" )
- ->setProperty("Text", CEGUI::String( toStr( item->mass() ) ) );
- CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/TextFrame/Amount/Text" )
- ->setProperty("Text", amountText );
- CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/TextFrame/Price/Text" )
- ->setProperty("Text", CEGUI::String( "c1" ) );
- CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/TextFrame/Rank" )
- ->setProperty("Text", CEGUI::String("Required rank:" + toStr( item->techLevel() ) ) );
+ } else {
+ CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/Top/Title")
+ ->setProperty("Text", CEGUI::String( "Would you like to sell this item?" ) );
+ }
+
+ CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView")->setUserData( itemWindow->getUserData() );
+
+
+ CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/Amount" )
+ ->setProperty("Text", CEGUI::String( toStr( amount ) ) );
+ CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/Image" )
+ ->setProperty("Image", item->ceguiImageName() );
+ CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/TextFrame/Name/Text" )
+ ->setProperty("Text", item->name() );
+ CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/TextFrame/Size/Text" )
+ ->setProperty("Text", CEGUI::String( toStr( item->size() ) ) );
+ CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/TextFrame/Mass/Text" )
+ ->setProperty("Text", CEGUI::String( toStr( item->mass() ) ) );
+ CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/TextFrame/Amount/Text" )
+ ->setProperty("Text", amountText );
+ CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/TextFrame/Price/Text" )
+ ->setProperty("Text", CEGUI::String( "c1" ) );
+ CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/TextFrame/Rank" )
+ ->setProperty("Text", CEGUI::String("Required rank:" + toStr( item->techLevel() ) ) );
+ }
}
bool MarketDialog::handleMarketItemViewNotNowButton( const CEGUI::EventArgs & e ){
@@ -558,8 +600,9 @@
->getText( ).c_str() );
if ( buyMode_ ){
- amount = min( amount, (int)floor(toInt( CEGUI::WindowManager::getSingleton().getWindow( "InventoryStorageText" )
- ->getText( ).c_str() ) / size ) );
+ amount = min( amount, (int)floor(
+ ( toInt( CEGUI::WindowManager::getSingleton().getWindow( "InventoryFloorSize/Text" )->getText( ).c_str() ) -
+ toInt( CEGUI::WindowManager::getSingleton().getWindow( "InventoryShipCargo/Text" )->getText( ).c_str() ) ) / size ) );
} else {
amount = min( amount, toInt( CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/TextFrame/Amount/Text" )->getText().c_str() ) );
}
@@ -567,6 +610,13 @@
CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/Amount" )
->setProperty("Text", CEGUI::String( toStr( (int)amount ) ) );
+ if ( amount > 0 ){
+ CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/AcceptButton/Highlight" )->show();
+ CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/AcceptButton" )->show();
+ } else {
+ CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/AcceptButton" )->hide();
+ CEGUI::WindowManager::getSingleton().getWindow( "MarketItemDetailedView/AcceptButton/Highlight" )->hide();
+ }
}
bool MarketDialog::buyItems( Entity * item , int amount ){
Modified: branches/ogsector/src/MarketDialog.h
===================================================================
--- branches/ogsector/src/MarketDialog.h 2007-06-02 02:36:57 UTC (rev 520)
+++ branches/ogsector/src/MarketDialog.h 2007-06-02 16:14:07 UTC (rev 521)
@@ -57,8 +57,7 @@
void fillShortItemWindow( CEGUI::Window * win, Entity * item = NULL, int amount = 0, int price = 0 );
void fillMarketItemDetailedView( CEGUI::Window * itemWindow );
- bool handleCategorieCommodities( const CEGUI::EventArgs & e );
- bool handleCategorieCapacitors( const CEGUI::EventArgs & e );
+ bool handleCategorieChanged( const CEGUI::EventArgs & e );
bool handleMarketItemSortAlphaAscend( const CEGUI::EventArgs & e ){ sortBy_ = Alphanumeric; updateSortIcons(); return true; }
bool handleMarketItemSortAlphaDescend( const CEGUI::EventArgs & e ){ sortBy_ = Alphanumeric; updateSortIcons(); return true; }
Modified: branches/ogsector/src/VesselManager.cpp
===================================================================
--- branches/ogsector/src/VesselManager.cpp 2007-06-02 02:36:57 UTC (rev 520)
+++ branches/ogsector/src/VesselManager.cpp 2007-06-02 16:14:07 UTC (rev 521)
@@ -45,7 +45,7 @@
TiXmlHandle docHandle( &doc );
TiXmlElement* pElem;
- TiXmlNode* pNode;
+// TiXmlNode* pNode;
TiXmlHandle hRoot( 0 );
//** block: Ship;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-06-02 02:36:57
|
Revision: 520
http://svn.sourceforge.net/opengate/?rev=520&view=rev
Author: ultrasick
Date: 2007-06-01 19:36:57 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
uploading an asteroid generator. this generator is able to create random asteroids with a more or less round shape. You can choose between an ice asteroid and a normal asteroid (only different texture).
Added Paths:
-----------
trunk/templates/data/misc/
trunk/templates/data/misc/asteroid_generator.blend
Added: trunk/templates/data/misc/asteroid_generator.blend
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/misc/asteroid_generator.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-06-01 23:53:33
|
Revision: 519
http://svn.sourceforge.net/opengate/?rev=519&view=rev
Author: spom_spom
Date: 2007-06-01 16:53:34 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
win compatibility commit
Modified Paths:
--------------
branches/ogsector/win32/ogsectorclient/ogsectorclient.cbp
branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
branches/ogsector/win32/ogsectorclient/resources.cfg
Added Paths:
-----------
branches/ogsector/win32/ogsectorclient/commodities.xml
Added: branches/ogsector/win32/ogsectorclient/commodities.xml
===================================================================
--- branches/ogsector/win32/ogsectorclient/commodities.xml (rev 0)
+++ branches/ogsector/win32/ogsectorclient/commodities.xml 2007-06-01 23:53:34 UTC (rev 519)
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+
+<commodities>
+ <Resource id="1" location="../../../../trunk/data/commodities/aluminium.xml"/>
+ <Resource id="2" location="../../../../trunk/data/commodities/antimony.xml"/>
+ <Resource id="3" location="../../../../trunk/data/commodities/barium.xml"/>
+ <Resource id="4" location="../../../../trunk/data/commodities/cesium.xml"/>
+ <Resource id="5" location="../../../../trunk/data/commodities/chemicals.xml"/>
+ <Resource id="6" location="../../../../trunk/data/commodities/chromium.xml"/>
+ <Resource id="7" location="../../../../trunk/data/commodities/copper.xml"/>
+ <Resource id="8" location="../../../../trunk/data/commodities/cpu.xml"/>
+ <Resource id="9" location="../../../../trunk/data/commodities/fuel_cells.xml"/>
+ <Resource id="10" location="../../../../trunk/data/commodities/gold.xml"/>
+ <Resource id="11" location="../../../../trunk/data/commodities/helium.xml"/>
+ <Resource id="12" location="../../../../trunk/data/commodities/iron.xml"/>
+ <Resource id="12" location="../../../../trunk/data/commodities/laser_components.xml"/>
+ <Resource id="13" location="../../../../trunk/data/commodities/medical_supplies.xml"/>
+ <Resource id="14" location="../../../../trunk/data/commodities/nitrogen.xml"/>
+ <Resource id="15" location="../../../../trunk/data/commodities/octavia_light.xml"/>
+ <Resource id="16" location="../../../../trunk/data/commodities/rubber.xml"/>
+ <Resource id="17" location="../../../../trunk/data/commodities/xenon.xml"/>
+ <Resource id="18" location="../../../../trunk/data/commodities/ice.xml"/>
+</commodities>
Modified: branches/ogsector/win32/ogsectorclient/ogsectorclient.cbp
===================================================================
--- branches/ogsector/win32/ogsectorclient/ogsectorclient.cbp 2007-06-01 23:35:06 UTC (rev 518)
+++ branches/ogsector/win32/ogsectorclient/ogsectorclient.cbp 2007-06-01 23:53:34 UTC (rev 519)
@@ -57,10 +57,14 @@
</Linker>
<Unit filename="..\..\src\Avatar.cpp" />
<Unit filename="..\..\src\Avatar.h" />
+ <Unit filename="..\..\src\BaseDialog.cpp" />
+ <Unit filename="..\..\src\BaseDialog.h" />
<Unit filename="..\..\src\ConfigDialog.cpp" />
<Unit filename="..\..\src\ConfigDialog.h" />
<Unit filename="..\..\src\Console.cpp" />
<Unit filename="..\..\src\Console.h" />
+ <Unit filename="..\..\src\DeviceManager.cpp" />
+ <Unit filename="..\..\src\DeviceManager.h" />
<Unit filename="..\..\src\DockedState.cpp" />
<Unit filename="..\..\src\DockedState.h" />
<Unit filename="..\..\src\Entity.cpp" />
@@ -75,6 +79,8 @@
<Unit filename="..\..\src\InputManager.h" />
<Unit filename="..\..\src\LogManager.cpp" />
<Unit filename="..\..\src\LogManager.h" />
+ <Unit filename="..\..\src\MarketDialog.cpp" />
+ <Unit filename="..\..\src\MarketDialog.h" />
<Unit filename="..\..\src\Sector.cpp" />
<Unit filename="..\..\src\Sector.h" />
<Unit filename="..\..\src\SectorObjects.cpp" />
@@ -83,6 +89,7 @@
<Unit filename="..\..\src\ShipConfigDialog.h" />
<Unit filename="..\..\src\UnDockedState.cpp" />
<Unit filename="..\..\src\UnDockedState.h" />
+ <Unit filename="..\..\src\Vessel.h" />
<Unit filename="..\..\src\VesselManager.cpp" />
<Unit filename="..\..\src\VesselManager.h" />
<Unit filename="..\..\src\common.cpp" />
Modified: branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
===================================================================
(Binary files differ)
Modified: branches/ogsector/win32/ogsectorclient/resources.cfg
===================================================================
--- branches/ogsector/win32/ogsectorclient/resources.cfg 2007-06-01 23:35:06 UTC (rev 518)
+++ branches/ogsector/win32/ogsectorclient/resources.cfg 2007-06-01 23:53:34 UTC (rev 519)
@@ -14,6 +14,7 @@
FileSystem=../../data/gui/layouts/
Zip=../../data/fonts.zip
FileSystem=../../../../trunk/data/
+FileSystem=../../../../trunk/data/commodities
FileSystem=../../../../trunk/data/ships/octavius/apteryx
FileSystem=../../../../trunk/data/ships/quantar/storm
FileSystem=../../../../trunk/data/ships/tauseti/lady_kickstart
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-06-01 23:35:05
|
Revision: 518
http://svn.sourceforge.net/opengate/?rev=518&view=rev
Author: spom_spom
Date: 2007-06-01 16:35:06 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
Hurray! Shopping Shopping Shopping. (Add: Market dialog, best viewed with 1024x786 or more.) Data
Modified Paths:
--------------
trunk/data/GUI/Font.xsd
trunk/data/GUI/GUILayout.xsd
trunk/data/GUI/GUIScheme.xsd
trunk/data/client/data1.x/GUI/BlueHighway-10.font
trunk/data/client/data1.x/GUI/BlueHighway-12.font
trunk/data/client/data1.x/GUI/OpenGate.looknfeel
trunk/data/client/data1.x/GUI/OpenGateLook.scheme
trunk/data/commodities/aluminium.xml
trunk/data/commodities/antimony.xml
trunk/data/commodities/barium.xml
trunk/data/commodities/cesium.xml
trunk/data/commodities/chemicals.xml
trunk/data/commodities/chromium.xml
trunk/data/commodities/copper.xml
trunk/data/commodities/cpu.xml
trunk/data/commodities/fuel_cells.xml
trunk/data/commodities/gold.xml
trunk/data/commodities/laser_components.xml
trunk/data/commodities/medical_supplies.xml
trunk/data/commodities/rubber.xml
trunk/data/commodities/xenon.xml
Added Paths:
-----------
trunk/data/commodities/CPU.png
trunk/data/commodities/aluminium.png
trunk/data/commodities/antimony.png
trunk/data/commodities/barium.png
trunk/data/commodities/cesium.png
trunk/data/commodities/chemicals.png
trunk/data/commodities/chromium.png
trunk/data/commodities/copper.png
trunk/data/commodities/fuel_cells.png
trunk/data/commodities/gold.png
trunk/data/commodities/helium.png
trunk/data/commodities/ice.png
trunk/data/commodities/ice.xml
trunk/data/commodities/laser_components.png
trunk/data/commodities/medical_supplies.png
trunk/data/commodities/nitrogen.png
trunk/data/commodities/octavia_light.png
trunk/data/commodities/rubber.png
trunk/data/commodities/xenon.png
Modified: trunk/data/GUI/Font.xsd
===================================================================
--- trunk/data/GUI/Font.xsd 2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/GUI/Font.xsd 2007-06-01 23:35:06 UTC (rev 518)
@@ -5,11 +5,6 @@
<xsd:complexType name="FontType">
<xsd:sequence>
<xsd:element name="Mapping" type="MapType" maxOccurs="unbounded" minOccurs="0" />
- <xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element name="GlyphSet" type="GlyphSetType" />
- <xsd:element name="GlyphRange" type="GlyphRangeType" />
- <xsd:element name="Glyph" type="GlyphType" />
- </xsd:choice>
</xsd:sequence>
<xsd:attributeGroup ref="FontAttrs" />
</xsd:complexType>
@@ -18,16 +13,6 @@
<xsd:attribute name="Image" type="xsd:string" use="required" />
<xsd:attribute name="HorzAdvance" type="xsd:integer" use="optional" default="-1" />
</xsd:complexType>
- <xsd:complexType name="GlyphType">
- <xsd:attribute name="Codepoint" type="xsd:nonNegativeInteger" use="required" />
- </xsd:complexType>
- <xsd:complexType name="GlyphRangeType">
- <xsd:attribute name="StartCodepoint" type="xsd:nonNegativeInteger" use="required" />
- <xsd:attribute name="EndCodepoint" type="xsd:nonNegativeInteger" use="required" />
- </xsd:complexType>
- <xsd:complexType name="GlyphSetType">
- <xsd:attribute name="Glyphs" type="xsd:string" use="required" />
- </xsd:complexType>
<xsd:attributeGroup name="FontAttrs">
<xsd:attribute name="Name" type="xsd:string" use="required" />
<xsd:attribute name="Filename" type="xsd:string" use="required" />
@@ -35,17 +20,15 @@
<xsd:attribute name="Type" use="required">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
- <xsd:enumeration value="Dynamic" />
- <xsd:enumeration value="Static" />
+ <xsd:enumeration value="FreeType" />
+ <xsd:enumeration value="Pixmap" />
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
<xsd:attribute name="Size" type="xsd:nonNegativeInteger" use="optional" default="12" />
- <xsd:attribute name="FirstCodepoint" type="xsd:nonNegativeInteger" use="optional" default="32" />
- <xsd:attribute name="LastCodepoint" type="xsd:nonNegativeInteger" use="optional" default="127" />
<xsd:attribute name="NativeHorzRes" type="xsd:nonNegativeInteger" use="optional" default="640" />
<xsd:attribute name="NativeVertRes" type="xsd:nonNegativeInteger" use="optional" default="480" />
<xsd:attribute name="AutoScaled" type="xsd:boolean" use="optional" default="false" />
<xsd:attribute name="AntiAlias" type="xsd:boolean" use="optional" default="true" />
</xsd:attributeGroup>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
Modified: trunk/data/GUI/GUILayout.xsd
===================================================================
--- trunk/data/GUI/GUILayout.xsd 2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/GUI/GUILayout.xsd 2007-06-01 23:35:06 UTC (rev 518)
@@ -15,16 +15,37 @@
<xsd:element name="LayoutImport" type="LayoutImportType" minOccurs="0" maxOccurs="unbounded" />
<xsd:element name="Property" type="PropertyType" minOccurs="0" maxOccurs="unbounded" />
<xsd:element name="Event" type="EventType" minOccurs="0" maxOccurs="unbounded" />
- <xsd:element name="Window" type="WindowType" minOccurs="0" maxOccurs="unbounded" />
+ <xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="Window" type="WindowType" />
+ <xsd:element name="AutoWindow" type="AutoWindowType" />
+ </xsd:choice>
<xsd:element name="Property" type="PropertyType" minOccurs="0" maxOccurs="unbounded" />
</xsd:sequence>
<xsd:attribute name="Type" type="xsd:string" use="required"/>
<xsd:attribute name="Name" type="xsd:string" use="optional" default="" />
</xsd:complexType>
+ <xsd:complexType name="AutoWindowType">
+ <xsd:sequence>
+ <xsd:element name="LayoutImport" type="LayoutImportType" minOccurs="0" maxOccurs="unbounded" />
+ <xsd:element name="Property" type="PropertyType" minOccurs="0" maxOccurs="unbounded" />
+ <xsd:element name="Event" type="EventType" minOccurs="0" maxOccurs="unbounded" />
+ <xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="Window" type="WindowType" />
+ <xsd:element name="AutoWindow" type="AutoWindowType" />
+ </xsd:choice>
+ <xsd:element name="Property" type="PropertyType" minOccurs="0" maxOccurs="unbounded" />
+ </xsd:sequence>
+ <xsd:attribute name="NameSuffix" type="xsd:string" use="required"/>
+ </xsd:complexType>
+
<xsd:complexType name="PropertyType">
- <xsd:attribute name="Name" type="xsd:string" use="required"/>
- <xsd:attribute name="Value" type="xsd:string" use="required"/>
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:string">
+ <xsd:attribute name="Name" type="xsd:string" use="required"/>
+ <xsd:attribute name="Value" type="xsd:string" use="optional"/>
+ </xsd:extension>
+ </xsd:simpleContent>
</xsd:complexType>
<xsd:complexType name="LayoutImportType">
Modified: trunk/data/GUI/GUIScheme.xsd
===================================================================
--- trunk/data/GUI/GUIScheme.xsd 2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/GUI/GUIScheme.xsd 2007-06-01 23:35:06 UTC (rev 518)
@@ -8,6 +8,7 @@
<xsd:element name="Font" type="NamedDataType" />
<xsd:element name="LookNFeel" type="FileDataType" />
<xsd:element name="WindowSet" type="WindowSetType" />
+ <xsd:element name="WindowRendererSet" type="WindowRendererSetType" />
<xsd:element name="WindowAlias" type="WindowAliasType" />
<xsd:element name="FalagardMapping" type="FalagardMapType" />
</xsd:choice>
@@ -19,6 +20,12 @@
</xsd:sequence>
<xsd:attribute name="Filename" type="xsd:string" use="required" />
</xsd:complexType>
+ <xsd:complexType name="WindowRendererSetType">
+ <xsd:sequence>
+ <xsd:element name="WindowRendererFactory" type="WindowRendererFactoryType" minOccurs="0" maxOccurs="unbounded" />
+ </xsd:sequence>
+ <xsd:attribute name="Filename" type="xsd:string" use="required" />
+ </xsd:complexType>
<xsd:complexType name="FileDataType">
<xsd:attribute name="Filename" type="xsd:string" use="required" />
<xsd:attribute name="ResourceGroup" type="xsd:string" use="optional" default="" />
@@ -31,6 +38,9 @@
<xsd:complexType name="WindowFactoryType">
<xsd:attribute name="Name" type="xsd:string" use="required" />
</xsd:complexType>
+ <xsd:complexType name="WindowRendererFactoryType">
+ <xsd:attribute name="Name" type="xsd:string" use="required" />
+ </xsd:complexType>
<xsd:complexType name="WindowAliasType">
<xsd:attribute name="Alias" type="xsd:string" use="required" />
<xsd:attribute name="Target" type="xsd:string" use="required" />
@@ -38,6 +48,7 @@
<xsd:complexType name="FalagardMapType">
<xsd:attribute name="WindowType" type="xsd:string" use="required" />
<xsd:attribute name="TargetType" type="xsd:string" use="required" />
+ <xsd:attribute name="Renderer" type="xsd:string" use="required" />
<xsd:attribute name="LookNFeel" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:schema>
\ No newline at end of file
Modified: trunk/data/client/data1.x/GUI/BlueHighway-10.font
===================================================================
--- trunk/data/client/data1.x/GUI/BlueHighway-10.font 2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/client/data1.x/GUI/BlueHighway-10.font 2007-06-01 23:35:06 UTC (rev 518)
@@ -1,2 +1,2 @@
<?xml version="1.0" ?>
-<Font Name="BlueHighway-10" Filename="BlueHighway.ttf" Type="Dynamic" Size="10" NativeHorzRes="800" NativeVertRes="600" AutoScaled="false" AntiAlias="true" />
+<Font Name="BlueHighway-10" Filename="BlueHighway.ttf" Type="FreeType" Size="10" NativeHorzRes="800" NativeVertRes="600" AutoScaled="false" />
Modified: trunk/data/client/data1.x/GUI/BlueHighway-12.font
===================================================================
--- trunk/data/client/data1.x/GUI/BlueHighway-12.font 2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/client/data1.x/GUI/BlueHighway-12.font 2007-06-01 23:35:06 UTC (rev 518)
@@ -1,2 +1,2 @@
<?xml version="1.0" ?>
-<Font Name="BlueHighway-12" Filename="BlueHighway.ttf" Type="Dynamic" Size="12" NativeHorzRes="800" NativeVertRes="600" AutoScaled="false" AntiAlias="true" />
+<Font Name="BlueHighway-12" Filename="BlueHighway.ttf" Type="FreeType" Size="12" NativeHorzRes="800" NativeVertRes="600" AutoScaled="false" />
Modified: trunk/data/client/data1.x/GUI/OpenGate.looknfeel
===================================================================
--- trunk/data/client/data1.x/GUI/OpenGate.looknfeel 2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/client/data1.x/GUI/OpenGate.looknfeel 2007-06-01 23:35:06 UTC (rev 518)
@@ -32,7 +32,7 @@
<Image type="BottomRightCorner" imageset="OpenGateLook" image="OGUIPanelRight" />
</FrameComponent>
</ImagerySection>
- <ImagerySection name="background">
+<!-- <ImagerySection name="background">
<ImageryComponent>
<Area>
<Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
@@ -40,10 +40,11 @@
<Dim type="Width" ><UnifiedDim scale="1" type="Width" /></Dim>
<Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim>
</Area>
- <VertFormat type="Tiled" />
+ <VertFormat type="Tiled" />
<HorzFormat type="Tiled" />
</ImageryComponent>
- </ImagerySection>
+ </ImagerySection>
+-->
<StateImagery name="Enabled" />
<StateImagery name="Disabled" />
<StateImagery name="EnabledFrame">
@@ -904,16 +905,21 @@
<Dim type="Width" ><UnifiedDim scale="1" type="Width" /></Dim>
<Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim>
</Area>
+<!--
<Image type="TopLeftCorner" imageset="OpenGateLook" image="OGDefaultWindowTopLeft" />
<Image type="TopRightCorner" imageset="OpenGateLook" image="OGDefaultWindowTopRight" />
+-->
<Image type="BottomLeftCorner" imageset="OpenGateLook" image="OGDefaultWindowBottomLeft" />
<Image type="BottomRightCorner" imageset="OpenGateLook" image="OGDefaultWindowBottomRight" />
+<!--
<Image type="TopEdge" imageset="OpenGateLook" image="OGDefaultWindowTopEdge" />
+-->
<Image type="LeftEdge" imageset="OpenGateLook" image="OGDefaultWindowLeftEdge" />
<Image type="RightEdge" imageset="OpenGateLook" image="OGDefaultWindowRightEdge" />
<Image type="BottomEdge" imageset="OpenGateLook" image="OGDefaultWindowBottomEdge" />
</FrameComponent>
</ImagerySection>
+<!--
<ImagerySection name="withtitle_noframe_client_area">
<ImageryComponent>
<Area>
@@ -940,6 +946,7 @@
<HorzFormat type="Stretched" />
</ImageryComponent>
</ImagerySection>
+-->
<StateImagery name="ActiveWithTitleWithFrame">
<Layer>
<Section section="withtitle_frame" />
Modified: trunk/data/client/data1.x/GUI/OpenGateLook.scheme
===================================================================
--- trunk/data/client/data1.x/GUI/OpenGateLook.scheme 2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/client/data1.x/GUI/OpenGateLook.scheme 2007-06-01 23:35:06 UTC (rev 518)
@@ -4,21 +4,53 @@
<Font Name="BlueHighway-12" Filename="BlueHighway-12.font" />
<Font Name="BlueHighway-10" Filename="BlueHighway-10.font" />
<LookNFeel Filename="OpenGate.looknfeel" />
- <WindowSet Filename="CEGUIFalagardBase" />
- <FalagardMapping WindowType="OpenGateLook/OGButton" TargetType="Falagard/Button" LookNFeel="OpenGateLook/OGButton" />
- <FalagardMapping WindowType="OpenGateLook/OGDefaultFrameWindow" TargetType="Falagard/FrameWindow" LookNFeel="OpenGateLook/OGDefaultFrameWindow" />
- <FalagardMapping WindowType="OpenGateLook/OGDefaultTitlebar" TargetType="Falagard/Titlebar" LookNFeel="OpenGateLook/OGDefaultTitlebar" />
- <FalagardMapping WindowType="OpenGateLook/OGEditbox" TargetType="Falagard/Editbox" LookNFeel="OpenGateLook/OGEditbox" />
- <FalagardMapping WindowType="OpenGateLook/OGProgressBarEnergy" TargetType="Falagard/ProgressBar" LookNFeel="OpenGateLook/OGProgressBarEnergy" />
- <FalagardMapping WindowType="OpenGateLook/OGProgressBarHull" TargetType="Falagard/ProgressBar" LookNFeel="OpenGateLook/OGProgressBarHull" />
- <FalagardMapping WindowType="OpenGateLook/OGProgressBarShield" TargetType="Falagard/ProgressBar" LookNFeel="OpenGateLook/OGProgressBarShield" />
- <FalagardMapping WindowType="OpenGateLook/OGProgressBarVert" TargetType="Falagard/ProgressBar" LookNFeel="OpenGateLook/OGProgressBarVert" />
- <FalagardMapping WindowType="OpenGateLook/OGProgressBarWeapon1" TargetType="Falagard/ProgressBar" LookNFeel="OpenGateLook/OGProgressBarWeapon1" />
- <FalagardMapping WindowType="OpenGateLook/OGProgressBarWeapon2" TargetType="Falagard/ProgressBar" LookNFeel="OpenGateLook/OGProgressBarWeapon2" />
- <FalagardMapping WindowType="OpenGateLook/OGProgressBarWeapon3" TargetType="Falagard/ProgressBar" LookNFeel="OpenGateLook/OGProgressBarWeapon3" />
- <FalagardMapping WindowType="OpenGateLook/OGStaticText" TargetType="Falagard/StaticText" LookNFeel="OpenGateLook/OGStaticText" />
- <FalagardMapping WindowType="OpenGateLook/OGSystemButton" TargetType="Falagard/SystemButton" LookNFeel="OpenGateLook/OGButton" />
- <FalagardMapping WindowType="OpenGateLook/OGUIPanels" TargetType="Falagard/StaticImage" LookNFeel="OpenGateLook/OGUIPanels" />
- <FalagardMapping WindowType="OpenGateLook/OGVerticalScrollbar" TargetType="Falagard/Scrollbar" LookNFeel="OpenGateLook/OGVerticalScrollbar" />
- <FalagardMapping WindowType="OpenGateLook/OGVerticalScrollbarThumb" TargetType="Falagard/Thumb" LookNFeel="OpenGateLook/OGVerticalScrollbarThumb" />
+ <WindowSet Filename="CEGUIFalagardWRBase" />
+ <FalagardMapping WindowType="OpenGateLook/OGDefaultFrameWindow" TargetType="CEGUI/FrameWindow"
+ Renderer="Falagard/FrameWindow"
+ LookNFeel="OpenGateLook/OGDefaultFrameWindow" />
+ <FalagardMapping WindowType="OpenGateLook/OGButton" TargetType="CEGUI/FrameWindow"
+ Renderer="Falagard/FrameWindow"
+ LookNFeel="OpenGateLook/OGDefaultFrameWindow" />
+ <FalagardMapping WindowType="OpenGateLook/OGSystemButton" TargetType="CEGUI/PushButton"
+ Renderer="Falagard/SystemButton"
+ LookNFeel="OpenGateLook/OGButton" />
+ <FalagardMapping WindowType="OpenGateLook/OGDefaultTitlebar" TargetType="CEGUI/Titlebar"
+ Renderer="Falagard/Titlebar"
+ LookNFeel="OpenGateLook/OGDefaultTitlebar" />
+ <FalagardMapping WindowType="OpenGateLook/OGEditbox" TargetType="CEGUI/Editbox"
+ Renderer="Falagard/Editbox"
+ LookNFeel="OpenGateLook/OGEditbox" />
+ <FalagardMapping WindowType="OpenGateLook/OGVerticalScrollbar" TargetType="CEGUI/Scrollbar"
+ Renderer="Falagard/Scrollbar"
+ LookNFeel="OpenGateLook/OGVerticalScrollbar" />
+ <FalagardMapping WindowType="OpenGateLook/OGProgressBarEnergy" TargetType="CEGUI/ProgressBar"
+ Renderer="Falagard/ProgressBar"
+ LookNFeel="OpenGateLook/OGProgressBarEnergy" />
+ <FalagardMapping WindowType="OpenGateLook/OGProgressBarHull" TargetType="CEGUI/ProgressBar"
+ Renderer="Falagard/ProgressBar"
+ LookNFeel="OpenGateLook/OGProgressBarHull" />
+ <FalagardMapping WindowType="OpenGateLook/OGProgressBarShield" TargetType="CEGUI/ProgressBar"
+ Renderer="Falagard/ProgressBar"
+ LookNFeel="OpenGateLook/OGProgressBarShield" />
+ <FalagardMapping WindowType="OpenGateLook/OGProgressBarVert" TargetType="CEGUI/ProgressBar"
+ Renderer="Falagard/ProgressBar"
+ LookNFeel="OpenGateLook/OGProgressBarVert" />
+ <FalagardMapping WindowType="OpenGateLook/OGProgressBarWeapon1" TargetType="CEGUI/ProgressBar"
+ Renderer="Falagard/ProgressBar"
+ LookNFeel="OpenGateLook/OGProgressBarWeapon1" />
+ <FalagardMapping WindowType="OpenGateLook/OGProgressBarWeapon2" TargetType="CEGUI/ProgressBar"
+ Renderer="Falagard/ProgressBar"
+ LookNFeel="OpenGateLook/OGProgressBarWeapon2" />
+ <FalagardMapping WindowType="OpenGateLook/OGProgressBarWeapon3" TargetType="CEGUI/ProgressBar"
+ Renderer="Falagard/ProgressBar"
+ LookNFeel="OpenGateLook/OGProgressBarWeapon3" />
+ <FalagardMapping WindowType="OpenGateLook/OGVerticalScrollbarThumb" TargetType="CEGUI/Thumb"
+ Renderer="Falagard/Button"
+ LookNFeel="OpenGateLook/OGVerticalScrollbarThumb" />
+ <FalagardMapping WindowType="OpenGateLook/OGUIPanels" TargetType="DefaultWindow"
+ Renderer="Falagard/StaticImage"
+ LookNFeel="OpenGateLook/OGUIPanels" />
+ <FalagardMapping WindowType="OpenGateLook/OGStaticText" TargetType="DefaultWindow"
+ Renderer="Falagard/StaticText"
+ LookNFeel="OpenGateLook/OGStaticText" />
</GUIScheme>
Added: trunk/data/commodities/CPU.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/CPU.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/commodities/aluminium.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/aluminium.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/commodities/aluminium.xml
===================================================================
--- trunk/data/commodities/aluminium.xml 2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/aluminium.xml 2007-06-01 23:35:06 UTC (rev 518)
@@ -10,12 +10,12 @@
<class_de>Metall</class_de>
<class_en>metal</class_en>
<techlevel>0</techlevel>
- <size>1</size>
+ <size>8</size>
<mass>2702</mass>
<!-- Additional Data -->
<description>TODO</description>
- <image>aluminium.jpg</image>
+ <image>aluminium.png</image>
<model>aluminium.blend</model>
<mesh>aluminium.mesh</mesh>
@@ -27,4 +27,4 @@
<!-- Production Data -->
<production-center>Mined</production-center>
-</component>
\ No newline at end of file
+</component>
Added: trunk/data/commodities/antimony.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/antimony.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/commodities/antimony.xml
===================================================================
--- trunk/data/commodities/antimony.xml 2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/antimony.xml 2007-06-01 23:35:06 UTC (rev 518)
@@ -9,7 +9,7 @@
<class_de>Halbmetall</class_de>
<class_en>Metalloid</class_en>
- <image>antimony.jpg</image>
+ <image>antimony.png</image>
<model>antimony.blend</model>
<!-- Production Data -->
@@ -23,4 +23,4 @@
<melting-point>630</melting-point>
<gravitic-sig>6.7</gravitic-sig>
-</component>
\ No newline at end of file
+</component>
Added: trunk/data/commodities/barium.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/barium.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/commodities/barium.xml
===================================================================
--- trunk/data/commodities/barium.xml 2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/barium.xml 2007-06-01 23:35:06 UTC (rev 518)
@@ -9,7 +9,7 @@
<class_de>Metall</class_de>
<class_en>metal</class_en>
- <image>barium.jpg</image>
+ <image>barium.png</image>
<model>barium.blend</model>
<!-- Production Data -->
@@ -23,4 +23,4 @@
<melting-point>725</melting-point>
<gravitic-sig>3.5</gravitic-sig>
-</component>
\ No newline at end of file
+</component>
Added: trunk/data/commodities/cesium.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/cesium.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/commodities/cesium.xml
===================================================================
--- trunk/data/commodities/cesium.xml 2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/cesium.xml 2007-06-01 23:35:06 UTC (rev 518)
@@ -9,7 +9,7 @@
<class_de>Metall</class_de>
<class_en>metal</class_en>
- <image>cesium.jpg</image>
+ <image>cesium.png</image>
<model>cesium.blend</model>
<!-- Production Data -->
@@ -23,4 +23,4 @@
<melting-point>28</melting-point>
<gravitic-sig>1.9</gravitic-sig>
-</component>
\ No newline at end of file
+</component>
Added: trunk/data/commodities/chemicals.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/chemicals.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/commodities/chemicals.xml
===================================================================
--- trunk/data/commodities/chemicals.xml 2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/chemicals.xml 2007-06-01 23:35:06 UTC (rev 518)
@@ -1,10 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE Umlaute [
- <!ENTITY auml "ä">
- <!ENTITY ouml "ö">
- <!ENTITY uuml "ü">
- <!ENTITY szlig "ß">
-]>
<component type="Produced">
<!-- Name -->
@@ -42,4 +36,4 @@
<required-component>Zinc</required-component>
<required-component>Nitrogen</required-component>
<required-component>Carbon</required-component>
-</component>
\ No newline at end of file
+</component>
Added: trunk/data/commodities/chromium.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/chromium.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/commodities/chromium.xml
===================================================================
--- trunk/data/commodities/chromium.xml 2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/chromium.xml 2007-06-01 23:35:06 UTC (rev 518)
@@ -9,7 +9,7 @@
<class_de>Metall</class_de>
<class_en>metal</class_en>
- <image>chromium.jpg</image>
+ <image>chromium.png</image>
<model>chromium.blend</model>
<!-- Production Data -->
@@ -23,4 +23,4 @@
<melting-point>1857</melting-point>
<gravitic-sig>7.2</gravitic-sig>
-</component>
\ No newline at end of file
+</component>
Added: trunk/data/commodities/copper.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/copper.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/commodities/copper.xml
===================================================================
--- trunk/data/commodities/copper.xml 2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/copper.xml 2007-06-01 23:35:06 UTC (rev 518)
@@ -9,7 +9,7 @@
<class_de>Metall</class_de>
<class_en>metal</class_en>
- <image>copper.jpg</image>
+ <image>copper.png</image>
<model>copper.blend</model>
<!-- Production Data -->
@@ -23,4 +23,4 @@
<melting-point>1083</melting-point>
<gravitic-sig>8.9</gravitic-sig>
-</component>
\ No newline at end of file
+</component>
Modified: trunk/data/commodities/cpu.xml
===================================================================
--- trunk/data/commodities/cpu.xml 2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/cpu.xml 2007-06-01 23:35:06 UTC (rev 518)
@@ -1,10 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE Umlaute [
- <!ENTITY auml "ä">
- <!ENTITY ouml "ö">
- <!ENTITY uuml "ü">
- <!ENTITY szlig "ß">
-]>
<component type="Produced">
<!-- Name -->
@@ -39,4 +33,4 @@
<required-component>Silver</required-component>
<required-component>Silicon</required-component>
<required-component>RAM</required-component>
-</component>
\ No newline at end of file
+</component>
Added: trunk/data/commodities/fuel_cells.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/fuel_cells.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/commodities/fuel_cells.xml
===================================================================
--- trunk/data/commodities/fuel_cells.xml 2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/fuel_cells.xml 2007-06-01 23:35:06 UTC (rev 518)
@@ -1,10 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE Umlaute [
- <!ENTITY auml "ä">
- <!ENTITY ouml "ö">
- <!ENTITY uuml "ü">
- <!ENTITY szlig "ß">
-]>
<component type="Produced">
<!-- Name -->
@@ -17,7 +11,7 @@
<!-- Description -->
<description_de>Brennstoffzellen sind Energieumwandler, die chemische Energie in elektrische Energie wandeln können. Als chemische Energiequellen verwendet man meist den aus dem All gesammelten Wasserstoff und verbindet diesen mit Sauerstoff in der Zelle zu Wasser. Der Vorteil einer leistungsstarken Brennstoffzelle im Vergleich zu einem Fusionsreaktor besteht darin, dass keine Radioaktivität anfällt und außerdem das Endprodukt der Wandlung, das Wasser, durch Energie wieder zu Wasserstoff und Sauerstoff getrennt werden kann. Brennstoffzellen können daher wieder aufgeladen werden, während Fussionsreaktoren mit neuem Brennmaterial versorgt werden müssen. Leider reicht bis heute auch die stärkste Brennstoffzelle bei Weitem nicht aus, um Schiffstriebwerke betreiben zu können. Sie werden jedoch oft in Drohnen und Satelliten zur Energiebereitstellung eingesetzt.</description_de>
- <description_en></description_en>
+ <description_en>Brennstoffzellen sind Energieumwandler, die chemische Energie in elektrische Energie wandeln können. Als chemische Energiequellen verwendet man meist den aus dem All gesammelten Wasserstoff und verbindet diesen mit Sauerstoff in der Zelle zu Wasser. Der Vorteil einer leistungsstarken Brennstoffzelle im Vergleich zu einem Fusionsreaktor besteht darin, dass keine Radioaktivität anfällt und außerdem das Endprodukt der Wandlung, das Wasser, durch Energie wieder zu Wasserstoff und Sauerstoff getrennt werden kann. Brennstoffzellen können daher wieder aufgeladen werden, während Fussionsreaktoren mit neuem Brennmaterial versorgt werden müssen. Leider reicht bis heute auch die stärkste Brennstoffzelle bei Weitem nicht aus, um Schiffstriebwerke betreiben zu können. Sie werden jedoch oft in Drohnen und Satelliten zur Energiebereitstellung eingesetzt.</description_de>
<image>fuel_cells.png</image>
<model>fuel_cells.blend</model>
@@ -41,4 +35,4 @@
<required-component>Phosphorous</required-component>
<required-component>Silicon</required-component>
<required-component>Rubber</required-component>
-</component>
\ No newline at end of file
+</component>
Added: trunk/data/commodities/gold.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/gold.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/commodities/gold.xml
===================================================================
--- trunk/data/commodities/gold.xml 2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/gold.xml 2007-06-01 23:35:06 UTC (rev 518)
@@ -1,10 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE Umlaute [
- <!ENTITY auml "ä">
- <!ENTITY ouml "ö">
- <!ENTITY uuml "ü">
- <!ENTITY szlig "ß">
-]>
<component type="Mineable">
<!-- Name -->
@@ -32,4 +26,4 @@
<melting-point>1064</melting-point>
<gravitic-sig>19.3</gravitic-sig>
-</component>
\ No newline at end of file
+</component>
Added: trunk/data/commodities/helium.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/helium.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/commodities/ice.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/ice.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/commodities/ice.xml
===================================================================
--- trunk/data/commodities/ice.xml (rev 0)
+++ trunk/data/commodities/ice.xml 2007-06-01 23:35:06 UTC (rev 518)
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE equipment SYSTEM "http://opengate.sourceforge.net/opengate.dtd">
+
+<component type="Mineable">
+ <!-- Naming -->
+ <name_de>Eis</name_de>
+ <name_en>Ice</name_en>
+
+ <!-- Generic Data -->
+ <class_de>Food</class_de>
+ <class_en>food</class_en>
+ <techlevel>0</techlevel>
+ <size>1</size>
+ <mass>917</mass>
+
+ <!-- Additional Data -->
+ <description>TODO</description>
+ <image>ice.png</image>
+ <model>ice.blend</model>
+
+ <!-- Specific data -->
+ <id>Ice</id>
+ <melting-point>273</melting-point>
+ <gravitic-sig>2.7</gravitic-sig>
+
+ <!-- Production Data -->
+ <production-center>Mined</production-center>
+
+</component>
Added: trunk/data/commodities/laser_components.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/laser_components.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/commodities/laser_components.xml
===================================================================
--- trunk/data/commodities/laser_components.xml 2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/laser_components.xml 2007-06-01 23:35:06 UTC (rev 518)
@@ -9,7 +9,7 @@
<class_de>Komponente</class_de>
<class_en>component</class_en>
- <image>laser_components.jpg</image>
+ <image>laser_components.png</image>
<model>laser_components.blend</model>
<!-- Production Data -->
@@ -30,4 +30,4 @@
<required-component>Xenon</required-component>
<required-component>Nitrogen</required-component>
<required-component>Machined Parts</required-component>
-</component>
\ No newline at end of file
+</component>
Added: trunk/data/commodities/medical_supplies.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/medical_supplies.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/commodities/medical_supplies.xml
===================================================================
--- trunk/data/commodities/medical_supplies.xml 2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/medical_supplies.xml 2007-06-01 23:35:06 UTC (rev 518)
@@ -1,10 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE Umlaute [
- <!ENTITY auml "ä">
- <!ENTITY ouml "ö">
- <!ENTITY uuml "ü">
- <!ENTITY szlig "ß">
-]>
<component type="Produced">
<!-- Name -->
Added: trunk/data/commodities/nitrogen.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/nitrogen.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/commodities/octavia_light.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/octavia_light.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/commodities/rubber.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/rubber.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/commodities/rubber.xml
===================================================================
(Binary files differ)
Added: trunk/data/commodities/xenon.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/xenon.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/commodities/xenon.xml
===================================================================
--- trunk/data/commodities/xenon.xml 2007-06-01 23:33:29 UTC (rev 517)
+++ trunk/data/commodities/xenon.xml 2007-06-01 23:35:06 UTC (rev 518)
@@ -1,11 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE Umlaute [
- <!ENTITY auml "ä">
- <!ENTITY ouml "ö">
- <!ENTITY uuml "ü">
- <!ENTITY Uuml "Ü">
- <!ENTITY szlig "ß">
-]>
<component type="Mineable">
<!-- Name -->
@@ -17,8 +10,8 @@
<class_en>noble gas</class_en>
<!-- Description -->
- <description_de>Das extrem reaktionsträge Edelgas wurde in früheren Zeiten oft in Ionenantrieben der ersten Schiffstriebwerksgeneration eingesetzt. Da die Herstellung damals noch recht teuer war hat man die leistungsschwache Technologie schon bald durch die neue Generation der Schiffstriebwerke ersetzen können, bei denen kein Xenon mehr notwendig war. Heute steht Xenon hingegen oft im Überfluss zur Verfügung, da es eines Zerfallsprodukte des Fussionsreaktors ist. Auf den Raumstationen wird das Xenon für die Beleuchtung eingesetzt. Xenon kann durch elektrische Energie zum Leuchten gebracht werden, wobei die Lichtfarbe durch den Gasdruck in der Gasentladungsröhre reguliert werden kann. Dieser Effekt wird vorallem in den Octavia light Werbeschildern eingesetzt, bei denen die Schrift zwischen orange glühend und rot wechselt.</description_de>
- <description_en></description_en>
+ <description_de>üÜäÄßDas extrem reaktionsträge Edelgas wurde in früheren Zeiten oft in Ionenantrieben der ersten Schiffstriebwerksgeneration eingesetzt. Da die Herstellung damals noch recht teuer war hat man die leistungsschwache Technologie schon bald durch die neue Generation der Schiffstriebwerke ersetzen können, bei denen kein Xenon mehr notwendig war. Heute steht Xenon hingegen oft im Überfluss zur Verfügung, da es eines Zerfallsprodukte des Fussionsreaktors ist. Auf den Raumstationen wird das Xenon für die Beleuchtung eingesetzt. Xenon kann durch elektrische Energie zum Leuchten gebracht werden, wobei die Lichtfarbe durch den Gasdruck in der Gasentladungsröhre reguliert werden kann. Dieser Effekt wird vorallem in den Octavia light Werbeschildern eingesetzt, bei denen die Schrift zwischen orange glühend und rot wechselt.</description_de>
+ <description_en>üöäÜÖÄßDas extrem reaktionsträge Edelgas wurde in früheren Zeiten oft in Ionenantrieben der ersten Schiffstriebwerksgeneration eingesetzt. Da die Herstellung damals noch recht teuer war hat man die leistungsschwache Technologie schon bald durch die neue Generation der Schiffstriebwerke ersetzen können, bei denen kein Xenon mehr notwendig war. Heute steht Xenon hingegen oft im Überfluss zur Verfügung, da es eines Zerfallsprodukte des Fussionsreaktors ist. Auf den Raumstationen wird das Xenon für die Beleuchtung eingesetzt. Xenon kann durch elektrische Energie zum Leuchten gebracht werden, wobei die Lichtfarbe durch den Gasdruck in der Gasentladungsröhre reguliert werden kann. Dieser Effekt wird vorallem in den Octavia light Werbeschildern eingesetzt, bei denen die Schrift zwischen orange glühend und rot wechselt.</description_en>
<image>xenon.png</image>
<model>xenon.blend</model>
@@ -34,4 +27,4 @@
<melting-point>-111.8</melting-point>
<gravitic-sig>5.8</gravitic-sig>
-</component>
\ No newline at end of file
+</component>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-06-01 23:33:29
|
Revision: 517
http://svn.sourceforge.net/opengate/?rev=517&view=rev
Author: spom_spom
Date: 2007-06-01 16:33:29 -0700 (Fri, 01 Jun 2007)
Log Message:
-----------
Hurray! Shopping Shopping Shopping. (Add: Market dialog, best viewed with 1024x786 or more.) Base
Modified Paths:
--------------
branches/ogsector/data/commodities.xml
branches/ogsector/data/gui/layouts/dialogs/ShipConfigDialog.layout
branches/ogsector/data/gui/layouts/opengateDocked.layout
branches/ogsector/data/gui/schemes/opengate/opengate.imageset
branches/ogsector/data/gui/schemes/opengate/opengate.png
branches/ogsector/data/gui/schemes/opengate/opengate.scheme
branches/ogsector/data/gui/schemes/opengate/opengateButtons.looknfeel
branches/ogsector/data/gui/schemes/opengate/opengateContainers.looknfeel
branches/ogsector/data/gui/schemes/opengate/opengateStatic.looknfeel
branches/ogsector/ogre.cfg
branches/ogsector/resources.cfg
branches/ogsector/src/Avatar.cpp
branches/ogsector/src/Avatar.h
branches/ogsector/src/ConfigDialog.cpp
branches/ogsector/src/ConfigDialog.h
branches/ogsector/src/Console.cpp
branches/ogsector/src/Console.h
branches/ogsector/src/DockedState.cpp
branches/ogsector/src/DockedState.h
branches/ogsector/src/Entity.cpp
branches/ogsector/src/Entity.h
branches/ogsector/src/EntityManager.cpp
branches/ogsector/src/EntityManager.h
branches/ogsector/src/GameState.h
branches/ogsector/src/GameStateManager.cpp
branches/ogsector/src/GameStateManager.h
branches/ogsector/src/Makefile.am
branches/ogsector/src/Makefile.in
branches/ogsector/src/Sector.cpp
branches/ogsector/src/SectorObjects.cpp
branches/ogsector/src/ShipConfigDialog.cpp
branches/ogsector/src/ShipConfigDialog.h
branches/ogsector/src/UnDockedState.cpp
branches/ogsector/src/VesselManager.cpp
branches/ogsector/src/VesselManager.h
Added Paths:
-----------
branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout
branches/ogsector/data/gui/layouts/dialogs/MarketItemShortDialog.layout
branches/ogsector/data/gui/schemes/opengate/BlueHighway-14.font
branches/ogsector/data/gui/schemes/opengate/BlueHighway-16.font
branches/ogsector/data/gui/schemes/opengate/BlueHighway-18.font
branches/ogsector/data/gui/schemes/opengate/BlueHighway-8.font
branches/ogsector/src/BaseDialog.cpp
branches/ogsector/src/BaseDialog.h
branches/ogsector/src/DeviceManager.cpp
branches/ogsector/src/DeviceManager.h
branches/ogsector/src/MarketDialog.cpp
branches/ogsector/src/MarketDialog.h
branches/ogsector/src/Vessel.h
Removed Paths:
-------------
branches/ogsector/src/VesselTemplate.h
Modified: branches/ogsector/data/commodities.xml
===================================================================
--- branches/ogsector/data/commodities.xml 2007-06-01 01:11:40 UTC (rev 516)
+++ branches/ogsector/data/commodities.xml 2007-06-01 23:33:29 UTC (rev 517)
@@ -1,5 +1,23 @@
<?xml version="1.0"?>
<commodities>
- <Resource id="1" location="../../trunk/data/commodities/aluminium.xml"/>
+ <Resource id="1" location="../../trunk/data/commodities/aluminium.xml"/>
+ <Resource id="2" location="../../trunk/data/commodities/antimony.xml"/>
+ <Resource id="3" location="../../trunk/data/commodities/barium.xml"/>
+ <Resource id="4" location="../../trunk/data/commodities/cesium.xml"/>
+ <Resource id="5" location="../../trunk/data/commodities/chemicals.xml"/>
+ <Resource id="6" location="../../trunk/data/commodities/chromium.xml"/>
+ <Resource id="7" location="../../trunk/data/commodities/copper.xml"/>
+ <Resource id="8" location="../../trunk/data/commodities/cpu.xml"/>
+ <Resource id="9" location="../../trunk/data/commodities/fuel_cells.xml"/>
+ <Resource id="10" location="../../trunk/data/commodities/gold.xml"/>
+ <Resource id="11" location="../../trunk/data/commodities/helium.xml"/>
+ <Resource id="12" location="../../trunk/data/commodities/iron.xml"/>
+ <Resource id="12" location="../../trunk/data/commodities/laser_components.xml"/>
+ <Resource id="13" location="../../trunk/data/commodities/medical_supplies.xml"/>
+ <Resource id="14" location="../../trunk/data/commodities/nitrogen.xml"/>
+ <Resource id="15" location="../../trunk/data/commodities/octavia_light.xml"/>
+ <Resource id="16" location="../../trunk/data/commodities/rubber.xml"/>
+ <Resource id="17" location="../../trunk/data/commodities/xenon.xml"/>
+ <Resource id="18" location="../../trunk/data/commodities/ice.xml"/>
</commodities>
Added: branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout
===================================================================
--- branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout (rev 0)
+++ branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout 2007-06-01 23:33:29 UTC (rev 517)
@@ -0,0 +1,781 @@
+<?xml version="1.0" ?>
+<GUILayout>
+ <Window Type="opengate/StaticGreenImage" Name="MarketDialog">
+<!-- <Window Type="opengate/StaticGreenImage" Name="MarketDialog"> -->
+ <Property Name="MousePassThroughEnabled" Value="True" />
+ <Property Name="UnifiedPosition" Value="{{0.0,100},{0.0,115}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-167},{1.0,-217}}" />
+ <Property Name="Text" Value="Market" />
+
+<!-- ********************* -->
+<!-- Item Detailed View -->
+<!-- ********************* -->
+ <Window Type="opengate/StaticGreenImage" Name="MarketItemDetailedView">
+ <Property Name="UnifiedPosition" Value="{{0,220},{0.0,10}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-230},{1.0,-170}}" />
+ <Property Name="BackgroundEnabled" Value="True" />
+ <Property Name="FrameEnabled" Value="True" />
+ <Property Name="Visible" Value="False" />
+ <Window Type="opengate/StaticGreenImage" Name="MarketItemDetailedView/TopLeft">
+ <Property Name="UnifiedPosition" Value="{{0.0, 0},{0.0, 0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 31},{0.0, 31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenTopLeft"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="MarketItemDetailedView/Top">
+ <Property Name="UnifiedPosition" Value="{{0.0, 31},{ 0.0, 0}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, -62},{ 0.0, 31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenTop"/>
+ <Window Type="opengate/StaticLabel" Name="MarketItemDetailedView/Top/Title">
+ <Property Name="UnifiedPosition" Value="{{0.0, 10},{ 0.0, 10}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, 0},{ 0.0, 20}}" />
+ <Property Name="Text" Value="Would you like to purchase this item?" />
+ <Property Name="Font" Value="BlueHighway-16" />
+ </Window>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="MarketItemDetailedView/TopRight">
+ <Property Name="UnifiedPosition" Value="{{1.0, -31},{ 0.0, 0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 31},{ 0.0, 31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenTopRight"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="MarketItemDetailedView/Image">
+ <!-- Filled within game -->
+ <Property Name="UnifiedPosition" Value="{{0.0, 20},{0.5, -120}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 250},{0.0, 240}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="MarketItemDetailedView/TextFrame">
+ <Property Name="UnifiedPosition" Value="{{0.0, 290},{0.5, -120}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 250},{0.0, 240}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Window Type="opengate/StaticLabel" Name="MarketItemDetailedView/TextFrame/Name">
+ <Property Name="UnifiedPosition" Value="{{0.0, 0},{0.0, 0}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, 0},{0.0, 20}}" />
+ <Property Name="Text" Value="Name:" />
+ <Window Type="opengate/StaticLabel" Name="MarketItemDetailedView/TextFrame/Name/Text">
+ <Property Name="UnifiedPosition" Value="{{0.0, 100},{0.0, 0}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, -100},{1.0, 0}}" />
+ </Window>
+ </Window>
+ <Window Type="opengate/StaticLabel" Name="MarketItemDetailedView/TextFrame/Size">
+ <Property Name="UnifiedPosition" Value="{{0.0, 0},{0.0, 20}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, 0},{0.0, 20}}" />
+ <Property Name="Text" Value="Size:" />
+ <Window Type="opengate/StaticLabel" Name="MarketItemDetailedView/TextFrame/Size/Text">
+ <Property Name="UnifiedPosition" Value="{{0.0, 100},{0.0, 0}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, -100},{1.0, 0}}" />
+ </Window>
+ </Window>
+ <Window Type="opengate/StaticLabel" Name="MarketItemDetailedView/TextFrame/Mass">
+ <Property Name="UnifiedPosition" Value="{{0.0, 0},{0.0, 40}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, 0},{0.0, 20}}" />
+ <Property Name="Text" Value="Mass:" />
+ <Window Type="opengate/StaticLabel" Name="MarketItemDetailedView/TextFrame/Mass/Text">
+ <Property Name="UnifiedPosition" Value="{{0.0, 100},{0.0, 0}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, -100},{1.0, 0}}" />
+ </Window>
+ </Window>
+ <Window Type="opengate/StaticLabel" Name="MarketItemDetailedView/TextFrame/Amount">
+ <Property Name="UnifiedPosition" Value="{{0.0, 0},{0.0, 70}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, 0},{0.0, 20}}" />
+ <Property Name="Text" Value="Amount available:" />
+ <Window Type="opengate/StaticLabel" Name="MarketItemDetailedView/TextFrame/Amount/Text">
+ <Property Name="UnifiedPosition" Value="{{0.0, 100},{0.0, 0}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, -100},{1.0, 0}}" />
+ </Window>
+ </Window>
+ <Window Type="opengate/StaticLabel" Name="MarketItemDetailedView/TextFrame/Price">
+ <Property Name="UnifiedPosition" Value="{{0.0, 0},{0.0, 100}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, 0},{0.0, 20}}" />
+ <Property Name="Text" Value="Cost with tax:" />
+ <Window Type="opengate/StaticLabel" Name="MarketItemDetailedView/TextFrame/Price/Text">
+ <Property Name="UnifiedPosition" Value="{{0.0, 100},{0.0, 0}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, -100},{1.0, 0}}" />
+ </Window>
+ </Window>
+ <Window Type="opengate/StaticLabel" Name="MarketItemDetailedView/TextFrame/Rank">
+ <Property Name="UnifiedPosition" Value="{{0.0, 0},{1.0, -20}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, 0},{0.0, 20}}" />
+ <Property Name="Text" Value="Required rank:" />
+ </Window>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="MarketItemDetailedView/BottomLeft">
+ <Property Name="UnifiedPosition" Value="{{0.0, 0},{1.0, -31}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 31},{0.0, 31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenBottomLeft"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="MarketItemDetailedView/Bottom">
+ <Property Name="UnifiedPosition" Value="{{0.0, 31},{1.0, -31}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, -62},{0.0, 31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenBottom"/>
+ <Window Type="opengate/StaticBlueImage" Name="MarketItemDetailedView/NotNowButton/Highlight">
+ <Property Name="UnifiedPosition" Value="{{1.0, -80},{1.0, -26}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 80},{0.0, 20}}" />
+ <Property Name="Alpha" Value="0.8" />
+ <Property Name="RiseOnClick" Value="False" />
+ <Property Name="MousePassThroughEnabled" Value="True" />
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/NotNowButton">
+ <Property Name="UnifiedPosition" Value="{{1.0, -80},{1.0, -26}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 80},{0.0, 20}}" />
+ <Property Name="Text" Value="Not now" />
+ </Window>
+ <Window Type="opengate/StaticBlueImage" Name="MarketItemDetailedView/AcceptButton/Highlight">
+ <Property Name="UnifiedPosition" Value="{{1.0, -170},{1.0, -26}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 80},{0.0, 20}}" />
+ <Property Name="Alpha" Value="0.8" />
+ <Property Name="RiseOnClick" Value="False" />
+ <Property Name="MousePassThroughEnabled" Value="True" />
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/AcceptButton">
+ <Property Name="UnifiedPosition" Value="{{1.0, -170},{1.0, -26}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 80},{0.0, 20}}" />
+ <Property Name="Text" Value="Accept now" />
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/Decrease100">
+ <Property Name="UnifiedPosition" Value="{{0.0, 0},{1.0, -24}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 22},{0.0, 17}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketDecrease100Normal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketDecrease100Hover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketDecrease100Pushed" />
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/Decrease10">
+ <Property Name="UnifiedPosition" Value="{{0.0, 25},{1.0, -24}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 22},{0.0, 17}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketDecrease10Normal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketDecrease10Hover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketDecrease10Pushed" />
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/Decrease1">
+ <Property Name="UnifiedPosition" Value="{{0.0, 50},{1.0, -24}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 22},{0.0, 17}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketDecrease1Normal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketDecrease1Hover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketDecrease1Pushed" />
+ </Window>
+ <Window Type="opengate/StaticImage" Name="MarketItemDetailedView/AmountBackground">
+ <Property Name="UnifiedPosition" Value="{{0.0, 76},{1.0, -24}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 41},{0.0, 17}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="RiseOnClick" Value="False" />
+ <Property Name="Image" Value="set:opengate image:ConsoleBackground50" />
+ </Window>
+ <Window Type="opengate/ConsoleEditbox" Name="MarketItemDetailedView/Amount" >
+ <Property Name="UnifiedPosition" Value="{{0.0, 76},{1.0, -24}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 41},{0.0, 17}}" />
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/Increase1">
+ <Property Name="UnifiedPosition" Value="{{0.0, 120},{1.0, -24}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 22},{0.0, 17}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketIncrease1Normal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketIncrease1Hover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketIncrease1Pushed" />
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/Increase10">
+ <Property Name="UnifiedPosition" Value="{{0.0, 145},{1.0, -24}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 22},{0.0, 17}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketIncrease10Normal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketIncrease10Hover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketIncrease10Pushed" />
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/Increase100">
+ <Property Name="UnifiedPosition" Value="{{0.0, 170},{1.0, -24}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 22},{0.0, 17}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketIncrease100Normal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketIncrease100Hover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketIncrease100Pushed" />
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/SellAll">
+ <Property Name="UnifiedPosition" Value="{{0.0, 195},{1.0, -24}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 22},{0.0, 17}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketSellAllNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketSellAllHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketSellAllPushed" />
+ <Property Name="Visible" Value="False" />
+ </Window>
+ <Window Type="opengate/StaticLabel" Name="MarketItemDetailedView/QuantityLabel">
+ <Property Name="UnifiedPosition" Value="{{0.0, 210},{1.0, -26}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 100},{0.0, 20}}" />
+ <Property Name="Font" Value="BlueHighway-16" />
+ <Property Name="Text" Value="Quantity" />
+ </Window>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="MarketItemDetailedView/BottomRight">
+ <Property Name="UnifiedPosition" Value="{{1.0, -31},{ 1.0, -31}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 31},{ 0.0, 31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenBottomRight"/>
+ </Window>
+ </Window>
+
+<!-- ********************* -->
+<!-- Description Section -->
+<!-- ********************* -->
+ <Window Type="DefaultWindow" Name="ItemDescription">
+ <Property Name="UnifiedPosition" Value="{{0,10},{1.0,-150}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,140}}" />
+ <Window Type="opengate/StaticGreenImage" Name="ItemDescription/InventoryCapacityBottomLeft">
+ <Property Name="UnifiedPosition" Value="{{1.0, -287},{0.0, -5}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 31},{0.0, 31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="RiseOnClick" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenBottomLeft"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="ItemDescription/InventoryCapacityBottom">
+ <Property Name="UnifiedPosition" Value="{{1.0, -256},{0.0, -5}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 225},{0.0, 31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="RiseOnClick" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenBottom"/>
+ <Window Type="opengate/StaticLabel" Name="ItemDescription/InventoryChipCargoLabel">
+ <Property Name="UnifiedPosition" Value="{{0.0, 0},{0.0, 11}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 50},{0.0, 15}}" />
+ <Property Name="Text" Value="Ship cargo:"/>
+ <Property Name="Font" Value="BlueHighway-10"/>
+ </Window>
+ <Window Type="opengate/StaticLabel" Name="InventoryChipCargoText">
+ <Property Name="UnifiedPosition" Value="{{0.0, 53},{0.0, 11}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 50},{0.0, 15}}" />
+ <Property Name="Text" Value="0.0000/4"/>
+ <Property Name="Font" Value="BlueHighway-10"/>
+ </Window>
+ <Window Type="opengate/StaticLabel" Name="ItemDescription/InventoryStorageLabel">
+ <Property Name="UnifiedPosition" Value="{{1.0, -60},{0.0, 11}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 25},{0.0, 15}}" />
+ <Property Name="Font" Value="BlueHighway-10"/>
+ <Property Name="Text" Value="Floor:"/>
+ </Window>
+ <Window Type="opengate/StaticLabel" Name="InventoryStorageText">
+ <Property Name="UnifiedPosition" Value="{{1.0, -30},{0.0, 11}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 25},{0.0, 15}}" />
+ <Property Name="Text" Value="0000"/>
+ <Property Name="Font" Value="BlueHighway-10"/>
+ </Window>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="ItemDescription/InventoryCapacityTop">
+ <Property Name="UnifiedPosition" Value="{{1.0, -281},{0.0, 0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 250},{0.0, 1}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenHorizLine"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="ItemDescription/InventoryCapacityRight">
+ <Property Name="UnifiedPosition" Value="{{1.0, -31},{0.0, -5}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 1},{0.0, 31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenVertLine"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="ItemDescription/TopLeft">
+ <Property Name="UnifiedPosition" Value="{{0.0, 0},{0.0, 0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 31},{0.0, 31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenTopLeft"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="ItemDescription/Background1">
+ <Property Name="UnifiedPosition" Value="{{0.0, 31},{0.0, 31}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, -323},{1.0, -62}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenBackdrop"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="ItemDescription/Background2">
+ <Property Name="UnifiedPosition" Value="{{1.0, -292},{0.0, 31}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 30},{1.0, -62}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenBackdrop"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="ItemDescription/Background3">
+ <Property Name="UnifiedPosition" Value="{{1.0, -262},{0.0, 62}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 231},{1.0, -93}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenBackdrop"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="ItemDescription/Top1">
+ <Property Name="UnifiedPosition" Value="{{0.0, 31},{ 0.0, 0}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, -323},{ 0.0, 31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenTop"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="ItemDescription/TopRight1">
+ <Property Name="UnifiedPosition" Value="{{1.0, -292},{0.0, 0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 31},{0.0, 31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenTopRight"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="ItemDescription/Top2">
+ <Property Name="UnifiedPosition" Value="{{1.0, -262},{ 0.0, 31}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 231},{ 0.0, 31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenTop"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="ItemDescription/TopRight2">
+ <Property Name="UnifiedPosition" Value="{{1.0, -31},{0.0, 31}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 31},{0.0, 31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenTopRight"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="ItemDescription/Right2">
+ <Property Name="UnifiedPosition" Value="{{1.0, -31},{0.0, 62}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 31},{1.0, -93}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenRight"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="ItemDescription/BottomRight">
+ <Property Name="UnifiedPosition" Value="{{1.0, -31},{1.0, -31}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 31},{0.0, 31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenBottomRight"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="ItemDescription/Bottom">
+ <Property Name="UnifiedPosition" Value="{{0.0, 31},{1.0, -31}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, -62},{0.0, 31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenBottom"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="ItemDescription/BottomLeft">
+ <Property Name="UnifiedPosition" Value="{{0.0, 0},{1.0, -31}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 31},{0.0, 31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenBottomLeft"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="ItemDescription/Left">
+ <Property Name="UnifiedPosition" Value="{{0.0, 0},{0.0, 31}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 31},{1.0, -62}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenLeft"/>
+ </Window>
+
+ <Window Type="opengate/StaticLabel" Name="ItemDescription/Name/Label">
+ <Property Name="UnifiedPosition" Value="{{0,50},{0.0,10}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,200},{0.0,20}}" />
+ <Property Name="Visible" Value="False" />
+ <Property Name="Text" Value="Name: " />
+ <Window Type="opengate/StaticLabel" Name="ItemDescription/Name/Text">
+ <Property Name="UnifiedPosition" Value="{{0.0, 50},{ 0.0, 0 }}" />
+ <Property Name="UnifiedSize" Value="{{1.0, -50},{ 1.0, 0 }}" />
+ </Window>
+ </Window>
+ <Window Type="opengate/StaticLabel" Name="ItemDescription/Size/Label">
+ <Property Name="UnifiedPosition" Value="{{0.5,0},{0.0,10}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,200},{0.0,20}}" />
+ <Property Name="Text" Value="Size: " />
+ <Property Name="Visible" Value="False" />
+ <Window Type="opengate/StaticLabel" Name="ItemDescription/Size/Text">
+ <Property Name="UnifiedPosition" Value="{{0.0, 30},{ 0.0, 0 }}" />
+ <Property Name="UnifiedSize" Value="{{1.0, -30},{ 1.0, 0 }}" />
+ </Window>
+ </Window>
+ <Window Type="opengate/StaticLabel" Name="ItemDescription/Mass/Label">
+ <Property Name="UnifiedPosition" Value="{{0.5,+60},{0.0,10}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,200},{0.0,20}}" />
+ <Property Name="Text" Value="Mass: " />
+ <Property Name="Visible" Value="False" />
+ <Window Type="opengate/StaticLabel" Name="ItemDescription/Mass/Text">
+ <Property Name="UnifiedPosition" Value="{{0.0, 35},{ 0.0, 0 }}" />
+ <Property Name="UnifiedSize" Value="{{1.0, -35},{ 1.0, 0 }}" />
+ </Window>
+ </Window>
+ <Window Type="opengate/StaticText" Name="ItemDescription/Text">
+ <Property Name="UnifiedPosition" Value="{{0,10},{0.0,35}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-20},{1.0,-45}}" />
+ <Property Name="Text" Value="" />
+ </Window>
+ </Window>
+<!-- ********************* -->
+<!-- Catagorie Selection -->
+<!-- ********************* -->
+ <Window Type="opengate/StaticGreenImage" Name="CategorieSelection">
+ <Property Name="UnifiedPosition" Value="{{0,10},{0.0,10}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,200},{1.0,-170}}" />
+ <Window Type="opengate/StaticBlueImage" Name="CategorieHighlight">
+ <Property Name="UnifiedPosition" Value="{{0,10},{0.0,27}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
+ <Property Name="Alpha" Value="0.8" />
+ </Window>
+ <Window Type="opengate/MarketButton" Name="CategorieCommodities">
+ <Property Name="UnifiedPosition" Value="{{0,10},{0.0,27}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
+ <Property Name="Text" Value="Commodities" />
+ <Window Type="opengate/StaticImage" Name="CategorieCom">
+ <Property Name="UnifiedPosition" Value="{{0.0,+10},{0.5,-7}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,15},{0.0,15}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:IconCommoditiesNormal" />
+ </Window>
+ </Window>
+ <Window Type="opengate/MarketButton" Name="CategoriePowerPlants">
+ <Property Name="UnifiedPosition" Value="{{0,10},{0.0,56}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
+ <Property Name="Disabled" Value="True" />
+ <Property Name="Text" Value="Power Plants" />
+ </Window>
+ <Window Type="opengate/MarketButton" Name="CategorieEngines">
+ <Property Name="UnifiedPosition" Value="{{0,10},{0.0,85}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
+ <Property Name="Disabled" Value="True" />
+ <Property Name="Text" Value="Engines" />
+ </Window>
+ <Window Type="opengate/MarketButton" Name="CategorieRadars">
+ <Property Name="UnifiedPosition" Value="{{0,10},{0.0,114}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
+ <Property Name="Disabled" Value="True" />
+ <Property Name="Text" Value="Radars" />
+ </Window>
+ <Window Type="opengate/MarketButton" Name="CategorieECM">
+ <Property Name="UnifiedPosition" Value="{{0,10},{0.0,143}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
+ <Property Name="Disabled" Value="True" />
+ <Property Name="Text" Value="ECM" />
+ </Window>
+ <Window Type="opengate/MarketButton" Name="CategorieCapacitors">
+ <Property Name="UnifiedPosition" Value="{{0,10},{0.0,172}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
+ <Property Name="Disabled" Value="True" />
+ <Property Name="Text" Value="Capacitors" />
+ </Window>
+ <Window Type="opengate/MarketButton" Name="CategorieShields">
+ <Property Name="UnifiedPosition" Value="{{0,10},{0.0,201}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
+ <Property Name="Disabled" Value="True" />
+ <Property Name="Text" Value="Shields" />
+ </Window>
+ <Window Type="opengate/MarketButton" Name="CategorieGuns">
+ <Property Name="UnifiedPosition" Value="{{0,10},{0.0,230}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
+ <Property Name="Disabled" Value="True" />
+ <Property Name="Text" Value="Guns" />
+ </Window>
+ <Window Type="opengate/MarketButton" Name="CategorieMissiles">
+ <Property Name="UnifiedPosition" Value="{{0,10},{0.0,259}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
+ <Property Name="Disabled" Value="True" />
+ <Property Name="Text" Value="Missiles" />
+ </Window>
+ <Window Type="opengate/MarketButton" Name="CategorieMODx">
+ <Property Name="UnifiedPosition" Value="{{0,10},{0.0,288}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
+ <Property Name="Disabled" Value="True" />
+ <Property Name="Text" Value="MODx" />
+ </Window>
+ <Window Type="opengate/MarketButton" Name="CategorieStorage">
+ <Property Name="UnifiedPosition" Value="{{0,10},{0.0,317}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-20},{0.0,30}}" />
+ <Property Name="Disabled" Value="True" />
+ <Property Name="Text" Value="Storage" />
+ </Window>
+ </Window>
+<!-- ********************* -->
+<!-- Market Item Selection -->
+<!-- ********************* -->
+ <Window Type="opengate/StaticGreenImage" Name="MarketWindow">
+ <Property Name="UnifiedPosition" Value="{{0,225},{0.0,10}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-496},{1.0,-170}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Window Type="opengate/StaticGreenImage" Name="MarketItemWindow">
+ <Property Name="UnifiedPosition" Value="{{0.0, 0},{0.0, 31}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, -31},{1.0, -31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="MarketItemWindowTopLeft">
+ <Property Name="UnifiedPosition" Value="{{0.0,0},{0.0,0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,31},{0.0,31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenTopLeft"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="MarketItemWindowTop">
+ <Property Name="UnifiedPosition" Value="{{0.0,31},{0.0,0}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-62},{0.0,31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenTop"/>
+ <Window Type="opengate/StaticLabel" Name="MarketItem/Title">
+ <Property Name="UnifiedPosition" Value="{{0.0, 0},{0.0, 7}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 100},{1.0, 0}}" />
+ <Property Name="Text" Value="Public market" />
+ <Property Name="Font" Value="BlueHighway-14" />
+ </Window>
+ <Window Type="opengate/StaticImage" Name="MarketItemSortCategoryHighlight">
+ <Property Name="UnifiedPosition" Value="{{0.0,100},{0.0,8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="AlwaysOnTop" Value="True" />
+ <Property Name="MousePassThroughEnabled" Value="True" />
+ <Property Name="Image" Value="set:opengate image:MarketItemSortHighlight" />
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="MarketItemSortAlphaAscend">
+ <Property Name="UnifiedPosition" Value="{{0.0,100},{0.0,8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketItemSortAlphaAscendNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketItemSortAlphaAscendHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketItemSortAlphaAscendHover" />
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="MarketItemSortAlphaDescend">
+ <Property Name="UnifiedPosition" Value="{{0.0,100},{0.0,8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketItemSortAlphaDescendNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketItemSortAlphaDescendHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketItemSortAlphaDescendHover" />
+ <Property Name="Visible" Value="False" />
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="MarketItemSortCost">
+ <Property Name="UnifiedPosition" Value="{{0.0,118},{0.0,8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketItemSortCostNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketItemSortCostHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketItemSortCostHover" />
+ <Property Name="Disabled" Value="True" />
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="MarketItemSortSizeAscend">
+ <Property Name="UnifiedPosition" Value="{{0.0,136},{0.0,8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketItemSortSizeAscendNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketItemSortSizeAscendHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketItemSortSizeAscendHover" />
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="MarketItemSortSizeDescend">
+ <Property Name="UnifiedPosition" Value="{{0.0,136},{0.0,8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketItemSortSizeDescendNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketItemSortSizeDescendHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketItemSortSizeDescendHover" />
+ <Property Name="Visible" Value="False" />
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="MarketItemSortRank">
+ <Property Name="UnifiedPosition" Value="{{0.0,154},{0.0,8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketItemSortRankNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketItemSortRankHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketItemSortRankHover" />
+ <Property Name="Disabled" Value="True" />
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="MarketItemSortAmountAscend">
+ <Property Name="UnifiedPosition" Value="{{0.0,172},{0.0,8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketItemSortAmountAscendNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketItemSortAmountAscendHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketItemSortAmountAscendHover" />
+ <Property Name="Disabled" Value="True" />
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="MarketItemSortAmountDescend">
+ <Property Name="UnifiedPosition" Value="{{0.0,172},{0.0,8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketItemSortAmountDescendNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketItemSortAmountDescendHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketItemSortAmountDescendHover" />
+ <Property Name="Visible" Value="False" />
+ <Property Name="Disabled" Value="True" />
+ </Window>
+ <Window Type="opengate/StaticImage" Name="MarketItemSortHighlight">
+ <Property Name="UnifiedPosition" Value="{{0.0,195},{0.0,8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="AlwaysOnTop" Value="True" />
+ <Property Name="Image" Value="set:opengate image:MarketItemSortHighlight" />
+ <Property Name="Disabled" Value="True" />
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="MarketItemSortAscend">
+ <Property Name="UnifiedPosition" Value="{{0.0,195},{0.0,8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketItemSortAscendNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketItemSortAscendHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketItemSortAscendHover" />
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="MarketItemSortDescend">
+ <Property Name="UnifiedPosition" Value="{{0.0,213},{0.0,8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketItemSortDescendNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketItemSortDescendHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketItemSortDescendHover" />
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="MarketItemSortShowAll">
+ <Property Name="UnifiedPosition" Value="{{1.0,-61},{0.0,8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,61},{0.0,16}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketItemSortShowAllNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketItemSortDescendHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketItemSortShowAllHover" />
+ <Property Name="Disabled" Value="True" />
+ </Window>
+ <Window Type="opengate/StaticImage" Name="MarketItemSortShowAllHighlight">
+ <Property Name="UnifiedPosition" Value="{{1.0,-61},{0.0,8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,61},{0.0,16}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:MarketItemSortShowAllHighlight" />
+ </Window>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="MarketItemWindowBottom">
+ <Property Name="UnifiedPosition" Value="{{0.0,0},{0.0,31}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-31},{0.0,1}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenHorizLine"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="MarketItemWindowTopRight">
+ <Property Name="UnifiedPosition" Value="{{1.0,-31},{0.0,0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,31},{0.0,31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenTopRight"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="MarketItemWindowRight">
+ <Property Name="UnifiedPosition" Value="{{1.0,-31},{0.0,31}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,31},{1.0,-62}}" />
+ <Property Name="RiseOnClick" Value="False" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenRight"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="MarketItemWindowBottomRight">
+ <Property Name="UnifiedPosition" Value="{{1.0,-31},{1.0,-31}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,31},{0.0,31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenBottomRight"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="MarketItemWindowLeft">
+ <Property Name="UnifiedPosition" Value="{{1.0,-31},{0.0,31}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,1},{1.0,-31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenVertLine"/>
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="MarketItemWindow/UpButton">
+ <Property Name="UnifiedPosition" Value="{{1.0,-23},{0.0,32}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,14},{ 0.0,56}}" />
+ <Property Name="NormalImage" Value="set:opengate image:ScrollThumbUpNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:ScrollThumbUpHover" />
+ <Property Name="PushedImage" Value="set:opengate image:ScrollThumbUpPushed" />
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="MarketItemWindow/DownButton">
+ <Property Name="UnifiedPosition" Value="{{1.0,-23},{1.0,-88}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,14},{ 0.0,56}}" />
+ <Property Name="NormalImage" Value="set:opengate image:ScrollThumbDownNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:ScrollThumbDownHover" />
+ <Property Name="PushedImage" Value="set:opengate image:ScrollThumbDownPushed" />
+ </Window>
+ </Window>
+<!-- ********************* -->
+<!-- Inventore Item Selection -->
+<!-- ********************* -->
+ <Window Type="opengate/StaticGreenImage" Name="InventoryWindow">
+ <Property Name="UnifiedPosition" Value="{{1,-256},{0.0,10}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,246},{1.0,-170}}" />
+ <Property Name="RiseOnClick" Value="False" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Window Type="opengate/EmptyButton" Name="InventoryItemWindow/UpButton">
+ <Property Name="UnifiedPosition" Value="{{1.0,-23},{0.0,32}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,14},{ 0.0,56}}" />
+ <Property Name="AlwaysOnTop" Value="True" />
+ <Property Name="NormalImage" Value="set:opengate image:ScrollThumbUpNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:ScrollThumbUpHover" />
+ <Property Name="PushedImage" Value="set:opengate image:ScrollThumbUpPushed" />
+ </Window>
+ <Window Type="opengate/EmptyButton" Name="InventoryItemWindow/DownButton">
+ <Property Name="UnifiedPosition" Value="{{1.0,-23},{1.0,-88}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,14},{ 0.0,56}}" />
+ <Property Name="AlwaysOnTop" Value="True" />
+ <Property Name="NormalImage" Value="set:opengate image:ScrollThumbDownNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:ScrollThumbDownHover" />
+ <Property Name="PushedImage" Value="set:opengate image:ScrollThumbDownPushed" />
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="InventoryItemWindow">
+ <Property Name="UnifiedPosition" Value="{{0, 0},{0.0, 31}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, -31},{1.0, -31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="InventoryItemWindowTopLeft">
+ <Property Name="UnifiedPosition" Value="{{0.0,0},{0.0,0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,31},{0.0,31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenTopLeft"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="InventoryItemWindowTop">
+ <Property Name="UnifiedPosition" Value="{{0.0,31},{0.0,0}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-62},{0.0,31}}" />
+ <Property Name="RiseOnClick" Value="False" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenTop"/>
+ <Window Type="opengate/StaticLabel" Name="InventoryItemWindowTitle">
+ <Property Name="UnifiedPosition" Value="{{0.0, 0},{0.0, 7}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, 0},{1.0, 0}}" />
+ <Property Name="Text" Value="Private cargo hold" />
+ <Property Name="Font" Value="BlueHighway-14" />
+ </Window>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="InventoryItemWindowBottom">
+ <Property Name="UnifiedPosition" Value="{{0.0,0},{0.0,31}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-31},{0.0,1}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenHorizLine"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="InventoryItemWindowTopRight">
+ <Property Name="UnifiedPosition" Value="{{1.0,-31},{0.0,0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,31},{0.0,31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenTopRight"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="InventoryItemWindowRight">
+ <Property Name="UnifiedPosition" Value="{{1.0,-31},{0.0,31}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,31},{1.0,-62}}" />
+ <Property Name="RiseOnClick" Value="False" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenRight"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="InventoryItemWindowBottomRight">
+ <Property Name="UnifiedPosition" Value="{{1.0,-31},{1.0,-31}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,31},{0.0,31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenBottomRight"/>
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="InventoryItemWindowLeft">
+ <Property Name="UnifiedPosition" Value="{{1.0,-31},{0.0,31}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,1},{1.0,-31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenVertLine"/>
+ </Window>
+ </Window>
+ </Window>
+</GUILayout>
Added: branches/ogsector/data/gui/layouts/dialogs/MarketItemShortDialog.layout
===================================================================
--- branches/ogsector/data/gui/layouts/dialogs/MarketItemShortDialog.layout (rev 0)
+++ branches/ogsector/data/gui/layouts/dialogs/MarketItemShortDialog.layout 2007-06-01 23:33:29 UTC (rev 517)
@@ -0,0 +1,44 @@
+<?xml version="1.0" ?>
+<GUILayout>
+ <Window Type="opengate/MarketShortInfoButton" Name="MarketShortItem">
+ <Property Name="UnifiedPosition" Value="{{0.0,10},{0.0,10}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,98},{0.0,106}}" />
+ <Property Name="AlwaysOnTop" Value="true" />
+ <Property Name="Text" Value="ItemName" />
+ <Window Type="opengate/StaticGreenImage" Name="MarketShortItemImage">
+ <Property Name="UnifiedPosition" Value="{{0.0,12},{0.0,15}}" />
+ <Property Name="UnifiedSize" Value="{{1.0,-30},{1.0,-40}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="false" />
+ <Property Name="MousePassThroughEnabled" Value="true" />
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="MarketShortItemTypIcon">
+ <Property Name="UnifiedPosition" Value="{{1.0, -15},{0,3}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 12},{0.0, 12}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="false" />
+ <Property Name="Image" Value="set:opengate image:IconCommoditiesNeutral" />
+ <Property Name="MousePassThroughEnabled" Value="true" />
+ </Window>
+ <Window Type="opengate/StaticGreenImage" Name="MarketShortItemSizeIcon">
+ <Property Name="UnifiedPosition" Value="{{1.0, -15},{1, -41}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 12},{0.0, 26}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="false" />
+ <Property Name="Image" Value="set:opengate image:IconSize1" />
+ <Property Name="MousePassThroughEnabled" Value="true" />
+ </Window>
+ <Window Type="opengate/StaticLabel" Name="MarketShortItemAmount">
+ <Property Name="UnifiedPosition" Value="{{0.0,10},{0.0,2}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,50},{0.0,10}}" />
+ <Property Name="Font" Value="BlueHighway-10" />
+ <Property Name="MousePassThroughEnabled" Value="true" />
+ </Window>
+ <Window Type="opengate/StaticLabel" Name="MarketShortItemPrice">
+ <Property Name="UnifiedPosition" Value=...
[truncated message content] |
|
From: <ult...@us...> - 2007-06-01 01:11:40
|
Revision: 516
http://svn.sourceforge.net/opengate/?rev=516&view=rev
Author: ultrasick
Date: 2007-05-31 18:11:40 -0700 (Thu, 31 May 2007)
Log Message:
-----------
uploading commodity: "ice"
Added Paths:
-----------
trunk/data/commodities/ice.blend
Added: trunk/data/commodities/ice.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/ice.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-05-29 22:58:20
|
Revision: 515
http://svn.sourceforge.net/opengate/?rev=515&view=rev
Author: spom_spom
Date: 2007-05-29 15:58:20 -0700 (Tue, 29 May 2007)
Log Message:
-----------
Added asteroid to play with it
Added Paths:
-----------
trunk/data/misc/asteroids/
trunk/data/misc/asteroids/asteroid1.blend
trunk/data/misc/asteroids/asteroid1.mesh
trunk/data/misc/asteroids/asteroid_normal.png
trunk/data/misc/asteroids/asteroids.material
Added: trunk/data/misc/asteroids/asteroid1.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/asteroids/asteroid1.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/misc/asteroids/asteroid1.mesh
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/asteroids/asteroid1.mesh
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/misc/asteroids/asteroid_normal.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/asteroids/asteroid_normal.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/misc/asteroids/asteroids.material
===================================================================
--- trunk/data/misc/asteroids/asteroids.material (rev 0)
+++ trunk/data/misc/asteroids/asteroids.material 2007-05-29 22:58:20 UTC (rev 515)
@@ -0,0 +1,25 @@
+material asteroid/TEXFACE/asteroid_normal.png
+{
+ receive_shadows on
+ technique
+ {
+ pass
+ {
+ ambient 0.500000 0.500000 0.500000 1.000000
+ diffuse 0.800000 0.800000 0.800000 1.000000
+ emissive 0.000000 0.000000 0.000000 1.000000
+ texture_unit
+ {
+ texture asteroid_normal.png
+ colour_op modulate
+ }
+ }
+ pass
+ {
+ ambient 0.0 0.0 0.0
+ diffuse 0.0 0.0 0.0
+ specular 0.500000 0.500000 0.500000 1.000000 12.500000
+ scene_blend add
+ }
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-05-27 20:29:00
|
Revision: 514
http://svn.sourceforge.net/opengate/?rev=514&view=rev
Author: ultrasick
Date: 2007-05-27 13:28:55 -0700 (Sun, 27 May 2007)
Log Message:
-----------
renaming the material from "Material" to "chromium" because I am using this nice material quite often. It makes it easier to use it after you imported it to another blender file
Modified Paths:
--------------
trunk/data/commodities/chromium.blend
Modified: trunk/data/commodities/chromium.blend
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-05-27 14:46:29
|
Revision: 513
http://svn.sourceforge.net/opengate/?rev=513&view=rev
Author: spom_spom
Date: 2007-05-27 07:46:31 -0700 (Sun, 27 May 2007)
Log Message:
-----------
win compatibility commit
Modified Paths:
--------------
branches/ogsector/src/ShipConfigDialog.h
branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
Modified: branches/ogsector/src/ShipConfigDialog.h
===================================================================
--- branches/ogsector/src/ShipConfigDialog.h 2007-05-27 14:33:40 UTC (rev 512)
+++ branches/ogsector/src/ShipConfigDialog.h 2007-05-27 14:46:31 UTC (rev 513)
@@ -61,7 +61,7 @@
/*! Update the dialog by rotating the ship. \param timeElapsed The amount of time passed since the last update */
void update( Ogre::Real timeElapsed );
- virtual void setupEventHandlers();
+ void setupEventHandlers();
CEGUI::Window * rootWindow(){ return rootWindow_; }
@@ -78,13 +78,13 @@
bool handleSelectShipButton( const CEGUI::EventArgs & e );
/*! CEGUI event handler: Handles the event when the user pushes the "Close dialog" button */
bool handleCloseButton( const CEGUI::EventArgs & e );
-
+
+ CEGUI::Window * rootWindow_;
DeviceInfo * devices_;
Ogre::SceneManager * sceneMgr_;
bool visible_;
- CEGUI::Window * rootWindow_;
-
+
CEGUI::Window * shipConfigWindowView_;
CEGUI::PushButton * shipConfigWindowViewButton_;
CEGUI::OgreCEGUITexture * ceguiTex_;
Modified: branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-05-27 14:33:38
|
Revision: 512
http://svn.sourceforge.net/opengate/?rev=512&view=rev
Author: spom_spom
Date: 2007-05-27 07:33:40 -0700 (Sun, 27 May 2007)
Log Message:
-----------
Fixed some network glitches
Modified Paths:
--------------
branches/ogsector/src/DockedState.cpp
branches/ogsector/src/DockedState.h
branches/ogsector/src/GameStateManager.cpp
branches/ogsector/src/Sector.cpp
branches/ogsector/src/Sector.h
branches/ogsector/src/SectorObjects.cpp
branches/ogsector/src/SectorObjects.h
branches/ogsector/src/UnDockedState.cpp
branches/ogsector/src/common.cpp
branches/ogsector/src/common.h
branches/ogsector/src/networkServer.cpp
Modified: branches/ogsector/src/DockedState.cpp
===================================================================
--- branches/ogsector/src/DockedState.cpp 2007-05-26 20:22:37 UTC (rev 511)
+++ branches/ogsector/src/DockedState.cpp 2007-05-27 14:33:40 UTC (rev 512)
@@ -52,7 +52,6 @@
}
void DockedState::createContent(){
-
sceneMgr_ = devices_->ogreRoot->createSceneManager( Ogre::ST_GENERIC, "DockedSceneManagerInstance" );
Ogre::Camera * camera = sceneMgr_->createCamera( "StationCamera" );
@@ -103,6 +102,7 @@
}
void DockedState::enter( ) {
+ launchUndockedState_ = false;
log_->info("Entering dockstate");
devices_->guiRenderer->setTargetSceneManager( sceneMgr_ );
devices_->guiSystem->setGUISheet( overlayRootWindow_ );
@@ -142,6 +142,8 @@
}
bool DockedState::frameEnded( const Ogre::FrameEvent & evt ){
+ // if ( launchUndockedState_ ) parent_->start( parent_->findByName( "UnDockedState" ) );
+
return true;
}
@@ -157,6 +159,11 @@
}
}
+ if ( e.key == OIS::KC_F4 ){
+ parent_->start( parent_->findByName( "UnDockedState" ) );
+ return true;
+ }
+
if ( e.key == OIS::KC_RETURN) {
CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"ConsoleEdit")->activate();
}
Modified: branches/ogsector/src/DockedState.h
===================================================================
--- branches/ogsector/src/DockedState.h 2007-05-26 20:22:37 UTC (rev 511)
+++ branches/ogsector/src/DockedState.h 2007-05-27 14:33:40 UTC (rev 512)
@@ -97,6 +97,7 @@
ShipConfigDialog * shipConfigDialog_;
bool consoleMax_;
+ bool launchUndockedState_;
};
} // namespace OpenGate
Modified: branches/ogsector/src/GameStateManager.cpp
===================================================================
--- branches/ogsector/src/GameStateManager.cpp 2007-05-26 20:22:37 UTC (rev 511)
+++ branches/ogsector/src/GameStateManager.cpp 2007-05-27 14:33:40 UTC (rev 512)
@@ -135,7 +135,6 @@
}
}
-
void GameStateManager::manageGameState( const std::string & stateName, GameState * state ){
StateInfo newStateInfo;
newStateInfo.name = stateName;
Modified: branches/ogsector/src/Sector.cpp
===================================================================
--- branches/ogsector/src/Sector.cpp 2007-05-26 20:22:37 UTC (rev 511)
+++ branches/ogsector/src/Sector.cpp 2007-05-27 14:33:40 UTC (rev 512)
@@ -49,7 +49,7 @@
: sceneMgr_( sceneMgr ), network_( network ) {
log_ = LogManager::getSingletonPtr();
- bool radar_ = true;
+ radar_ = true;
sectorname_ = "Testsector";
planetNode_ = NULL;
starsNode_ = NULL;
@@ -222,7 +222,7 @@
delete *it;
sectorObjects_.erase( (*it++) );
-
+
// log_->info( "done: " );
}
@@ -295,7 +295,7 @@
Ogre::OverlayElement * dotB = (*it)->dotB();
if ( relativPosition.length() < radarRange ){
-
+
Ogre::Quaternion q;
q.FromAngleAxis( -avatar_->mainNode()->getOrientation( ).getYaw(), Ogre::Vector3::UNIT_Y);
relativPosition = q * relativPosition;
@@ -346,9 +346,9 @@
}
it++;
} else { //** died object is not avatar;
-// log_->info( "Destructing: " + it->second->name() );
-// destructMoveableObject( (it++)->second );
-// log_->info( "done: " );
+ log_->info( "Destructing: " + it->second->name() );
+ destructMoveableObject( (it++)->second );
+ log_->info( "done: " );
}
} else ++it;
}
@@ -393,7 +393,6 @@
movableObjects_.erase( obj->globalID() );
delete obj;
obj = NULL;
-
break;
case SECTOROBJECTMOVABLE_AI_RTTI: {
if ( dynamic_cast< SectorObjectMoveableAi *>( obj )->target() == avatar_ ) sendVesselDeRegister( obj );
@@ -620,7 +619,7 @@
void Sector::sendVesselRegister( SectorObjectMoveable * obj ){
if ( obj ) {
- log_->info( std::string( "Send register " ) + obj->name() );
+ log_->info( std::string( "Send register " ) + obj->name() + " id:" + toStr( obj->vesselBluePrint()->id() ) );
MessageBodyShipRegister msg( obj->userID(), obj->childID(), obj->name(), obj->mainNode()->getPosition(),
obj->vesselBluePrint()->id() );
network_->send( msg );
Modified: branches/ogsector/src/Sector.h
===================================================================
--- branches/ogsector/src/Sector.h 2007-05-26 20:22:37 UTC (rev 511)
+++ branches/ogsector/src/Sector.h 2007-05-27 14:33:40 UTC (rev 512)
@@ -77,6 +77,8 @@
void selectNextTarget( SectorObject * obj = NULL );
void selectPrevTarget( SectorObject * obj = NULL );
+ inline SectorObject * firstTarget( ){ return *itTarget_; }
+
SectorObject * nextTarget( );
SectorObject * prevTarget( );
Modified: branches/ogsector/src/SectorObjects.cpp
===================================================================
--- branches/ogsector/src/SectorObjects.cpp 2007-05-26 20:22:37 UTC (rev 511)
+++ branches/ogsector/src/SectorObjects.cpp 2007-05-27 14:33:40 UTC (rev 512)
@@ -246,9 +246,12 @@
setShape( vesselBluePrint_->meshPtr()->getName() );
+ LogManager::getSingleton().info( "Create " + name + " with " + vesselBluePrint_->name() );
+
baseYaw( Ogre::Degree( vesselBluePrint_->baseYaw() ) );
setBaseSize( vesselBluePrint_->baseSize() );
+
if ( vesselBluePrint_->factionName() == "squadrok" ){
thrusterParticles_ = NULL;
@@ -518,7 +521,9 @@
roll_ = 0;
pitch_ = 0;
- armor_ = vesselBluePrint_->armor();
+ armorMax_ = vesselBluePrint_->armor();
+ armor_ = armorMax_;
+
//** omnus
shieldMax_ = 5700.0;
shield_ = shieldMax_;
Modified: branches/ogsector/src/SectorObjects.h
===================================================================
--- branches/ogsector/src/SectorObjects.h 2007-05-26 20:22:37 UTC (rev 511)
+++ branches/ogsector/src/SectorObjects.h 2007-05-27 14:33:40 UTC (rev 512)
@@ -224,6 +224,7 @@
firePressed_ = fireStatus;
}
inline bool firePressed( ) const { return firePressed_; }
+ inline Ogre::Real ammoSpeed() const { return ammoSpeed_; }
inline void setAfterburnerPressed( bool afterburnerStatus ){
if ( afterburnerStatus != afterburnerPressed_ ) statusChanged_ = true;
@@ -251,38 +252,33 @@
}
inline Ogre::Real thrustMax( ) const { return maxThrust_; }
- inline void setArmorPercent( Ogre::Real armor ) { armor_ = min( (double)vesselBluePrint_->armor(),
- vesselBluePrint_->armor() * armor/100.0 ); }
- inline Ogre::Real armorPercent() const { return round( 100.0 * armor_ / vesselBluePrint_->armor(), 1 ); }
-
- inline void setShieldPercent( Ogre::Real shield ) { shield_ = min( (double)shieldMax_, shieldMax_ * shield / 100.0 ); }
- inline Ogre::Real shieldPercent() const {
- if ( shieldMax_ > 0 ) return round( 100.0 * shield_ / shieldMax_, 1 ); else return 0.0;
- }
-
Ogre::Vector3 flightDirection() const {
Ogre::Vector3 flightDir( vel_ ); flightDir.normalise();
return flightDir;
}
- Ogre::Real ammoSpeed() const { return ammoSpeed_; }
-
-
Ogre::Vector3 velDirection() const { return vel_; }
-
Ogre::Real velocity() const { return vel_.length(); }
-
Ogre::Real velocityMax() const { return sqrt( thrustMax() / vesselBluePrint_->dragFactor() ); }
-
void setVelocity( const Ogre::Vector3 & vel ) { vel_ = vel; }
Ogre::Real capacity() const { return capacity_; }
-
Ogre::Real capacityMax() const { return capacityMax_; }
- Ogre::Real acceleration() const { return acc_.length(); }
+ inline void setShieldPercent( Ogre::Real shield ) { shield_ = min( (double)shieldMax_, shieldMax_ * shield / 100.0 ); }
+ inline Ogre::Real shield() const { return shield_; }
+ inline Ogre::Real shieldMax() const { return shieldMax_; }
+ inline Ogre::Real shieldPercent() const {
+ if ( shieldMax_ > 0 ) return round( 100.0 * shield_ / shieldMax_, 1 ); else return 0.0; }
+ inline void setArmorPercent( Ogre::Real armor ) { armor_ = min( armorMax_, armorMax_ * armor / 100.0f ); }
+ inline Ogre::Real armor() const { return armor_; }
+ inline Ogre::Real armorMax() const { return armorMax_; }
+ inline Ogre::Real armorPercent() const {
+ if ( armorMax_ > 0 ) return round( 100.0 * armor_ / armorMax_, 1 ); else return 0.0; }
+ Ogre::Real acceleration() const { return acc_.length(); }
+
void fire( Ogre::Real elapsedTime );
virtual bool deathSequence( Ogre::Real elapsedTime );
@@ -308,6 +304,7 @@
Ogre::Real acceleration_;
Ogre::Real ethernalDensity_;
+ Ogre::Real armorMax_;
Ogre::Real armor_;
Ogre::Real shieldMax_;
Ogre::Real shield_;
Modified: branches/ogsector/src/UnDockedState.cpp
===================================================================
--- branches/ogsector/src/UnDockedState.cpp 2007-05-26 20:22:37 UTC (rev 511)
+++ branches/ogsector/src/UnDockedState.cpp 2007-05-27 14:33:40 UTC (rev 512)
@@ -133,21 +133,18 @@
flightCurserHalfWidth_ = 10;
flightCurserHalfHeight_ = 10;
- sector_ = new Sector( sceneMgr_, network_ );
- sector_->setListener( this );
-
}
void UnDockedState::destroyContent( ){
- delete sector_;
sceneMgr_->destroyAllCameras();
if ( overlayRootWindow_ ) CEGUI::WindowManager::getSingleton().destroyWindow( overlayRootWindow_ );
}
void UnDockedState::enter(){
log_->info("Entering undockstate");
+ sector_ = new Sector( sceneMgr_, network_ );
+ sector_->setListener( this );
-
devices_->guiRenderer->setTargetSceneManager( sceneMgr_ );
if ( overlayRootWindow_ ){
devices_->guiSystem->setGUISheet( overlayRootWindow_ );
@@ -187,7 +184,7 @@
Ogre::OverlayManager::getSingleton().getByName( "Radar" )->show();
sceneDetailIndex_ = 0;
- target_ = sector_->nextTarget();
+ target_ = sector_->firstTarget();
chatMode_ = false;
duelistPilot_ = false;
duelistTarget_ = false;
@@ -248,10 +245,36 @@
CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&UnDockedState::handleConfigBackButton, this ) ) ;
toggleNextCamera_( 1 );
+
+ //** start update SceneManager, if not set this leeds to strange behaviour by switching states
+ //** opengateclient: OgreRenderQueueSortingGrouping.cpp:355: void Ogre::QueuedRenderableCollection::addRenderable(Ogre::Pass*, Ogre::Renderable*): Assertion `retPair.second && "Error inserting new pass entry into PassGroupRenderableMap"' failed.
+
+ if ( devices_->ogreRoot && (Ogre::Pass::getDirtyHashList().size()!=0 || Ogre::Pass::getPassGraveyard().size()!=0)) {
+ Ogre::SceneManagerEnumerator::SceneManagerIterator scenesIter = devices_->ogreRoot->getSceneManagerIterator();
+
+ while ( scenesIter.hasMoreElements() ) {
+ Ogre::SceneManager * pScene = scenesIter.getNext();
+ if ( pScene ){
+ Ogre::RenderQueue * pQueue = pScene->getRenderQueue();
+ if ( pQueue ) {
+ Ogre::RenderQueue::QueueGroupIterator groupIter = pQueue->_getQueueGroupIterator();
+ while ( groupIter.hasMoreElements() ) {
+ Ogre::RenderQueueGroup * pGroup = groupIter.getNext();
+ if ( pGroup ) pGroup->clear( false );
+ }//end_while(groupIter.hasMoreElements())
+ }//end_if(pScene)
+ }//end_if(pScene)
+ }//end_while(scenesIter.hasMoreElements())
+
+ // Now trigger the pending pass updates
+ Ogre::Pass::processPendingPassUpdates();
+ }//end_if(m_Root..
+ //** end update SceneManager
}
void UnDockedState::exit(){
log_->info("Exiting undockstate");
+ // std::cout << "start: " << dumpSceneNodes( sceneMgr_->getRootSceneNode() ) << std::endl;
sector_->destructAvatarObject( );
CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"Config/BackButton" )->removeEvent(
@@ -269,6 +292,9 @@
devices_->inputManager->removeKeyListener( "SectorClientKeyListener" );
devices_->inputManager->removeMouseListener( "SectorClientMouseListener" );
devices_->inputManager->removeJoystickListener( "SectorClientJoystickListener" );
+
+ delete sector_;
+ // std::cout << "End: " << dumpSceneNodes( sceneMgr_->getRootSceneNode() ) << std::endl;
}
bool UnDockedState::switchConfigDialog( ){
@@ -318,8 +344,6 @@
timeSinceLastNetworkUpdate_ = 0.0;
}
-
-
//** update my camera;
updateCamera_();
updateHUD_();
@@ -894,7 +918,18 @@
thrustProgress_->setHeight( CEGUI::UDim( 0.0, height ) );
thrustProgressImg_->setYPosition( CEGUI::UDim( 0, -thrustProgressHeight_ + height ) );
+ height = sector_->avatarObject()->shield() * shieldProgressHeight_ / sector_->avatarObject()->shieldMax();
+ shieldProgress_->setYPosition( CEGUI::UDim( 0.5, - height + height/2.0 ) );
+ shieldProgress_->setHeight( CEGUI::UDim( 0.0, height ) );
+ shieldProgressLeftImg_->setYPosition( CEGUI::UDim( 0.5, -shieldProgressHeight_/2.0 ) );
+ shieldProgressRightImg_->setYPosition( CEGUI::UDim( 0.5, -shieldProgressHeight_/2.0 ) );
+ height = sector_->avatarObject()->armor() * armorProgressHeight_ / sector_->avatarObject()->armorMax();
+ armorProgress_->setYPosition( CEGUI::UDim( 0.5, - height + height/2.0 ) );
+ armorProgress_->setHeight( CEGUI::UDim( 0.0, height ) );
+ armorProgressLeftImg_->setYPosition( CEGUI::UDim( 0.5, -armorProgressHeight_/2.0 ) );
+ armorProgressRightImg_->setYPosition( CEGUI::UDim( 0.5, -armorProgressHeight_/2.0 ) );
+
velocityText_->setText( "V" + Ogre::StringConverter::toString( round( sector_->avatarObject()->velocity(), 2 ), 4 ) );
// conText_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDConText" );
shieldText_->setText( "S" + Ogre::StringConverter::toString( sector_->avatarObject()->shieldPercent(), 4 ) );
Modified: branches/ogsector/src/common.cpp
===================================================================
--- branches/ogsector/src/common.cpp 2007-05-26 20:22:37 UTC (rev 511)
+++ branches/ogsector/src/common.cpp 2007-05-27 14:33:40 UTC (rev 512)
@@ -19,6 +19,8 @@
***************************************************************************/
#include "common.h"
+#include <OgreSceneNode.h>
+#include <OgreMovableObject.h>
long createGlobalID( int userId, int childId ) { return childId * MAXUSERID + userId; }
@@ -37,3 +39,32 @@
while ( is >> tmp ) subStrings.push_back( tmp );
return subStrings;
}
+
+void dumpSceneNodes( std::stringstream & ss, Ogre::Node * n, int level ) {
+ for ( int i = 0; i < level; i++ ) {
+ ss << " ";
+ }
+ ss << "SceneNode: " << n->getName() << std::endl;
+
+ Ogre::SceneNode::ObjectIterator object_it = ((Ogre::SceneNode *)n)->getAttachedObjectIterator();
+ Ogre::Node::ChildNodeIterator node_it = n->getChildIterator();
+
+ Ogre::MovableObject *m;
+ while ( object_it.hasMoreElements() ){
+ for ( int i = 0; i < level + 2; i++ ) {
+ ss << " ";
+ }
+ m = object_it.getNext();
+ ss << m->getMovableType() << ": " << m->getName() << std::endl;
+ }
+ while ( node_it.hasMoreElements() ) {
+ dumpSceneNodes( ss, node_it.getNext(), level + 2 );
+ }
+}
+
+std::string dumpSceneNodes( Ogre::Node * n ) {
+ std::stringstream ss;
+ ss << std::endl << "Node Hierarchy:" << std::endl;
+ dumpSceneNodes( ss, n, 0 );
+ return ss.str();
+}
Modified: branches/ogsector/src/common.h
===================================================================
--- branches/ogsector/src/common.h 2007-05-26 20:22:37 UTC (rev 511)
+++ branches/ogsector/src/common.h 2007-05-27 14:33:40 UTC (rev 512)
@@ -42,6 +42,10 @@
#include <string>
#include <cmath>
+namespace Ogre{
+class Node;
+}
+
#ifdef WIN32
#define PATHSEPARATOR "\\"
#include <windows.h>
@@ -131,4 +135,10 @@
*/
void myMSleep( int s );
+/*! For debugging purposes dump scene node tree to a string */
+void dumpSceneNodes( std::stringstream & ss, Ogre::Node * n, int level );
+
+/*! For debugging purposes dump scene node tree to a string */
+std::string dumpSceneNodes( Ogre::Node * n );
+
#endif // _OPENGATE_COMMON__H
Modified: branches/ogsector/src/networkServer.cpp
===================================================================
--- branches/ogsector/src/networkServer.cpp 2007-05-26 20:22:37 UTC (rev 511)
+++ branches/ogsector/src/networkServer.cpp 2007-05-27 14:33:40 UTC (rev 512)
@@ -222,7 +222,8 @@
void Server::receiveShipDeRegister( UserSession * user, const MessageBodyShipDeRegister & msg ){
if ( userObjects_.count( createGlobalID( user->userID(), msg.childID() ) ) ){
- deRegisterUserObject( userObjects_[ createGlobalID( user->userID(), msg.childID() ) ] );
+ destroyUserObject( userObjects_[ createGlobalID( user->userID(), msg.childID() ) ] );
+ // deRegisterUserObject( userObjects_[ createGlobalID( user->userID(), msg.childID() ) ] );
} else {
log_->warn( std::string( "Deregistering request for unknown object: " )
+ toStr( user->userName() ) + ": " + toStr( msg.childID() ) +
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-05-26 20:22:42
|
Revision: 511
http://svn.sourceforge.net/opengate/?rev=511&view=rev
Author: spom_spom
Date: 2007-05-26 13:22:37 -0700 (Sat, 26 May 2007)
Log Message:
-----------
win compatibility commit
Modified Paths:
--------------
branches/ogsector/win32/ogsectorclient/ogsectorclient.cbp
branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
Modified: branches/ogsector/win32/ogsectorclient/ogsectorclient.cbp
===================================================================
--- branches/ogsector/win32/ogsectorclient/ogsectorclient.cbp 2007-05-26 20:14:58 UTC (rev 510)
+++ branches/ogsector/win32/ogsectorclient/ogsectorclient.cbp 2007-05-26 20:22:37 UTC (rev 511)
@@ -55,6 +55,8 @@
<Add directory="C:\OgreSDK\lib" />
<Add directory="C:\OgreSDK\bin\Release" />
</Linker>
+ <Unit filename="..\..\src\Avatar.cpp" />
+ <Unit filename="..\..\src\Avatar.h" />
<Unit filename="..\..\src\ConfigDialog.cpp" />
<Unit filename="..\..\src\ConfigDialog.h" />
<Unit filename="..\..\src\Console.cpp" />
Modified: branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-05-26 20:14:56
|
Revision: 510
http://svn.sourceforge.net/opengate/?rev=510&view=rev
Author: spom_spom
Date: 2007-05-26 13:14:58 -0700 (Sat, 26 May 2007)
Log Message:
-----------
forgot files
Added Paths:
-----------
branches/ogsector/src/Avatar.cpp
branches/ogsector/src/Avatar.h
Added: branches/ogsector/src/Avatar.cpp
===================================================================
--- branches/ogsector/src/Avatar.cpp (rev 0)
+++ branches/ogsector/src/Avatar.cpp 2007-05-26 20:14:58 UTC (rev 510)
@@ -0,0 +1,34 @@
+/***************************************************************************
+ * Copyright (C) 2006-2007 by OpenGate development team *
+ * spo...@us... *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+
+#include "Avatar.h"
+#include "VesselManager.h"
+
+namespace OpenGate{
+
+Avatar::Avatar( const std::string & name, int ID ): name_( name ), id_( ID ) {
+ vessel_ = VesselManager::getSingleton().vessel( "apteryx" );
+}
+
+Avatar::~Avatar( ){
+}
+
+} // namespace OpenGate{
+
Added: branches/ogsector/src/Avatar.h
===================================================================
--- branches/ogsector/src/Avatar.h (rev 0)
+++ branches/ogsector/src/Avatar.h 2007-05-26 20:14:58 UTC (rev 510)
@@ -0,0 +1,57 @@
+/***************************************************************************
+ * 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_AVATAR__H
+#define _OPENGATE_AVATAR__H
+
+#include <string>
+
+namespace OpenGate{
+
+class Vessel;
+
+//!
+/*! */
+class Avatar{
+public:
+ Avatar( const std::string & name, int id );
+
+ ~Avatar( );
+
+ std::string name() const { return name_; }
+
+ int userID() const { return id_; }
+
+ void setVessel( Vessel & vessel ){ vessel_ = &vessel; }
+
+ Vessel & vessel() { return *vessel_; }
+
+
+protected:
+ std::string name_;
+ int id_;
+
+ Vessel * vessel_;
+};
+
+} // namespace OpenGate{
+
+
+#endif // _OPENGATE_AVATAR__H
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-05-26 20:09:43
|
Revision: 509
http://svn.sourceforge.net/opengate/?rev=509&view=rev
Author: spom_spom
Date: 2007-05-26 13:09:35 -0700 (Sat, 26 May 2007)
Log Message:
-----------
Fixed some small issues. Some obscurities within the multiplayer mode during de/registering between the gamestates occur and will be fixed tommorow
Modified Paths:
--------------
branches/ogsector/src/GameState.h
branches/ogsector/src/GameStateManager.cpp
branches/ogsector/src/GameStateManager.h
branches/ogsector/src/Makefile.am
branches/ogsector/src/Makefile.in
branches/ogsector/src/Sector.cpp
branches/ogsector/src/Sector.h
branches/ogsector/src/SectorObjects.cpp
branches/ogsector/src/SectorObjects.h
branches/ogsector/src/ShipConfigDialog.cpp
branches/ogsector/src/UnDockedState.cpp
branches/ogsector/src/UnDockedState.h
Modified: branches/ogsector/src/GameState.h
===================================================================
--- branches/ogsector/src/GameState.h 2007-05-23 21:24:50 UTC (rev 508)
+++ branches/ogsector/src/GameState.h 2007-05-26 20:09:35 UTC (rev 509)
@@ -45,6 +45,7 @@
class LogManager;
class GameState;
class GameStateManager;
+class Avatar;
class Console;
/*!
@@ -62,6 +63,7 @@
NetworkClient * network;
Console * console;
GameStateManager * gameStateRoot;
+ Avatar * avatar;
} DeviceInfo;
/*!
Modified: branches/ogsector/src/GameStateManager.cpp
===================================================================
--- branches/ogsector/src/GameStateManager.cpp 2007-05-23 21:24:50 UTC (rev 508)
+++ branches/ogsector/src/GameStateManager.cpp 2007-05-26 20:09:35 UTC (rev 509)
@@ -25,6 +25,7 @@
#include <OgreWindowEventUtilities.h>
#include "LogManager.h"
#include "Console.h"
+#include "Avatar.h"
#include "Sector.h"
#include "InputManager.h"
#include "VesselManager.h"
@@ -147,10 +148,16 @@
if ( state ){
shutdownRequest_ = false;
changeGameState( state );
+
+ //hack-mack
+ enterDockedStateHack_ = false;
}
while ( !shutdownRequest_ ){
devices_.inputManager->capture();
+
+ if ( enterDockedStateHack_ ) start( findByName( "DockedState" ) );
+
captureNetwork();
Ogre::WindowEventUtilities::messagePump();
@@ -328,6 +335,8 @@
devices_.gameStateRoot = this;
+ devices_.avatar = new Avatar( devices_.network->userName(), devices_.network->userID() );
+
return true;
}
@@ -408,25 +417,34 @@
}
void GameStateManager::CMD_spawnAi( const std::vector < std::string > & argv ){
- if ( stateStack_.back()->name() == "UnDockedState" ){
- std::string aiName = "squid";
- if ( argv.size() > 1 ){
- aiName = argv[ 1 ];
- }
- if ( VesselManager::getSingleton().vessel( aiName ) && aiName != "help" ){
- dynamic_cast< UnDockedState * >( stateStack_.back() )->spawnAI( aiName );
+ std::string aiName = "squid";
+ if ( argv.size() > 1 ){
+ aiName = argv[ 1 ];
+ }
+
+ bool showHelp = false;
+ if ( aiName != "help" ){
+ if ( stateStack_.back()->name() == "UnDockedState" ){
+ if ( VesselManager::getSingleton().vessel( aiName ) ){
+ dynamic_cast< UnDockedState * >( stateStack_.back() )->spawnAI( aiName );
+ } else {
+ showHelp = true;
+ }
} else {
-
- std::set< Vessel * > vessel( VesselManager::getSingleton().factionVessels( "All" ) );
- std::string vesselNames("Vessels available: ");
- for ( std::set< Vessel * >::iterator it = vessel.begin(); it!= vessel.end(); it ++ ){
- vesselNames += (*it)->name() + " ";
- }
- LogManager::getSingleton().info( vesselNames );
+ LogManager::getSingleton().info("You cannot spawn ai subjects at a station.");
}
} else {
- LogManager::getSingleton().info("You cannot spawn ai subjects at a station.");
+ showHelp = true;
}
+
+ if ( showHelp ){
+ std::set< Vessel * > vessel( VesselManager::getSingleton().factionVessels( "All" ) );
+ std::string vesselNames("Vessels available: ");
+ for ( std::set< Vessel * >::iterator it = vessel.begin(); it!= vessel.end(); it ++ ){
+ vesselNames += (*it)->name() + " ";
+ }
+ LogManager::getSingleton().info( vesselNames );
+ }
}
} // namespace OpenGate
Modified: branches/ogsector/src/GameStateManager.h
===================================================================
--- branches/ogsector/src/GameStateManager.h 2007-05-23 21:24:50 UTC (rev 508)
+++ branches/ogsector/src/GameStateManager.h 2007-05-26 20:09:35 UTC (rev 509)
@@ -28,6 +28,7 @@
namespace OpenGate {
+class Avatar;
class LogManager;
class InputManager;
class VesselManager;
@@ -94,6 +95,8 @@
/*! This is a special case function to cause a shutdown. */
void shutdown( );
+ bool enterDockedStateHack_;
+
protected:
/*! This initializes a state to receive the events. */
Modified: branches/ogsector/src/Makefile.am
===================================================================
--- branches/ogsector/src/Makefile.am 2007-05-23 21:24:50 UTC (rev 508)
+++ branches/ogsector/src/Makefile.am 2007-05-26 20:09:35 UTC (rev 509)
@@ -14,6 +14,8 @@
tinyxml/tinyxml.cpp \
tinyxml/tinyxmlerror.cpp \
tinyxml/tinyxmlparser.cpp \
+ Avatar.h \
+ Avatar.cpp \
Console.h \
Console.cpp \
ConfigDialog.h \
Modified: branches/ogsector/src/Makefile.in
===================================================================
--- branches/ogsector/src/Makefile.in 2007-05-23 21:24:50 UTC (rev 508)
+++ branches/ogsector/src/Makefile.in 2007-05-26 20:09:35 UTC (rev 509)
@@ -51,8 +51,8 @@
am_opengateclient_OBJECTS = opengateclient.$(OBJEXT) common.$(OBJEXT) \
networkClient.$(OBJEXT) tinyxml.$(OBJEXT) \
tinyxmlerror.$(OBJEXT) tinyxmlparser.$(OBJEXT) \
- Console.$(OBJEXT) ConfigDialog.$(OBJEXT) Entity.$(OBJEXT) \
- EntityManager.$(OBJEXT) LogManager.$(OBJEXT) \
+ Avatar.$(OBJEXT) Console.$(OBJEXT) ConfigDialog.$(OBJEXT) \
+ Entity.$(OBJEXT) EntityManager.$(OBJEXT) LogManager.$(OBJEXT) \
InputManager.$(OBJEXT) VesselManager.$(OBJEXT) \
GameStateManager.$(OBJEXT) GameState.$(OBJEXT) \
DockedState.$(OBJEXT) ShipConfigDialog.$(OBJEXT) \
@@ -191,6 +191,8 @@
tinyxml/tinyxml.cpp \
tinyxml/tinyxmlerror.cpp \
tinyxml/tinyxmlparser.cpp \
+ Avatar.h \
+ Avatar.cpp \
Console.h \
Console.cpp \
ConfigDialog.h \
@@ -313,6 +315,7 @@
distclean-compile:
-rm -f *.tab.c
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Avatar.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConfigDialog.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Console.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DockedState.Po@am__quote@
Modified: branches/ogsector/src/Sector.cpp
===================================================================
--- branches/ogsector/src/Sector.cpp 2007-05-23 21:24:50 UTC (rev 508)
+++ branches/ogsector/src/Sector.cpp 2007-05-26 20:09:35 UTC (rev 509)
@@ -19,6 +19,7 @@
***************************************************************************/
#include "Sector.h"
+#include "Avatar.h"
namespace OpenGate{
@@ -45,15 +46,16 @@
// };
Sector::Sector( Ogre::SceneManager * sceneMgr, NetworkClient * network )
- : sceneMgr_( sceneMgr ), network_( network ) {
+ : sceneMgr_( sceneMgr ), network_( network ) {
log_ = LogManager::getSingletonPtr();
+ bool radar_ = true;
sectorname_ = "Testsector";
planetNode_ = NULL;
starsNode_ = NULL;
avatar_ = NULL;
- avatarRespawnTime_ = 0.0;
+ avatarDeathSequenceTime_ = 0.0;
sceneMgr_->setAmbientLight( Ogre::ColourValue(0.9, 0.9, 0.9) );
//** Create a light;
@@ -140,6 +142,7 @@
collideInSectorContext_ = OgreOpcode::CollisionManager::getSingletonPtr()->getDefaultContext();
+
// Ogre::MeshPtr pMesh = Ogre::MeshManager::getSingleton().load( "astro/Sphere.mesh",
// Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
// Ogre::HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY,
@@ -197,13 +200,36 @@
}
itTarget_ = sectorObjects_.begin();
+
}
Sector::~Sector( ){
- delete OgreOpcode::CollisionManager::getSingletonPtr();
+ for ( std::map< long, SectorObjectMoveable * >::iterator it = movableObjects_.begin(); it != movableObjects_.end();){
+// log_->info( "Destructing: " + it->second->name() );
+ destructMoveableObject( (it++)->second );
+// log_->info( "done: " );
+ }
+
for ( std::set< SectorObject * >::iterator it = sectorObjects_.begin(); it != sectorObjects_.end(); ){
+// log_->info( "Destructing: " + (*it)->name() );
+
+ if ( (*it)->isOnRadar() && radar_ ){
+ Ogre::Overlay * radar = Ogre::OverlayManager::getSingleton().getByName( "Radar" );
+ Ogre::OverlayContainer * radarMap = radar->getChild( "Radar/Map" );
+ radarMap->removeChild( (*it)->dotA()->getName() );
+ radarMap->removeChild( (*it)->dotB()->getName() );
+ }
+
+ delete *it;
sectorObjects_.erase( (*it++) );
+
+// log_->info( "done: " );
}
+
+ sceneMgr_->destroyManualObject( "Planet" );
+ sceneMgr_->getRootSceneNode()->removeAndDestroyChild( "PlanetNode" );
+
+ delete OgreOpcode::CollisionManager::getSingletonPtr();
}
void Sector::update( Ogre::Real elapsedTime ){
@@ -250,92 +276,90 @@
}
if ( starsNode_ ) starsNode_->setPosition( avatar_->mainNode()->getPosition() );
- Ogre::Overlay * radar = Ogre::OverlayManager::getSingleton().getByName( "Radar" );
- Ogre::OverlayContainer * radarMap = radar->getChild( "Radar/Map" );
-
- int dotAWidth = 4;
- int dotAHeight = 2;
- float radarRange = 5000;
- float radarWidth = radarMap->getWidth() * Ogre::OverlayManager::getSingleton().getViewportWidth();
- float radarHeight = radarMap->getHeight() * Ogre::OverlayManager::getSingleton().getViewportHeight();
- float xScale = radarRange / ( radarWidth / 2.0 );
- float yScale = radarRange / ( radarHeight / 2.0 );
-
- for ( std::set< SectorObject * >::iterator it = sectorObjects_.begin(); it != sectorObjects_.end(); it++){
+ if ( radar_ ){
+ Ogre::Overlay * radar = Ogre::OverlayManager::getSingleton().getByName( "Radar" );
+ Ogre::OverlayContainer * radarMap = radar->getChild( "Radar/Map" );
- Ogre::Vector3 relativPosition( (*it)->mainNode()->getPosition( ) - avatar_->mainNode()->getPosition( ) );
+ int dotAWidth = 4;
+ int dotAHeight = 2;
+ float radarRange = 5000;
+ float radarWidth = radarMap->getWidth() * Ogre::OverlayManager::getSingleton().getViewportWidth();
+ float radarHeight = radarMap->getHeight() * Ogre::OverlayManager::getSingleton().getViewportHeight();
+ float xScale = radarRange / ( radarWidth / 2.0 );
+ float yScale = radarRange / ( radarHeight / 2.0 );
- if ( relativPosition.length() < radarRange ){
- Ogre::OverlayElement * dotA, * dotB;
+ for ( std::set< SectorObject * >::iterator it = sectorObjects_.begin(); it != sectorObjects_.end(); it++){
- if ( !(*it)->isOnRadar() ) {
- dotA = Ogre::OverlayManager::getSingleton().createOverlayElement( "Panel", "Radar/Map/DotA" + (*it)->name() );
- dotA->setMaterialName( "BaseWhite" );
- dotA->setMetricsMode( Ogre::GMM_PIXELS );
- dotA->setWidth( dotAWidth );
- dotA->setHeight( dotAHeight );
- radarMap->addChild( dotA );
+ Ogre::Vector3 relativPosition( (*it)->mainNode()->getPosition( ) - avatar_->mainNode()->getPosition( ) );
+ Ogre::OverlayElement * dotA = (*it)->dotA();
+ Ogre::OverlayElement * dotB = (*it)->dotB();
+
+ if ( relativPosition.length() < radarRange ){
- dotB = Ogre::OverlayManager::getSingleton().createOverlayElement( "Panel", "Radar/Map/DotB" + (*it)->name() );
- dotB->setMaterialName( "BaseWhite" );
- dotB->setMetricsMode( Ogre::GMM_PIXELS );
- dotB->setWidth( 1 );
- dotB->setHeight( 1 );
- dotB->setColour( Ogre::ColourValue( 1.0f, 0.0f, 0.0f ) );
- radarMap->addChild( dotB );
+ Ogre::Quaternion q;
+ q.FromAngleAxis( -avatar_->mainNode()->getOrientation( ).getYaw(), Ogre::Vector3::UNIT_Y);
+ relativPosition = q * relativPosition;
- (*it)->onRadar( true );
- } else {
- dotA = radarMap->getChild( "Radar/Map/DotA" + (*it)->name() );
- dotB = radarMap->getChild( "Radar/Map/DotB" + (*it)->name() );
+ Ogre::Plane viewPlane( avatar_->mainNode()->getOrientation().yAxis().normalisedCopy(),
+ avatar_->mainNode()->getPosition() );
+
+ float distToPlane = viewPlane.getDistance( (*it)->mainNode()->getPosition( ) ) / yScale;
+
+ dotB->setHeight( fabs( distToPlane ) );
+
+ dotA->setPosition( radarWidth / 2.0 + relativPosition[ 0 ] / xScale - dotAWidth / 2,
+ - distToPlane - dotAHeight / 2 + radarHeight / 2.0 + relativPosition[ 2 ] / yScale );
+
+ if ( distToPlane < 0 ) distToPlane = 0;
+
+ dotB->setPosition( radarWidth / 2.0 + relativPosition[ 0 ] / xScale,
+ - distToPlane + radarHeight / 2.0 + relativPosition[ 2 ] / yScale );
+
+ if ( (*it)->isOnRadar() == false ){
+ radarMap->addChild( dotA );
+ radarMap->addChild( dotB );
+ (*it)->onRadar( true );
+ }
+ } else { // if not in radarrange
+ if ( (*it)->isOnRadar() == true ){
+ radarMap->removeChild( dotA->getName() );
+ radarMap->removeChild( dotB->getName() );
+ (*it)->onRadar( false );
+ }
}
-
- Ogre::Quaternion q;
- q.FromAngleAxis( -avatar_->mainNode()->getOrientation( ).getYaw(), Ogre::Vector3::UNIT_Y);
- relativPosition = q * relativPosition;
-
- Ogre::Plane viewPlane( avatar_->mainNode()->getOrientation().yAxis().normalisedCopy(),
- avatar_->mainNode()->getPosition() );
-
- float distToPlane = viewPlane.getDistance( (*it)->mainNode()->getPosition( ) ) / yScale;
-
- dotB->setHeight( fabs( distToPlane ) );
-
- dotA->setPosition( radarWidth / 2.0 + relativPosition[ 0 ] / xScale - dotAWidth / 2,
- - distToPlane - dotAHeight / 2 + radarHeight / 2.0 + relativPosition[ 2 ] / yScale );
-
- if ( distToPlane < 0 ) distToPlane = 0;
-
- dotB->setPosition( radarWidth / 2.0 + relativPosition[ 0 ] / xScale,
- - distToPlane + radarHeight / 2.0 + relativPosition[ 2 ] / yScale );
-
- }
- } // if in radarrange
- }
+ } // for each object
+ } // if radar
+ } // if avatar
for ( std::map< long, SectorObjectMoveable * >::iterator it = movableObjects_.begin(); it != movableObjects_.end();){
+
if ( !it->second->update( elapsedTime ) ) { //** object died;
-
if ( it->second == avatar_ ) {
- if ( avatarRespawnTime_ == 0.0 ){
- sendVesselDeRegister( avatar_ );
- avatarRespawnTime_ = 5.0;
+ if ( avatarDeathSequenceTime_ == 0.0 ){
+ avatarDeathSequenceTime_ = 1.0;
} else {
- avatarRespawnTime_ -= elapsedTime;
- if ( avatarRespawnTime_ < 0 ){
- spawnAvatar();
+ avatarDeathSequenceTime_ -= elapsedTime;
+ if ( avatarDeathSequenceTime_ < 0 ){
+ avatarDeathSequenceTime_ = 0.0;
+ listener_->avatarDeathSequence( false );
}
}
it++;
} else { //** died object is not avatar;
- log_->info( "Destructing: " + it->second->name() );
- destructMoveableObject( (it++)->second );
- log_->info( "done: " );
+// log_->info( "Destructing: " + it->second->name() );
+// destructMoveableObject( (it++)->second );
+// log_->info( "done: " );
}
} else ++it;
}
}
+void Sector::avatarDied( ){
+ if ( avatar_ ){
+ listener_->avatarDeathSequence( true );
+ }
+}
+
SectorObjectMoveable * Sector::createMoveableObject( const Ogre::String & name, int userID, int childID,
Vessel & vessel ){
SectorObjectMoveable * obj = new SectorObjectMoveable( name, this, userID, childID, vessel );
@@ -349,13 +373,11 @@
selectNextTarget( obj );
sectorObjects_.erase( obj );
- if ( obj->isOnRadar() ){
+ if ( obj->isOnRadar() && radar_ ){
Ogre::Overlay * radar = Ogre::OverlayManager::getSingleton().getByName( "Radar" );
Ogre::OverlayContainer * radarMap = radar->getChild( "Radar/Map" );
- radarMap->removeChild( "Radar/Map/DotA" + obj->name() );
- radarMap->removeChild( "Radar/Map/DotB" + obj->name() );
- Ogre::OverlayManager::getSingleton().destroyOverlayElement( "Radar/Map/DotA" + obj->name() );
- Ogre::OverlayManager::getSingleton().destroyOverlayElement( "Radar/Map/DotB" + obj->name() );
+ radarMap->removeChild( obj->dotA()->getName() );
+ radarMap->removeChild( obj->dotB()->getName() );
}
for ( std::map< long, SectorObjectMoveableAi * >::iterator it = localAiObjects_.begin();
@@ -437,18 +459,24 @@
sendVesselMovement( obj );
}
-void Sector::createAvatar( const Ogre::String & playername ){
- log_->info( std::string( "Create avatar: " ) + playername );
- avatar_ = new SectorObjectAvatar( playername, this, network_->userID(),
- *VesselManager::getSingleton().vessel( "apteryx" ) );
- log_->info( std::string( "Avatar_ " ) + playername );
- movableObjects_[ avatar_->globalID() ] = avatar_;
- log_->info( std::string( "Created " ) + playername );
+void Sector::createAvatarObject( Avatar & avatar ){
+ log_->info( std::string( "Create avatar: " ) + avatar.name() );
+ avatar_ = new SectorObjectAvatar( avatar.name(), this, avatar.userID(), avatar.vessel() );
+ movableObjects_[ avatar_->userID() ] = avatar_;
+
+ avatar_->reset();
+ avatar_->mainNode()->setPosition( 0.0, 0.0, 500.0 );
+ avatar_->mainNode()->setOrientation( Ogre::Quaternion( 1.0, 0.0, 0.0, 0.0 ) );
+ avatar_->setVelocity( Ogre::Vector3( 0.0, 0.0, -20.0 ) );
+
+ avatar_->setVisible( false );
+ sendVesselRegister( avatar_ );
}
-void Sector::destructAvatar( ){
+void Sector::destructAvatarObject( ){
for ( std::map< long, SectorObjectMoveableAi * >::iterator it = localAiObjects_.begin();
it != localAiObjects_.end(); it ++ ){
+
if ( it->second->target() == avatar_ ){
log_->warn( std::string( "ai object target: " ) + it->second->name() + " loose target." );
it->second->setTarget( NULL );
@@ -456,33 +484,11 @@
}
sendVesselDeRegister( avatar_ );
- movableObjects_.erase( avatar_->globalID() );
+ movableObjects_.erase( avatar_->userID() );
if ( avatar_ ) delete avatar_;
avatar_ = NULL;
}
-void Sector::avatarDied( ){
- if ( avatar_ ){
- avatar_->setVisible( true );
- listener_->avatarDeathSequence( true );
- }
-}
-
-void Sector::spawnAvatar( ){
- if ( avatar_ ){
- log_->info( std::string( "Spawn avatar: " ) + avatar_->name() );
- avatarRespawnTime_ = 0.0;
- avatar_->reset();
- avatar_->mainNode()->setPosition( 0.0, 0.0, 500.0 );
- avatar_->mainNode()->setOrientation( Ogre::Quaternion( 1.0, 0.0, 0.0, 0.0 ) );
- avatar_->setVelocity( Ogre::Vector3( 0.0, 0.0, -20.0 ) );
-
- avatar_->setVisible( false );
- sendVesselRegister( avatar_ );
- listener_->avatarDeathSequence( false );
- }
-}
-
void Sector::selectNextTarget( SectorObject * obj ){
if ( obj != NULL ){
if ( listener_->target() == obj ) listener_->setTarget( nextTarget() );
@@ -626,7 +632,7 @@
if ( !movableObjects_.count( createGlobalID( msg.senderID(), msg.childID() ) ) ){
if ( msg.childID() == 0 ){
- log_->info( "Create player object " + msg.name()+ " " + toStr( msg.senderID() ) + " " + toStr( msg.vesselID() ) );
+ log_->info( "Create player object " + msg.name()+ " " + toStr( msg.senderID() ) + " VesselID: " + toStr( msg.vesselID() ) );
SectorObjectMoveable * obj = createMoveableObject( msg.name(), msg.senderID(), msg.childID(),
*VesselManager::getSingleton().vessel( msg.vesselID() ) );
obj->mainNode()->setPosition( msg.position() );
@@ -671,7 +677,7 @@
} else {
log_->warn( std::string( "Deregistering request for unknown object: " ) +
- toStr( msg.senderID() ) + ": " + toStr( msg.childID() ) );
+ toStr( msg.senderID() ) + ": " + toStr( (int)msg.childID() ) );
}
}
Modified: branches/ogsector/src/Sector.h
===================================================================
--- branches/ogsector/src/Sector.h 2007-05-23 21:24:50 UTC (rev 508)
+++ branches/ogsector/src/Sector.h 2007-05-26 20:09:35 UTC (rev 509)
@@ -30,8 +30,9 @@
namespace OpenGate{
+class Avatar;
+
class Sector {
-
public:
Sector( Ogre::SceneManager * sceneMgr, NetworkClient * network );
@@ -51,7 +52,7 @@
LogManager * log() { return log_; }
void createStaticObject( const Ogre::String & meshname, const Ogre::String & objectname,
- const Ogre::Vector3 & pos, Ogre::Real targetSize, Ogre::Degree yaw );
+ const Ogre::Vector3 & pos, Ogre::Real targetSize, Ogre::Degree yaw );
SectorObjectMoveable * createMoveableObject( const Ogre::String & name, int userId, int childId, Vessel & vessel );
@@ -59,16 +60,14 @@
void destructMoveableObject( SectorObjectMoveable * obj );
- void createAvatar( const Ogre::String & playername );
+ void createAvatarObject( Avatar & avatar );
- SectorObjectAvatar * avatar() { return avatar_; }
+ SectorObjectAvatar * avatarObject() { return avatar_; }
- void destructAvatar( );
+ void destructAvatarObject( );
void avatarDied( );
- void spawnAvatar( );
-
void spawnAiObject( const std::string & vesselName );
OgreOpcode::CollisionContext * collisionContext() { return collideInSectorContext_; }
@@ -121,8 +120,9 @@
std::map< long, SectorObjectMoveable * > movableObjects_;
std::map< long, SectorObjectMoveableAi * > localAiObjects_;
- float avatarRespawnTime_;
+ float avatarDeathSequenceTime_;
+ bool radar_ ;
};
} // namespace OpenGate
Modified: branches/ogsector/src/SectorObjects.cpp
===================================================================
--- branches/ogsector/src/SectorObjects.cpp 2007-05-23 21:24:50 UTC (rev 508)
+++ branches/ogsector/src/SectorObjects.cpp 2007-05-26 20:09:35 UTC (rev 509)
@@ -21,6 +21,7 @@
#include "Sector.h"
#include "SectorObjects.h"
#include "common.h"
+#include <string>
namespace OpenGate{
@@ -29,9 +30,15 @@
globalID_ = createGlobalID( userID, childID );
sceneMgr_ = sector_->sceneManager();
- mainNode_ = static_cast< Ogre::SceneNode * >( sceneMgr_->getRootSceneNode()->createChild() );
+ try{
+ mainNode_ = sceneMgr_->getRootSceneNode()->createChildSceneNode( name + "_MainNode" );
+ } catch( Ogre::Exception& e ) {
+ std::cout << e.getFullDescription().c_str() << std::endl;
+ }
+
lifeTime_ = 0.0;
selectable_ = false;
+
}
BaseObject::~BaseObject(){
@@ -39,7 +46,7 @@
}
Projectile::Projectile( BaseObject * parent, long shotCounter, Ogre::Real speed )
- : BaseObject( parent->name(), parent->sector() ), parent_( parent ) {
+ : BaseObject( parent->name() + "_" + toStr( shotCounter ), parent->sector() ), parent_( parent ) {
selectable_ = false;
Ogre::String bulletName( name_ + "_" + toStr( shotCounter ) );
@@ -180,9 +187,28 @@
mainNodeEntity_ = mainNode_->createChildSceneNode( name_ + "_transform" );
baseSize_ = 0.0;
selectable_ = true;
+
+ int dotAWidth = 4;
+ int dotAHeight = 2;
+ dotA_ = Ogre::OverlayManager::getSingleton().createOverlayElement( "Panel", "Radar/Map/DotA_" + name_ );
+ dotA_->setMaterialName( "BaseWhite" );
+ dotA_->setMetricsMode( Ogre::GMM_PIXELS );
+ dotA_->setWidth( dotAWidth );
+ dotA_->setHeight( dotAHeight );
+ dotA_->setColour( Ogre::ColourValue( 1.0f, 0.0f, 0.0f ) );
+
+ dotB_ = Ogre::OverlayManager::getSingleton().createOverlayElement( "Panel", "Radar/Map/DotB_" + name_ );
+ dotB_->setMaterialName( "BaseWhite" );
+ dotB_->setMetricsMode( Ogre::GMM_PIXELS );
+ dotB_->setWidth( 1 );
+ dotB_->setHeight( 1 );
+ dotB_->setColour( Ogre::ColourValue( 1.0f, 0.0f, 0.0f ) );
}
SectorObject::~SectorObject(){
+ Ogre::OverlayManager::getSingleton().destroyOverlayElement( "Radar/Map/DotA_" + name_ );
+ Ogre::OverlayManager::getSingleton().destroyOverlayElement( "Radar/Map/DotB_" + name_ );
+
sector_->collisionContext()->destroyObject( collObj_ );
OgreOpcode::CollisionManager::getSingletonPtr()->destroyShape( collObj_->getShape() );
@@ -597,6 +623,7 @@
}
explosion_->getEmitter( 0 )->setEnabled( true );
explodeSequenceTime_ = explosion_->getEmitter( 0 )->getDuration() + explosion_->getEmitter( 0 )->getMaxTimeToLive();
+
if ( thrusterBbs_ ) thrusterBbs_->setVisible( false );
percentageThrust_ = 0;
@@ -609,7 +636,7 @@
if ( explodeSequenceTime_ > 0 || projectiles_.size() > 0 ) {
return true;
} else {
- explosion_->getEmitter( 0 )->setEnabled( false );
+ if ( explosion_ ) explosion_->getEmitter( 0 )->setEnabled( false );
return false;
}
@@ -680,7 +707,6 @@
targetArrow_ = NULL;
flightArrow_ = NULL;
- LogManager::getSingleton().info( std::string( "SectorObjectAvatar" ) );
forceMovement_ = false;
targetArrow_ = mainNode_->createChildSceneNode( name_ + "_TargetArrow" );
@@ -753,10 +779,7 @@
}
bool SectorObjectAvatar::deathSequence( Ogre::Real elapsedTime ){
- if ( !deathSequence_ ) {
- sector_->avatarDied( );
- }
-
+ if ( !deathSequence_ ){ sector_->avatarDied( ); }
return SectorObjectMoveable::deathSequence( elapsedTime );
}
Modified: branches/ogsector/src/SectorObjects.h
===================================================================
--- branches/ogsector/src/SectorObjects.h 2007-05-23 21:24:50 UTC (rev 508)
+++ branches/ogsector/src/SectorObjects.h 2007-05-26 20:09:35 UTC (rev 509)
@@ -150,11 +150,17 @@
virtual Ogre::Vector3 velDirection() const { return Ogre::Vector3(0.0, 0.0, 0.0 ); }
+ Ogre::OverlayElement * dotA() { return dotA_; }
+ Ogre::OverlayElement * dotB() { return dotB_; }
+
protected:
Ogre::SceneNode * mainNodeEntity_; // Main character node
Ogre::Entity * entity_;
+ Ogre::OverlayElement * dotA_;
+ Ogre::OverlayElement * dotB_;
+
bool isOnRadar_;
double baseSize_;
};
Modified: branches/ogsector/src/ShipConfigDialog.cpp
===================================================================
--- branches/ogsector/src/ShipConfigDialog.cpp 2007-05-23 21:24:50 UTC (rev 508)
+++ branches/ogsector/src/ShipConfigDialog.cpp 2007-05-26 20:09:35 UTC (rev 509)
@@ -27,6 +27,7 @@
#include "ShipConfigDialog.h"
#include "LogManager.h"
+#include "Avatar.h"
#include "VesselManager.h"
namespace OpenGate{
@@ -191,6 +192,7 @@
}
bool ShipConfigDialog::handleSelectShipButton( const CEGUI::EventArgs & e ){
+ devices_->avatar->setVessel( *(*itVessel_) );
hide();
return true;
}
Modified: branches/ogsector/src/UnDockedState.cpp
===================================================================
--- branches/ogsector/src/UnDockedState.cpp 2007-05-23 21:24:50 UTC (rev 508)
+++ branches/ogsector/src/UnDockedState.cpp 2007-05-26 20:09:35 UTC (rev 509)
@@ -19,6 +19,7 @@
***************************************************************************/
#include "UnDockedState.h"
+#include "Avatar.h"
#include "Sector.h"
#include "networkProtocol.h"
#include "networkClient.h"
@@ -64,8 +65,6 @@
windowsHalfWidth_ = (int)(windowsWidth_ * 0.5);
windowsHalfHeight_ = (int)(windowsHeight_ * 0.5);
- sector_ = new Sector( sceneMgr_, network_ );
- sector_->setListener( this );
setupEventHandlers();
targetCurser_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDTargetCurser" );
@@ -133,6 +132,10 @@
flightCurser_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDFlightCurser" );
flightCurserHalfWidth_ = 10;
flightCurserHalfHeight_ = 10;
+
+ sector_ = new Sector( sceneMgr_, network_ );
+ sector_->setListener( this );
+
}
void UnDockedState::destroyContent( ){
@@ -143,6 +146,8 @@
void UnDockedState::enter(){
log_->info("Entering undockstate");
+
+
devices_->guiRenderer->setTargetSceneManager( sceneMgr_ );
if ( overlayRootWindow_ ){
devices_->guiSystem->setGUISheet( overlayRootWindow_ );
@@ -181,10 +186,8 @@
Ogre::OverlayManager::getSingleton().getByName( "Radar" )->show();
- deathSequence_ = false;
sceneDetailIndex_ = 0;
- target_ = NULL;
- cameraMode_ = 1;
+ target_ = sector_->nextTarget();
chatMode_ = false;
duelistPilot_ = false;
duelistTarget_ = false;
@@ -214,7 +217,7 @@
// hudTargetPointer->
// spaceDustParticleSystem_ = mainCamera_->getSceneManager()->createParticleSystem( "SpaceDust", "Space/Dust" );
-// Ogre::SceneNode * spaceDustNode = sector_->avatar()->mainNode()->createChildSceneNode( "DustParticles", mainCamera_->getRealPosition() );
+// Ogre::SceneNode * spaceDustNode = sector_->avatarObject()->mainNode()->createChildSceneNode( "DustParticles", mainCamera_->getRealPosition() );
// spaceDustNode_->attachObject( spaceDustParticleSystem_ );
// mainCamera_->getParentSceneNode()
@@ -232,10 +235,9 @@
// aniso_ = 1;
// filtering_ = TFO_BILINEAR;
+ enterDockedState_ = false;
+ sector_->createAvatarObject( *devices_->avatar );
- sector_->createAvatar( network_->userName() );
- sector_->spawnAvatar();
-
if ( devices_->console ){
CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"ConsoleList__auto_vscrollbar__")->hide();
}
@@ -244,13 +246,16 @@
CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"Config/BackButton" )->subscribeEvent(
CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber(&UnDockedState::handleConfigBackButton, this ) ) ;
+
+ toggleNextCamera_( 1 );
}
void UnDockedState::exit(){
+ log_->info("Exiting undockstate");
+ sector_->destructAvatarObject( );
+
CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"Config/BackButton" )->removeEvent(
CEGUI::PushButton::EventClicked ) ;
-
- log_->info("Exiting dockstate");
if ( overlayRootWindow_ ) overlayRootWindow_->hide();
if ( devices_->console ) devices_->console->stop();
@@ -264,8 +269,6 @@
devices_->inputManager->removeKeyListener( "SectorClientKeyListener" );
devices_->inputManager->removeMouseListener( "SectorClientMouseListener" );
devices_->inputManager->removeJoystickListener( "SectorClientJoystickListener" );
-
- sector_->destructAvatar( );
}
bool UnDockedState::switchConfigDialog( ){
@@ -294,21 +297,19 @@
}
bool UnDockedState::frameStarted( const Ogre::FrameEvent & evt ) {
+ //** this crahes at shutdown
+ //** if ( enterDockedState_ ) parent_->start( parent_->findByName( "DockedState" ) );
+ if ( enterDockedState_ ) devices_->gameStateRoot->enterDockedStateHack_ = true;
+
if ( window_->isClosed() ) return false;
timeSinceLastSectorUpdate_ += evt.timeSinceLastFrame;
timeSinceLastNetworkUpdate_ += evt.timeSinceLastFrame;
- if ( deathSequence_ ){
- } else {
- //** capture my input
- }
-
// max 1000 sector-updates/second
if ( timeSinceLastSectorUpdate_ > 0.001 ){
sector_->update( timeSinceLastSectorUpdate_ );
timeSinceLastSectorUpdate_ = 0.0;
- updateHUD_();
}
//** send movement data, max 10 net-updates/second
@@ -317,8 +318,11 @@
timeSinceLastNetworkUpdate_ = 0.0;
}
+
+
//** update my camera;
updateCamera_();
+ updateHUD_();
// renderSpaceDust();
return true;
@@ -351,48 +355,49 @@
chatMode_ = true;
}
- if ( sector_->avatar() != NULL ){
+ if ( sector_->avatarObject() != NULL ){
//** Avatar yaw LEFT;
- if ( e.key == OIS::KC_A || e.key == OIS::KC_NUMPAD4 ) { sector_->avatar()->setScaledYaw( 1.0 ); }
+ 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_->avatar()->setScaledYaw( -1.0 ); }
+ 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_->avatar()->setScaledPitch( -1.0 ); }
+ 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_->avatar()->setScaledPitch( 1.0 ); }
+ 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_->avatar()->setScaledRoll( 1.0 ); }
+ 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_->avatar()->setScaledRoll( -1.0 ); }
+ 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_->avatar()->incrementThrust(); }
+ if ( e.key == OIS::KC_NUMPAD7 ) { sector_->avatarObject()->incrementThrust(); }
//** Avatar increase thrust by 10%;
- if ( e.key == OIS::KC_NUMPAD1 ) { sector_->avatar()->decrementThrust(); }
+ if ( e.key == OIS::KC_NUMPAD1 ) { sector_->avatarObject()->decrementThrust(); }
//** Avatar press break;
- if ( e.key == OIS::KC_NUMPAD3 ) { sector_->avatar()->setBreakPressed( true ); }
+ if ( e.key == OIS::KC_NUMPAD3 ) { sector_->avatarObject()->setBreakPressed( true ); }
//** Avatar press afterburner;
- if ( e.key == OIS::KC_NUMPAD9 ) { sector_->avatar()->setAfterburnerPressed( true ); }
+ if ( e.key == OIS::KC_NUMPAD9 ) { sector_->avatarObject()->setAfterburnerPressed( true ); }
//** Avatar centering;
if ( e.key == OIS::KC_NUMPAD5 ) {
- sector_->avatar()->setScaledYaw( 0.0 );
- sector_->avatar()->setScaledPitch( 0.0 );
- sector_->avatar()->setScaledRoll( 0.0 );
+ sector_->avatarObject()->setScaledYaw( 0.0 );
+ sector_->avatarObject()->setScaledPitch( 0.0 );
+ sector_->avatarObject()->setScaledRoll( 0.0 );
}
//** selfdestruct and eject;
- if ( e.key == OIS::KC_F4 ) { parent_->start( parent_->findByName( "DockedState" ) ); }
+ if ( e.key == OIS::KC_F4 ) { devices_->gameStateRoot->enterDockedStateHack_ = true; }
+// if ( e.key == OIS::KC_F4 || enterDockedState_ ) { parent_->start( parent_->findByName( "DockedState" ) ); }// enterDockedState_ = true; }
if ( e.key == OIS::KC_F5 ) { duelistPilot_ = !duelistPilot_; }
if ( e.key == OIS::KC_F6 ) { duelistTarget_ = !duelistTarget_; }
- if ( e.key == OIS::KC_F8 ) { sector_->avatar()->deathSequence( 0 ); }
+ if ( e.key == OIS::KC_F8 ) { sector_->avatarObject()->deathSequence( 0 ); }
} // if avatar;
//** next Target;
@@ -452,12 +457,12 @@
bool UnDockedState::keyReleased( const OIS::KeyEvent & e ){
if (!configMode_){
- if ( sector_->avatar() != NULL ){
+ if ( sector_->avatarObject() != NULL ){
// Avatar release break
- if ( e.key == OIS::KC_NUMPAD3 ) { sector_->avatar()->setBreakPressed( false ); }
+ if ( e.key == OIS::KC_NUMPAD3 ) { sector_->avatarObject()->setBreakPressed( false ); }
// Avatar release afterburner
- if ( e.key == OIS::KC_NUMPAD9 ) { sector_->avatar()->setAfterburnerPressed( false ); }
+ if ( e.key == OIS::KC_NUMPAD9 ) { sector_->avatarObject()->setAfterburnerPressed( false ); }
}
}
return true;
@@ -492,7 +497,7 @@
- if ( sector_->avatar() != NULL ){
+ if ( sector_->avatarObject() != NULL ){
// std::cout << "X" << e.state.X.abs << " " << e.state.X.rel << " " << mousePointer_->getLeft( ) << std::endl;
// std::cout << "Y" << e.state.Y.abs << " " << e.state.Y.rel << " " << mousePointer_->getTop( ) << std::endl;
// std::cout << "Z" << e.state.Z.abs << " " << e.state.Z.rel<< std::endl;
@@ -537,8 +542,8 @@
// String(" yaw: ") + StringConverter::toString( yaw ) +
// String(" pitch ") + StringConverter::toString( pitch ) ) << std::endl;
- sector_->avatar()->setScaledYaw( -yaw );
- sector_->avatar()->setScaledPitch( -pitch );
+ sector_->avatarObject()->setScaledYaw( -yaw );
+ sector_->avatarObject()->setScaledPitch( -pitch );
} // if avatar;
if ( e.state.Z.rel < -10 ){ // mouse wheel up
@@ -554,10 +559,10 @@
bool UnDockedState::mousePressed( const OIS::MouseEvent &e , OIS::MouseButtonID id ){
if ( !configMode_ ){
- if ( sector_->avatar() != NULL ){
+ if ( sector_->avatarObject() != NULL ){
// std::cout << "Mouse Button: " << id << std::endl;
if ( id == 0){
- sector_->avatar()->setFirePressed( true );
+ sector_->avatarObject()->setFirePressed( true );
}
}
} else {
@@ -568,10 +573,10 @@
bool UnDockedState::mouseReleased( const OIS::MouseEvent &e , OIS::MouseButtonID id ){
if ( !configMode_ ){
- if ( sector_->avatar() != NULL ){
+ if ( sector_->avatarObject() != NULL ){
// std::cout << "Mouse Button: " << id << std::endl;
if ( id == 0){
- sector_->avatar()->setFirePressed( false);
+ sector_->avatarObject()->setFirePressed( false);
}
}
} else{
@@ -582,7 +587,7 @@
bool UnDockedState::axisMoved( const OIS::JoyStickEvent & e, int axis ){
if ( !configMode_ ){
- if ( sector_->avatar() != NULL ){
+ if ( sector_->avatarObject() != NULL ){
//** axis definition for my MS Sidewinder FF2
int joyStickAxisX = 0;
int joyStickAxisY = 1;
@@ -622,10 +627,10 @@
// " roll: " + StringConverter::toString(roll) +
// " thrust: " + StringConverter::toString(thrust) );
- sector_->avatar()->setScaledYaw( -yaw );
- sector_->avatar()->setScaledPitch( pitch );
- sector_->avatar()->setScaledRoll( -roll );
- sector_->avatar()->setThrustPercent( thrust * 100. );
+ sector_->avatarObject()->setScaledYaw( -yaw );
+ sector_->avatarObject()->setScaledPitch( pitch );
+ sector_->avatarObject()->setScaledRoll( -roll );
+ sector_->avatarObject()->setThrustPercent( thrust * 100. );
} // if avatar
}
return true;
@@ -634,9 +639,9 @@
bool UnDockedState::buttonPressed( const OIS::JoyStickEvent & e , int button){
if ( !configMode_ ){
// window_->setDebugText( "Joy: " + toStr( button ) );
- if ( sector_->avatar() != NULL ){
+ if ( sector_->avatarObject() != NULL ){
if ( button == 0){
- sector_->avatar()->setFirePressed( true );
+ sector_->avatarObject()->setFirePressed( true );
}
} // if avatar_
}
@@ -646,54 +651,58 @@
bool UnDockedState::buttonReleased( const OIS::JoyStickEvent & e , int button){
if ( !configMode_ ){
// window_->setDebugText( "Joy: " + toStr( button ) );
- if ( sector_->avatar() != NULL ){
+ if ( sector_->avatarObject() != NULL ){
if ( button == 0){
- sector_->avatar()->setFirePressed( false );
+ sector_->avatarObject()->setFirePressed( false );
}
} // if avatar_
}
return true;
}
-void UnDockedState::toggleNextCamera_(){
+void UnDockedState::toggleNextCamera_( int mode ){
int maxCameraModes = 4;
//** circle through cameraModes;
- cameraMode_ = (cameraMode_ + 1)%maxCameraModes;
+ if ( mode == -1 ){
+ cameraMode_ = (cameraMode_ + 1)%maxCameraModes;
+ } else {
+ cameraMode_ = mode;
+ }
switch ( cameraMode_ ){
case 0: //** free camera at orign
mainCamera_->setPosition( Ogre::Vector3( 0, 0, 500 ) );
- if ( sector_->avatar() != NULL ){
- mainCamera_->setAutoTracking( false, sector_->avatar()->mainNode() );
- sector_->avatar()->setVisible( true );
+ if ( sector_->avatarObject() != NULL ){
+ mainCamera_->setAutoTracking( false, sector_->avatarObject()->mainNode() );
+ sector_->avatarObject()->setVisible( true );
}
break;
case 1: //** first person avatar camera
- if ( sector_->avatar() != NULL ){
- sector_->avatar()->setVisible( false );
+ if ( sector_->avatarObject() != NULL ){
+ sector_->avatarObject()->setVisible( false );
break;
}
case 2: //** avatar chase camera;
- if ( sector_->avatar() != NULL ){
- sector_->avatar()->setVisible( true );
+ if ( sector_->avatarObject() != NULL ){
+ sector_->avatarObject()->setVisible( true );
break;
}
case 3: //** free avatar tracking-camera at orign
mainCamera_->setPosition( Ogre::Vector3( 0, 0, 500 ) );
mainCamera_->lookAt( Ogre::Vector3( 0, 0, -300 ) );
- if ( sector_->avatar() != NULL ){
- mainCamera_->setAutoTracking( true, sector_->avatar()->mainNode() );
- sector_->avatar()->setVisible( true );
+ if ( sector_->avatarObject() != NULL ){
+ mainCamera_->setAutoTracking( true, sector_->avatarObject()->mainNode() );
+ sector_->avatarObject()->setVisible( true );
}
break;
}
}
void UnDockedState::updateCamera_(){
- if ( sector_->avatar() != NULL ){
- Ogre::Vector3 avatarPos( sector_->avatar()->mainNode()->getPosition() );
+ if ( sector_->avatarObject() != NULL ){
+ Ogre::Vector3 avatarPos( sector_->avatarObject()->mainNode()->getPosition() );
Ogre::Vector3 targetPos( 0.0, 0.0, 0.0 );
if ( target_ != NULL ){
@@ -702,7 +711,7 @@
Ogre::Vector3 dist( targetPos - avatarPos );
Ogre::Vector3 distNorm( dist.normalisedCopy() );
- Ogre::Quaternion avatarOrient( sector_->avatar()->mainNode()->getOrientation() );
+ Ogre::Quaternion avatarOrient( sector_->avatarObject()->mainNode()->getOrientation() );
secondCamera_->setOrientation( avatarOrient );
@@ -717,17 +726,17 @@
switch ( cameraMode_ ){
case 0: //** free camera at orign
- mainCamera_->lookAt( sector_->avatar()->mainNode()->getPosition( ) );
+ mainCamera_->lookAt( sector_->avatarObject()->mainNode()->getPosition( ) );
break;
case 1: //** first person avatar camera
mainCamera_->setPosition( avatarPos );
mainCamera_->setOrientation( avatarOrient );
- sector_->avatar()->setVisible( false );
+ sector_->avatarObject()->setVisible( false );
break;
case 2: //** avatar chase camera
mainCamera_->setPosition( avatarPos + avatarOrient.zAxis() * 100 );
mainCamera_->setOrientation( avatarOrient );
- mainCamera_->yaw( Ogre::Degree(-90) );
+ // mainCamera_->yaw( Ogre::Degree(-90) );
break;
case 3: //** free avatar tracking-camera at orign
break;
@@ -767,24 +776,24 @@
Ogre::OverlayManager::getSingleton().getOverlayElement( overlayName_ + "/MainPanel/StatsTextArea" )
->setCaption( "fps: " + toStr( stats.lastFPS ) + " ping: " + toStr( network_->pingTime() ) + " ms" );
- if ( sector_->avatar() != NULL ){
- if ( sector_->avatar()->flightArrow() ) {
- if ( fabs( sector_->avatar()->velocity() ) > 1e-1 ){
- sector_->avatar()->flightArrow()->setVisible( true );
- sector_->avatar()->flightArrow()->setOrientation( sector_->avatar()->mainNode()->getOrientation() );
- sector_->avatar()->flightArrow()->setDirection( sector_->avatar()->flightDirection().normalisedCopy(),
+ if ( sector_->avatarObject() != NULL ){
+ if ( sector_->avatarObject()->flightArrow() ) {
+ if ( fabs( sector_->avatarObject()->velocity() ) > 1e-1 ){
+ sector_->avatarObject()->flightArrow()->setVisible( true );
+ sector_->avatarObject()->flightArrow()->setOrientation( sector_->avatarObject()->mainNode()->getOrientation() );
+ sector_->avatarObject()->flightArrow()->setDirection( sector_->avatarObject()->flightDirection().normalisedCopy(),
Ogre::Node::TS_WORLD );
} else {
- sector_->avatar()->flightArrow()->setVisible( false );
+ sector_->avatarObject()->flightArrow()->setVisible( false );
}
}
if ( target_ != NULL ) {
- Ogre::Vector3 distToTarget = target_->mainNode()->getPosition() - sector_->avatar()->mainNode()->getPosition();
- if ( sector_->avatar()->targetArrow() ) {
- sector_->avatar()->targetArrow()->setVisible( true );
- sector_->avatar()->targetArrow()->setOrientation( sector_->avatar()->mainNode()->getOrientation() );
- sector_->avatar()->targetArrow()->setDirection( distToTarget.normalisedCopy(), Ogre::Node::TS_WORLD );
+ Ogre::Vector3 distToTarget = target_->mainNode()->getPosition() - sector_->avatarObject()->mainNode()->getPosition();
+ if ( sector_->avatarObject()->targetArrow() ) {
+ sector_->avatarObject()->targetArrow()->setVisible( true );
+ sector_->avatarObject()->targetArrow()->setOrientation( sector_->avatarObject()->mainNode()->getOrientation() );
+ sector_->avatarObject()->targetArrow()->setDirection( distToTarget.normalisedCopy(), Ogre::Node::TS_WORLD );
}
//** Start update targeting pointer and duelist pointers;
@@ -805,13 +814,13 @@
targetCurser_->hide();
}
- Ogre::Real ammoTimeToTarget( distToTarget.length() / sector_->avatar()->ammoSpeed() );
+ Ogre::Real ammoTimeToTarget( distToTarget.length() / sector_->avatarObject()->ammoSpeed() );
if ( duelistPilot_ ){
- Ogre::Vector3 duelistPilotPos( sector_->avatar()->mainNode()->getPosition() +
- - sector_->avatar()->mainNode()->getOrientation().zAxis().normalisedCopy()
- * sector_->avatar()->ammoSpeed() * ammoTimeToTarget +
- sector_->avatar()->velDirection() * ammoTimeToTarget );
+ Ogre::Vector3 duelistPilotPos( sector_->avatarObject()->mainNode()->getPosition() +
+ - sector_->avatarObject()->mainNode()->getOrientation().zAxis().normalisedCopy()
+ * sector_->avatarObject()->ammoSpeed() * ammoTimeToTarget +
+ sector_->avatarObject()->velDirection() * ammoTimeToTarget );
targetVisible = projectionPos_( mainCamera_, duelistPilotPos, targetScreenPos );
if ( targetVisible ){
@@ -858,7 +867,7 @@
dynamic_cast< SectorObjectMoveable *>( target_ )->velocity(), 6 ) );
targetShieldText_->setText( "S" + Ogre::StringConverter::toString(
dynamic_cast< SectorObjectMoveable *>( target_ )->shieldPercent(), 4 ) );
- targetArmorText_->setText( "A" + Ogre::StringConverter::toString(
+ targetArmorText_->setText( "A" + Ogre::StringConverter::toString(
dynamic_cast< SectorObjectMoveable *>( target_ )->armorPercent(), 4 ) );
} else{
@@ -867,37 +876,31 @@
targetArmorText_->setText( "" );
}
} else {
- if ( sector_->avatar()->targetArrow() ) sector_->avatar()->targetArrow()->setVisible( false );
+ if ( sector_->avatarObject()->targetArrow() ) sector_->avatarObject()->targetArrow()->setVisible( false );
}
- Ogre::Real height = sector_->avatar()->velocity() * velocityProgressHeight_ / sector_->avatar()->velocityMax();
+ Ogre::Real height = sector_->avatarObject()->velocity() * velocityProgressHeight_ / sector_->avatarObject()->velocityMax();
velocityProgress_->setYPosition( CEGUI::UDim( 0.5, velocityProgressHeight_/2.0 - height ) );
velocityProgress_->setHeight( CEGUI::UDim( 0.0, height ) );
velocityProgressImg_->setYPosition( CEGUI::UDim( 0, -velocityProgressHeight_ + height ) );
- height = sector_->avatar()->capacity() * capacitorProgressHeight_ / sector_->avatar()->capacityMax();
+ height = sector_->avatarObject()->capacity() * capacitorProgressHeight_ / sector_->avatarObject()->capacityMax();
capacitorProgress_->setYPosition( CEGUI::UDim( 0.5, capacitorProgressHeight_/2.0 - height ) );
capacitorProgress_->setHeight( CEGUI::UDim( 0.0, height ) );
capacitorProgressImg_->setYPosition( CEGUI::UDim( 0, -capacitorProgressHeight_ + height ) );
- height = sector_->avatar()->thrust() * thrustProgressHeight_ / sector_->avatar()->thrustMax();
+ height = sector_->avatarObject()->thrust() * thrustProgressHeight_ / sector_->avatarObject()->thrustMax();
thrustProgress_->setYPosition( CEGUI::UDim( 0.5, thrustProgressHeight_/2.0 - height ) );
thrustProgress_->setHeight( CEGUI::UDim( 0.0, height ) );
thrustProgressImg_->setYPosition( CEGUI::UDim( 0, -thrustProgressHeight_ + height ) );
- velocityText_->setText( "V" + Ogre::StringConverter::toString( round( sector_->avatar()->velocity(), 2 ), 4 ) );
+ velocityText_->setText( "V" + Ogre::StringConverter::toString( round( sector_->avatarObject()->velocity(), 2 ), 4 ) );
// conText_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDConText" );
- shieldText_->setText( "S" + Ogre::StringConverter::toString( sector_->avatar()->shieldPercent(), 4 ) );
- armorText_->setText( "A" + Ogre::StringConverter::toString( sector_->avatar()->armorPercent(), 4 ) );
+ shieldText_->setText( "S" + Ogre::StringConverter::toString( sector_->avatarObject()->shieldPercent(), 4 ) );
+ armorText_->setText( "A" + Ogre::StringConverter::toString( sector_->avatarObject()->armorPercent(), 4 ) );
-
-
-
-
-
-
// OverlayElement* guiAvg = OverlayManager::getSingleton().getOverlayElement("Core/AverageFps");
// OverlayElement* guiCurr = OverlayManager::getSingleton().getOverlayElement("Core/CurrFps");
// OverlayElement* guiBest = OverlayManager::getSingleton().getOverlayElement("Core/BestFps");
@@ -922,8 +925,6 @@
void UnDockedState::updateRadar_( ){
-
-
// Overlay* pHUD = OverlayManager::getSingleton().getByName("HUD");
// OverlayContainer* pMinMapElement = pHUD->getChild("MiniMap");
// Overlay* pMiniMapDots = OverlayManager::getSingleton().getByName("MiniMapDots");
@@ -941,23 +942,22 @@
}
void UnDockedState::avatarDeathSequence( bool on ){
- if ( sector_->avatar() != NULL ){
+ if ( sector_->avatarObject() != NULL ){
if ( on ){
- deathSequence_ = true;
cameraMode_ = 0;
- mainCamera_->setOrientation( sector_->avatar()->mainNode()->getOrientation() );
- mainCamera_->setPosition( sector_->avatar()->mainNode()->getOrientation().zAxis() * 100.0 );
+ mainCamera_->setOrientation( sector_->avatarObject()->mainNode()->getOrientation() );
+ mainCamera_->setPosition( sector_->avatarObject()->mainNode()->getOrientation().zAxis() * 50.0 );
+ Ogre::OverlayManager::getSingleton().getByName( "Radar" )->hide();
+ overlayRootWindow_->hide();
hudOverlay_->hide();
} else {
- deathSequence_ = false;
- cameraMode_ = 1;
- hudOverlay_->show();
+ enterDockedState_ = true;
}
} // if avatar
}
bool UnDockedState::renderSpaceDust(){
-// if ( sector_->avatar() != NULL ){
+// if ( sector_->avatarObject() != NULL ){
// const Ogre::Real maxDist = 250.0;
// const Ogre::Real mirrorDist = maxDist*0.99;
// const Ogre::Real dimFactor = 0.8*0.005*0.005;
Modified: branches/ogsector/src/UnDockedState.h
===================================================================
--- branches/ogsector/src/UnDockedState.h 2007-05-23 21:24:50 UTC (rev 508)
+++ branches/ogsector/src/UnDockedState.h 2007-05-26 20:09:35 UTC (rev 509)
@@ -92,7 +92,7 @@
inline bool handleMinimiseConsole( const CEGUI::EventArgs & e ){ minimiseConsole(); return true; }
inline bool handleConfigBackButton( const CEGUI::EventArgs & e ){ return switchConfigDialog( ); }
- void toggleNextCamera_( );
+ void toggleNextCamera_( int mode = -1 );
void updateCamera_( );
void updateHUD_( );
void updateRadar_( );
@@ -174,7 +174,8 @@
Ogre::ParticleSystem * spaceDustParticleSystem_;
- bool deathSequence_;
+ bool enterDockedState_;
+
double timeSinceLastSectorUpdate_;
double timeSinceLastNetworkUpdate_;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-05-23 21:24:49
|
Revision: 508
http://svn.sourceforge.net/opengate/?rev=508&view=rev
Author: spom_spom
Date: 2007-05-23 14:24:50 -0700 (Wed, 23 May 2007)
Log Message:
-----------
Add: starting support for JG style HUD. Not yet finished and Im not happy with the images but you will see the idea.
Modified Paths:
--------------
branches/ogsector/data/gui/layouts/opengateDocked.layout
branches/ogsector/data/gui/layouts/opengateUnDocked.layout
branches/ogsector/data/gui/schemes/opengate/opengate.scheme
branches/ogsector/data/simpleHUD.overlay
branches/ogsector/src/DockedState.cpp
branches/ogsector/src/GameStateManager.cpp
branches/ogsector/src/Makefile.in
branches/ogsector/src/SectorObjects.cpp
branches/ogsector/src/SectorObjects.h
branches/ogsector/src/UnDockedState.cpp
branches/ogsector/src/UnDockedState.h
Added Paths:
-----------
branches/ogsector/data/gui/schemes/opengate/hud/
branches/ogsector/data/gui/schemes/opengate/hud/defaultHUD.imageset
branches/ogsector/data/gui/schemes/opengate/hud/defaultHUD.odg
branches/ogsector/data/gui/schemes/opengate/hud/defaultHUD.png
branches/ogsector/data/gui/schemes/opengate/hud/defaultHUD.xcf
Modified: branches/ogsector/data/gui/layouts/opengateDocked.layout
===================================================================
--- branches/ogsector/data/gui/layouts/opengateDocked.layout 2007-05-22 12:57:43 UTC (rev 507)
+++ branches/ogsector/data/gui/layouts/opengateDocked.layout 2007-05-23 21:24:50 UTC (rev 508)
@@ -15,6 +15,7 @@
<Property Name="UnifiedSize" Value="{{1.0,-18},{1.0,-16}}" />
<Property Name="BackgroundEnabled" Value="False" />
<Property Name="FrameEnabled" Value="false" />
+ <Property Name="RiseOnClick" Value="false" />
<Property Name="Image" Value="set:opengate image:ConsoleBackground50" />
</Window>
<Window Type="opengate/StaticImage" Name="Docked/MainWindow/ConsoleFrameTopLeftHS">
Modified: branches/ogsector/data/gui/layouts/opengateUnDocked.layout
===================================================================
--- branches/ogsector/data/gui/layouts/opengateUnDocked.layout 2007-05-22 12:57:43 UTC (rev 507)
+++ branches/ogsector/data/gui/layouts/opengateUnDocked.layout 2007-05-23 21:24:50 UTC (rev 508)
@@ -6,6 +6,193 @@
<!-- <Property Name="UnifiedPosition" Value="{{0.0,23},{0.0,5}}" /> -->
<!-- <Property Name="UnifiedSize" Value="{{1.0,-46},{1.0,-10}}" /> -->
<Property Name="Alpha" Value="1" />
+ <Window Type="opengate/StaticImage" Name="HUDCenterUp">
+ <Property Name="UnifiedPosition" Value="{{0.5,-81},{0.5,-112}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,162},{0.0,50}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengateHUD image:CenterUp" />
+ </Window>
+ <Window Type="opengate/StaticImage" Name="HUDCenterDown">
+ <Property Name="UnifiedPosition" Value="{{0.5,-81},{0.5,62}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,162},{0.0,50}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengateHUD image:CenterDown" />
+ </Window>
+ <Window Type="DefaultWindow" Name="HUDVelocityProgress">
+ <Property Name="UnifiedPosition" Value="{{0.5,-112},{0.5,-73}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,40},{0.0,146}}" />
+ <Window Type="opengate/StaticImage" Name="HUDVelocity">
+ <Property Name="UnifiedPosition" Value="{{0.0,0},{0.0,0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,40},{0.0,146}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengateHUD image:Velocity" />
+ </Window>
+ </Window>
+ <Window Type="DefaultWindow" Name="HUDArmorProgress">
+ <Property Name="UnifiedPosition" Value="{{0.5,-125},{0.5,-75}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,250},{0.0,150}}" />
+ <Window Type="opengate/StaticImage" Name="HUDArmorLeft">
+ <Property Name="UnifiedPosition" Value="{{0.0,0},{0.0,0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,39},{0.0,150}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengateHUD image:ArmorLeft" />
+ </Window>
+ <Window Type="opengate/StaticImage" Name="HUDArmorRight">
+ <Property Name="UnifiedPosition" Value="{{1.0,-39},{0.0,0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,39},{0.0,150}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengateHUD image:ArmorRight" />
+ </Window>
+ </Window>
+ <Window Type="DefaultWindow" Name="HUDShieldProgress">
+ <Property Name="UnifiedPosition" Value="{{0.5,-136},{0.5,-80}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,272},{0.0,160}}" />
+ <Window Type="opengate/StaticImage" Name="HUDShieldLeft">
+ <Property Name="UnifiedPosition" Value="{{0.0,0},{0.0,0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,48},{0.0,160}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengateHUD image:ShieldLeft" />
+ </Window>
+ <Window Type="opengate/StaticImage" Name="HUDShieldRight">
+ <Property Name="UnifiedPosition" Value="{{1.0,-48},{0.0,0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,48},{0.0,160}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengateHUD image:ShieldRight" />
+ </Window>
+ </Window>
+ <Window Type="DefaultWindow" Name="HUDThrustProgress">
+ <Property Name="UnifiedPosition" Value="{{0.5,-92},{0.5,-62}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,27},{0.0,124}}" />
+ <Window Type="opengate/StaticImage" Name="HUDThrust">
+ <Property Name="UnifiedPosition" Value="{{0.0,0},{0.0,0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,27},{0.0,124}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengateHUD image:Thrust" />
+ </Window>
+ </Window>
+ <Window Type="DefaultWindow" Name="HUDFuelProgress">
+ <Property Name="UnifiedPosition" Value="{{0.5,65},{0.5,-62}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,27},{0.0,124}}" />
+ <Window Type="opengate/StaticImage" Name="HUDFuel">
+ <Property Name="UnifiedPosition" Value="{{0.0,0},{0.0,0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,27},{0.0,124}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengateHUD image:Fuel" />
+ </Window>
+ </Window>
+ <Window Type="DefaultWindow" Name="HUDCapacitorProgress">
+ <Property Name="UnifiedPosition" Value="{{0.5,70},{0.5,-73}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,40},{0.0,146}}" />
+ <Window Type="opengate/StaticImage" Name="HUDCapacitor">
+ <Property Name="UnifiedPosition" Value="{{0.0,0},{0.0,0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,40},{0.0,146}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengateHUD image:Capacitor" />
+ </Window>
+ </Window>
+ <Window Type="opengate/StaticImage" Name="HUDFlightCurser">
+ <Property Name="UnifiedPosition" Value="{{0.5,-20},{0.5,-20}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,20},{0.0,20}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengateHUD image:FlightCurser" />
+ </Window>
+ <Window Type="opengate/StaticImage" Name="HUDCenter">
+ <Property Name="UnifiedPosition" Value="{{0.5,-20},{0.5,-20}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,40},{0.0,40}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengateHUD image:Center" />
+ </Window>
+ <Window Type="opengate/StaticImage" Name="HUDTargetCurser">
+ <Property Name="UnifiedPosition" Value="{{0.0,0},{0.0,0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,40},{0.0,40}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengateHUD image:TargetCurser" />
+ </Window>
+ <Window Type="opengate/StaticImage" Name="HUDPilotFlightCurser">
+ <Property Name="UnifiedPosition" Value="{{0.0,0},{0.0,0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,20},{0.0,20}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengateHUD image:PilotFlightCurser" />
+ </Window>
+ <Window Type="opengate/StaticImage" Name="HUDTargetFlightCurser">
+ <Property Name="UnifiedPosition" Value="{{0.0,0},{0.0,0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,40},{0.0,40}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengateHUD image:TargetFlightCurser" />
+ </Window>
+
+ <Window Type="opengate/StaticText" Name="HUDVelocityText">
+ <Property Name="UnifiedPosition" Value="{{0.5,-100},{0.5,-120}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,60},{0.0,40}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Text" Value="V0.00" />
+ </Window>
+ <Window Type="opengate/StaticText" Name="HUDConText">
+ <Property Name="UnifiedPosition" Value="{{0.5,-100},{0.5,-105}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,60},{0.0,40}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Text" Value="C0.00" />
+ </Window>
+ <Window Type="opengate/StaticText" Name="HUDShieldText">
+ <Property Name="UnifiedPosition" Value="{{0.5,+60},{0.5,-120}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,60},{0.0,40}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Text" Value="S100%" />
+ </Window>
+ <Window Type="opengate/StaticText" Name="HUDArmorText">
+ <Property Name="UnifiedPosition" Value="{{0.5,+60},{0.5,-105}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,60},{0.0,40}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Text" Value="A100%" />
+ </Window>
+
+ <Window Type="opengate/StaticText" Name="HUDTargetDistanceText">
+ <Property Name="UnifiedPosition" Value="{{0.5,-100},{0.5,65}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,60},{0.0,40}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Text" Value="D000" />
+ </Window>
+ <Window Type="opengate/StaticText" Name="HUDTargetVelocityText">
+ <Property Name="UnifiedPosition" Value="{{0.5,-100},{0.5,80}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,60},{0.0,40}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Text" Value="V0" />
+ </Window>
+ <Window Type="opengate/StaticText" Name="HUDTargetShieldText">
+ <Property Name="UnifiedPosition" Value="{{0.5,+60},{0.5,65}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,60},{0.0,40}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Text" Value="S100%" />
+ </Window>
+ <Window Type="opengate/StaticText" Name="HUDTargetArmorText">
+ <Property Name="UnifiedPosition" Value="{{0.5,+60},{0.5,80}}" />
+ <Property Name="UnifiedSize" Value="{{0.0,60},{0.0,40}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Text" Value="A100%" />
+ </Window>
<Window Type="DefaultWindow" Name="UnDocked/MainWindow/ConsoleFrame">
<Property Name="UnifiedPosition" Value="{{0.0,62},{0.0,10}}" />
<Property Name="UnifiedSize" Value="{{1.0,-370},{0.0,100}}" />
Added: branches/ogsector/data/gui/schemes/opengate/hud/defaultHUD.imageset
===================================================================
--- branches/ogsector/data/gui/schemes/opengate/hud/defaultHUD.imageset (rev 0)
+++ branches/ogsector/data/gui/schemes/opengate/hud/defaultHUD.imageset 2007-05-23 21:24:50 UTC (rev 508)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Imageset Name="opengateHUD" Imagefile="hud/defaultHUD.png">
+ <Image Name="FlightCurser" XPos="3" YPos="4" Width="20" Height="20" />
+ <Image Name="Center" XPos="0" YPos="30" Width="40" Height="40" />
+ <Image Name="TargetCurser" XPos="0" YPos="71" Width="40" Height="40" />
+ <Image Name="PilotFlightCurser" XPos="26" YPos="4" Width="20" Height="20" />
+ <Image Name="TargetFlightCurser" XPos="45" YPos="71" Width="40" Height="40" />
+ <Image Name="GreenShieldLeft" XPos="4" YPos="135" Width="98" Height="280" />
+ <Image Name="Velocity" XPos="170" YPos="55" Width="40" Height="146" />
+ <Image Name="Capacitor" XPos="213" YPos="55" Width="40" Height="146" />
+ <Image Name="CenterUp" XPos="276" YPos="88" Width="162" Height="50" />
+ <Image Name="CenterDown" XPos="276" YPos="37" Width="162" Height="50" />
+ <Image Name="Thrust" XPos="444" YPos="14" Width="27" Height="124" />
+ <Image Name="Fuel" XPos="481" YPos="14" Width="27" Height="124" />
+ <Image Name="ArmorRight" XPos="432" YPos="138" Width="39" Height="149" />
+ <Image Name="ArmorLeft" XPos="472" YPos="138" Width="39" Height="149" />
+ <Image Name="ShieldLeft" XPos="334" YPos="139" Width="48" Height="160" />
+ <Image Name="ShieldRight" XPos="384" YPos="139" Width="48" Height="160" />
+</Imageset>
Added: branches/ogsector/data/gui/schemes/opengate/hud/defaultHUD.odg
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/data/gui/schemes/opengate/hud/defaultHUD.odg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/data/gui/schemes/opengate/hud/defaultHUD.png
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/data/gui/schemes/opengate/hud/defaultHUD.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/data/gui/schemes/opengate/hud/defaultHUD.xcf
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/data/gui/schemes/opengate/hud/defaultHUD.xcf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/ogsector/data/gui/schemes/opengate/opengate.scheme
===================================================================
--- branches/ogsector/data/gui/schemes/opengate/opengate.scheme 2007-05-22 12:57:43 UTC (rev 507)
+++ branches/ogsector/data/gui/schemes/opengate/opengate.scheme 2007-05-23 21:24:50 UTC (rev 508)
@@ -1,6 +1,7 @@
<?xml version="1.0" ?>
<GUIScheme Name="opengate">
<Imageset Name="opengate" Filename="opengate.imageset" />
+ <Imageset Name="opengateHUD" Filename="hud/defaultHUD.imageset" />
<ImagesetFromImage Name="MainWindowTopLeft" Filename="textures/mainTopLeft.png" />
<ImagesetFromImage Name="MainWindowTopRight" Filename="textures/mainTopRight.png" />
Modified: branches/ogsector/data/simpleHUD.overlay
===================================================================
--- branches/ogsector/data/simpleHUD.overlay 2007-05-22 12:57:43 UTC (rev 507)
+++ branches/ogsector/data/simpleHUD.overlay 2007-05-23 21:24:50 UTC (rev 508)
@@ -18,79 +18,79 @@
SimpleHUD
{
zorder 500
- container Panel(SimpleHUD/Console)
- {
- left 0.01
- top 0.01
- width 0.98
- height 0.5
+// 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/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
- }
-
+//
+// 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/FlightCurser)
{
metrics_mode pixels
@@ -98,39 +98,39 @@
left 0
width 32
height 32
- material SimpleHUD/FlightCurser
+// material SimpleHUD/FlightCurser
}
+//
+// 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/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
@@ -150,90 +150,90 @@
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/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
Modified: branches/ogsector/src/DockedState.cpp
===================================================================
--- branches/ogsector/src/DockedState.cpp 2007-05-22 12:57:43 UTC (rev 507)
+++ branches/ogsector/src/DockedState.cpp 2007-05-23 21:24:50 UTC (rev 508)
@@ -65,11 +65,7 @@
// camera->setAspectRatio( (Ogre::Real)devices_->renderWindow->getViewport( 0 )->getActualWidth() /
// (Ogre::Real)devices_->renderWindow->getViewport( 0 )->getActualHeight() );
- devices_->guiSystem->setDefaultMouseCursor( (CEGUI::utf8*)"opengate", (CEGUI::utf8*)"MouseArrow" );
- CEGUI::MouseCursor::getSingleton().setImage( (CEGUI::utf8*)"opengate", (CEGUI::utf8*)"MouseArrow" );
-
overlayRootWindow_ = CEGUI::WindowManager::getSingleton().loadWindowLayout((CEGUI::utf8*)"opengateDocked.layout");
-
Ogre::SceneNode * backgroundNode = sceneMgr_->getRootSceneNode()->createChildSceneNode( "Background" );
Ogre::ManualObject * background = sceneMgr_->createManualObject( "BackgroundObject" );
@@ -116,6 +112,9 @@
devices_->inputManager->addKeyListener( this, "DockedStateKeyListener" );
devices_->inputManager->addMouseListener( this, "DockedStateMouseListener" );
+ devices_->guiSystem->setDefaultMouseCursor( (CEGUI::utf8*)"opengate", (CEGUI::utf8*)"MouseArrow" );
+ CEGUI::MouseCursor::getSingleton().setImage( (CEGUI::utf8*)"opengate", (CEGUI::utf8*)"MouseArrow" );
+
Ogre::Viewport * vp = devices_->renderWindow->addViewport( sceneMgr_->getCamera( "StationCamera" ), 0, 0.0, 0.0, 1.0f, 1.0f );
vp->setBackgroundColour( Ogre::ColourValue( 0, 0, 0) );
minimiseConsole( );
Modified: branches/ogsector/src/GameStateManager.cpp
===================================================================
--- branches/ogsector/src/GameStateManager.cpp 2007-05-22 12:57:43 UTC (rev 507)
+++ branches/ogsector/src/GameStateManager.cpp 2007-05-23 21:24:50 UTC (rev 508)
@@ -113,11 +113,6 @@
delete vesselManager_;
vesselManager_ = NULL;
}
- if ( vesselManager_ ){
- log_->info( "Shutdown vesselmanager." );
- delete vesselManager_;
- vesselManager_ = NULL;
- }
if ( devices_.inputManager ) {
log_->info( "Shutdown inputmanager." );
delete devices_.inputManager;
Modified: branches/ogsector/src/Makefile.in
===================================================================
--- branches/ogsector/src/Makefile.in 2007-05-22 12:57:43 UTC (rev 507)
+++ branches/ogsector/src/Makefile.in 2007-05-23 21:24:50 UTC (rev 508)
@@ -51,12 +51,13 @@
am_opengateclient_OBJECTS = opengateclient.$(OBJEXT) common.$(OBJEXT) \
networkClient.$(OBJEXT) tinyxml.$(OBJEXT) \
tinyxmlerror.$(OBJEXT) tinyxmlparser.$(OBJEXT) \
- Console.$(OBJEXT) Entity.$(OBJEXT) EntityManager.$(OBJEXT) \
- LogManager.$(OBJEXT) InputManager.$(OBJEXT) \
- VesselManager.$(OBJEXT) GameStateManager.$(OBJEXT) \
- GameState.$(OBJEXT) DockedState.$(OBJEXT) \
- ShipConfigDialog.$(OBJEXT) UnDockedState.$(OBJEXT) \
- Sector.$(OBJEXT) SectorObjects.$(OBJEXT)
+ Console.$(OBJEXT) ConfigDialog.$(OBJEXT) Entity.$(OBJEXT) \
+ EntityManager.$(OBJEXT) LogManager.$(OBJEXT) \
+ InputManager.$(OBJEXT) VesselManager.$(OBJEXT) \
+ GameStateManager.$(OBJEXT) GameState.$(OBJEXT) \
+ DockedState.$(OBJEXT) ShipConfigDialog.$(OBJEXT) \
+ UnDockedState.$(OBJEXT) Sector.$(OBJEXT) \
+ SectorObjects.$(OBJEXT)
opengateclient_OBJECTS = $(am_opengateclient_OBJECTS)
opengateclient_LDADD = $(LDADD)
am_opengateserver_OBJECTS = opengateserver.$(OBJEXT) common.$(OBJEXT) \
@@ -192,6 +193,8 @@
tinyxml/tinyxmlparser.cpp \
Console.h \
Console.cpp \
+ ConfigDialog.h \
+ ConfigDialog.cpp \
Entity.h \
Entity.cpp \
EntityManager.h \
@@ -310,6 +313,7 @@
distclean-compile:
-rm -f *.tab.c
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConfigDialog.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Console.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DockedState.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Entity.Po@am__quote@
Modified: branches/ogsector/src/SectorObjects.cpp
===================================================================
--- branches/ogsector/src/SectorObjects.cpp 2007-05-22 12:57:43 UTC (rev 507)
+++ branches/ogsector/src/SectorObjects.cpp 2007-05-23 21:24:50 UTC (rev 508)
@@ -467,8 +467,11 @@
}
shield_ += shieldRechargeBaseRate_ * elapsedTime;
- shield_ = min( maxShield_, shield_ );
+ shield_ = min( shield_, shieldMax_ );
+ capacity_ += capacityRecharge_ * elapsedTime;
+ capacity_ = min( capacity_, capacityMax_ );
+
fire( elapsedTime );
//** snap quaternion
@@ -491,10 +494,14 @@
armor_ = vesselBluePrint_->armor();
//** omnus
- maxShield_ = 5700.0;
- shield_ = maxShield_;
+ shieldMax_ = 5700.0;
+ shield_ = shieldMax_;
shieldRechargeBaseRate_ = 52.500;
+ capacity_ = 0;
+ capacityRecharge_ = 1000;
+ capacityMax_ = 1000;
+
ammoSpeed_ = 1000;
velocity_ = 0.0;
@@ -554,10 +561,14 @@
if ( fireDelay_ <= 0 ){
+ Ogre::Real damage = 500.0;
if ( firePressed_ ){
- projectiles_.insert( new Projectile( this, shotsFired_, ammoSpeed_ ) );
- fireDelay_ = delayTime;
- shotsFired_++;
+ if ( capacity_ > damage ){
+ projectiles_.insert( new Projectile( this, shotsFired_, ammoSpeed_ ) );
+ fireDelay_ = delayTime;
+ shotsFired_++;
+ capacity_ -= damage;
+ }
}
// int nEmits = fireParticles_->getNumEmitters( );
Modified: branches/ogsector/src/SectorObjects.h
===================================================================
--- branches/ogsector/src/SectorObjects.h 2007-05-22 12:57:43 UTC (rev 507)
+++ branches/ogsector/src/SectorObjects.h 2007-05-23 21:24:50 UTC (rev 508)
@@ -191,7 +191,7 @@
Ogre::Real rotFriction(){ return 0.4 + ( 0.6 * ( 100.0 - percentageThrust_ )/ 100.0 ); }
- inline Ogre::Real thrustPercent() const { return 100.0 * thrust() / maxThrust(); }
+ inline Ogre::Real thrustPercent() const { return 100.0 * thrust() / thrustMax(); }
inline void setThrustPercent( Ogre::Real thrust ) {
percentageThrust_ = min( thrust, Ogre::Real( 100.0 ) );
percentageThrust_ = max( Ogre::Real( 0.0 ), thrust );
@@ -237,22 +237,21 @@
}
inline bool breakPressed( ) const { return breakPressed_; }
- inline Ogre::Real maxThrust( ) const { return maxThrust_; }
-
Ogre::Real thrust() const {
- Ogre::Real thrust = maxThrust() * percentageThrust_ / 100.0;
- if ( afterburnerPressed_ ) thrust *= 1.2;
+ Ogre::Real thrust = thrustMax() * percentageThrust_ / 100.0;
+ if ( afterburnerPressed_ ) thrust *= 1.3;
if ( flashfire_ ) thrust *= 10;
return thrust;
}
+ inline Ogre::Real thrustMax( ) const { return maxThrust_; }
inline void setArmorPercent( Ogre::Real armor ) { armor_ = min( (double)vesselBluePrint_->armor(),
vesselBluePrint_->armor() * armor/100.0 ); }
inline Ogre::Real armorPercent() const { return round( 100.0 * armor_ / vesselBluePrint_->armor(), 1 ); }
- inline void setShieldPercent( Ogre::Real shield ) { shield_ = min( (double)maxShield_, maxShield_ * shield / 100.0 ); }
+ inline void setShieldPercent( Ogre::Real shield ) { shield_ = min( (double)shieldMax_, shieldMax_ * shield / 100.0 ); }
inline Ogre::Real shieldPercent() const {
- if (maxShield_ > 0 ) return round( 100.0 * shield_ / maxShield_, 1 ); else return 0.0;
+ if ( shieldMax_ > 0 ) return round( 100.0 * shield_ / shieldMax_, 1 ); else return 0.0;
}
Ogre::Vector3 flightDirection() const {
@@ -262,15 +261,21 @@
Ogre::Real ammoSpeed() const { return ammoSpeed_; }
+
Ogre::Vector3 velDirection() const { return vel_; }
Ogre::Real velocity() const { return vel_.length(); }
+ Ogre::Real velocityMax() const { return sqrt( thrustMax() / vesselBluePrint_->dragFactor() ); }
+
void setVelocity( const Ogre::Vector3 & vel ) { vel_ = vel; }
+ Ogre::Real capacity() const { return capacity_; }
+
+ Ogre::Real capacityMax() const { return capacityMax_; }
+
Ogre::Real acceleration() const { return acc_.length(); }
- Ogre::Real velocityMax() const { return sqrt( maxThrust() / vesselBluePrint_->dragFactor() ); }
void fire( Ogre::Real elapsedTime );
@@ -279,6 +284,7 @@
virtual Uint16 incNetSequence( ){ netSequence_++; return netSequence_; }
protected:
+
Vessel * vesselBluePrint_;
std::set < Projectile * > projectiles_;
@@ -297,10 +303,14 @@
Ogre::Real ethernalDensity_;
Ogre::Real armor_;
- Ogre::Real maxShield_;
+ Ogre::Real shieldMax_;
Ogre::Real shield_;
Ogre::Real shieldRechargeBaseRate_;
+ Ogre::Real capacity_;
+ Ogre::Real capacityRecharge_;
+ Ogre::Real capacityMax_;
+
Ogre::Real yaw_;
Ogre::Real pitch_;
Ogre::Real roll_;
Modified: branches/ogsector/src/UnDockedState.cpp
===================================================================
--- branches/ogsector/src/UnDockedState.cpp 2007-05-22 12:57:43 UTC (rev 507)
+++ branches/ogsector/src/UnDockedState.cpp 2007-05-23 21:24:50 UTC (rev 508)
@@ -67,6 +67,72 @@
sector_ = new Sector( sceneMgr_, network_ );
sector_->setListener( this );
setupEventHandlers();
+
+ targetCurser_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDTargetCurser" );
+ targetCurserHalfWidth_ = targetCurser_->getWidth().asAbsolute( 0.0 ) / 2.0;
+ targetCurserHalfHeight_ = targetCurser_->getHeight().asAbsolute( 0.0 ) / 2.0;
+ targetCurser_->hide();
+
+ pilotFlightCurser_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDPilotFlightCurser" );
+ pilotFlightCurserHalfWidth_ = pilotFlightCurser_->getWidth().asAbsolute( 0.0 ) / 2.0;
+ pilotFlightCurserHalfHeight_ = pilotFlightCurser_->getHeight().asAbsolute( 0.0 ) / 2.0;
+ pilotFlightCurser_->hide();
+
+ targetFlightCurser_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDTargetFlightCurser" );
+ targetFlightCurserHalfWidth_ = targetFlightCurser_->getWidth().asAbsolute( 0.0 ) / 2.0;
+ targetFlightCurserHalfHeight_ = targetFlightCurser_->getHeight().asAbsolute( 0.0 ) / 2.0;
+ targetFlightCurser_->hide();
+
+ velocityProgress_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDVelocityProgress" );
+ velocityProgressHeight_ = velocityProgress_->getHeight().asAbsolute( 0.0 );
+ velocityProgressImg_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDVelocity" );
+ velocityProgressImg_->setClippedByParent( true );
+
+ thrustProgress_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDThrustProgress" );
+ thrustProgressHeight_ = thrustProgress_->getHeight().asAbsolute( 0.0 );
+ thrustProgressImg_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDThrust" );
+ thrustProgressImg_->setClippedByParent( true );
+
+ fuelProgress_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDFuelProgress" );
+ fuelProgressHeight_ = fuelProgress_->getHeight().asAbsolute( 0.0 );
+ fuelProgressImg_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDFuel" );
+ fuelProgressImg_->setClippedByParent( true );
+
+ capacitorProgress_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDCapacitorProgress" );
+ capacitorProgressHeight_ = capacitorProgress_->getHeight().asAbsolute( 0.0 );
+ capacitorProgressImg_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDCapacitor" );
+ capacitorProgressImg_->setClippedByParent( true );
+
+ armorProgress_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDArmorProgress" );
+ armorProgressHeight_ = armorProgress_->getHeight().asAbsolute( 0.0 );
+ armorProgressLeftImg_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDArmorLeft" );
+ armorProgressRightImg_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDArmorRight" );
+ armorProgressLeftImg_->setClippedByParent( true );
+ armorProgressRightImg_->setClippedByParent( true );
+
+ shieldProgress_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDShieldProgress" );
+ shieldProgressHeight_ = shieldProgress_->getHeight().asAbsolute( 0.0 );
+ shieldProgressLeftImg_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDShieldLeft" );
+ shieldProgressRightImg_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDShieldRight" );
+ shieldProgressLeftImg_->setClippedByParent( true );
+ shieldProgressRightImg_->setClippedByParent( true );
+
+ velocityText_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDVelocityText" );
+ conText_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDConText" );
+ shieldText_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDShieldText" );
+ armorText_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDArmorText" );
+
+ targetDistanceText_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDTargetDistanceText" );
+ targetVelocity_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDTargetVelocityText" );
+ targetShieldText_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDTargetShieldText" );
+ targetArmorText_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDTargetArmorText" );
+
+ devices_->guiSystem->setDefaultMouseCursor( (CEGUI::utf8*)"opengate", (CEGUI::utf8*)"MouseArrow" );
+ CEGUI::MouseCursor::getSingleton().setImage( (CEGUI::utf8*)"opengate", (CEGUI::utf8*)"MouseArrow" );
+
+ flightCurser_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDFlightCurser" );
+ flightCurserHalfWidth_ = 10;
+ flightCurserHalfHeight_ = 10;
}
void UnDockedState::destroyContent( ){
@@ -98,29 +164,21 @@
vp1->setShadowsEnabled( false );
vp1->setOverlaysEnabled( false );
+ CEGUI::MouseCursor::getSingleton().hide();
+
overlayName_ = "SimpleHUD";
-
hudOverlay_ = Ogre::OverlayManager::getSingleton().getByName( overlayName_ );
- hudOverlay_->getChild( overlayName_ + "/ChatIn" )->hide( );
+ hudOverlay_->show( );
+// mousePointer_ = hudOverlay_->getChild( overlayName_ + "/FlightCurser" );
+// mousePointer_->setTop( windowsHalfHeight_ - mousePointer_->getHeight() / 2 );
+// mousePointer_->setLeft( windowsHalfWidth_ - mousePointer_->getWidth() / 2 );
+// mousePointer_->hide();
- Ogre::OverlayElement * centerPointer_ = hudOverlay_->getChild( overlayName_ + "/CenterPointer" );
- centerPointer_->setTop( windowsHalfHeight_ - centerPointer_->getHeight() / 2 );
- centerPointer_->setLeft( windowsHalfWidth_ - centerPointer_->getWidth() / 2 );
+ flightCurserPos_[ 0 ] = windowsHalfWidth_ - flightCurserHalfWidth_;
+ flightCurserPos_[ 1 ] = windowsHalfHeight_ - flightCurserHalfHeight_;
+ flightCurser_->setPosition( CEGUI::UVector2( CEGUI::UDim( 0.0, flightCurserPos_[ 0 ] ),
+ CEGUI::UDim( 0.0, flightCurserPos_[ 1 ] ) ) );
- mousePointer_ = hudOverlay_->getChild( overlayName_ + "/FlightCurser" );
- mousePointer_->setTop( windowsHalfHeight_ - mousePointer_->getHeight() / 2 );
- mousePointer_->setLeft( windowsHalfWidth_ - mousePointer_->getWidth() / 2 );
-
- Ogre::OverlayElement * duelistPilotPointer = hudOverlay_->getChild( overlayName_ + "/DuelistPilotPointer" );
- duelistPilotPointer->setLeft( windowsHalfWidth_ - duelistPilotPointer->getWidth() / 2 );
- duelistPilotPointer->setTop( windowsHalfHeight_ - duelistPilotPointer->getHeight() / 2 );
- duelistPilotPointer->show();
-
- hudOverlay_->getChild( overlayName_ + "/DuelistTargetPointer" )->hide();
- // hudOverlay_->getChild( overlayName_ + "/SimpleHUD/Console" )->hide();
-
- duelistPilotPointer->show();
- hudOverlay_->show( );
Ogre::OverlayManager::getSingleton().getByName( "Radar" )->show();
deathSequence_ = false;
@@ -196,6 +254,8 @@
if ( overlayRootWindow_ ) overlayRootWindow_->hide();
if ( devices_->console ) devices_->console->stop();
+ CEGUI::MouseCursor::getSingleton().show();
+
hudOverlay_->hide( );
Ogre::OverlayManager::getSingleton().getByName( "Radar" )->hide();
@@ -215,7 +275,9 @@
if ( configMode_ ){
hudOverlay_->hide( );
Ogre::OverlayManager::getSingleton().getByName( "Radar" )->hide();
+ CEGUI::MouseCursor::getSingleton().show();
} else {
+ CEGUI::MouseCursor::getSingleton().hide();
hudOverlay_->show( );
Ogre::OverlayManager::getSingleton().getByName( "Radar" )->show();
}
@@ -402,19 +464,33 @@
}
bool UnDockedState::mouseMoved( const OIS::MouseEvent & e ){
- if (!configMode_){
- mousePointer_->setLeft( mousePointer_->getLeft( ) + e.state.X.rel );
- mousePointer_->setTop( mousePointer_->getTop( ) + e.state.Y.rel );
+ if ( !configMode_ ){
+ flightCurserPos_[ 0 ] += e.state.X.rel;
+ flightCurserPos_[ 1 ] += e.state.Y.rel;
+
+ flightCurserPos_[ 0 ] = min ( flightCurserPos_[ 0 ], windowsWidth_- flightCurserHalfWidth_ );
+ flightCurserPos_[ 1 ] = min ( flightCurserPos_[ 1 ], windowsHeight_- flightCurserHalfHeight_ );
+
+ flightCurserPos_[ 0 ] = max ( flightCurserPos_[ 0 ], -flightCurserHalfWidth_ );
+ flightCurserPos_[ 1 ] = max ( flightCurserPos_[ 1 ], -flightCurserHalfHeight_ );
+
+ flightCurser_->setPosition( CEGUI::UVector2( CEGUI::UDim( 0.0, flightCurserPos_[ 0 ] ),
+ CEGUI::UDim( 0.0, flightCurserPos_[ 1 ] ) ) );
+
+// mousePointer_->setLeft( mousePointer_->getLeft( ) + e.state.X.rel );
+// mousePointer_->setTop( mousePointer_->getTop( ) + e.state.Y.rel );
- Ogre::Real mousePointerWidth = mousePointer_->getWidth();
- Ogre::Real mousePointerHeight = mousePointer_->getHeight();
- if ( mousePointer_->getLeft( ) < -mousePointerWidth ) mousePointer_->setLeft( -mousePointerWidth );
- if ( mousePointer_->getTop( ) < -mousePointerHeight ) mousePointer_->setTop( -mousePointerHeight );
+// Ogre::Real mousePointerWidth = mousePointer_->getWidth();
+// Ogre::Real mousePointerHeight = mousePointer_->getHeight();
+// if ( mousePointer_->getLeft( ) < -mousePointerWidth ) mousePointer_->setLeft( -mousePointerWidth );
+// if ( mousePointer_->getTop( ) < -mousePointerHeight ) mousePointer_->setTop( -mousePointerHeight );
+
+// if ( mousePointer_->getLeft( ) > windowsWidth_-mousePointerWidth ) mousePointer_->setLeft( windowsWidth_-
+// mousePointerWidth );
+// if ( mousePointer_->getTop( ) > windowsHeight_-mousePointerHeight ) mousePointer_->setTop( windowsHeight_-
+// mousePointerHeight );
+
- if ( mousePointer_->getLeft( ) > windowsWidth_-mousePointerWidth ) mousePointer_->setLeft( windowsWidth_-
- mousePointerWidth );
- if ( mousePointer_->getTop( ) > windowsHeight_-mousePointerHeight ) mousePointer_->setTop( windowsHeight_-
- mousePointerHeight );
if ( sector_->avatar() != NULL ){
// std::cout << "X" << e.state.X.abs << " " << e.state.X.rel << " " << mousePointer_->getLeft( ) << std::endl;
@@ -422,8 +498,11 @@
// std::cout << "Z" << e.state.Z.abs << " " << e.state.Z.rel<< std::endl;
// return true;
- int relativToMidPointX = (int)rint( (mousePointer_->getLeft( ) + mousePointerWidth) - windowsHalfWidth_ );
- int relativToMidPointY = (int)rint( (mousePointer_->getTop( ) + mousePointerHeight) - windowsHalfHeight_ );
+// int relativToMidPointX = (int)rint( (mousePointer_->getLeft( ) + mousePointerWidth) - windowsHalfWidth_ );
+// int relativToMidPointY = (int)rint( (mousePointer_->getTop( ) + mousePointerHeight) - windowsHalfHeight_ );
+
+ int relativToMidPointX = (int)rint( ( flightCurserPos_[ 0 ] + flightCurserHalfWidth_ ) - windowsHalfWidth_ );
+ int relativToMidPointY = (int)rint( ( flightCurserPos_[ 1 ] + flightCurserHalfHeight_ ) - windowsHalfHeight_ );
int minActiveZonePercent = 5;
int maxActiveZonePercent = 90;
@@ -660,7 +739,7 @@
target_ = target;
if ( target_ != NULL ){
- hudOverlay_->getChild( overlayName_ + "/TargetPointer" )->show();
+ // hudOverlay_->getChild( overlayName_ + "/TargetPointer" )->show();
Ogre::OverlayManager::getSingleton().getOverlayElement( overlayName_ +
"/MainPanel/TextTargetName" )->setCaption( target_->name() );
@@ -709,140 +788,116 @@
}
//** Start update targeting pointer and duelist pointers;
+ Ogre::Vector3 targetScreenPos;
+
+ target_->mainNode()->needUpdate();
Ogre::Vector3 targetPos( target_->mainNode()->getPosition() );
- Ogre::Vector3 targetScreenPos( mainCamera_->getProjectionMatrix() * ( mainCamera_->getViewMatrix() * targetPos ) );
-
-// poss.x = max( -1.0f, poss.x ); poss.x = min( 1.0f, poss.x );
-// poss.y = max( -1.0f, poss.y ); poss.y = min( 1.0f, poss.y );
- if ( targetScreenPos[ 2 ] < 1 ){
- //"getAABB()" || "Entity::getBoundingRadius"
- Ogre::OverlayElement * hudTargetPointer =
- Ogre::OverlayManager::getSingleton().getOverlayElement( overlayName_ + "/TargetPointer" );
+ bool targetVisible = projectionPos_( mainCamera_, targetPos, targetScreenPos );
- hudTargetPointer->setPosition( windowsHalfWidth_ + ( windowsHalfWidth_ * targetScreenPos[ 0 ] ) -
- hudTargetPointer->getWidth()/2,
- windowsHalfHeight_ + ( windowsHalfHeight_ * -targetScreenPos[ 1 ] ) -
- hudTargetPointer->getHeight()/2 );
- hudTargetPointer->_update();
+ if ( targetVisible ){
+ targetCurser_->show();
+ targetCurser_->setPosition( CEGUI::UVector2( CEGUI::UDim( 0.5 + targetScreenPos[ 0 ] / 2.0,
+ -targetCurserHalfWidth_ ),
+ CEGUI::UDim( 0.5 - targetScreenPos[ 1 ] / 2.0,
+ -targetCurserHalfHeight_ ) ) );
+ } else {
+ targetCurser_->hide();
}
Ogre::Real ammoTimeToTarget( distToTarget.length() / sector_->avatar()->ammoSpeed() );
- Ogre::OverlayElement * duelistPilotPointer =
- Ogre::OverlayManager::getSingleton().getOverlayElement( overlayName_ + "/DuelistPilotPointer" );
if ( duelistPilot_ ){
- Ogre::Vector3 duelistPilotPos( sector_->avatar()->mainNode()->getPosition() +
- - sector_->avatar()->mainNode()->getOrientation().zAxis().normalisedCopy()
- * sector_->avatar()->ammoSpeed() * ammoTimeToTarget +
- sector_->avatar()->velDirection() * ammoTimeToTarget );
-
- Ogre::Vector3 duelistPilotScreenPos( mainCamera_->getProjectionMatrix() * ( mainCamera_->getViewMatrix() * duelistPilotPos ) );
- if ( duelistPilotScreenPos[ 2 ] < 1 ){
- duelistPilotPointer->setPosition( windowsHalfWidth_ + (windowsHalfWidth_ * duelistPilotScreenPos[ 0 ] ) -
- duelistPilotPointer->getWidth()/2,
- windowsHalfHeight_ + (windowsHalfHeight_ * -duelistPilotScreenPos[ 1 ] ) -
- duelistPilotPointer->getHeight()/2 );
- duelistPilotPointer->_update();
+ Ogre::Vector3 duelistPilotPos( sector_->avatar()->mainNode()->getPosition() +
+ - sector_->avatar()->mainNode()->getOrientation().zAxis().normalisedCopy()
+ * sector_->avatar()->ammoSpeed() * ammoTimeToTarget +
+ sector_->avatar()->velDirection() * ammoTimeToTarget );
+
+ targetVisible = projectionPos_( mainCamera_, duelistPilotPos, targetScreenPos );
+ if ( targetVisible ){
+ pilotFlightCurser_->show();
+ pilotFlightCurser_->setPosition( CEGUI::UVector2( CEGUI::UDim( 0.5 + targetScreenPos[ 0 ] / 2.0,
+ - pilotFlightCurserHalfWidth_ ),
+ CEGUI::UDim( 0.5 - targetScreenPos[ 1 ] / 2.0,
+ - pilotFlightCurserHalfHeight_ ) ) );
+ } else {
+ pilotFlightCurser_->hide();
}
} else {
- duelistPilotPointer->setPosition( windowsHalfWidth_ - duelistPilotPointer->getWidth()/2,
- windowsHalfHeight_ - duelistPilotPointer->getHeight()/2 );
+ pilotFlightCurser_->hide();
}
+
+ if ( duelistTarget_ && ( target_->getTypeID() == SECTOROBJECTMOVABLE_RTTI ||
+ target_->getTypeID() == SECTOROBJECTMOVABLE_AI_RTTI ) ){
- //** start duelist TargetPointer;
-
- Ogre::OverlayElement * duelistTargetPointer =
- Ogre::OverlayManager::getSingleton().getOverlayElement( overlayName_ + "/DuelistTargetPointer" );
-
- if ( duelistTarget_ &&
- ( target_->getTypeID() == SECTOROBJECTMOVABLE_RTTI ||
- target_->getTypeID() == SECTOROBJECTMOVABLE_AI_RTTI ) ){
-
- Ogre::OverlayElement * duelistTargetPointer =
- Ogre::OverlayManager::getSingleton().getOverlayElement( overlayName_ + "/DuelistTargetPointer" );
- duelistTargetPointer->show();
-
Ogre::Vector3 duelistTargetPos( targetPos + dynamic_cast< SectorObjectMoveable *>( target_ )->velDirection()
* ammoTimeToTarget );
- Ogre::Vector3 duelistTargetScreenPos( mainCamera_->getProjectionMatrix() * ( mainCamera_->getViewMatrix() * duelistTargetPos ) );
- if ( duelistTargetScreenPos[ 2 ] < 1 ){
- duelistTargetPointer->setPosition( windowsHalfWidth_ + (windowsHalfWidth_ * duelistTargetScreenPos[ 0 ] ) -
- duelistTargetPointer->getWidth()/2,
- windowsHalfHeight_ + (windowsHalfHeight_ * -duelistTargetScreenPos[ 1 ]) -
- duelistTargetPointer->getHeight()/2 );
- duelistTargetPointer->_update();
+
+ targetVisible = projectionPos_( mainCamera_, duelistTargetPos, targetScreenPos );
+
+ if ( targetVisible ){
+ targetFlightCurser_->show();
+ targetFlightCurser_->setPosition( CEGUI::UVector2( CEGUI::UDim( 0.5 + targetScreenPos[ 0 ] / 2.0,
+ - targetFlightCurserHalfWidth_ ),
+ CEGUI::UDim( 0.5 - targetScreenPos[ 1 ] / 2.0,
+ - targetFlightCurserHalfHeight_ ) ) );
+ } else {
+ targetFlightCurser_->hide();
}
} else {
- duelistTargetPointer->hide();
+ targetFlightCurser_->hide();
}
- //** end duelist TargetPointer
//** End update targeting pointer and duelist pointers;
- Ogre::OverlayElement* hudTargetDist =
- Ogre::OverlayManager::getSingleton().getOverlayElement( overlayName_ + "/MainPanel/TextTargetDistance" );
- hudTargetDist->setCaption( "D " + Ogre::StringConverter::toString( round( distToTarget.length(), 0 ) ) );
+ targetDistanceText_->setText( "D" + Ogre::StringConverter::toString( round( distToTarget.length(), 0 ) ) );
- Ogre::OverlayElement * hudTargetShield =
- Ogre::OverlayManager::getSingleton().getOverlayElement( overlayName_ + "/MainPanel/TextTargetShield" );
- Ogre::OverlayElement * hudTargetArmor =
- Ogre::OverlayManager::getSingleton().getOverlayElement( overlayName_ + "/MainPanel/TextTargetArmor" );
- Ogre::OverlayElement * hudTargetVel =
- Ogre::OverlayManager::getSingleton().getOverlayElement( overlayName_ + "/MainPanel/TextTargetVelocity" );
+ if ( target_->getTypeID() == SECTOROBJECTMOVABLE_RTTI || target_->getTypeID() == SECTOROBJECTMOVABLE_AI_RTTI ){
+
+ targetVelocity_->setText( "V" + Ogre::StringConverter::toString(
+ dynamic_cast< SectorObjectMoveable *>( target_ )->velocity(), 6 ) );
+ targetShieldText_->setText( "S" + Ogre::StringConverter::toString(
+ dynamic_cast< SectorObjectMoveable *>( target_ )->shieldPercent(), 4 ) );
+ targetArmorText_->setText( "A" + Ogre::StringConverter::toString(
+ dynamic_cast< SectorObjectMoveable *>( target_ )->armorPercent(), 4 ) );
- if ( target_->getTypeID() == SECTOROBJECTMOVABLE_RTTI || target_->getTypeID() == SECTOROBJECTMOVABLE_AI_RTTI ){
- hudTargetShield->setCaption( "S " + Ogre::StringConverter::toString( dynamic_cast< SectorObjectMoveable *>( target_ )->shieldPercent(), 4 ) );
- hudTargetArmor->setCaption( "A " + Ogre::StringConverter::toString( dynamic_cast< SectorObjectMoveable *>( target_ )->armorPercent(), 4 ) );
- hudTargetVel->setCaption( "V " + Ogre::StringConverter::toString( dynamic_cast< SectorObjectMoveable *>( target_ )->velocity(), 6 ) );
} else{
- hudTargetVel->setCaption( "" );
- hudTargetShield->setCaption( "" );
- hudTargetArmor->setCaption( "" );
+ targetVelocity_->setText( "" );
+ targetShieldText_->setText( "" );
+ targetArmorText_->setText( "" );
}
} else {
if ( sector_->avatar()->targetArrow() ) sector_->avatar()->targetArrow()->setVisible( false );
- Ogre::OverlayManager::getSingleton().getOverlayElement( overlayName_ + "/TargetPointer")->hide( );
}
- Ogre::OverlayElement* hudVel =
- Ogre::OverlayManager::getSingleton().getOverlayElement( overlayName_ + "/MainPanel/TextVelocity");
+ Ogre::Real height = sector_->avatar()->velocity() * velocityProgressHeight_ / sector_->avatar()->velocityMax();
+ velocityProgress_->setYPosition( CEGUI::UDim( 0.5, velocityProgressHeight_/2.0 - height ) );
+ velocityProgress_->setHeight( CEGUI::UDim( 0.0, height ) );
+ velocityProgressImg_->setYPosition( CEGUI::UDim( 0, -velocityProgressHeight_ + height ) );
- Ogre::OverlayElement* hudVelMax =
- Ogre::OverlayManager::getSingleton().getOverlayElement( overlayName_ + "/MainPanel/TextVelocityMax");
+ height = sector_->avatar()->capacity() * capacitorProgressHeight_ / sector_->avatar()->capacityMax();
+ capacitorProgress_->setYPosition( CEGUI::UDim( 0.5, capacitorProgressHeight_/2.0 - height ) );
+ capacitorProgress_->setHeight( CEGUI::UDim( 0.0, height ) );
+ capacitorProgressImg_->setYPosition( CEGUI::UDim( 0, -capacitorProgressHeight_ + height ) );
- Ogre::OverlayElement* hudThr =
- Ogre::OverlayManager::getSingleton().getOverlayElement( overlayName_ + "/MainPanel/TextThr");
+ height = sector_->avatar()->thrust() * thrustProgressHeight_ / sector_->avatar()->thrustMax();
+ thrustProgress_->setYPosition( CEGUI::UDim( 0.5, thrustProgressHeight_/2.0 - height ) );
+ thrustProgress_->setHeight( CEGUI::UDim( 0.0, height ) );
+ thrustProgressImg_->setYPosition( CEGUI::UDim( 0, -thrustProgressHeight_ + height ) );
- Ogre::OverlayElement* hudAcc =
- Ogre::OverlayManager::getSingleton().getOverlayElement( overlayName_ + "/MainPanel/TextAcc");
- Ogre::OverlayElement* hudPos =
- Ogre::OverlayManager::getSingleton().getOverlayElement( overlayName_ + "/MainPanel/TextPosition");
+ velocityText_->setText( "V" + Ogre::StringConverter::toString( round( sector_->avatar()->velocity(), 2 ), 4 ) );
+// conText_ = CEGUI::WindowManager::getSingleton().getWindow( "HUDConText" );
+ shieldText_->setText( "S" + Ogre::StringConverter::toString( sector_->avatar()->shieldPercent(), 4 ) );
+ armorText_->setText( "A" + Ogre::StringConverter::toString( sector_->avatar()->armorPercent(), 4 ) );
- Ogre::OverlayElement* hudShield =
- Ogre::OverlayManager::getSingleton().getOverlayElement( overlayName_ + "/MainPanel/TextShield");
- Ogre::OverlayElement* hudArmor =
- Ogre::OverlayManager::getSingleton().getOverlayElement( overlayName_ + "/MainPanel/TextArmor");
- hudVel->setCaption( "Vel: " + Ogre::StringConverter::toString( round( sector_->avatar()->velocity(), 2 ), 6 ) );
- hudVelMax->setCaption( " / " + Ogre::StringConverter::toString( round( sector_->avatar()->velocityMax(), 2), 6 ) );
- hudThr->setCaption( "Thr: " + Ogre::StringConverter::toString( sector_->avatar()->thrustPercent(), 4 ) + "%" );
- hudAcc->setCaption( "Acc: " + Ogre::StringConverter::toString( sector_->avatar()->acceleration(), 2 ) );
- hudShield->setCaption( "S " + Ogre::StringConverter::toString( sector_->avatar()->shieldPercent(), 4 ) );
- hudArmor->setCaption( "A " + Ogre::StringConverter::toString( sector_->avatar()->armorPercent(), 4 ) );
- Ogre::Vector3 pos( sector_->avatar()->mainNode()->getPosition() );
- hudPos->setCaption( "Pos: " +
- Ogre::StringConverter::toString( Ogre::Real( rint( pos[ 0 ] ) ), 5, 5 ) + " " +
- Ogre::StringConverter::toString( Ogre::Real( rint( pos[ 1 ] ) ), 5, 5 ) + " " +
- Ogre::StringConverter::toString( Ogre::Real( rint( pos[ 2 ] ) ), 5, 5 ) );
-
// OverlayElement* guiAvg = OverlayManager::getSingleton().getOverlayElement("Core/AverageFps");
// OverlayElement* guiCurr = OverlayManager::getSingleton().getOverlayElement("Core/CurrFps");
// OverlayElement* guiBest = OverlayManager::getSingleton().getOverlayElement("Core/BestFps");
@@ -943,6 +998,45 @@
return true;
}
+bool UnDockedState::projectionPos_( Ogre::Camera * cam, const Ogre::Vector3 & pos, Ogre::Vector3 & screenSpacePos ){
+ Ogre::Vector3 eyeSpacePos = cam->getViewMatrix( true ) * pos;
+ // z < 0 means in front of cam
+ if ( eyeSpacePos.z < 0 ) {
+ // calculate projected pos
+ screenSpacePos = cam->getProjectionMatrix() * eyeSpacePos;
+ return true;
+ } else {
+ screenSpacePos.x = (-eyeSpacePos.x > 0) ? -1 : 1;
+ screenSpacePos.y = (-eyeSpacePos.y > 0) ? -1 : 1;
+ return false;
+ }
+}
+
+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::Vector3 eyeSpacePos = cam->getViewMatrix( true ) * pos;
+ // z < 0 means in front of cam
+ if ( eyeSpacePos.z < 0 ) {
+ // calculate projected pos
+ Ogre::Vector3 screenSpacePos = cam->getProjectionMatrix() * eyeSpacePos;
+ x = screenSpacePos.x;
+ y = screenSpacePos.y;
+ // calculate projected size
+ Ogre::Vector3 spheresize( rad, rad, eyeSpacePos.z );
+ spheresize = cam->getProjectionMatrix() * spheresize;
+ cx = spheresize.x;
+ cy = spheresize.y;
+ return true;
+ } else {
+ cx = 0;
+ cy = 0;
+ x = (-eyeSpacePos.x > 0) ? -1 : 1;
+ y = (-eyeSpacePos.y > 0) ? -1 : 1;
+ return false;
+ }
+}
+
bool UnDockedState::maximiseConsole( ){
if ( overlayRootWindow_ ){
CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"UnDocked/MainWindow/ConsoleFrame")->
Modified: branches/ogsector/src/UnDockedState.h
===================================================================
--- branches/ogsector/src/UnDockedState.h 2007-05-22 12:57:43 UTC (rev 507)
+++ branches/ogsector/src/UnDockedState.h 2007-05-23 21:24:50 UTC (rev 508)
@@ -97,6 +97,10 @@
void updateHUD_( );
void updateRadar_( );
+ bool projectionPos_( Ogre::Camera * cam, const Ogre::Vector3 & pos, Ogre::Vector3 & screenPos );
+ bool 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::RenderWindow * window_;
Ogre::Root * root_;
Ogre::SceneManager * sceneMgr_;
@@ -106,14 +110,67 @@
Sector * sector_;
NetworkClient * network_;
+ Ogre::Vector2 flightCurserPos_;
+ CEGUI::Window * flightCurser_;
+ Ogre::Real flightCurserHalfWidth_;
+ Ogre::Real flightCurserHalfHeight_;
+
+ CEGUI::Window * targetCurser_;
+ Ogre::Real targetCurserHalfWidth_;
+ Ogre::Real targetCurserHalfHeight_;
+
+ CEGUI::Window * pilotFlightCurser_;
+ Ogre::Real pilotFlightCurserHalfWidth_;
+ Ogre::Real pilotFlightCurserHalfHeight_;
+
+ CEGUI::Window * targetFlightCurser_;
+ Ogre::Real targetFlightCurserHalfWidth_;
+ Ogre::Real targetFlightCurserHalfHeight_;
+
+ CEGUI::Window * velocityProgress_;
+ CEGUI::Window * velocityProgressImg_;
+ Ogre::Real velocityProgressHeight_;
+
+ CEGUI::Window * thrustProgress_;
+ CEGUI::Window * thrustProgressImg_;
+ Ogre::Real thrustProgressHeight_;
+
+ CEGUI::Window * fuelProgress_;
+ CEGUI::Window * fuelProgressImg_;
+ Ogre::Real fuelProgressHeight_;
+
+ CEGUI::Window * capacitorProgress_;
+ CEGUI::Window * capacitorProgressImg_;
+ Ogre::Real capacitorProgressHeight_;
+
+ CEGUI::Window * armorProgress_;
+ CEGUI::Window * armorProgressLeftImg_;
+ CEGUI::Window * armorProgressRightImg_;
+ Ogre::Real armorProgressHeight_;
+
+ CEGUI::Window * shieldProgress_;
+ CEGUI::Window * shieldProgressLeftImg_;
+ CEGUI::Window * shieldProgressRightImg_;
+ Ogre::R...
[truncated message content] |
|
From: <eg...@us...> - 2007-05-22 12:57:42
|
Revision: 507
http://svn.sourceforge.net/opengate/?rev=507&view=rev
Author: egore
Date: 2007-05-22 05:57:43 -0700 (Tue, 22 May 2007)
Log Message:
-----------
Minor minor fixes
Modified Paths:
--------------
branches/ogsector/src/LogManager.cpp
branches/ogsector/src/LogManager.h
Modified: branches/ogsector/src/LogManager.cpp
===================================================================
--- branches/ogsector/src/LogManager.cpp 2007-05-21 03:03:35 UTC (rev 506)
+++ branches/ogsector/src/LogManager.cpp 2007-05-22 12:57:43 UTC (rev 507)
@@ -43,7 +43,7 @@
}
void LogManager::setChatLogFile( const std::string & chatLogFileName ){
- chatLogFile_.open( chatLogFileName.c_str(), std::fstream::app );
+ chatLogFile_.open( chatLogFileName.c_str(), std::fstream::app );
chatLogFile_ << "\n" << timeStamp() << "Starting new session" << std::endl;
haveChatLogFile_ = true;
}
@@ -63,7 +63,7 @@
return std::string("["
+ toStr( time->tm_year + 1900 ) + "."
- + toStr( time->tm_mon + 1 ) + "."
+ + toStr( time->tm_mon + 1 ) + "."
+ toStr( time->tm_mday ) + "-"
+ toStr( time->tm_hour ) + ":"
+ toStr( time->tm_min ) + ":"
@@ -71,7 +71,7 @@
}
void LogManager::chat( const std::string & name, const std::string & msg ){
- std::string logMsg( name + ": " + msg );
+ std::string logMsg( name + ": " + msg );
if ( haveChatLogFile_ ) chatLogFile_ << timeStamp() << " " << logMsg << std::endl;
writeToConsole_( logMsg );
@@ -91,7 +91,7 @@
}
void LogManager::warn( const std::string & msg ){
- std::string logMsg( "WARN: " + msg );
+ std::string logMsg( "WARN: " + msg );
writeToConsole_( logMsg );
write_( logMsg );
}
@@ -155,5 +155,3 @@
} //namespace OpenGate
-
-
Modified: branches/ogsector/src/LogManager.h
===================================================================
--- branches/ogsector/src/LogManager.h 2007-05-21 03:03:35 UTC (rev 506)
+++ branches/ogsector/src/LogManager.h 2007-05-22 12:57:43 UTC (rev 507)
@@ -18,8 +18,8 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#ifndef LOGMANAGER__H
-#define LOGMANAGER__H
+#ifndef _OPENGATE_LOGMANAGER__H
+#define _OPENGATE_LOGMANAGER__H
#include <iostream>
#include <fstream>
@@ -136,6 +136,4 @@
} //namespace OpenGate
-
-
-#endif // #ifndef __LOGCPP_H
+#endif // _OPENGATE_LOGMANAGER__H
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-05-21 03:03:34
|
Revision: 506
http://svn.sourceforge.net/opengate/?rev=506&view=rev
Author: ultrasick
Date: 2007-05-20 20:03:35 -0700 (Sun, 20 May 2007)
Log Message:
-----------
a possible loading screen of a beginning game
Added Paths:
-----------
trunk/data/startup/computer_game.png
trunk/templates/data/startup/computer_game.blend
trunk/templates/data/startup/computer_game.pspimage
Added: trunk/data/startup/computer_game.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/startup/computer_game.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/startup/computer_game.blend
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/startup/computer_game.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/startup/computer_game.pspimage
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/startup/computer_game.pspimage
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-05-20 21:52:27
|
Revision: 505
http://svn.sourceforge.net/opengate/?rev=505&view=rev
Author: ultrasick
Date: 2007-05-20 14:52:28 -0700 (Sun, 20 May 2007)
Log Message:
-----------
moving iintro video to "startup" directory. I will upload the loading screen in this directory too
Added Paths:
-----------
trunk/templates/data/startup/
trunk/templates/data/startup/open_source.blend
trunk/templates/data/startup/radarping.aup
trunk/templates/data/startup/radarping_data/
trunk/templates/data/startup/radarping_data/e00/
trunk/templates/data/startup/radarping_data/e00/d00/
trunk/templates/data/startup/radarping_data/e00/d00/e0000506.au
trunk/templates/data/startup/radarping_data/e00/d00/e000067a.au
trunk/templates/data/startup/radarping_data/e00/d00/e0000696.au
trunk/templates/data/startup/radarping_data/e00/d00/e0000876.au
trunk/templates/data/startup/radarping_data/e00/d00/e0000895.au
trunk/templates/data/startup/radarping_data/e00/d00/e0000ee0.au
Removed Paths:
-------------
trunk/templates/data/intros/
Added: trunk/templates/data/startup/open_source.blend
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/startup/open_source.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/startup/radarping.aup
===================================================================
--- trunk/templates/data/startup/radarping.aup (rev 0)
+++ trunk/templates/data/startup/radarping.aup 2007-05-20 21:52:28 UTC (rev 505)
@@ -0,0 +1,58 @@
+<?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="radarping_data" version="1.3.0" audacityversion="1.3.2-beta" sel0="0.0000000000" sel1="0.0000000000" vpos="0" h="0.0000000000" zoom="178.0015059778" rate="8000">
+ <tags title="" artist="" album="" track="-1" year="" genre="-1" comments="" id3v2="1"/>
+ <wavetrack name="radarping" channel="2" linked="0" offset="0.00000000" rate="8000" gain="1" pan="0">
+ <waveclip offset="0.23000038">
+ <sequence maxsamples="262144" sampleformat="262159" numsamples="14519">
+ <waveblock start="0">
+ <simpleblockfile filename="e0000696.au" len="14400" min="-0.986301" max="1" rms="0.093837"/>
+ </waveblock>
+ <waveblock start="14400">
+ <simpleblockfile filename="e0000ee0.au" len="119" min="-0.027397" max="0.013699" rms="0.000608"/>
+ </waveblock>
+ </sequence>
+ <envelope numpoints="0"/>
+ </waveclip>
+ </wavetrack>
+ <wavetrack name="radarping" channel="2" linked="0" offset="0.00000000" rate="8000" gain="1" pan="0">
+ <waveclip offset="2.23000026">
+ <sequence maxsamples="262144" sampleformat="262159" numsamples="14519">
+ <waveblock start="0">
+ <simpleblockfile filename="e0000876.au" len="14519" min="-0.986301" max="1" rms="0.093837"/>
+ </waveblock>
+ </sequence>
+ <envelope numpoints="0"/>
+ </waveclip>
+ </wavetrack>
+ <wavetrack name="radarping" channel="2" linked="0" offset="0.00000000" rate="8000" gain="1" pan="0">
+ <waveclip offset="4.22999994">
+ <sequence maxsamples="262144" sampleformat="262159" numsamples="14519">
+ <waveblock start="0">
+ <simpleblockfile filename="e0000506.au" len="14519" min="-0.986301" max="1" rms="0.093837"/>
+ </waveblock>
+ </sequence>
+ <envelope numpoints="0"/>
+ </waveclip>
+ </wavetrack>
+ <wavetrack name="rauschen" channel="2" linked="0" offset="0.00000000" rate="8000" gain="1" pan="0">
+ <waveclip offset="0.00000000">
+ <sequence maxsamples="262144" sampleformat="262159" numsamples="64359">
+ <waveblock start="0">
+ <simpleblockfile filename="e000067a.au" len="64359" min="-0.008912" max="0.008913" rms="0.005108"/>
+ </waveblock>
+ </sequence>
+ <envelope numpoints="0"/>
+ </waveclip>
+ </wavetrack>
+ <wavetrack name="radarping" channel="2" linked="0" offset="0.00000000" rate="8000" gain="1" pan="0">
+ <waveclip offset="6.23000076">
+ <sequence maxsamples="262144" sampleformat="262159" numsamples="14519">
+ <waveblock start="0">
+ <simpleblockfile filename="e0000895.au" len="14519" min="-0.986301" max="1" rms="0.093837"/>
+ </waveblock>
+ </sequence>
+ <envelope numpoints="0"/>
+ </waveclip>
+ </wavetrack>
+</project>
Property changes on: trunk/templates/data/startup/radarping.aup
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/templates/data/startup/radarping_data/e00/d00/e0000506.au
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/startup/radarping_data/e00/d00/e0000506.au
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/startup/radarping_data/e00/d00/e000067a.au
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/startup/radarping_data/e00/d00/e000067a.au
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/startup/radarping_data/e00/d00/e0000696.au
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/startup/radarping_data/e00/d00/e0000696.au
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/startup/radarping_data/e00/d00/e0000876.au
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/startup/radarping_data/e00/d00/e0000876.au
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/startup/radarping_data/e00/d00/e0000895.au
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/startup/radarping_data/e00/d00/e0000895.au
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/startup/radarping_data/e00/d00/e0000ee0.au
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/startup/radarping_data/e00/d00/e0000ee0.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-05-20 21:40:58
|
Revision: 504
http://svn.sourceforge.net/opengate/?rev=504&view=rev
Author: ultrasick
Date: 2007-05-20 14:41:00 -0700 (Sun, 20 May 2007)
Log Message:
-----------
moving iintro video to "startup" directory. I will upload the loading screen in this directory too
Added Paths:
-----------
trunk/data/startup/
trunk/data/startup/open_source.avi
Removed Paths:
-------------
trunk/data/intros/
Added: trunk/data/startup/open_source.avi
===================================================================
(Binary files differ)
Property changes on: trunk/data/startup/open_source.avi
___________________________________________________________________
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-05-20 21:37:58
|
Revision: 503
http://svn.sourceforge.net/opengate/?rev=503&view=rev
Author: egore
Date: 2007-05-20 14:37:59 -0700 (Sun, 20 May 2007)
Log Message:
-----------
Fix 1 memleak
Modified Paths:
--------------
branches/ogsector/src/GameStateManager.cpp
Modified: branches/ogsector/src/GameStateManager.cpp
===================================================================
--- branches/ogsector/src/GameStateManager.cpp 2007-05-20 21:36:05 UTC (rev 502)
+++ branches/ogsector/src/GameStateManager.cpp 2007-05-20 21:37:59 UTC (rev 503)
@@ -98,11 +98,26 @@
delete devices_.console;
devices_.console = NULL;
}
+ if ( commodityManager_ ){
+ log_->info( "Shutdown commoditymanager." );
+ delete commodityManager_;
+ commodityManager_ = NULL;
+ }
+ if ( equipmentManager_ ){
+ log_->info( "Shutdown equipmentmanager." );
+ delete equipmentManager_;
+ equipmentManager_ = NULL;
+ }
if ( vesselManager_ ){
log_->info( "Shutdown vesselmanager." );
delete vesselManager_;
vesselManager_ = NULL;
}
+ if ( vesselManager_ ){
+ log_->info( "Shutdown vesselmanager." );
+ delete vesselManager_;
+ vesselManager_ = NULL;
+ }
if ( devices_.inputManager ) {
log_->info( "Shutdown inputmanager." );
delete devices_.inputManager;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-05-20 21:36:03
|
Revision: 502
http://svn.sourceforge.net/opengate/?rev=502&view=rev
Author: ultrasick
Date: 2007-05-20 14:36:05 -0700 (Sun, 20 May 2007)
Log Message:
-----------
imported the mesh from the wings3d files into blender. I needed the meshes for the loading screen. we will probably need the blender files anyway as soon as we start texturing
Added Paths:
-----------
trunk/data/ships/octavius/phoenix/phoenix.blend
trunk/data/ships/quantar/typhoon/typhoon.blend
trunk/data/ships/tauseti/intensity/intensity.blend
trunk/data/ships/tauseti/pioneer/pioneer.blend
Added: trunk/data/ships/octavius/phoenix/phoenix.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/octavius/phoenix/phoenix.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/ships/quantar/typhoon/typhoon.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/quantar/typhoon/typhoon.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/ships/tauseti/intensity/intensity.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/tauseti/intensity/intensity.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/ships/tauseti/pioneer/pioneer.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/ships/tauseti/pioneer/pioneer.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
