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-08-27 15:56:47
|
Revision: 672
http://opengate.svn.sourceforge.net/opengate/?rev=672&view=rev
Author: ultrasick
Date: 2007-08-26 06:02:37 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
another sound file. it's a simple "click" or an "roll over" for the GUI
Added Paths:
-----------
trunk/data/GUI/docked/click.wav
trunk/templates/data/GUI/docked/click.aup
trunk/templates/data/GUI/docked/click.txt
trunk/templates/data/GUI/docked/click_data/
trunk/templates/data/GUI/docked/click_data/e00/
trunk/templates/data/GUI/docked/click_data/e00/d00/
trunk/templates/data/GUI/docked/click_data/e00/d00/e0000efe.au
Added: trunk/data/GUI/docked/click.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/GUI/docked/click.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/GUI/docked/click.aup
===================================================================
--- trunk/templates/data/GUI/docked/click.aup (rev 0)
+++ trunk/templates/data/GUI/docked/click.aup 2007-08-26 13:02:37 UTC (rev 672)
@@ -0,0 +1,15 @@
+<?xml version="1.0" standalone="no" ?>
+<!DOCTYPE project PUBLIC "-//audacityproject-1.3.0//DTD//EN" "http://audacity.sourceforge.net/xml/audacityproject-1.3.0.dtd" >
+<project xmlns="http://audacity.sourceforge.net/xml/" projname="click_data" version="1.3.0" audacityversion="1.3.3-beta" sel0="0.0000000000" sel1="0.0000000000" vpos="0" h="0.0000000000" zoom="52234.2431761787" rate="44100">
+ <tags title="" artist="" album="" track="-1" year="" genre="-1" comments="" id3v2="1"/>
+ <wavetrack name="Tonspur" channel="2" linked="0" offset="0.00000000" rate="44100" gain="1" pan="0">
+ <waveclip offset="0.00000000">
+ <sequence maxsamples="262144" sampleformat="262159" numsamples="1209">
+ <waveblock start="0">
+ <simpleblockfile filename="e0000efe.au" len="1209" min="-0.748553" max="0.748331" rms="0.065612"/>
+ </waveblock>
+ </sequence>
+ <envelope numpoints="0"/>
+ </waveclip>
+ </wavetrack>
+</project>
Property changes on: trunk/templates/data/GUI/docked/click.aup
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/templates/data/GUI/docked/click.txt
===================================================================
--- trunk/templates/data/GUI/docked/click.txt (rev 0)
+++ trunk/templates/data/GUI/docked/click.txt 2007-08-26 13:02:37 UTC (rev 672)
@@ -0,0 +1,11 @@
+neue monospur (44.100 Hz; 32 bit float)
+click track erzeugen (werte egal)
+einen der starken schallimpulse rausschneiden, rest l\xF6schen
+stille wegschneiden, alles wegschneiden was nicht zur sauberen sinuskurve geh\xF6rt, an den anfang der tonspur schieben
+2 volle wellen am anfang ausw\xE4hlen und fade in effekt anwenden
+2 volle wellen am ende ausw\xE4hlen und fade out effekt anwenden
+effekt "tonh\xF6he \xE4ndern" anwenden (-24 halbtonschritte)
+stille wegschneiden
+projekt speichern
+schlie\xDFen und wieder aufrufen (nutzlose dateien l\xF6schen lassen)
+sound exportieren (wave; 32 bit float; microsoft)
\ No newline at end of file
Property changes on: trunk/templates/data/GUI/docked/click.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/templates/data/GUI/docked/click_data/e00/d00/e0000efe.au
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/GUI/docked/click_data/e00/d00/e0000efe.au
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-08-27 15:56:47
|
Revision: 678
http://opengate.svn.sourceforge.net/opengate/?rev=678&view=rev
Author: ultrasick
Date: 2007-08-26 06:26:21 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
moving "click"-sound from data/sound to data/sound/GUI
+ uploading background music for tauseti sectors
Added Paths:
-----------
trunk/data/sounds/GUI/
trunk/data/sounds/GUI/click.wav
trunk/data/sounds/GUI/click32.wav
trunk/data/sounds/sectors/
trunk/data/sounds/sectors/tauseti/
trunk/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3
trunk/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.txt
Removed Paths:
-------------
trunk/data/sounds/click.wav
trunk/data/sounds/click32.wav
Added: trunk/data/sounds/GUI/click.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/GUI/click.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sounds/GUI/click32.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/GUI/click32.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/data/sounds/click.wav
===================================================================
(Binary files differ)
Deleted: trunk/data/sounds/click32.wav
===================================================================
(Binary files differ)
Added: trunk/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.txt
===================================================================
--- trunk/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.txt (rev 0)
+++ trunk/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.txt 2007-08-26 13:26:21 UTC (rev 678)
@@ -0,0 +1 @@
+see trunk/doc/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.pdf
\ No newline at end of file
Property changes on: trunk/data/sounds/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.txt
___________________________________________________________________
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-08-27 15:55:13
|
Revision: 689
http://opengate.svn.sourceforge.net/opengate/?rev=689&view=rev
Author: ultrasick
Date: 2007-08-26 07:30:25 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
moving files around, sorry for the file chaos
Added Paths:
-----------
trunk/data/sounds/guns/
trunk/data/sounds/guns/laser.wav
Removed Paths:
-------------
trunk/data/guns/laser.wav
Deleted: trunk/data/guns/laser.wav
===================================================================
(Binary files differ)
Added: trunk/data/sounds/guns/laser.wav
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/guns/laser.wav
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-08-27 15:53:34
|
Revision: 680
http://opengate.svn.sourceforge.net/opengate/?rev=680&view=rev
Author: ultrasick
Date: 2007-08-26 06:36:00 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
uploading background music for tauseti stations
Added Paths:
-----------
trunk/data/sounds/stations/
trunk/data/sounds/stations/tauseti/
trunk/data/sounds/stations/tauseti/Sarin_Sunday_-_Lonely_hike.mp3
trunk/data/sounds/stations/tauseti/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.txt
Added: trunk/data/sounds/stations/tauseti/Sarin_Sunday_-_Lonely_hike.mp3
===================================================================
(Binary files differ)
Property changes on: trunk/data/sounds/stations/tauseti/Sarin_Sunday_-_Lonely_hike.mp3
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sounds/stations/tauseti/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.txt
===================================================================
--- trunk/data/sounds/stations/tauseti/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.txt (rev 0)
+++ trunk/data/sounds/stations/tauseti/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.txt 2007-08-26 13:36:00 UTC (rev 680)
@@ -0,0 +1 @@
+see trunk/doc/data/stations/tauseti/interior/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.pdf
\ No newline at end of file
Property changes on: trunk/data/sounds/stations/tauseti/Sarin_Sunday_-_Lonely_hike.mp3_-_License_information.txt
___________________________________________________________________
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-08-27 13:43:05
|
Revision: 673
http://opengate.svn.sourceforge.net/opengate/?rev=673&view=rev
Author: ultrasick
Date: 2007-08-26 06:07:46 -0700 (Sun, 26 Aug 2007)
Log Message:
-----------
uploading soundtrack for tauseti sectors
Added Paths:
-----------
trunk/data/sectors/
trunk/data/sectors/tauseti/
trunk/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3
trunk/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.txt
trunk/doc/data/sectors/
trunk/doc/data/sectors/tauseti/
trunk/doc/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.odt
trunk/doc/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.pdf
Added: trunk/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3
===================================================================
(Binary files differ)
Property changes on: trunk/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.txt
===================================================================
--- trunk/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.txt (rev 0)
+++ trunk/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.txt 2007-08-26 13:07:46 UTC (rev 673)
@@ -0,0 +1 @@
+see trunk/doc/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.pdf
\ No newline at end of file
Property changes on: trunk/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/doc/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.odt
===================================================================
(Binary files differ)
Property changes on: trunk/doc/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.odt
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/doc/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.pdf
===================================================================
(Binary files differ)
Property changes on: trunk/doc/data/sectors/tauseti/Simon_Mahler_-_HipDaHop.mp3_-_License_information.pdf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-08-22 11:45:06
|
Revision: 670
http://opengate.svn.sourceforge.net/opengate/?rev=670&view=rev
Author: ultrasick
Date: 2007-08-22 04:45:10 -0700 (Wed, 22 Aug 2007)
Log Message:
-----------
forgot to mention in the last commit: I also moved the upper cube a little down so that it is exactly on the other cubes and doesn't "hover" somewhere above.
uploading commodity: RAM
Added Paths:
-----------
trunk/data/commodities/ram.blend
trunk/data/commodities/ram.xml
trunk/data/commodities/ram_290x290.png
trunk/data/commodities/ram_76x76.png
Added: trunk/data/commodities/ram.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/ram.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/commodities/ram.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/ram.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/commodities/ram_290x290.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/ram_290x290.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/commodities/ram_76x76.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/ram_76x76.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-08-22 11:43:11
|
Revision: 669
http://opengate.svn.sourceforge.net/opengate/?rev=669&view=rev
Author: ultrasick
Date: 2007-08-22 04:43:11 -0700 (Wed, 22 Aug 2007)
Log Message:
-----------
renamed the material from "material" to "aluminium" for easier usage in other blender files
Modified Paths:
--------------
trunk/data/commodities/aluminium.blend
trunk/data/commodities/aluminium_290x290.png
trunk/data/commodities/aluminium_76x76.png
Modified: trunk/data/commodities/aluminium.blend
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/aluminium_290x290.png
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/aluminium_76x76.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-08-22 11:37:28
|
Revision: 668
http://opengate.svn.sourceforge.net/opengate/?rev=668&view=rev
Author: ultrasick
Date: 2007-08-22 04:37:30 -0700 (Wed, 22 Aug 2007)
Log Message:
-----------
uploading capacitor: alembic
Added Paths:
-----------
trunk/data/capacitors/alembic.blend
trunk/data/capacitors/alembic.xml
trunk/data/capacitors/alembic_290x290.png
trunk/data/capacitors/alembic_76x76.png
Added: trunk/data/capacitors/alembic.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/alembic.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/alembic.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/alembic.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/capacitors/alembic_290x290.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/alembic_290x290.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/alembic_76x76.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/alembic_76x76.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-08-22 10:54:07
|
Revision: 667
http://opengate.svn.sourceforge.net/opengate/?rev=667&view=rev
Author: ultrasick
Date: 2007-08-22 03:53:54 -0700 (Wed, 22 Aug 2007)
Log Message:
-----------
uploading capacitor: jar (based on tank)
Added Paths:
-----------
trunk/data/capacitors/jar.blend
trunk/data/capacitors/jar.xml
trunk/data/capacitors/jar_290x290.png
trunk/data/capacitors/jar_76x76.png
Added: trunk/data/capacitors/jar.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/jar.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/jar.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/jar.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/capacitors/jar_290x290.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/jar_290x290.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/jar_76x76.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/jar_76x76.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-08-22 10:22:54
|
Revision: 666
http://opengate.svn.sourceforge.net/opengate/?rev=666&view=rev
Author: ultrasick
Date: 2007-08-22 03:22:47 -0700 (Wed, 22 Aug 2007)
Log Message:
-----------
uploading capacitor: germ
Added Paths:
-----------
trunk/data/capacitors/germ.blend
trunk/data/capacitors/germ.xml
trunk/data/capacitors/germ_290x290.png
trunk/data/capacitors/germ_76x76.png
Added: trunk/data/capacitors/germ.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/germ.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/germ.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/germ.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/capacitors/germ_290x290.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/germ_290x290.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/capacitors/germ_76x76.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/capacitors/germ_76x76.png
___________________________________________________________________
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-08-18 18:52:01
|
Revision: 665
http://opengate.svn.sourceforge.net/opengate/?rev=665&view=rev
Author: spom_spom
Date: 2007-08-18 11:52:00 -0700 (Sat, 18 Aug 2007)
Log Message:
-----------
win compatibility commit
Modified Paths:
--------------
branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
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-08-18 18:09:21
|
Revision: 664
http://opengate.svn.sourceforge.net/opengate/?rev=664&view=rev
Author: spom_spom
Date: 2007-08-18 11:09:19 -0700 (Sat, 18 Aug 2007)
Log Message:
-----------
add very simple texture for tauseti-wake station. Normalmapping can be switched in runtime by pressing o/O-key. Background ambient lightness can be changed be pressing l/L-key.
Modified Paths:
--------------
branches/ogsector/data/asteroids/asteroid.material
branches/ogsector/data/materials/advancedMaterials.material
branches/ogsector/data/materials/station.material
branches/ogsector/src/Console.cpp
branches/ogsector/src/ResourceManager.h
branches/ogsector/src/Station.cpp
branches/ogsector/src/Station.h
branches/ogsector/src/UnDockedState.cpp
branches/ogsector/src/UnDockedState.h
branches/ogsector/src/common.h
trunk/data/stations/tauseti_wake.mesh
trunk/data/stations/tauseti_wake_2.blend
Added Paths:
-----------
trunk/data/stations/TausetiStationBackground.png
trunk/data/stations/TausetiStationBackground.xcf
trunk/data/stations/TausetiStationBackgroundBM.png
trunk/data/stations/TausetiStationBackgroundPlain.png
trunk/data/stations/TausetiStationWindow.png
trunk/data/stations/TausetiStationWindow.xcf
trunk/data/stations/TausetiStationWindowBM.png
Modified: branches/ogsector/data/asteroids/asteroid.material
===================================================================
--- branches/ogsector/data/asteroids/asteroid.material 2007-08-16 21:44:01 UTC (rev 663)
+++ branches/ogsector/data/asteroids/asteroid.material 2007-08-18 18:09:19 UTC (rev 664)
@@ -1,180 +1,11 @@
-material Asteroid/BumpMapping
-{
-
- // This is the preferred technique which uses both vertex and
- // fragment programs, supports coloured lights
- technique
- {
- // Base ambient pass
- pass
- {
- // base colours, not needed for rendering, but as information
- // to lighting pass categorisation routine
- ambient 1 1 1
- diffuse 0 0 0
- specular 0 0 0 0
- // Really basic vertex program
- // NB we don't use fixed function here because GL does not like
- // mixing fixed function and vertex programs, depth fighting can
- // be an issue
- vertex_program_ref BasicVertexPrograms/AmbientOneTextureUnified
- {
- param_named_auto worldViewProj worldviewproj_matrix
- param_named_auto ambient ambient_light_colour
- }
-
- }
- // Now do the lighting pass
- // NB we don't do decal texture here because this is repeated per light
- pass
- {
- // base colours, not needed for rendering, but as information
- // to lighting pass categorisation routine
- ambient 0 0 0
-
- // do this for each light
- iteration once_per_light
-
-
- scene_blend add
-
- // Vertex program reference
- vertex_program_ref BumpMapVP
- {
- param_named_auto lightPosition light_position_object_space 0
- param_named_auto worldViewProj worldviewproj_matrix
- }
-
- // Fragment program
- fragment_program_ref BumpMapFP
- {
- param_named_auto lightDiffuse light_diffuse_colour 0
- }
-
- // Base bump map
- texture_unit
- {
- texture asteroidBump.png
- colour_op replace
- }
- // Normalisation cube map
- texture_unit
- {
- cubic_texture nm.png combinedUVW
- tex_coord_set 1
- tex_address_mode clamp
- }
- }
-
- // Decal pass
- pass
- {
- // base colours, not needed for rendering, but as information
- // to lighting pass categorisation routine
- lighting off
- // Really basic vertex program
- // NB we don't use fixed function here because GL does not like
- // mixing fixed function and vertex programs, depth fighting can
- // be an issue
- vertex_program_ref BasicVertexPrograms/AmbientOneTextureUnified
- {
- param_named_auto worldViewProj worldviewproj_matrix
- param_named ambient float4 1 1 1 1
- }
- scene_blend dest_colour zero
- texture_unit
- {
- texture asteroid.png
- }
-
- }
- }
-
- // This is the fallback which cards which don't have fragment program
- // support will use
- // Note that it still requires vertex program support
- technique
- {
- // Base ambient pass
- pass
- {
- // base colours, not needed for rendering, but as information
- // to lighting pass categorisation routine
- ambient 1 1 1
- diffuse 0 0 0
- specular 0 0 0 0
- // Really basic vertex program
- // NB we don't use fixed function here because GL does not like
- // mixing fixed function and vertex programs, depth fighting can
- // be an issue
- vertex_program_ref BasicVertexPrograms/AmbientOneTextureUnified
- {
- param_named_auto worldViewProj worldviewproj_matrix
- param_named_auto ambient ambient_light_colour
- }
-
- }
- // Now do the lighting pass
- // NB we don't do decal texture here because this is repeated per light
- pass
- {
- // base colours, not needed for rendering, but as information
- // to lighting pass categorisation routine
- ambient 0 0 0
- // do this for each light
- iteration once_per_light
-
-
- scene_blend add
-
- // Vertex program reference
- vertex_program_ref BumpMapVP
- {
- param_named_auto lightPosition light_position_object_space 0
- param_named_auto worldViewProj worldviewproj_matrix
- }
-
- // Base bump map
- texture_unit
- {
- texture asteroidBump.png
- colour_op replace
- }
- // Normalisation cube map, with dot product on bump map
- texture_unit
- {
- cubic_texture nm.png combinedUVW
- tex_coord_set 1
- tex_address_mode clamp
- colour_op_ex dotproduct src_texture src_current
- colour_op_multipass_fallback dest_colour zero
- }
- }
-
- // Decal pass
- pass
- {
- lighting off
- // Really basic vertex program
- // NB we don't use fixed function here because GL does not like
- // mixing fixed function and vertex programs, depth fighting can
- // be an issue
- vertex_program_ref BasicVertexPrograms/AmbientOneTextureUnified
- {
- param_named_auto worldViewProj worldviewproj_matrix
- param_named ambient float4 1 1 1 1
- }
- scene_blend dest_colour zero
- texture_unit
- {
- texture asteroid.png
- }
-
- }
-
- }
+material Asteroid/BumpMapping : OpenGate/BumpMapping
+{
+ set_texture_alias Image asteroid.png
+ set_texture_alias ImageBumpMap asteroidBump.png
+ set_texture_alias ImageFallback asteroid.png
}
+
material Asteroid
{
receive_shadows on
@@ -184,7 +15,7 @@
{
// ambient 0.500000 0.500000 0.500000 1.000000
// diffuse 0.900000 0.900000 0.900000 1.000000
- emissive 0.800000 0.800000 0.800000 1.000000
+ emissive 0.500000 0.500000 0.500000 1.000000
texture_unit
{
texture asteroid.png
Modified: branches/ogsector/data/materials/advancedMaterials.material
===================================================================
--- branches/ogsector/data/materials/advancedMaterials.material 2007-08-16 21:44:01 UTC (rev 663)
+++ branches/ogsector/data/materials/advancedMaterials.material 2007-08-18 18:09:19 UTC (rev 664)
@@ -1,10 +1,11 @@
-material StationTileBackground/BumpMapping
+material OpenGate/BumpMapping
{
// This is the preferred technique which uses both vertex and
// fragment programs, supports coloured lights
- technique
+ technique vpfp
{
+ scheme vpfp
// Base ambient pass
pass
{
@@ -54,7 +55,7 @@
// Base bump map
texture_unit
{
- texture stationTileBackgroundBump.png
+ texture_alias ImageBumpMap
colour_op replace
}
// Normalisation cube map
@@ -84,17 +85,17 @@
scene_blend dest_colour zero
texture_unit
{
- texture stationTileBackground.png
+ texture_alias Image
}
}
}
- // This is the fallback which cards which don't have fragment program
- // support will use
+ // This is the fallback which cards which don't have fragment program support will use
// Note that it still requires vertex program support
- technique
+ technique vp
{
+ scheme vpOnly
// Base ambient pass
pass
{
@@ -137,7 +138,7 @@
// Base bump map
texture_unit
{
- texture stationTileBackgroundBump.png
+ texture_alias ImageBumpMap
colour_op replace
}
// Normalisation cube map, with dot product on bump map
@@ -167,206 +168,80 @@
scene_blend dest_colour zero
texture_unit
{
- texture stationTileBackground.png
+ texture_alias Image
}
}
-
- }
-}
-
-material StationTileIcon/BumpMapping
-{
-
- // This is the preferred technique which uses both vertex and
- // fragment programs, supports coloured lights
- technique
+ }
+ // This is the fallback which cards which don't have fragment program and vertex program support
+ technique fallback
{
- // Base ambient pass
+ scheme Default
pass
{
- // base colours, not needed for rendering, but as information
- // to lighting pass categorisation routine
- ambient 1 1 1
- diffuse 0 0 0
- specular 0 0 0 0
- // Really basic vertex program
- // NB we don't use fixed function here because GL does not like
- // mixing fixed function and vertex programs, depth fighting can
- // be an issue
- vertex_program_ref BasicVertexPrograms/AmbientOneTextureUnified
+ ambient 0.500000 0.500000 0.500000 1.000000
+ diffuse 0.900000 0.900000 0.900000 1.000000
+ emissive 0.500000 0.500000 0.500000 1.000000
+ texture_unit
{
- param_named_auto worldViewProj worldviewproj_matrix
- param_named_auto ambient ambient_light_colour
+ texture_alias ImageFallback
}
-
}
- // Now do the lighting pass
- // NB we don't do decal texture here because this is repeated per light
- pass
- {
- // base colours, not needed for rendering, but as information
- // to lighting pass categorisation routine
- ambient 0 0 0
-
- // do this for each light
- iteration once_per_light
+ }
+}
-
- scene_blend add
- // Vertex program reference
- vertex_program_ref BumpMapVP
- {
- param_named_auto lightPosition light_position_object_space 0
- param_named_auto worldViewProj worldviewproj_matrix
- }
-
- // Fragment program
- fragment_program_ref BumpMapFP
- {
- param_named_auto lightDiffuse light_diffuse_colour 0
- }
-
- // Base bump map
- texture_unit
- {
- texture stationTileIconBump.png
- colour_op replace
- }
- // Normalisation cube map
- texture_unit
- {
- cubic_texture nm.png combinedUVW
- tex_coord_set 1
- tex_address_mode clamp
- }
- }
-
- // Decal pass
+material OpenGate/SingleTexture
+{
+ receive_shadows on
+ technique
+ {
pass
{
- // base colours, not needed for rendering, but as information
- // to lighting pass categorisation routine
- lighting off
- // Really basic vertex program
- // NB we don't use fixed function here because GL does not like
- // mixing fixed function and vertex programs, depth fighting can
- // be an issue
- vertex_program_ref BasicVertexPrograms/AmbientOneTextureUnified
- {
- param_named_auto worldViewProj worldviewproj_matrix
- param_named ambient float4 1 1 1 1
- }
- scene_blend dest_colour zero
+// ambient 0.500000 0.500000 0.500000 1.000000
+// diffuse 0.900000 0.900000 0.900000 1.000000
+ emissive 0.500000 0.500000 0.500000 1.000000
texture_unit
{
- texture stationTileBackground.png
+ texture_alias Image
}
-
}
}
+}
- // This is the fallback which cards which don't have fragment program
- // support will use
- // Note that it still requires vertex program support
- technique
- {
- // Base ambient pass
- pass
- {
- // base colours, not needed for rendering, but as information
- // to lighting pass categorisation routine
- ambient 1 1 1
- diffuse 0 0 0
- specular 0 0 0 0
- // Really basic vertex program
- // NB we don't use fixed function here because GL does not like
- // mixing fixed function and vertex programs, depth fighting can
- // be an issue
- vertex_program_ref BasicVertexPrograms/AmbientOneTextureUnified
- {
- param_named_auto worldViewProj worldviewproj_matrix
- param_named_auto ambient ambient_light_colour
- }
-
- }
- // Now do the lighting pass
- // NB we don't do decal texture here because this is repeated per light
- pass
- {
- // base colours, not needed for rendering, but as information
- // to lighting pass categorisation routine
- ambient 0 0 0
- // do this for each light
- iteration once_per_light
+material Sta/TS/Background : OpenGate/BumpMapping
+{
+ set_texture_alias Image TausetiStationBackgroundPlain.png
+ set_texture_alias ImageBumpMap TausetiStationBackgroundBM.png
+ set_texture_alias ImageFallback TausetiStationBackground.png
+}
-
- scene_blend add
+material Sta/TS/Window : OpenGate/BumpMapping
+{
+ set_texture_alias Image TausetiStationWindow.png
+ set_texture_alias ImageBumpMap TausetiStationWindowBM.png
+ set_texture_alias ImageFallback TausetiStationWindow.png
+}
- // Vertex program reference
- vertex_program_ref BumpMapVP
- {
- param_named_auto lightPosition light_position_object_space 0
- param_named_auto worldViewProj worldviewproj_matrix
- }
-
- // Base bump map
- texture_unit
- {
- texture stationTileIconBump.png
- colour_op replace
- }
- // Normalisation cube map, with dot product on bump map
- texture_unit
- {
- cubic_texture nm.png combinedUVW
- tex_coord_set 1
- tex_address_mode clamp
- colour_op_ex dotproduct src_texture src_current
- colour_op_multipass_fallback dest_colour zero
- }
- }
-
- // Decal pass
- pass
- {
- lighting off
- // Really basic vertex program
- // NB we don't use fixed function here because GL does not like
- // mixing fixed function and vertex programs, depth fighting can
- // be an issue
- vertex_program_ref BasicVertexPrograms/AmbientOneTextureUnified
- {
- param_named_auto worldViewProj worldviewproj_matrix
- param_named ambient float4 1 1 1 1
- }
- scene_blend dest_colour zero
- texture_unit
- {
- texture stationTileBackground.png
- }
-
- }
-
- }
+material Sta/TS/Plain : OpenGate/SingleTexture
+{
+ set_texture_alias Image TausetiStationBackgroundPlain.png
}
-material StationTile
+material Flashlight/Red
{
- receive_shadows on
technique
- {
+ {
pass
{
- ambient 0.500000 0.500000 0.500000 1.000000
- diffuse 0.900000 0.900000 0.900000 1.000000
- emissive 0.800000 0.800000 0.800000 1.000000
+ lighting on
+// scene_blend alpha_blend
+ scene_blend add
+ emissive 1.000000 0.000000 0.000000 1.000000
texture_unit
{
- texture tausetiTile.png
+ texture flare.png
}
}
}
}
-
Modified: branches/ogsector/data/materials/station.material
===================================================================
--- branches/ogsector/data/materials/station.material 2007-08-16 21:44:01 UTC (rev 663)
+++ branches/ogsector/data/materials/station.material 2007-08-18 18:09:19 UTC (rev 664)
@@ -1,21 +1,3 @@
-material Station/Background
-{
- receive_shadows on
- technique
- {
- pass
- {
- ambient 0.500000 0.500000 0.500000 1.000000
- diffuse 0.900000 0.900000 0.900000 1.000000
- emissive 0.800000 0.800000 0.800000 1.000000
- texture_unit
- {
- texture stationTileBackground.png
- }
- }
- }
-}
-
material Station/Tube
{
receive_shadows on
@@ -34,23 +16,6 @@
}
}
-material Station/Logo
-{
- receive_shadows on
- technique
- {
- pass
- {
- ambient 0.500000 0.500000 0.500000 1.000000
- diffuse 0.900000 0.900000 0.900000 1.000000
- emissive 0.800000 0.800000 0.800000 1.000000
- texture_unit
- {
- texture stationTileBackground.png
- }
- }
- }
-}
material Station/DockPad
{
Modified: branches/ogsector/src/Console.cpp
===================================================================
--- branches/ogsector/src/Console.cpp 2007-08-16 21:44:01 UTC (rev 663)
+++ branches/ogsector/src/Console.cpp 2007-08-18 18:09:19 UTC (rev 664)
@@ -121,17 +121,19 @@
CEGUI::System::getSingleton().injectKeyDown( e.key );
CEGUI::System::getSingleton().injectChar( e.text );
- if ( e.key == OIS::KC_LCONTROL) {
- resources_->setGlobalKeyModifier( KEY_LCONTROL );
- }
+ if ( e.key == OIS::KC_LCONTROL) resources_->setGlobalKeyModifier( KEY_LCONTROL );
+ if ( e.key == OIS::KC_LSHIFT) resources_->setGlobalKeyModifier( KEY_SHIFT );
+ if ( e.key == OIS::KC_RSHIFT) resources_->setGlobalKeyModifier( KEY_SHIFT );
+
return true;
}
bool Console::keyReleased( const OIS::KeyEvent & e ){
CEGUI::System::getSingleton().injectKeyUp( e.key );
- if ( e.key == OIS::KC_LCONTROL) {
- resources_->setGlobalKeyModifier( KEY_NONE );
- }
+
+ if ( e.key == OIS::KC_LCONTROL ) resources_->setGlobalKeyModifier( KEY_NONE );
+ if ( e.key == OIS::KC_LSHIFT) resources_->setGlobalKeyModifier( KEY_NONE );
+ if ( e.key == OIS::KC_RSHIFT) resources_->setGlobalKeyModifier( KEY_NONE );
return true;
}
Modified: branches/ogsector/src/ResourceManager.h
===================================================================
--- branches/ogsector/src/ResourceManager.h 2007-08-16 21:44:01 UTC (rev 663)
+++ branches/ogsector/src/ResourceManager.h 2007-08-18 18:09:19 UTC (rev 664)
@@ -48,7 +48,7 @@
class Entity;
class Station;
-enum GlobalKeyModifier{KEY_NONE, KEY_LCONTROL};
+enum GlobalKeyModifier{KEY_NONE, KEY_LCONTROL, KEY_SHIFT};
class ResourceManager : public Ogre::Singleton< ResourceManager > {
public:
@@ -99,7 +99,6 @@
return "unknown";
}
-
/*! Find file in resources and returns full name */
std::string findFullFileName( const std::string & fileName );
Modified: branches/ogsector/src/Station.cpp
===================================================================
--- branches/ogsector/src/Station.cpp 2007-08-16 21:44:01 UTC (rev 663)
+++ branches/ogsector/src/Station.cpp 2007-08-18 18:09:19 UTC (rev 664)
@@ -31,6 +31,8 @@
#include <OgreMeshManager.h>
#include <OgreSceneManager.h>
#include <OgreManualObject.h>
+#include <OgreBillboard.h>
+#include <OgreBillboardSet.h>
namespace OpenGate{
@@ -73,7 +75,7 @@
}
std::string Station::meshName( ){
- return strCopyToLowerCase( strReplaceBlankToUnderscore( name_ ) ) + ".mesh";
+ return strCopyToLowerCase( strReplaceBlankWithUnderscore( name_ ) ) + ".mesh";
}
StationDockPad::StationDockPad( const std::string & name, Sector * sector, Ogre::SubEntity * dockPad, Ogre::SceneNode * dockPadNode )
@@ -146,22 +148,34 @@
: SectorObject( station.name(), sector ), station_( &station ){
dockPad_ = NULL;
-// Ogre::MeshPtr pMesh = Ogre::MeshManager::getSingleton().load( station_->meshName(),
-// Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
-// Ogre::HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY,
-// Ogre::HardwareBuffer::HBU_STATIC_WRITE_ONLY,
-// true, true);
+ flashLights_ = NULL;
+ Ogre::MeshPtr pMesh = Ogre::MeshManager::getSingleton().load( station_->meshName(),
+ Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
+ Ogre::HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY,
+ Ogre::HardwareBuffer::HBU_STATIC_WRITE_ONLY,
+ true, true);
-// unsigned short src, dest;
-// if ( !pMesh->suggestTangentVectorBuildParams( Ogre::VES_TANGENT, src, dest) ) {
-// pMesh->buildTangentVectors( Ogre::VES_TANGENT, src, dest);
-// }
+ unsigned short src = 0, dest = 0;
+ if ( !pMesh->suggestTangentVectorBuildParams( Ogre::VES_TANGENT, src, dest) ) {
+ pMesh->buildTangentVectors( Ogre::VES_TANGENT, src, dest);
+ }
setShape( station_->meshName() );
OpcodeCollisionDetection::getSingleton().changeCollClass( collObj_, "Station" );
for ( uint i = 0; i < entity()->getNumSubEntities(); i ++ ){
- std::cout << entity()->getSubEntity( i )->getMaterialName() << std::endl;
+ std::cout << entity()->getSubEntity( i )->getMaterialName() << " Techniques: "
+ << entity()->getSubEntity( i )->getMaterial()->getNumTechniques() << " used: "
+ << entity()->getSubEntity( i )->getTechnique()->getName() << std::endl;
+
+// for ( uint j = 0; j < entity()->getSubEntity( i )->getMaterial()->getNumTechniques(); j ++ ){
+// std::cout << entity()->getSubEntity( i )->getMaterial()->getTechnique( j )->getName() << std::endl;
+// }
+
+ if ( entity()->getSubEntity( i )->getMaterialName() == "Flashlight/Red" ){
+ createFlashLights( entity()->getSubEntity( i ) );
+ }
+
if ( entity()->getSubEntity( i )->getMaterialName() == "Station/DockPad" ){
dockPadNode_ = mainNodeEntityRot_->createChildSceneNode( name_ + "/DockPadNode" );
@@ -209,6 +223,12 @@
mainNodeEntityRot_->removeAndDestroyChild( dockPadNode_->getName() );
mainNodeEntityRot_->removeAndDestroyChild( launchPadNode_->getName() );
}
+ if ( flashLights_ ){
+ mainNodeEntityRot_->detachObject( flashLights_ );
+ sceneMgr_->destroyBillboardSet( flashLights_ );
+ }
+
+ Ogre::MeshManager::getSingleton().unload( station_->meshName() );
}
void StationObject::collide( BaseObject * object ){
@@ -217,6 +237,29 @@
void StationObject::showRings( bool show ){ ringNode_->setVisible( show ); }
+void StationObject::createFlashLights( Ogre::SubEntity * entity ){
+
+ entity->setVisible( false );
+ std::vector< Ogre::Vector3 > verts;
+ std::vector< Triangle > tris;
+ readSubEntity( entity, verts, tris );
+
+ uint nLights = tris.size() / 2;
+
+ flashLights_ = sceneMgr_->createBillboardSet( name_ + "_BBS", nLights );
+ flashLights_->setMaterialName( entity->getMaterialName() );
+
+ Ogre::Billboard *bb;
+
+ for ( uint i = 0; i < nLights; i ++ ){
+ bb = flashLights_->createBillboard( Ogre::Vector3::ZERO, Ogre::ColourValue( 1.0f, 0.0f, 0.0f, 1.0f) );
+ bb->setDimensions( (verts[ i * 4 + 1 ] - verts[ i * 4 ] ).length(),
+ (verts[ i * 4 + 1 ] - verts[ i * 4 ] ).length() );
+ bb->setPosition( ( verts[ i * 4 ] + verts[ i * 4 + 1 ] + verts[ i * 4 + 2 ] + verts[ i * 4 + 3] ) / 4.0 );
+ }
+ mainNodeEntityRot_->attachObject( flashLights_ );
+}
+
Ogre::Vector3 StationObject::launchPadPosition(){
return launchPadNode_->getWorldPosition();
}
Modified: branches/ogsector/src/Station.h
===================================================================
--- branches/ogsector/src/Station.h 2007-08-16 21:44:01 UTC (rev 663)
+++ branches/ogsector/src/Station.h 2007-08-18 18:09:19 UTC (rev 664)
@@ -90,6 +90,8 @@
void showRings( bool show );
+ void createFlashLights( Ogre::SubEntity * entity );
+
virtual void selectedBy( SectorObject * obj ){
SectorObject::selectedBy( obj );
if ( obj ){
@@ -111,6 +113,8 @@
Ogre::ManualObject * ringEntity_;
+ Ogre::BillboardSet * flashLights_;
+
StationDockPad * dockPad_;
};
Modified: branches/ogsector/src/UnDockedState.cpp
===================================================================
--- branches/ogsector/src/UnDockedState.cpp 2007-08-16 21:44:01 UTC (rev 663)
+++ branches/ogsector/src/UnDockedState.cpp 2007-08-18 18:09:19 UTC (rev 664)
@@ -166,6 +166,7 @@
Ogre::Viewport* vp = window_->addViewport( sceneMgr_->getCamera( "MainCamera" ), 0, 0.0, 0.0, 1.0f, 1.0f );
vp->setBackgroundColour( Ogre::ColourValue( 0, 0, 0) );
+
// camera->setAspectRatio( Real(vp->getActualWidth()) / Real(vp->getActualHeight()));
Ogre::Viewport* vp1 = window_->addViewport( sceneMgr_->getCamera( "SecondCamera" ), 1, 0.01, 0.84, 0.15, 0.15 );
@@ -204,6 +205,11 @@
cameraRotateY_ = 0.0;
cameraZoom_ = 75.0;
+ ambientLight_ = 2;
+ setAmbientLight_();
+
+ schemeIdx_ = 0;
+ setScheme_();
// targetPointer_ = mainCamera_->getSceneManager()->getRootSceneNode()->createChildSceneNode( "TargetPointer" );
// BillboardSet* mySet = mainCamera_->getSceneManager()->createBillboardSet("mySet");
// targetPointerBB_ = mySet->createBillboard( Vector3(0, 0, 0) );
@@ -393,6 +399,13 @@
chatMode_ = true;
}
+ if ( e.key == OIS::KC_L && resources_->globalKeyModifier( ) != KEY_SHIFT ) { decreaseAmbientLight(); }
+ if ( e.key == OIS::KC_L && resources_->globalKeyModifier( ) == KEY_SHIFT ) { increaseAmbientLight(); }
+
+ if ( e.key == OIS::KC_O && resources_->globalKeyModifier( ) != KEY_SHIFT ) { decreaseScheme(); }
+ if ( e.key == OIS::KC_O && resources_->globalKeyModifier( ) == KEY_SHIFT ) { increaseScheme(); }
+
+
if ( sector_->avatarObject() != NULL ){
//** Avatar yaw LEFT;
if ( e.key == OIS::KC_A || e.key == OIS::KC_NUMPAD4 ) { sector_->avatarObject()->setScaledYaw( 1.0 ); }
@@ -1181,6 +1194,48 @@
sector_->spawnAiObject( name );
}
+void UnDockedState::increaseAmbientLight(){
+ ambientLight_ = min( ambientLight_ + 1, 10 );
+ setAmbientLight_();
+}
+
+void UnDockedState::decreaseAmbientLight(){
+ ambientLight_ = max( ambientLight_ - 1, 0 );
+ setAmbientLight_();
+}
+
+void UnDockedState::setAmbientLight_(){
+
+ std::cout << ambientLight_ << std::endl;
+ sceneMgr_->setAmbientLight( Ogre::ColourValue( (double)ambientLight_/10.0,
+ (double)ambientLight_/10.0,
+ (double)ambientLight_/10.0 ) );
+}
+
+void UnDockedState::increaseScheme(){
+ schemeIdx_ = min( schemeIdx_ + 1, 2 );
+ setScheme_();
+}
+
+void UnDockedState::decreaseScheme(){
+ schemeIdx_ = max( schemeIdx_ - 1, 0 );
+ setScheme_();
+}
+
+void UnDockedState::setScheme_(){
+
+ for ( uint i = 0; i < window_->getNumViewports(); i ++ ){
+ Ogre::Viewport * vp = window_->getViewport( i );
+ switch ( schemeIdx_ ){
+ case 0: vp->setMaterialScheme( "Default" ); break;
+ case 1: vp->setMaterialScheme( "vpOnly" ); break;
+ case 2: vp->setMaterialScheme( "vpfp" ); break;
+ }
+ }
+
+}
+
+
} // namespace OpenGate{
Modified: branches/ogsector/src/UnDockedState.h
===================================================================
--- branches/ogsector/src/UnDockedState.h 2007-08-16 21:44:01 UTC (rev 663)
+++ branches/ogsector/src/UnDockedState.h 2007-08-18 18:09:19 UTC (rev 664)
@@ -89,6 +89,12 @@
void showHud();
void hideHud();
+ void increaseAmbientLight();
+ void decreaseAmbientLight();
+
+ void increaseScheme();
+ void decreaseScheme();
+
protected:
UnDockedState( );
virtual ~UnDockedState( ){}
@@ -97,6 +103,8 @@
inline bool handleMinimiseConsole( const CEGUI::EventArgs & e ){ minimiseConsole(); return true; }
inline bool handleConfigBackButton( const CEGUI::EventArgs & e ){ return switchConfigDialog( ); }
+ void setAmbientLight_();
+ void setScheme_();
void toggleNextCamera_( int mode = -1 );
void updateCamera_( Ogre::Real elapsedTime );
void updateHUD_( Ogre::Real elapsedTime );
@@ -203,6 +211,9 @@
int sceneDetailIndex_ ;
+ int ambientLight_;
+ int schemeIdx_;
+
};
};
Modified: branches/ogsector/src/common.h
===================================================================
--- branches/ogsector/src/common.h 2007-08-16 21:44:01 UTC (rev 663)
+++ branches/ogsector/src/common.h 2007-08-18 18:09:19 UTC (rev 664)
@@ -83,7 +83,7 @@
/*! Read one line from a file stream and return a vector of strings. */
std::vector < std::string > getRowSubstrings( std::fstream & file, char comment = '#' );
-inline std::string strReplaceBlankToUnderscore( const std::string & str ) {
+inline std::string strReplaceBlankWithUnderscore( const std::string & str ) {
std::string res( str );
for ( uint i = 0; i < res.length(); i ++ ){
Added: trunk/data/stations/TausetiStationBackground.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/stations/TausetiStationBackground.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/stations/TausetiStationBackground.xcf
===================================================================
(Binary files differ)
Property changes on: trunk/data/stations/TausetiStationBackground.xcf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/stations/TausetiStationBackgroundBM.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/stations/TausetiStationBackgroundBM.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/stations/TausetiStationBackgroundPlain.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/stations/TausetiStationBackgroundPlain.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/stations/TausetiStationWindow.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/stations/TausetiStationWindow.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/stations/TausetiStationWindow.xcf
===================================================================
(Binary files differ)
Property changes on: trunk/data/stations/TausetiStationWindow.xcf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/stations/TausetiStationWindowBM.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/stations/TausetiStationWindowBM.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/stations/tauseti_wake.mesh
===================================================================
(Binary files differ)
Modified: trunk/data/stations/tauseti_wake_2.blend
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-08-16 21:43:58
|
Revision: 663
http://opengate.svn.sourceforge.net/opengate/?rev=663&view=rev
Author: egore
Date: 2007-08-16 14:44:01 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
OIS 1.0
Modified Paths:
--------------
branches/ogsector/src/InputManager.cpp
Modified: branches/ogsector/src/InputManager.cpp
===================================================================
--- branches/ogsector/src/InputManager.cpp 2007-08-16 21:15:05 UTC (rev 662)
+++ branches/ogsector/src/InputManager.cpp 2007-08-16 21:44:01 UTC (rev 663)
@@ -84,7 +84,7 @@
keyboard_->setEventCallback( this );
#ifndef WIN32
- if ( inputSystem_->numJoysticks() > 0 ) {
+ if ( inputSystem_->numJoySticks() > 0 ) {
// mJoysticks.resize( inputSystem_->numJoysticks() );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-08-16 21:15:05
|
Revision: 662
http://opengate.svn.sourceforge.net/opengate/?rev=662&view=rev
Author: egore
Date: 2007-08-16 14:15:05 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
ois, again and again
Added Paths:
-----------
branches/ogsector/externals/ois-1.0/src/Makefile.am
branches/ogsector/externals/ois-1.0/src/OISEffect.cpp
branches/ogsector/externals/ois-1.0/src/OISForceFeedback.cpp
branches/ogsector/externals/ois-1.0/src/OISInputManager.cpp
branches/ogsector/externals/ois-1.0/src/OISJoyStick.cpp
branches/ogsector/externals/ois-1.0/src/OISKeyboard.cpp
branches/ogsector/externals/ois-1.0/src/win32/
branches/ogsector/externals/ois-1.0/src/win32/Win32ForceFeedback.cpp
branches/ogsector/externals/ois-1.0/src/win32/Win32InputManager.cpp
branches/ogsector/externals/ois-1.0/src/win32/Win32JoyStick.cpp
branches/ogsector/externals/ois-1.0/src/win32/Win32KeyBoard.cpp
branches/ogsector/externals/ois-1.0/src/win32/Win32Mouse.cpp
Added: branches/ogsector/externals/ois-1.0/src/Makefile.am
===================================================================
--- branches/ogsector/externals/ois-1.0/src/Makefile.am (rev 0)
+++ branches/ogsector/externals/ois-1.0/src/Makefile.am 2007-08-16 21:15:05 UTC (rev 662)
@@ -0,0 +1,19 @@
+INCLUDES = $(STLPORT_CFLAGS) -I$(top_srcdir)/includes $(CFLAGS) -I/usr/X11R6/include
+
+lib_LTLIBRARIES=libOIS.la
+libOIS_la_SOURCES = OISInputManager.cpp \
+ OISObject.cpp \
+ OISEffect.cpp \
+ OISJoyStick.cpp \
+ OISKeyboard.cpp \
+ OISForceFeedback.cpp \
+ ./linux/EventHelpers.cpp \
+ ./linux/LinuxInputManager.cpp \
+ ./linux/LinuxJoyStickEvents.cpp \
+ ./linux/LinuxForceFeedback.cpp \
+ ./linux/LinuxKeyboard.cpp \
+ ./linux/LinuxMouse.cpp
+
+libOIS_la_LDFLAGS = -release @PACKAGE_VERSION@
+libOIS_la_LIBADD = $(STLPORT_LIBS) -L/usr/X11R6/lib -lX11 -lXaw
+
Property changes on: branches/ogsector/externals/ois-1.0/src/Makefile.am
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/ogsector/externals/ois-1.0/src/OISEffect.cpp
===================================================================
--- branches/ogsector/externals/ois-1.0/src/OISEffect.cpp (rev 0)
+++ branches/ogsector/externals/ois-1.0/src/OISEffect.cpp 2007-08-16 21:15:05 UTC (rev 662)
@@ -0,0 +1,93 @@
+/*
+The zlib/libpng License
+
+Copyright (c) 2006 Phillip Castaneda (pjcast -- www.wreckedgames.com)
+
+This software is provided 'as-is', without any express or implied warranty. In no event will
+the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial
+applications, and to alter it and redistribute it freely, subject to the following
+restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not claim that
+ you wrote the original software. If you use this software in a product,
+ an acknowledgment in the product documentation would be appreciated but is
+ not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "OISEffect.h"
+#include "OISException.h"
+
+using namespace OIS;
+
+//VC7.1 had a problem with these not getting included..
+//Perhaps a case of a crazy extreme optimizer :/ (moved to header)
+//const unsigned int Effect::OIS_INFINITE = 0xFFFFFFFF;
+
+//------------------------------------------------------------------------------//
+Effect::Effect() :
+ force(UnknownForce),
+ type(Unknown),
+ effect(0),
+ axes(1)
+{
+}
+
+//------------------------------------------------------------------------------//
+Effect::Effect(EForce ef, EType et) :
+ force(ef),
+ type(et),
+ direction(North),
+ trigger_button(-1),
+ trigger_interval(0),
+ replay_length(Effect::OIS_INFINITE),
+ replay_delay(0),
+ _handle(-1),
+ axes(1)
+{
+ effect = 0;
+
+ switch( ef )
+ {
+ case ConstantForce: effect = new ConstantEffect(); break;
+ case RampForce: effect = new RampEffect(); break;
+ case PeriodicForce: effect = new PeriodicEffect(); break;
+ case ConditionalForce: effect = new ConditionalEffect(); break;
+ default: break;
+ }
+}
+
+//------------------------------------------------------------------------------//
+Effect::~Effect()
+{
+ delete effect;
+}
+
+//------------------------------------------------------------------------------//
+ForceEffect* Effect::getForceEffect() const
+{
+ //If no effect was created in constructor, then we raise an error here
+ if( effect == 0 )
+ OIS_EXCEPT( E_NotSupported, "Requested ForceEffect is null!" );
+
+ return effect;
+}
+
+//------------------------------------------------------------------------------//
+void Effect::setNumAxes(short nAxes)
+{
+ //Can only be set before a handle was assigned (effect created)
+ if( _handle != -1 )
+ axes = nAxes;
+}
+
+//------------------------------------------------------------------------------//
+short Effect::getNumAxes() const
+{
+ return axes;
+}
Property changes on: branches/ogsector/externals/ois-1.0/src/OISEffect.cpp
___________________________________________________________________
Name: svn:mime-type
+ text/x-c++src
Name: svn:eol-style
+ native
Added: branches/ogsector/externals/ois-1.0/src/OISForceFeedback.cpp
===================================================================
--- branches/ogsector/externals/ois-1.0/src/OISForceFeedback.cpp (rev 0)
+++ branches/ogsector/externals/ois-1.0/src/OISForceFeedback.cpp 2007-08-16 21:15:05 UTC (rev 662)
@@ -0,0 +1,42 @@
+/*
+The zlib/libpng License
+
+Copyright (c) 2006 Phillip Castaneda (pjcast -- www.wreckedgames.com)
+
+This software is provided 'as-is', without any express or implied warranty. In no event will
+the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial
+applications, and to alter it and redistribute it freely, subject to the following
+restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not claim that
+ you wrote the original software. If you use this software in a product,
+ an acknowledgment in the product documentation would be appreciated but is
+ not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "OISForceFeedback.h"
+#include "OISException.h"
+
+using namespace OIS;
+
+//-------------------------------------------------------------//
+void ForceFeedback::_addEffectTypes( Effect::EForce force, Effect::EType type )
+{
+ if( force == Effect::UnknownForce || type == Effect::Unknown )
+ OIS_EXCEPT( E_General, "Unknown Force||Type was added too effect list..." );
+
+ mSupportedEffects[force] = type;
+}
+
+//-------------------------------------------------------------//
+const ForceFeedback::SupportedEffectList&
+ ForceFeedback::getSupportedEffects() const
+{
+ return mSupportedEffects;
+}
Property changes on: branches/ogsector/externals/ois-1.0/src/OISForceFeedback.cpp
___________________________________________________________________
Name: svn:mime-type
+ text/x-c++src
Name: svn:eol-style
+ native
Added: branches/ogsector/externals/ois-1.0/src/OISInputManager.cpp
===================================================================
--- branches/ogsector/externals/ois-1.0/src/OISInputManager.cpp (rev 0)
+++ branches/ogsector/externals/ois-1.0/src/OISInputManager.cpp 2007-08-16 21:15:05 UTC (rev 662)
@@ -0,0 +1,103 @@
+/*
+The zlib/libpng License
+
+Copyright (c) 2006 Phillip Castaneda (pjcast -- www.wreckedgames.com)
+
+This software is provided 'as-is', without any express or implied warranty. In no event will
+the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial
+applications, and to alter it and redistribute it freely, subject to the following
+restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not claim that
+ you wrote the original software. If you use this software in a product,
+ an acknowledgment in the product documentation would be appreciated but is
+ not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "OISInputManager.h"
+#include "OISException.h"
+#include <sstream>
+
+//Bring in correct Header / InputManager for current build platform
+#if defined OIS_SDL_PLATFORM
+# include "SDL/SDLInputManager.h"
+#elif defined OIS_WIN32_PLATFORM
+# include "win32/Win32InputManager.h"
+#elif defined OIS_LINUX_PLATFORM
+# include "linux/LinuxInputManager.h"
+#elif defined OIS_APPLE_PLATFORM
+# include "mac/MacInputManager.h"
+#elif defined OIS_XBOX_PLATFORM
+# include "xbox/XBoxInputManager.h"
+#endif
+
+using namespace OIS;
+
+const char* gVersionName = OIS_VERSION_NAME;
+
+//----------------------------------------------------------------------------//
+unsigned int InputManager::getVersionNumber()
+{
+ return OIS_VERSION;
+}
+
+//----------------------------------------------------------------------------//
+const char* InputManager::getVersionName()
+{
+ return gVersionName;
+}
+
+//----------------------------------------------------------------------------//
+InputManager* InputManager::createInputSystem( std::size_t windowhandle )
+{
+ ParamList pl;
+ std::ostringstream wnd;
+ wnd << windowhandle;
+ pl.insert(std::make_pair( std::string("WINDOW"), wnd.str() ));
+
+ return createInputSystem( pl );
+}
+
+//----------------------------------------------------------------------------//
+InputManager* InputManager::createInputSystem( ParamList ¶mList )
+{
+ InputManager* im = 0;
+
+#if defined OIS_SDL_PLATFORM
+ im = new SDLInputManager();
+#elif defined OIS_WIN32_PLATFORM
+ im = new Win32InputManager();
+#elif defined OIS_XBOX_PLATFORM
+ im = new XBoxInputManager();
+#elif defined OIS_LINUX_PLATFORM
+ im = new LinuxInputManager();
+#elif defined OIS_APPLE_PLATFORM
+ im = new MacInputManager();
+#else
+ OIS_EXCEPT(E_General, "No platform library.. check build platform defines!");
+#endif
+
+ try
+ {
+ im->_initialize(paramList);
+ }
+ catch(...)
+ {
+ delete im;
+ throw; //rethrow
+ }
+
+ return im;
+}
+
+//----------------------------------------------------------------------------//
+void InputManager::destroyInputSystem(InputManager* manager)
+{
+ delete manager;
+}
Property changes on: branches/ogsector/externals/ois-1.0/src/OISInputManager.cpp
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/x-c++src
Name: svn:eol-style
+ native
Added: branches/ogsector/externals/ois-1.0/src/OISJoyStick.cpp
===================================================================
--- branches/ogsector/externals/ois-1.0/src/OISJoyStick.cpp (rev 0)
+++ branches/ogsector/externals/ois-1.0/src/OISJoyStick.cpp 2007-08-16 21:15:05 UTC (rev 662)
@@ -0,0 +1,30 @@
+/*
+The zlib/libpng License
+
+Copyright (c) 2006 Phillip Castaneda (pjcast -- www.wreckedgames.com)
+
+This software is provided 'as-is', without any express or implied warranty. In no event will
+the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial
+applications, and to alter it and redistribute it freely, subject to the following
+restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not claim that
+ you wrote the original software. If you use this software in a product,
+ an acknowledgment in the product documentation would be appreciated but is
+ not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "OISJoyStick.h"
+
+//VC7.1 had a problem with these not getting included..
+//Perhaps a case of a crazy extreme optimizer :/ (moved to header)
+// The minimal axis value
+//const int OIS::JoyStick::MIN_AXIS = -32767;
+// The maximum axis value
+//const int OIS::JoyStick::MAX_AXIS = 32768;
Property changes on: branches/ogsector/externals/ois-1.0/src/OISJoyStick.cpp
___________________________________________________________________
Name: svn:mime-type
+ text/x-c++src
Name: svn:eol-style
+ native
Added: branches/ogsector/externals/ois-1.0/src/OISKeyboard.cpp
===================================================================
--- branches/ogsector/externals/ois-1.0/src/OISKeyboard.cpp (rev 0)
+++ branches/ogsector/externals/ois-1.0/src/OISKeyboard.cpp 2007-08-16 21:15:05 UTC (rev 662)
@@ -0,0 +1,49 @@
+/*
+The zlib/libpng License
+
+Copyright (c) 2006 Phillip Castaneda (pjcast -- www.wreckedgames.com)
+
+This software is provided 'as-is', without any express or implied warranty. In no event will
+the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial
+applications, and to alter it and redistribute it freely, subject to the following
+restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not claim that
+ you wrote the original software. If you use this software in a product,
+ an acknowledgment in the product documentation would be appreciated but is
+ not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "OISKeyboard.h"
+#include "OISException.h"
+
+using namespace OIS;
+//----------------------------------------------------------------------//
+Keyboard::Keyboard() : mModifiers(0), listener(0), mTextMode(Unicode)
+{
+}
+
+//----------------------------------------------------------------------//
+void Keyboard::setTextTranslation( TextTranslationMode mode )
+{
+ mTextMode = mode;
+}
+
+//----------------------------------------------------------------------//
+bool Keyboard::isModifierDown( Modifier mod )
+{
+#if defined(OIS_MSVC_COMPILER)
+ #pragma warning (push)
+ #pragma warning (disable : 4800)
+#endif
+ return (mModifiers & mod);
+#if defined(OIS_MSVC_COMPILER)
+ #pragma warning (pop)
+#endif
+}
Property changes on: branches/ogsector/externals/ois-1.0/src/OISKeyboard.cpp
___________________________________________________________________
Name: svn:mime-type
+ text/x-c++src
Name: svn:eol-style
+ native
Added: branches/ogsector/externals/ois-1.0/src/win32/Win32ForceFeedback.cpp
===================================================================
--- branches/ogsector/externals/ois-1.0/src/win32/Win32ForceFeedback.cpp (rev 0)
+++ branches/ogsector/externals/ois-1.0/src/win32/Win32ForceFeedback.cpp 2007-08-16 21:15:05 UTC (rev 662)
@@ -0,0 +1,334 @@
+/*
+The zlib/libpng License
+
+Copyright (c) 2006 Phillip Castaneda (pjcast -- www.wreckedgames.com)
+
+This software is provided 'as-is', without any express or implied warranty. In no event will
+the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial
+applications, and to alter it and redistribute it freely, subject to the following
+restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not claim that
+ you wrote the original software. If you use this software in a product,
+ an acknowledgment in the product documentation would be appreciated but is
+ not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "Win32/Win32ForceFeedback.h"
+#include "OISException.h"
+#include <Math.h>
+
+#if defined (_DEBUG)
+ #include <sstream>
+#endif
+
+using namespace OIS;
+
+//--------------------------------------------------------------//
+Win32ForceFeedback::Win32ForceFeedback(IDirectInputDevice8* joy) :
+ mHandles(0), mJoyStick(joy)
+{
+}
+
+//--------------------------------------------------------------//
+Win32ForceFeedback::~Win32ForceFeedback()
+{
+ //Get the effect - if it exists
+ for(EffectList::iterator i = mEffectList.begin(); i != mEffectList.end(); ++i )
+ {
+ LPDIRECTINPUTEFFECT dxEffect = i->second;
+ if( dxEffect )
+ dxEffect->Unload();
+ }
+
+ mEffectList.clear();
+}
+
+//--------------------------------------------------------------//
+void Win32ForceFeedback::upload( const Effect* effect )
+{
+ switch( effect->force )
+ {
+ case OIS::Effect::ConstantForce: _updateConstantEffect(effect); break;
+ case OIS::Effect::RampForce: _updateRampEffect(effect); break;
+ case OIS::Effect::PeriodicForce: _updatePeriodicEffect(effect); break;
+ case OIS::Effect::ConditionalForce: _updateConditionalEffect(effect); break;
+ //case OIS::Effect::CustomForce: _updateCustomEffect(effect); break;
+ default: OIS_EXCEPT(E_NotImplemented, "Requested Force not Implemented yet, sorry!"); break;
+ }
+}
+
+//--------------------------------------------------------------//
+void Win32ForceFeedback::modify( const Effect* eff )
+{
+ //Modifying is essentially the same as an upload, so, just reuse that function
+ upload(eff);
+}
+
+//--------------------------------------------------------------//
+void Win32ForceFeedback::remove( const Effect* eff )
+{
+ //Get the effect - if it exists
+ EffectList::iterator i = mEffectList.find(eff->_handle);
+ if( i != mEffectList.end() )
+ {
+ LPDIRECTINPUTEFFECT dxEffect = i->second;
+ if( dxEffect )
+ {
+ dxEffect->Stop();
+ //We care about the return value - as the effect might not
+ //have been unlaoded
+ if( SUCCEEDED(dxEffect->Unload()) )
+ mEffectList.erase(i);
+ }
+ else
+ mEffectList.erase(i);
+ }
+}
+
+//--------------------------------------------------------------//
+void Win32ForceFeedback::setMasterGain( float level )
+{
+ //Between 0 - 10,000
+ int gain_level = (int)(10000.0f * level);
+
+ if( gain_level > 10000 )
+ gain_level = 10000;
+ else if( gain_level < 0 )
+ gain_level = 0;
+
+ DIPROPDWORD DIPropGain;
+ DIPropGain.diph.dwSize = sizeof(DIPropGain);
+ DIPropGain.diph.dwHeaderSize = sizeof(DIPROPHEADER);
+ DIPropGain.diph.dwObj = 0;
+ DIPropGain.diph.dwHow = DIPH_DEVICE;
+ DIPropGain.dwData = gain_level;
+
+ mJoyStick->SetProperty(DIPROP_FFGAIN, &DIPropGain.diph);
+}
+
+//--------------------------------------------------------------//
+void Win32ForceFeedback::setAutoCenterMode( bool auto_on )
+{
+ //DI Property DIPROPAUTOCENTER_OFF = 0, 1 is on
+ DIPROPDWORD DIPropAutoCenter;
+ DIPropAutoCenter.diph.dwSize = sizeof(DIPropAutoCenter);
+ DIPropAutoCenter.diph.dwHeaderSize = sizeof(DIPROPHEADER);
+ DIPropAutoCenter.diph.dwObj = 0;
+ DIPropAutoCenter.diph.dwHow = DIPH_DEVICE;
+ DIPropAutoCenter.dwData = auto_on;
+
+ //hr =
+ mJoyStick->SetProperty(DIPROP_AUTOCENTER, &DIPropAutoCenter.diph);
+}
+
+//--------------------------------------------------------------//
+void Win32ForceFeedback::_updateConstantEffect( const Effect* effect )
+{
+ DWORD rgdwAxes[2] = { DIJOFS_X, DIJOFS_Y };
+ LONG rglDirection[2] = { 0, 0 };
+ DICONSTANTFORCE cf;
+ DIEFFECT diEffect;
+
+ //Currently only support 1 axis
+ //if( effect->getNumAxes() == 1 )
+ cf.lMagnitude = static_cast<ConstantEffect*>(effect->getForceEffect())->level;
+
+ _setCommonProperties(&diEffect, rgdwAxes, rglDirection, sizeof(DICONSTANTFORCE), &cf, effect);
+ _upload(GUID_ConstantForce, &diEffect, effect);
+}
+
+//--------------------------------------------------------------//
+void Win32ForceFeedback::_updateRampEffect( const Effect* effect )
+{
+ DWORD rgdwAxes[2] = { DIJOFS_X, DIJOFS_Y };
+ LONG rglDirection[2] = { 0, 0 };
+ DIRAMPFORCE rf;
+ DIEFFECT diEffect;
+
+ //Currently only support 1 axis
+ rf.lStart = static_cast<RampEffect*>(effect->getForceEffect())->startLevel;
+ rf.lEnd = static_cast<RampEffect*>(effect->getForceEffect())->endLevel;
+
+ _setCommonProperties(&diEffect, rgdwAxes, rglDirection, sizeof(DIRAMPFORCE), &rf, effect);
+ _upload(GUID_RampForce, &diEffect, effect);
+}
+
+//--------------------------------------------------------------//
+void Win32ForceFeedback::_updatePeriodicEffect( const Effect* effect )
+{
+ DWORD rgdwAxes[2] = { DIJOFS_X, DIJOFS_Y };
+ LONG rglDirection[2] = { 0, 0 };
+ DIPERIODIC pf;
+ DIEFFECT diEffect;
+
+ //Currently only support 1 axis
+ pf.dwMagnitude = static_cast<PeriodicEffect*>(effect->getForceEffect())->magnitude;
+ pf.lOffset = static_cast<PeriodicEffect*>(effect->getForceEffect())->offset;
+ pf.dwPhase = static_cast<PeriodicEffect*>(effect->getForceEffect())->phase;
+ pf.dwPeriod = static_cast<PeriodicEffect*>(effect->getForceEffect())->period;
+
+ _setCommonProperties(&diEffect, rgdwAxes, rglDirection, sizeof(DIPERIODIC), &pf, effect);
+
+ switch( effect->type )
+ {
+ case OIS::Effect::Square: _upload(GUID_Square, &diEffect, effect); break;
+ case OIS::Effect::Triangle: _upload(GUID_Triangle, &diEffect, effect); break;
+ case OIS::Effect::Sine: _upload(GUID_Sine, &diEffect, effect); break;
+ case OIS::Effect::SawToothUp: _upload(GUID_SawtoothUp, &diEffect, effect); break;
+ case OIS::Effect::SawToothDown: _upload(GUID_SawtoothDown, &diEffect, effect); break;
+ default: break;
+ }
+}
+
+//--------------------------------------------------------------//
+void Win32ForceFeedback::_updateConditionalEffect( const Effect* effect )
+{
+ DWORD rgdwAxes[2] = { DIJOFS_X, DIJOFS_Y };
+ LONG rglDirection[2] = { 0, 0 };
+ DICONDITION cf;
+ DIEFFECT diEffect;
+
+ cf.lOffset = static_cast<ConditionalEffect*>(effect->getForceEffect())->deadband;
+ cf.lPositiveCoefficient = static_cast<ConditionalEffect*>(effect->getForceEffect())->rightCoeff;
+ cf.lNegativeCoefficient = static_cast<ConditionalEffect*>(effect->getForceEffect())->leftCoeff;
+ cf.dwPositiveSaturation = static_cast<ConditionalEffect*>(effect->getForceEffect())->rightSaturation;
+ cf.dwNegativeSaturation = static_cast<ConditionalEffect*>(effect->getForceEffect())->leftSaturation;
+ cf.lDeadBand = static_cast<ConditionalEffect*>(effect->getForceEffect())->deadband;
+
+ _setCommonProperties(&diEffect, rgdwAxes, rglDirection, sizeof(DICONDITION), &cf, effect);
+
+ switch( effect->type )
+ {
+ case OIS::Effect::Friction: _upload(GUID_Friction, &diEffect, effect); break;
+ case OIS::Effect::Damper: _upload(GUID_Damper, &diEffect, effect); break;
+ case OIS::Effect::Inertia: _upload(GUID_Inertia, &diEffect, effect); break;
+ case OIS::Effect::Spring: _upload(GUID_Spring, &diEffect, effect); break;
+ default: break;
+ }
+}
+
+//--------------------------------------------------------------//
+void Win32ForceFeedback::_updateCustomEffect( const Effect* /*effect*/ )
+{
+ //DWORD rgdwAxes[2] = { DIJOFS_X, DIJOFS_Y };
+ //LONG rglDirection[2] = { 0, 0 };
+ //DICUSTOMFORCE cf;
+ //DIEFFECT diEffect;
+ //cf.cChannels = 0;
+ //cf.dwSamplePeriod = 0;
+ //cf.cSamples = 0;
+ //cf.rglForceData = 0;
+ //_setCommonProperties(&diEffect, rgdwAxes, rglDirection, sizeof(DICUSTOMFORCE), &cf, effect);
+ //_upload(GUID_CustomForce, &diEffect, effect);
+}
+
+//--------------------------------------------------------------//
+void Win32ForceFeedback::_setCommonProperties(
+ DIEFFECT* diEffect, DWORD* rgdwAxes,
+ LONG* rglDirection, DWORD struct_size,
+ LPVOID struct_type, const Effect* effect )
+{
+ ZeroMemory(diEffect, sizeof(DIEFFECT));
+
+ diEffect->dwSize = sizeof(DIEFFECT);
+ diEffect->dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS;
+ diEffect->dwDuration = effect->replay_length;
+ diEffect->dwSamplePeriod = 0;
+ diEffect->dwGain = DI_FFNOMINALMAX;
+ diEffect->dwTriggerButton = DIEB_NOTRIGGER;
+ diEffect->dwTriggerRepeatInterval = 0;
+ diEffect->cAxes = effect->getNumAxes();
+ diEffect->rgdwAxes = rgdwAxes;
+ diEffect->rglDirection = rglDirection;
+ diEffect->lpEnvelope = 0;
+ diEffect->cbTypeSpecificParams = struct_size;
+ diEffect->lpvTypeSpecificParams = struct_type;
+ diEffect->dwStartDelay = effect->replay_delay;
+}
+
+//--------------------------------------------------------------//
+void Win32ForceFeedback::_upload( GUID guid, DIEFFECT* diEffect, const Effect* effect)
+{
+ LPDIRECTINPUTEFFECT dxEffect = 0;
+
+ //Get the effect - if it exists
+ EffectList::iterator i = mEffectList.find(effect->_handle);
+ //It has been created already
+ if( i != mEffectList.end() )
+ dxEffect = i->second;
+ else //This effect has not yet been created - generate a handle
+ effect->_handle = mHandles++;
+
+ if( dxEffect == 0 )
+ {
+ //This effect has not yet been created, so create it
+ HRESULT hr = mJoyStick->CreateEffect(guid, diEffect, &dxEffect, NULL);
+ if(SUCCEEDED(hr))
+ {
+ mEffectList[effect->_handle] = dxEffect;
+ dxEffect->Start(INFINITE,0);
+ }
+ else if( hr == DIERR_DEVICEFULL )
+ OIS_EXCEPT(E_DeviceFull, "Remove an effect before adding more!");
+ else
+ OIS_EXCEPT(E_General, "Unknown error creating effect->..");
+ }
+ else
+ {
+ //ToDo -- Update the Effect
+ HRESULT hr = dxEffect->SetParameters( diEffect, DIEP_DIRECTION |
+ DIEP_DURATION | DIEP_ENVELOPE | DIEP_STARTDELAY | DIEP_TRIGGERBUTTON |
+ DIEP_TRIGGERREPEATINTERVAL | DIEP_TYPESPECIFICPARAMS | DIEP_START );
+
+ if(FAILED(hr)) OIS_EXCEPT(E_InvalidParam, "Error updating device!");
+ }
+}
+
+//--------------------------------------------------------------//
+void Win32ForceFeedback::_addEffectSupport( LPCDIEFFECTINFO pdei )
+{
+ //Determine what the effect is and how it corresponds to our OIS's Enums
+ //We could save the GUIDs too, however, we will just use the predefined
+ //ones later
+ if( pdei->guid == GUID_ConstantForce )
+ _addEffectTypes((Effect::EForce)DIEFT_GETTYPE(pdei->dwEffType), Effect::Constant );
+ else if( pdei->guid == GUID_Triangle )
+ _addEffectTypes((Effect::EForce)DIEFT_GETTYPE(pdei->dwEffType), Effect::Triangle );
+ else if( pdei->guid == GUID_Spring )
+ _addEffectTypes((Effect::EForce)DIEFT_GETTYPE(pdei->dwEffType), Effect::Spring );
+ else if( pdei->guid == GUID_Friction )
+ _addEffectTypes((Effect::EForce)DIEFT_GETTYPE(pdei->dwEffType), Effect::Friction );
+ else if( pdei->guid == GUID_Square )
+ _addEffectTypes((Effect::EForce)DIEFT_GETTYPE(pdei->dwEffType), Effect::Square );
+ else if( pdei->guid == GUID_Sine )
+ _addEffectTypes((Effect::EForce)DIEFT_GETTYPE(pdei->dwEffType), Effect::Sine );
+ else if( pdei->guid == GUID_SawtoothUp )
+ _addEffectTypes((Effect::EForce)DIEFT_GETTYPE(pdei->dwEffType), Effect::SawToothUp );
+ else if( pdei->guid == GUID_SawtoothDown )
+ _addEffectTypes((Effect::EForce)DIEFT_GETTYPE(pdei->dwEffType), Effect::SawToothDown );
+ else if( pdei->guid == GUID_Damper )
+ _addEffectTypes((Effect::EForce)DIEFT_GETTYPE(pdei->dwEffType), Effect::Damper );
+ else if( pdei->guid == GUID_Inertia )
+ _addEffectTypes((Effect::EForce)DIEFT_GETTYPE(pdei->dwEffType), Effect::Inertia );
+ else if( pdei->guid == GUID_CustomForce )
+ _addEffectTypes((Effect::EForce)DIEFT_GETTYPE(pdei->dwEffType), Effect::Custom );
+ else if( pdei->guid == GUID_RampForce )
+ _addEffectTypes((Effect::EForce)DIEFT_GETTYPE(pdei->dwEffType), Effect::Ramp );
+#if defined (_DEBUG)
+ //Only care about this for Debugging Purposes
+ //else
+ //{
+ // std::ostringstream ss;
+ // ss << "Win32ForceFeedback, DirectInput8 Effect not found. Reported as: "
+ // << pdei->tszName;
+ // OIS_EXCEPT( E_General, ss.str().c_str());
+ //}
+#endif
+}
Property changes on: branches/ogsector/externals/ois-1.0/src/win32/Win32ForceFeedback.cpp
___________________________________________________________________
Name: svn:mime-type
+ text/x-c++src
Name: svn:eol-style
+ native
Added: branches/ogsector/externals/ois-1.0/src/win32/Win32InputManager.cpp
===================================================================
--- branches/ogsector/externals/ois-1.0/src/win32/Win32InputManager.cpp (rev 0)
+++ branches/ogsector/externals/ois-1.0/src/win32/Win32InputManager.cpp 2007-08-16 21:15:05 UTC (rev 662)
@@ -0,0 +1,208 @@
+/*
+The zlib/libpng License
+
+Copyright (c) 2006 Phillip Castaneda (pjcast -- www.wreckedgames.com)
+
+This software is provided 'as-is', without any express or implied warranty. In no event will
+the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial
+applications, and to alter it and redistribute it freely, subject to the following
+restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not claim that
+ you wrote the original software. If you use this software in a product,
+ an acknowledgment in the product documentation would be appreciated but is
+ not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "Win32/Win32InputManager.h"
+#include "Win32/Win32Keyboard.h"
+#include "Win32/Win32Mouse.h"
+#include "Win32/Win32JoyStick.h"
+#include "OISException.h"
+
+using namespace OIS;
+
+const std::string Win32InputManager::iName = "Win32";
+
+//--------------------------------------------------------------------------------//
+Win32InputManager::Win32InputManager()
+{
+ hWnd = 0;
+ mDirectInput = 0;
+
+ kbSettings = 0;
+ mouseSettings = 0;
+ joySettings = 0;
+
+ joySticks = 0;
+}
+
+//--------------------------------------------------------------------------------//
+Win32InputManager::~Win32InputManager()
+{
+ if( mDirectInput )
+ {
+ mDirectInput->Release();
+ mDirectInput = 0;
+ }
+}
+
+//--------------------------------------------------------------------------------//
+void Win32InputManager::_initialize( ParamList ¶mList )
+{
+ HINSTANCE hInst = 0;
+ HRESULT hr;
+
+ //TODO 64 bit proof this little conversion xxx wip
+ //First of all, get the Windows Handle and Instance
+ ParamList::iterator i = paramList.find("WINDOW");
+ if( i == paramList.end() )
+ OIS_EXCEPT( E_InvalidParam, "Win32InputManager::Win32InputManager >> No HWND found!" );
+
+ hWnd = (HWND)strtoul(i->second.c_str(), 0, 10);
+
+ if( IsWindow(hWnd) == 0 )
+ OIS_EXCEPT( E_General, "Win32InputManager::Win32InputManager >> The sent HWND is not valid!");
+
+ hInst = GetModuleHandle(0);
+
+ //Create the device
+ hr = DirectInput8Create( hInst, DIRECTINPUT_VERSION, IID_IDirectInput8, (VOID**)&mDirectInput, NULL );
+ if (FAILED(hr))
+ OIS_EXCEPT( E_General, "Win32InputManager::Win32InputManager >> Not able to init DirectX8 Input!");
+
+ //Ok, now we have DirectInput, parse whatever extra settings were sent to us
+ _parseConfigSettings( paramList );
+ _enumerateDevices();
+}
+
+//--------------------------------------------------------------------------------//
+void Win32InputManager::_parseConfigSettings( ParamList ¶mList )
+{
+ //Here we pick up settings such as a device's cooperation mode
+ std::map<std::string, DWORD> temp;
+ temp["DISCL_BACKGROUND"] = DISCL_BACKGROUND;
+ temp["DISCL_EXCLUSIVE"] = DISCL_EXCLUSIVE;
+ temp["DISCL_FOREGROUND"] = DISCL_FOREGROUND;
+ temp["DISCL_NONEXCLUSIVE"] = DISCL_NONEXCLUSIVE;
+ temp["DISCL_NOWINKEY"] = DISCL_NOWINKEY;
+
+ //Check for pairs: ie. ("w32_keyboard","DISCL_NOWINKEY")("w32_keyboard","DISCL_FOREGROUND")
+ ParamList::iterator i = paramList.begin(), e = paramList.end();
+ for( ; i != e; ++i )
+ {
+ if( i->first == "w32_keyboard" )
+ kbSettings |= temp[i->second];
+ else if( i->first == "w32_mouse" )
+ mouseSettings |= temp[i->second];
+ else if( i->first == "w32_joystick" )
+ joySettings |= temp[i->second];
+ }
+ if( kbSettings == 0 ) kbSettings = DISCL_FOREGROUND | DISCL_NONEXCLUSIVE | DISCL_NOWINKEY;
+ if( mouseSettings == 0 ) mouseSettings = DISCL_FOREGROUND | DISCL_EXCLUSIVE;
+ if( joySettings == 0 ) joySettings = DISCL_FOREGROUND | DISCL_EXCLUSIVE;
+}
+
+//--------------------------------------------------------------------------------//
+void Win32InputManager::_enumerateDevices()
+{
+ //Enumerate all attached devices
+ mDirectInput->EnumDevices(NULL, _DIEnumKbdCallback, this, DIEDFL_ATTACHEDONLY);
+}
+
+//--------------------------------------------------------------------------------//
+BOOL CALLBACK Win32InputManager::_DIEnumKbdCallback(LPCDIDEVICEINSTANCE lpddi, LPVOID pvRef)
+{
+ Win32InputManager *_this_ = static_cast<Win32InputManager*>(pvRef);
+ if( GET_DIDEVICE_TYPE(lpddi->dwDevType) == DI8DEVTYPE_JOYSTICK ||
+ GET_DIDEVICE_TYPE(lpddi->dwDevType) == DI8DEVTYPE_GAMEPAD ||
+ GET_DIDEVICE_TYPE(lpddi->dwDevType) == DI8DEVTYPE_1STPERSON ||
+ GET_DIDEVICE_TYPE(lpddi->dwDevType) == DI8DEVTYPE_DRIVING ||
+ GET_DIDEVICE_TYPE(lpddi->dwDevType) == DI8DEVTYPE_FLIGHT)
+ {
+ JoyStickInfo jsInfo;
+ jsInfo.deviceID = lpddi->guidInstance;
+ jsInfo.vendor = lpddi->tszInstanceName;
+ jsInfo.devId = _this_->joySticks;
+
+ _this_->joySticks++;
+
+ _this_->unusedJoyStickList.push_back( jsInfo );
+ }
+
+ return DIENUM_CONTINUE;
+}
+
+//--------------------------------------------------------------------------------//
+int Win32InputManager::numJoySticks()
+{
+ return joySticks;
+}
+
+//--------------------------------------------------------------------------------//
+int Win32InputManager::numMice()
+{
+ return 1;
+}
+
+//--------------------------------------------------------------------------------//
+int Win32InputManager::numKeyboards()
+{
+ return 1;
+}
+
+//----------------------------------------------------------------------------//
+Object* Win32InputManager::createInputObject( Type iType, bool bufferMode )
+{
+ Object* obj = 0;
+
+ switch( iType )
+ {
+ case OISKeyboard: obj = new Win32Keyboard( this, mDirectInput, bufferMode, kbSettings ); break;
+ case OISMouse: obj = new Win32Mouse( this, mDirectInput, bufferMode, mouseSettings ); break;
+ case OISJoyStick:
+ {
+ //Find a JoyStick not in use
+ JoyStickInfoList::iterator i = unusedJoyStickList.begin();
+ if( i != unusedJoyStickList.end() )
+ {
+ obj = new Win32JoyStick( this, mDirectInput, bufferMode, joySettings, (*i) );
+ unusedJoyStickList.erase(i);
+ break;
+ }
+ OIS_EXCEPT(E_InputDeviceNonExistant, "No Unused JoyStick could be found!");
+ }
+ default: OIS_EXCEPT( E_InputDeviceNotSupported, "Type not implemented");
+ }
+
+ try {
+ obj->_initialize();
+ }
+ catch(...) {
+ delete obj;
+ throw; //rethrow
+ }
+
+ return obj;
+}
+
+//----------------------------------------------------------------------------//
+void Win32InputManager::destroyInputObject( Object* obj )
+{
+ if( obj == 0 )
+ return;
+
+ //If it was a numbered device... add it back to availiable list
+ if( obj->type() == OISJoyStick )
+ {
+ unusedJoyStickList.push_back(((Win32JoyStick*)obj)->_getJoyInfo());
+ }
+
+ delete obj;
+}
Property changes on: branches/ogsector/externals/ois-1.0/src/win32/Win32InputManager.cpp
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/x-c++src
Name: svn:eol-style
+ native
Added: branches/ogsector/externals/ois-1.0/src/win32/Win32JoyStick.cpp
===================================================================
--- branches/ogsector/externals/ois-1.0/src/win32/Win32JoyStick.cpp (rev 0)
+++ branches/ogsector/externals/ois-1.0/src/win32/Win32JoyStick.cpp 2007-08-16 21:15:05 UTC (rev 662)
@@ -0,0 +1,405 @@
+/*
+The zlib/libpng License
+
+Copyright (c) 2006 Phillip Castaneda (pjcast -- www.wreckedgames.com)
+
+This software is provided 'as-is', without any express or implied warranty. In no event will
+the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial
+applications, and to alter it and redistribute it freely, subject to the following
+restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not claim that
+ you wrote the original software. If you use this software in a product,
+ an acknowledgment in the product documentation would be appreciated but is
+ not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "Win32/Win32JoyStick.h"
+#include "Win32/Win32InputManager.h"
+#include "Win32/Win32ForceFeedback.h"
+
+#include "OISEvents.h"
+#include "OISException.h"
+
+#include <cassert>
+
+using namespace OIS;
+
+//--------------------------------------------------------------------------------------------------//
+Win32JoyStick::Win32JoyStick( InputManager* creator, IDirectInput8* pDI,
+ bool buffered, DWORD coopSettings,
+ const JoyStickInfo &info )
+{
+ mCreator = creator;
+ mBuffered = buffered;
+ mDirectInput = pDI;
+ coopSetting = coopSettings;
+ mJoyStick = 0;
+ mType = OISJoyStick;
+
+ deviceGuid = info.deviceID;
+ mVendor = info.vendor;
+ mDevID = info.devId;
+
+ listener = 0;
+ ff_device = 0;
+}
+
+//--------------------------------------------------------------------------------------------------//
+Win32JoyStick::~Win32JoyStick()
+{
+ delete ff_device;
+
+ if(mJoyStick)
+ {
+ mJoyStick->Unacquire();
+ mJoyStick->Release();
+ mJoyStick = 0;
+ }
+}
+
+//--------------------------------------------------------------------------------------------------//
+void Win32JoyStick::_initialize()
+{
+ //Clear old state
+ mState.mAxes.clear();
+
+ delete ff_device;
+ ff_device = 0;
+
+ DIPROPDWORD dipdw;
+
+ dipdw.diph.dwSize = sizeof(DIPROPDWORD);
+ dipdw.diph.dwHeaderSize = sizeof(DIPROPHEADER);
+ dipdw.diph.dwObj = 0;
+ dipdw.diph.dwHow = DIPH_DEVICE;
+ dipdw.dwData = JOYSTICK_DX_BUFFERSIZE;
+
+ if(FAILED(mDirectInput->CreateDevice(deviceGuid, &mJoyStick, NULL)))
+ OIS_EXCEPT( E_General, "Win32JoyStick::_initialize() >> Could not initialize joy device!");
+
+ if(FAILED(mJoyStick->SetDataFormat(&c_dfDIJoystick2)))
+ OIS_EXCEPT( E_General, "Win32JoyStick::_initialize() >> data format error!");
+
+ HWND hwin = ((Win32InputManager*)mCreator)->getWindowHandle();
+
+ if(FAILED(mJoyStick->SetCooperativeLevel( hwin, coopSetting)))
+ OIS_EXCEPT( E_General, "Win32JoyStick::_initialize() >> failed to set cooperation level!");
+
+ if( FAILED(mJoyStick->SetProperty(DIPROP_BUFFERSIZE, &dipdw.diph)) )
+ OIS_EXCEPT( E_General, "Win32Mouse::Win32Mouse >> Failed to set buffer size property" );
+
+ //Enumerate all axes/buttons/sliders/etc before aquiring
+ _enumerate();
+
+ mState.clear();
+
+ capture();
+}
+
+//--------------------------------------------------------------------------------------------------//
+void Win32JoyStick::_enumerate()
+{
+ //We can check force feedback here too
+ DIDEVCAPS DIJoyCaps;
+ DIJoyCaps.dwSize = sizeof(DIDEVCAPS);
+ mJoyStick->GetCapabilities(&DIJoyCaps);
+
+ numAxes = (short)DIJoyCaps.dwAxes;
+ numButtons = (short)DIJoyCaps.dwButtons;
+ numHats = (short)DIJoyCaps.dwPOVs;
+
+ mState.mAxes.resize(numAxes);
+
+ //Reset the axis mapping enumeration value
+ _AxisNumber = 0;
+
+ //Enumerate Force Feedback (if any)
+ mJoyStick->EnumEffects(DIEnumEffectsCallback, this, DIEFT_ALL);
+
+ //Enumerate and set axis constraints (and check FF Axes)
+ mJoyStick->EnumObjects(DIEnumDeviceObjectsCallback, this, DIDFT_AXIS);
+}
+
+//--------------------------------------------------------------------------------------------------//
+BOOL CALLBACK Win32JoyStick::DIEnumDeviceObjectsCallback(LPCDIDEVICEOBJECTINSTANCE lpddoi, LPVOID pvRef)
+{
+ Win32JoyStick* _this = (Win32JoyStick*)pvRef;
+
+ //Setup mappings
+ DIPROPPOINTER diptr;
+ diptr.diph.dwSize = sizeof(DIPROPPOINTER);
+ diptr.diph.dwHeaderSize = sizeof(DIPROPHEADER);
+ diptr.diph.dwHow = DIPH_BYID;
+ diptr.diph.dwObj = lpddoi->dwType;
+ //Add the high bit in so that an axis value of zero does not mean a null userdata
+ diptr.uData = 0x80000000 | _this->_AxisNumber;
+
+ if (FAILED(_this->mJoyStick->SetProperty(DIPROP_APPDATA, &diptr.diph)))
+ { //If for some reason we could not set needed user data, just ignore this axis
+ return DIENUM_CONTINUE;
+ }
+
+ //Increase for next time through
+ _this->_AxisNumber += 1;
+
+ //Set range
+ DIPROPRANGE diprg;
+ diprg.diph.dwSize = sizeof(DIPROPRANGE);
+ diprg.diph.dwHeaderSize = sizeof(DIPROPHEADER);
+ diprg.diph.dwHow = DIPH_BYID;
+ diprg.diph.dwObj = lpddoi->dwType;
+ diprg.lMin = MIN_AXIS;
+ diprg.lMax = MAX_AXIS;
+
+ if (FAILED(_this->mJoyStick->SetProperty(DIPROP_RANGE, &diprg.diph)))
+ OIS_EXCEPT( E_General, "Win32JoyStick::_DIEnumDeviceObjectsCallback >> Failed to set min/max range property" );
+
+ //Check if FF Axes
+ if((lpddoi->dwFlags & DIDOI_FFACTUATOR) != 0 )
+ {
+ if( _this->ff_device )
+ {
+ //todo - increment force feedback axis count
+ }
+ }
+
+ return DIENUM_CONTINUE;
+}
+
+//--------------------------------------------------------------------------------------------------//
+BOOL CALLBACK Win32JoyStick::DIEnumEffectsCallback(LPCDIEFFECTINFO pdei, LPVOID pvRef)
+{
+ Win32JoyStick* _this = (Win32JoyStick*)pvRef;
+
+ //Create the FF class after we know there is at least one effect type
+ if( _this->ff_device == 0 )
+ _this->ff_device = new Win32ForceFeedback(_this->mJoyStick);
+
+ _this->ff_device->_addEffectSupport( pdei );
+
+ return DIENUM_CONTINUE;
+}
+
+//--------------------------------------------------------------------------------------------------//
+void Win32JoyStick::capture()
+{
+ DIDEVICEOBJECTDATA diBuff[JOYSTICK_DX_BUFFERSIZE];
+ DWORD entries = JOYSTICK_DX_BUFFERSIZE;
+
+ // Poll the device to read the current state
+ HRESULT hr = mJoyStick->Poll();
+ if( hr == DI_OK )
+ hr = mJoyStick->GetDeviceData( sizeof(DIDEVICEOBJECTDATA), diBuff, &entries, 0 );
+
+ if( hr != DI_OK )
+ {
+ hr = mJoyStick->Acquire();
+ while( hr == DIERR_INPUTLOST )
+ hr = mJoyStick->Acquire();
+
+ // Poll the device to read the current state
+ mJoyStick->Poll();
+ hr = mJoyStick->GetDeviceData( sizeof(DIDEVICEOBJECTDATA), diBuff, &entries, 0 );
+ //Perhaps the user just tabbed away
+ if( FAILED(hr) )
+ return;
+ }
+
+ bool axisMoved[24] = {false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,
+ false,false,false,false,false,false,false,false};
+ bool sliderMoved[4] = {false,false,false,false};
+
+ //Loop through all the events
+ for(unsigned int i = 0; i < entries; ++i)
+ {
+ //First check to see if event entry is a Axis we enumerated earlier
+ if( diBuff[i].uAppData != 0xFFFFFFFF && diBuff[i].uAppData > 0 )
+ {
+ int axis = 0x7FFFFFFF & diBuff[i].uAppData; //Mask out the high bit
+ assert( axis >= 0 && axis < mState.mAxes.size() && "Axis out of range!");
+ mState.mAxes[axis].abs = diBuff[i].dwData;
+ axisMoved[axis] = true;
+ }
+ else
+ {
+ //DX Only defines macros for the JOYSTICK not JOYSTICK2, so we redeclare them to match what we are using
+ #undef DIJOFS_BUTTON
+ #undef DIJOFS_POV
+ #define DIJOFS_BUTTON(n) (FIELD_OFFSET(DIJOYSTATE2, rgbButtons) + (n))
+ #define DIJOFS_POV(n) (FIELD_OFFSET(DIJOYSTATE2, rgdwPOV)+(n)*sizeof(DWORD))
+
+ #define DIJOFS_SLIDER0(n) (FIELD_OFFSET(DIJOYSTATE2, rglSlider)+(n) * sizeof(LONG))
+ #define DIJOFS_SLIDER1(n) (FIELD_OFFSET(DIJOYSTATE2, rglVSlider)+(n) * sizeof(LONG))
+ #define DIJOFS_SLIDER2(n) (FIELD_OFFSET(DIJOYSTATE2, rglASlider)+(n) * sizeof(LONG))
+ #define DIJOFS_SLIDER3(n) (FIELD_OFFSET(DIJOYSTATE2, rglFSlider)+(n) * sizeof(LONG))
+
+ //This may seem outof order, but is in order of the way these variables
+ //are declared in the JoyStick State 2 structure.
+ switch(diBuff[i].dwOfs)
+ {
+ //------ slider -//
+ case DIJOFS_SLIDER0(0):
+ sliderMoved[0] = true;
+ mState.mSliders[0].abX = diBuff[i].dwData;
+ break;
+ case DIJOFS_SLIDER0(1):
+ sliderMoved[0] = true;
+ mState.mSliders[0].abY = diBuff[i].dwData;
+ break;
+ //----- Max 4 POVs Next ---------------//
+ case DIJOFS_POV(0):
+ if(!_changePOV(0,diBuff[i]))
+ return;
+ break;
+ case DIJOFS_POV(1):
+ if(!_changePOV(1,diBuff[i]))
+ return;
+ break;
+ case DIJOFS_POV(2):
+ if(!_changePOV(2,diBuff[i]))
+ return;
+ break;
+ case DIJOFS_POV(3):
+ if(!_changePOV(3,diBuff[i]))
+ return;
+ break;
+ case DIJOFS_SLIDER1(0):
+ sliderMoved[1] = true;
+ mState.mSliders[1].abX = diBuff[i].dwData;
+ break;
+ case DIJOFS_SLIDER1(1):
+ sliderMoved[1] = true;
+ mState.mSliders[1].abY = diBuff[i].dwData;
+ break;
+ case DIJOFS_SLIDER2(0):
+ sliderMoved[2] = true;
+ mState.mSliders[2].abX = diBuff[i].dwData;
+ break;
+ case DIJOFS_SLIDER2(1):
+ sliderMoved[2] = true;
+ mState.mSliders[2].abY = diBuff[i].dwData;
+ break;
+ case DIJOFS_SLIDER3(0):
+ sliderMoved[3] = true;
+ mState.mSliders[3].abX = diBuff[i].dwData;
+ break;
+ case DIJOFS_SLIDER3(1):
+ sliderMoved[3] = true;
+ mState.mSliders[3].abY = diBuff[i].dwData;
+ break;
+ //-----------------------------------------//
+ default:
+ //Handle Button Events Easily using the DX Offset Macros
+ if( diBuff[i].dwOfs >= DIJOFS_BUTTON(0) && diBuff[i].dwOfs <= DIJOFS_BUTTON(31) )
+ {
+ if(!_doButtonClick((diBuff[i].dwOfs - DIJOFS_BUTTON(0)), diBuff[i]))
+ return;
+ }
+ break;
+ } //end case
+ } //End else
+ } //end for
+
+ //Check to see if any of the axes values have changed.. if so send events
+ if( mBuffered && listener && entries > 0 )
+ {
+ JoyStickEvent temp(this, mState);
+
+ //Update axes
+ for( int i = 0; i < 24; ++i )
+ if( axisMoved[i] )
+ if( listener->axisMoved( temp, i ) == false )
+ return;
+
+ //Now update sliders
+ for( int i = 0; i < 4; ++i )
+ if( sliderMoved[i] )
+ if( listener->sliderMoved( temp, i ) == false )
+ return;
+ }
+}
+
+//--------------------------------------------------------------------------------------------------//
+bool Win32JoyStick::_doButtonClick( int button, DIDEVICEOBJECTDATA& di )
+{
+ if( di.dwData & 0x80 )
+ {
+ mState.buttons |= 1 << button; //turn the bit flag on
+ if( mBuffered && listener )
+ return listener->buttonPressed( JoyStickEvent( this, mState ), button );
+ }
+ else
+ {
+ mState.buttons &= ~(1 << button); //turn the bit flag off
+ if( mBuffered && listener )
+ return listener->buttonReleased( JoyStickEvent( this, mState ), button );
+ }
+
+ return true;
+}
+
+//--------------------------------------------------------------------------------------------------//
+bool Win32JoyStick::_changePOV( int pov, DIDEVICEOBJECTDATA& di )
+{
+ //Some drivers report a value of 65,535, instead of \x971,
+ //for the center position
+ if(LOWORD(di.dwData) == 0xFFFF)
+ {
+ mState.mPOV[pov].direction = Pov::Centered;
+ }
+ else
+ {
+ switch(di.dwData)
+ {
+ case 0: mState.mPOV[pov].direction = Pov::North; break;
+ case 4500: mState.mPOV[pov].direction = Pov::NorthEast; break;
+ case 9000: mState.mPOV[pov].direction = Pov::East; break;
+ case 13500: mState.mPOV[pov].direction = Pov::SouthEast; break;
+ case 18000: mState.mPOV[pov].direction = Pov::South; break;
+ case 22500: mState.mPOV[pov].direction = Pov::SouthWest; break;
+ case 27000: mState.mPOV[pov].direction = Pov::West; break;
+ case 31500: mState.mPOV[pov].direction = Pov::NorthWest; break;
+ }
+ }
+
+ if( mBuffered && listener )
+ return listener->povMoved( JoyStickEvent( this, mState ), pov );
+
+ return true;
+}
+
+//--------------------------------------------------------------------------------------------------//
+void Win32JoyStick::setBuffered(bool buffered)
+{
+ mBuffered = buffered;
+}
+
+//--------------------------------------------------------------------------------------------------//
+JoyStickInfo Win32JoyStick::_getJoyInfo()
+{
+ JoyStickInfo js;
+ js.deviceID = deviceGuid;
+ js.devId = mDevID;
+ js.vendor = mVendor;
+
+ return js;
+}
+
+//--------------------------------------------------------------------------------------------------//
+Interface* Win32JoyStick::queryInterface(Interface::IType type)
+{
+ //Thought about using covariant return type here.. however,
+ //some devices may allow LED light changing, or other interface stuff
+
+ if( ff_device && type == Interface::ForceFeedback )
+ return ff_device;
+ else
+ return 0;
+}
Property changes on: branches/ogsector/externals/ois-1.0/src/win32/Win32JoyStick.cpp
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/x-c++src
Name: svn:eol-style
+ native
Added: branches/ogsector/externals/ois-1.0/src/win32/Win32KeyBoard.cpp
===================================================================
--- branches/ogsector/externals/ois-1.0/src/win32/Win32KeyBoard.cpp (rev 0)
+++ branches/ogsector/externals/ois-1.0/src/win32/Win32KeyBoard.cpp 2007-08-16 21:15:05 UTC (rev 662)
@@ -0,0 +1,332 @@
+/*
+The zlib/libpng License
+
+Copyright (c) 2006 Phillip Castaneda (pjcast -- www.wreckedgames.com)
+
+This software is provided 'as-is', without any express or implied warranty. In no event will
+the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial
+applications, and to alter it and redistribute it freely, subject to the following
+restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not claim that
+ you wrote the original software. If you use this software in a product,
+ an acknowledgment in the product documentation would be appreciated but is
+ not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "Win32/Win32InputManager.h"
+#include "Win32/Win32KeyBoard.h"
+#include "OISException.h"
+#include "OISEvents.h"
+#include <sstream>
+
+using namespace OIS;
+
+//--------------------------------------------------------------------------------------------------//
+Win32Keyboard::Win32Keyboard( InputManager* creator, IDirectInput8* pDI, bool buffered, DWORD coopSettings )
+{
+ mCreator = creator;
+ mBuffered = buffered;
+ mKeyboard = 0;
+ mDirectInput = pDI;
+ coopSetting = coopSettings;
+ mType = OISKeyboard;
+ listener = 0;
+
+ //Clear our keyboard state buffer
+ memset( &KeyBuffer, 0, 256 );
+ deadKey = '\0';
+}
+
+//--------------------------------------------------------------------------------------------------//
+void Win32Keyboard::_initialize()
+{
+ mModifiers = 0;
+ deadKey = '\0';
+
+ if(FAILED(mDirectInput->CreateDevice(GUID_SysKeyboard, &mKeyboard, NULL)))
+ OIS_EXCEPT( E_General, "Win32Keyboard::Win32Keyboard >> Could not init device!");
+
+ if(FAILED(mKeyboard->SetDataFormat(&c_dfDIKeyboard)))
+ OIS_EXCEPT( E_General, "Win32Keyboard::Win32Keyboard >> format error!");
+
+ HWND hwin = ((Win32InputManager*)mCreator)->getWindowHandle();
+
+ if(FAILED(mKeyboard->SetCooperativeLevel( hwin, coopSetting)))
+ OIS_EXCEPT( E_General, "Win32Keyboard::Win32Keyboard >> coop error!");
+
+ if( mBuffered )
+ {
+ DIPROPDWORD dipdw;
+ dipdw.diph.dwSize = sizeof(DIPROPDWORD);
+ dipdw.diph.dwHeaderSize = sizeof(DIPROPHEADER);
+ dipdw.diph.dwObj = 0;
+ dipdw.diph.dwHow = DIPH_DEVICE;
+ dipdw.dwData = KEYBOARD_DX_BUFFERSIZE;
+
+ if (FAILED(mKeyboard->SetProperty( DIPROP_BUFFERSIZE, &dipdw.diph )))
+ OIS_EXCEPT( E_General, "Win32Keyboard::Win32Keyboard >> buffer error!");
+ }
+
+ HRESULT hr = mKeyboard->Acquire();
+ if(FAILED(hr) && hr != DIERR_OTHERAPPHASPRIO)
+ OIS_EXCEPT( E_General, "Win32Keyboard::Win32Keyboard >> aquire error!");
+}
+
+//--------------------------------------------------------------------------------------------------//
+Win32Keyboard::~Win32Keyboard()
+{
+ if(mKeyboard)
+ {
+ mKeyboard->Unacquire();
+ mKeyboard->Release();
+ mKeyboard = 0;
+ }
+}
+
+//--------------------------------------------------------------------------------------------------//
+void Win32Keyboard::capture()
+{
+ if( mBuffered )
+ _readBuffered();
+ else
+ _read();
+}
+
+//--------------------------------------------------------------------------------------------------//
+void Win32Keyboard::_readBuffered()
+{
+ DIDEVICEOBJECTDATA diBuff[KEYBOARD_DX_BUFFERSIZE];
+ DWORD entries = KEYBOARD_DX_BUFFERSIZE;
+ HRESULT hr;
+ //Only one keyboard allowed per app, so static is ok
+ static bool verifyAfterAltTab = false;
+
+ hr = mKeyboard->GetDeviceData( sizeof(DIDEVICEOBJECTDATA), diBuff, &entries, 0 );
+ if( hr != DI_OK )
+ {
+ hr = mKeyboard->Acquire();
+ if (hr == E_ACCESSDENIED)
+ verifyAfterAltTab = true;
+
+ while( hr == DIERR_INPUTLOST )
+ hr = mKeyboard->Acquire();
+
+ return;
+ }
+
+ //Update keyboard and modifier states.. And, if listener, fire events
+ for(unsigned int i = 0; i < entries; ++i )
+ {
+ //If the listener returns false, that means that we are probably deleted...
+ //send no more events and just leave as the this pointer is invalid now...
+ bool ret = true;
+ KeyCode kc = (KeyCode)diBuff[ i ].dwOfs;
+
+ //Store result in our keyBuffer too
+ KeyBuffer[kc] = static_cast<unsigned char>(diBuff[ i ].dwData);
+
+ if( diBuff[ i ].dwData & 0x80 )
+ {
+ //Turn on modifier
+ if( kc == KC_LCONTROL || kc == KC_RCONTROL )
+ mModifiers |= Ctrl;
+ else if( kc == KC_LSHIFT || kc == KC_RSHIFT )
+ mModifiers |= Shift;
+ else if( kc == KC_LMENU || kc == KC_RMENU )
+ mModifiers |= Alt;
+
+ if( listener )
+ ret = listener->keyPressed( KeyEvent( this, kc, _translateText(kc) ) );
+ }
+ else
+ {
+ //Turn off modifier
+ if( kc == KC_LCONTROL || kc == KC_RCONTROL )
+ mModifiers &= ~Ctrl;
+ else if( kc == KC_LSHIFT || kc == KC_RSHIFT )
+ mModifiers &= ~Shift;
+ else if( kc == KC_LMENU || kc == KC_RMENU )
+ mModifiers &= ~Alt;
+
+ if( listener )
+ ret = listener->keyReleased( KeyEvent( this, kc, 0 ) );
+ }
+
+ //If user returned false from callback, return immediately
+ if(ret == false)
+ return;
+ }
+
+ // If a lost device/access denied was detected, recover gracefully with new events
+ if(verifyAfterAltTab)
+ {
+ bool ret = true;
+
+ //Copy old buffer to temp location to compare against
+ unsigned char keyBufferCopy[256];
+ memcpy(keyBufferCopy, KeyBuffer, 256);
+
+ //Update new state
+ _read();
+
+ for (unsigned i = 0; i < 256; i++)
+ {
+ if (keyBufferCopy[i] != KeyBuffer[i])
+ {
+ if (listener)
+ {
+ if (KeyBuffer[i])
+ ret = listener->keyPressed( KeyEvent( this, (KeyCode)i, _translateText((KeyCode)i) ) );
+ else
+ ret = listener->keyReleased( KeyEvent( this, (KeyCode)i, 0 ) );
+ }
+ }
+
+ //If user returned false from callback, return immediately
+ if(ret == false)
+ return;
+ }
+
+ verifyAfterAltTab = false;
+ }
+}
+
+//--------------------------------------------------------------------------------------------------//
+void Win32Keyboard::_read()
+{
+ HRESULT hr = mKeyboard->GetDeviceState( sizeof(KeyBuffer), &KeyBuffer );
+
+ if( hr == DIERR_INPUTLOST || hr == DIERR_NOTACQUIRED )
+ {
+ hr = mKeyboard->Acquire();
+ if (hr != DIERR_OTHERAPPHASPRIO)
+ mKeyboard->GetDeviceState(sizeof(KeyBuffer), &KeyBuffer);
+ }
+
+ //Set Shift, Ctrl, Alt
+ mModifiers = 0;
+ if( isKeyDown(KC_LCONTROL) || isKeyDown(KC_RCONTROL) )
+ mModifiers |= Ctrl;
+ if( isKeyDown(KC_LSHIFT) || isKeyDown(KC_RSHIFT) )
+ mModifiers |= Shift;
+ if( isKeyDown(KC_LMENU) || isKeyDown(KC_RMENU) )
+ mModifiers |= Alt;
+}
+
+//--------------------------------------------------------------------------------------------------//
+int Win32Keyboard::_translateText( KeyCode kc )
+{
+ if( mTextMode == Off )
+ return 0;
+
+ BYTE keyState[256];
+ HKL layout = GetKeyboardLayout(0);
+ if( GetKeyboardState(keyState) == 0 )
+ return 0;
+
+ unsigned int vk = MapVirtualKeyEx(kc, 3, layout);
+ if( vk == 0 )
+ return 0;
+
+ unsigned char buff[3] = {0,0,0};
+ int ascii = ToAsciiEx(vk, kc, keyState, (LPWORD) buff, 0, layout);
+ //WCHAR wide[3];
+ //int ascii = ToUnicodeEx(vk, kc, keyState, wide, 3, 0, layout);
+ if(ascii == 1 && deadKey != '\0' )
+ {
+ // A dead key is stored and we have just converted a character key
+ // Combine the two into a single character
+ WCHAR wcBuff[3] = {buff[0], deadKey, '\0'};
+ WCHAR out[3];
+
+ deadKey = '\0';
+ if(FoldStringW(MAP_PRECOMPOSED, (LPWSTR)wcBuff, 3, (LPWSTR)out, 3))
+ return out[0];
+ }
+ else if (ascii == 1)
+ { // We have a single character
+ deadKey = '\0';
+ return buff[0];
+ }
+ else if(ascii == 2)
+ { // Convert a non-combining diacritical mark into a combining diacritical mark
+ // Combining versions range from 0x300 to 0x36F; only 5 (for French) have been mapped below
+ // http://www.fileformat.info/info/unicode/block/combining_diacritical_marks/images.htm
+ switch(buff[0]) {
+ case 0x5E: // Circumflex accent: \xE2
+ deadKey = 0x302; break;
+ case 0x60: // Grave accent: \xE0
+ deadKey = 0x300; break;
+ case 0xA8: // Diaeresis: \xFC
+ deadKey = 0x308; break;
+ case 0xB4: // Acute accent: \xE9
+ deadKey = 0x301; break;
+ case 0xB8: // Cedilla: \xE7
+ deadKey = 0x327; break;
+ default:
+ deadKey = buff[0]; break;
+ }
+ }
+
+ return 0;
+}
+
+//--------------------------------------------------------------------------------------------------//
+bool Win32Keyboard::isKeyDown( KeyCode key )
+{
+ return (KeyBuffer[key] & 0x80) != 0;
+}
+
+//--------------------------------------------------------------------------------------------------//
+const std::string& Win32Keyboard::getAsString( KeyCode kc )
+{
+ char temp[256];
+
+ DIPROPSTRING prop;
+ prop.diph.dwSize = sizeof(DIPROPSTRING);
+ prop.diph.dwHeaderSize = sizeof(DIPROPHEADER);
+ prop.diph.dwObj = static_cast<DWORD>(kc);
+ prop.diph.dwHow = DIPH_BYOFFSET;
+
+ if ( SUCCEEDED( mKeyboard->GetProperty( DIPROP_KEYNAME, &prop.diph ) ) )
+ {
+ // convert the WCHAR in "wsz" to multibyte
+ if ( WideCharToMultiByte( CP_ACP, 0, prop.wsz, -1, temp, sizeof(temp), NULL, NULL) )
+ return mGetString.assign( temp );
+ }
+
+ std::stringstream ss;
+ ss << "Key_" << (int)kc;
+ return mGetString.assign( ss.str() );
+}
+
+//--------------------------------------------------------------------------------------------------//
+void Win32Keyboard::copyKeyStates( char keys[256] )
+{
+ for(int i = 0; i < 256; ++i)
+ keys[i] = KeyBuffer[i] > 0; //Normalise the DX values (0x80)
+}
+
+//--------------------------------------------------------------------------------------------------//
+void Win32Keyboard::setBuffered(bool buffered)
+{
+ if( buffered != mBuffered )
+ {
+ if(mKeyboard)
+ {
+ mKeyboard->Unacquire();
+ mKeyboard->Release();
+ mKeyboard = 0;
+ }
+
+ mBuffered = buffered;
+ _initialize();
+ }
+}
Property changes on: branches/ogsector/externals/ois-1.0/src/win32/Win32KeyBoard.cpp
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/x-c++src
Name: svn:eol-style
+ native
Added: branches/ogsector/externals/ois-1.0/src/win32/Win32Mouse.cpp
===================================================================
--- branches/ogsec...
[truncated message content] |
|
From: <eg...@us...> - 2007-08-16 21:10:44
|
Revision: 661
http://opengate.svn.sourceforge.net/opengate/?rev=661&view=rev
Author: egore
Date: 2007-08-16 14:10:46 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
and the rest of it
Added Paths:
-----------
branches/ogsector/externals/ois-1.0/LinuxCB/
branches/ogsector/externals/ois-1.0/LinuxCB/ActionMapOgreDemo.cbp
branches/ogsector/externals/ois-1.0/LinuxCB/ConsoleDemo.cbp
branches/ogsector/externals/ois-1.0/LinuxCB/LinuxOIS.workspace
branches/ogsector/externals/ois-1.0/LinuxCB/OIS.cbp
branches/ogsector/externals/ois-1.0/Makefile.am
branches/ogsector/externals/ois-1.0/OIS.pc.in
branches/ogsector/externals/ois-1.0/Win32/
branches/ogsector/externals/ois-1.0/Win32/CommandLine/
branches/ogsector/externals/ois-1.0/Win32/CommandLine/CommandLine.cbp
branches/ogsector/externals/ois-1.0/Win32/CommandLine/CommandLine.rc
branches/ogsector/externals/ois-1.0/Win32/CommandLine/CommandLine.vcproj
branches/ogsector/externals/ois-1.0/Win32/CommandLine/CommandLine_vc8.vcproj
branches/ogsector/externals/ois-1.0/Win32/CommandLine/resource.h
branches/ogsector/externals/ois-1.0/Win32/DemoFFTest/
branches/ogsector/externals/ois-1.0/Win32/DemoFFTest/DemoFFTest.cbp
branches/ogsector/externals/ois-1.0/Win32/DemoFFTest/DemoFFTest.vcproj
branches/ogsector/externals/ois-1.0/Win32/DemoFFTest/DemoFFTest_vc8.vcproj
branches/ogsector/externals/ois-1.0/Win32/DemoFFTest/FF.rc
branches/ogsector/externals/ois-1.0/Win32/DemoFFTest/resource.h
branches/ogsector/externals/ois-1.0/Win32/OIS.vcproj
branches/ogsector/externals/ois-1.0/Win32/OIS.workspace
branches/ogsector/externals/ois-1.0/Win32/OIS_vc8.vcproj
branches/ogsector/externals/ois-1.0/Win32/SDL/
branches/ogsector/externals/ois-1.0/Win32/SDL/OIS_sdl_vc8.vcproj
branches/ogsector/externals/ois-1.0/Win32/SDL/SdlDemo/
branches/ogsector/externals/ois-1.0/Win32/SDL/SdlDemo/SdlDemo.cpp
branches/ogsector/externals/ois-1.0/Win32/SDL/SdlDemo/SdlDemo.rc
branches/ogsector/externals/ois-1.0/Win32/SDL/SdlDemo/SdlDemo.vcproj
branches/ogsector/externals/ois-1.0/Win32/SDL/SdlDemo/resource.h
branches/ogsector/externals/ois-1.0/Win32/SDL/ois_sdl_vc8.sln
branches/ogsector/externals/ois-1.0/Win32/ois.cbp
branches/ogsector/externals/ois-1.0/Win32/ois.sln
branches/ogsector/externals/ois-1.0/Win32/ois_vc8.sln
branches/ogsector/externals/ois-1.0/acinclude.m4
branches/ogsector/externals/ois-1.0/bootstrap
branches/ogsector/externals/ois-1.0/configure.ac
branches/ogsector/externals/ois-1.0/demos/
branches/ogsector/externals/ois-1.0/demos/FFConsoleDemo.cpp
branches/ogsector/externals/ois-1.0/demos/Makefile.am
branches/ogsector/externals/ois-1.0/demos/OISConsole.cpp
branches/ogsector/externals/ois-1.0/includes/
branches/ogsector/externals/ois-1.0/includes/Makefile.am
branches/ogsector/externals/ois-1.0/includes/OIS.h
branches/ogsector/externals/ois-1.0/includes/OISConfig.h
branches/ogsector/externals/ois-1.0/includes/OISEffect.h
branches/ogsector/externals/ois-1.0/includes/OISEvents.h
branches/ogsector/externals/ois-1.0/includes/OISException.h
branches/ogsector/externals/ois-1.0/includes/OISForceFeedback.h
branches/ogsector/externals/ois-1.0/includes/OISInputManager.h
branches/ogsector/externals/ois-1.0/includes/OISInterface.h
branches/ogsector/externals/ois-1.0/includes/OISJoyStick.h
branches/ogsector/externals/ois-1.0/includes/OISKeyboard.h
branches/ogsector/externals/ois-1.0/includes/OISMouse.h
branches/ogsector/externals/ois-1.0/includes/OISObject.h
branches/ogsector/externals/ois-1.0/includes/OISPrereqs.h
branches/ogsector/externals/ois-1.0/includes/SDL/
branches/ogsector/externals/ois-1.0/includes/SDL/SDLInputManager.h
branches/ogsector/externals/ois-1.0/includes/SDL/SDLJoyStick.h
branches/ogsector/externals/ois-1.0/includes/SDL/SDLKeyboard.h
branches/ogsector/externals/ois-1.0/includes/SDL/SDLMouse.h
branches/ogsector/externals/ois-1.0/includes/SDL/SDLPrereqs.h
branches/ogsector/externals/ois-1.0/includes/linux/
branches/ogsector/externals/ois-1.0/includes/linux/EventHelpers.h
branches/ogsector/externals/ois-1.0/includes/linux/LinuxForceFeedback.h
branches/ogsector/externals/ois-1.0/includes/linux/LinuxInputManager.h
branches/ogsector/externals/ois-1.0/includes/linux/LinuxJoyStick.h
branches/ogsector/externals/ois-1.0/includes/linux/LinuxJoyStickEvents.h
branches/ogsector/externals/ois-1.0/includes/linux/LinuxKeyboard.h
branches/ogsector/externals/ois-1.0/includes/linux/LinuxMouse.h
branches/ogsector/externals/ois-1.0/includes/linux/LinuxPrereqs.h
branches/ogsector/externals/ois-1.0/includes/mac/
branches/ogsector/externals/ois-1.0/includes/mac/MacHelpers.h
branches/ogsector/externals/ois-1.0/includes/mac/MacInputManager.h
branches/ogsector/externals/ois-1.0/includes/mac/MacKeyboard.h
branches/ogsector/externals/ois-1.0/includes/mac/MacMouse.h
branches/ogsector/externals/ois-1.0/includes/mac/MacPrereqs.h
branches/ogsector/externals/ois-1.0/includes/win32/
branches/ogsector/externals/ois-1.0/includes/win32/Win32ForceFeedback.h
branches/ogsector/externals/ois-1.0/includes/win32/Win32InputManager.h
branches/ogsector/externals/ois-1.0/includes/win32/Win32JoyStick.h
branches/ogsector/externals/ois-1.0/includes/win32/Win32KeyBoard.h
branches/ogsector/externals/ois-1.0/includes/win32/Win32Mouse.h
branches/ogsector/externals/ois-1.0/includes/win32/Win32Prereqs.h
Added: branches/ogsector/externals/ois-1.0/LinuxCB/ActionMapOgreDemo.cbp
===================================================================
--- branches/ogsector/externals/ois-1.0/LinuxCB/ActionMapOgreDemo.cbp (rev 0)
+++ branches/ogsector/externals/ois-1.0/LinuxCB/ActionMapOgreDemo.cbp 2007-08-16 21:10:46 UTC (rev 661)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+ <FileVersion major="1" minor="4" />
+ <Project>
+ <Option title="Demo_OgreActionMap" />
+ <Option compiler="gcc" />
+ <Build>
+ <Target title="Release">
+ <Option output="../demos/ogre/common/ActionMapping" />
+ <Option working_dir="../demos/ogre/common" />
+ <Option object_output="../demos/ogre/obj/release" />
+ <Option type="1" />
+ <Option compiler="gcc" />
+ <Option includeInTargetAll="1" />
+ <Option projectResourceIncludeDirsRelation="2" />
+ <Compiler>
+ <Add option="-O3" />
+ <Add directory="../demos/ogre" />
+ <Add directory="../includes" />
+ <Add directory="/usr/local/include/CEGUI" />
+ <Add directory="/usr/local/include/OGRE" />
+ <Add directory="/usr/local/include/CEGUI/elements" />
+ </Compiler>
+ <Linker>
+ <Add library="/usr/local/lib/libCEGUIBase.so" />
+ <Add library="/usr/local/lib/libCEGUIOgreRenderer.so" />
+ <Add library="/usr/local/lib/libOgreMain.so" />
+ <Add library="~/libs/OIS.so" />
+ </Linker>
+ </Target>
+ </Build>
+ <Unit filename="../demos/ogre/ActionConfig.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../demos/ogre/ActionConfig.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../demos/ogre/ActionMap.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../demos/ogre/ActionMap.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../demos/ogre/ExampleApplication.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../demos/ogre/ExampleFrameListener.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../demos/ogre/gui.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Release" />
+ </Unit>
+ </Project>
+</CodeBlocks_project_file>
\ No newline at end of file
Added: branches/ogsector/externals/ois-1.0/LinuxCB/ConsoleDemo.cbp
===================================================================
--- branches/ogsector/externals/ois-1.0/LinuxCB/ConsoleDemo.cbp (rev 0)
+++ branches/ogsector/externals/ois-1.0/LinuxCB/ConsoleDemo.cbp 2007-08-16 21:10:46 UTC (rev 661)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+ <FileVersion major="1" minor="4" />
+ <Project>
+ <Option title="Demo_Console" />
+ <Option pch_mode="0" />
+ <Option compiler="gcc" />
+ <Build>
+ <Target title="Release">
+ <Option output="../demos/Console" />
+ <Option working_dir="../demos" />
+ <Option object_output="../demos/obj/release" />
+ <Option type="1" />
+ <Option compiler="gcc" />
+ <Option includeInTargetAll="1" />
+ <Option projectResourceIncludeDirsRelation="2" />
+ <Compiler>
+ <Add directory="../includes" />
+ </Compiler>
+ </Target>
+ </Build>
+ <Linker>
+ <Add library="~/libs/OIS.so" />
+ </Linker>
+ <Unit filename="../demos/OISConsole.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Release" />
+ </Unit>
+ </Project>
+</CodeBlocks_project_file>
\ No newline at end of file
Added: branches/ogsector/externals/ois-1.0/LinuxCB/LinuxOIS.workspace
===================================================================
--- branches/ogsector/externals/ois-1.0/LinuxCB/LinuxOIS.workspace (rev 0)
+++ branches/ogsector/externals/ois-1.0/LinuxCB/LinuxOIS.workspace 2007-08-16 21:10:46 UTC (rev 661)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_workspace_file>
+ <Workspace title="OIS Project">
+ <Project filename="OIS.cbp" />
+ <Project filename="ConsoleDemo.cbp">
+ <Depends filename="OIS.cbp" />
+ </Project>
+ <Project filename="ActionMapOgreDemo.cbp" active="1">
+ <Depends filename="OIS.cbp" />
+ </Project>
+ </Workspace>
+</CodeBlocks_workspace_file>
\ No newline at end of file
Added: branches/ogsector/externals/ois-1.0/LinuxCB/OIS.cbp
===================================================================
--- branches/ogsector/externals/ois-1.0/LinuxCB/OIS.cbp (rev 0)
+++ branches/ogsector/externals/ois-1.0/LinuxCB/OIS.cbp 2007-08-16 21:10:46 UTC (rev 661)
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+ <FileVersion major="1" minor="4" />
+ <Project>
+ <Option title="OIS" />
+ <Option pch_mode="0" />
+ <Option default_target="-1" />
+ <Option compiler="gcc" />
+ <Build>
+ <Target title="Debug">
+ <Option output="~/libs/OIS_d.so" />
+ <Option working_dir="~/libs" />
+ <Option object_output="../lib/obj/debug" />
+ <Option type="3" />
+ <Option compiler="gcc" />
+ <Option includeInTargetAll="1" />
+ <Option createDefFile="1" />
+ <Option projectResourceIncludeDirsRelation="2" />
+ <Compiler>
+ <Add option="-Wfatal-errors" />
+ <Add option="-W" />
+ <Add option="-Wall" />
+ <Add option="-pg" />
+ <Add option="-g" />
+ <Add option="-D_DEBUG" />
+ <Add option="-DOIS_JOYEVENTS" />
+ <Add directory="../includes" />
+ </Compiler>
+ <Linker>
+ <Add option="-pg" />
+ <Add library="libXaw" />
+ <Add library="libX11" />
+ <Add directory="/usr/lib" />
+ <Add directory="/usr/lib/X11R6" />
+ </Linker>
+ </Target>
+ <Target title="Release">
+ <Option output="~/libs/OIS.so" />
+ <Option working_dir="~/libs" />
+ <Option object_output="../lib/obj/release" />
+ <Option type="3" />
+ <Option compiler="gcc" />
+ <Option includeInTargetAll="1" />
+ <Option createDefFile="1" />
+ <Option projectResourceIncludeDirsRelation="2" />
+ <Compiler>
+ <Add option="-O3" />
+ <Add option="-DOIS_JOYEVENTS" />
+ <Add directory="../includes" />
+ </Compiler>
+ <Linker>
+ <Add option="-s" />
+ <Add library="libXaw" />
+ <Add library="libX11" />
+ <Add directory="/usr/lib" />
+ <Add directory="/usr/lib/X11R6" />
+ </Linker>
+ </Target>
+ </Build>
+ <Unit filename="../includes/OIS.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISConfig.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISEffect.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISEvents.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISException.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISForceFeedback.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISInputManager.h">
+ <Option compilerVar="" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISInterface.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISJoyStick.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISKeyboard.h">
+ <Option compilerVar="" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISMouse.h">
+ <Option compilerVar="" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISObject.h">
+ <Option compilerVar="" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../includes/OISPrereqs.h">
+ <Option compilerVar="" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/OISEffect.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/OISForceFeedback.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/OISInputManager.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/OISJoyStick.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/OISKeyboard.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/OISObject.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/linux/EventHelpers.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/linux/LinuxForceFeedback.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/linux/LinuxInputManager.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/linux/LinuxJoyStickEvents.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/linux/LinuxKeyboard.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="../src/linux/LinuxMouse.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ </Project>
+</CodeBlocks_project_file>
\ No newline at end of file
Added: branches/ogsector/externals/ois-1.0/Makefile.am
===================================================================
--- branches/ogsector/externals/ois-1.0/Makefile.am (rev 0)
+++ branches/ogsector/externals/ois-1.0/Makefile.am 2007-08-16 21:10:46 UTC (rev 661)
@@ -0,0 +1,4 @@
+SUBDIRS = src includes demos
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = OIS.pc
Property changes on: branches/ogsector/externals/ois-1.0/Makefile.am
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/ogsector/externals/ois-1.0/OIS.pc.in
===================================================================
--- branches/ogsector/externals/ois-1.0/OIS.pc.in (rev 0)
+++ branches/ogsector/externals/ois-1.0/OIS.pc.in 2007-08-16 21:10:46 UTC (rev 661)
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: OIS
+Description: Crossplatform C++ Input Framework
+Version: @VERSION@
+Libs: -L${libdir} -lOIS
+Cflags: -I${includedir}/@PACKAGE@ -I${includedir}
+
Added: branches/ogsector/externals/ois-1.0/Win32/CommandLine/CommandLine.cbp
===================================================================
--- branches/ogsector/externals/ois-1.0/Win32/CommandLine/CommandLine.cbp (rev 0)
+++ branches/ogsector/externals/ois-1.0/Win32/CommandLine/CommandLine.cbp 2007-08-16 21:10:46 UTC (rev 661)
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+ <FileVersion major="1" minor="5" />
+ <Project>
+ <Option title="Demo Console" />
+ <Option default_target="" />
+ <Option compiler="gcc" />
+ <Option virtualFolders="" />
+ <Build>
+ <Target title="Debug">
+ <Option output="bin\Debug\CommandLine.exe" prefix_auto="0" extension_auto="0" />
+ <Option working_dir="bin\Debug" />
+ <Option object_output=".\obj\Debug" />
+ <Option external_deps="..\lib\libOIS_static_d.a;" />
+ <Option type="1" />
+ <Option compiler="gcc" />
+ <Option projectResourceIncludeDirsRelation="0" />
+ <Compiler>
+ <Add option="-g" />
+ <Add option="-O0" />
+ <Add option="-D_DEBUG" />
+ <Add option="-D_STLP_DEBUG" />
+ </Compiler>
+ <Linker>
+ <Add library="OIS_static_d" />
+ <Add library="dinput8" />
+ <Add library="dxguid" />
+ </Linker>
+ </Target>
+ <Target title="Release">
+ <Option output="bin\Release\CommandLine.exe" prefix_auto="0" extension_auto="0" />
+ <Option working_dir="bin\Release" />
+ <Option object_output=".\obj\Release" />
+ <Option external_deps="..\lib\libOIS_static.a;" />
+ <Option type="1" />
+ <Option compiler="gcc" />
+ <Option projectResourceIncludeDirsRelation="0" />
+ <Compiler>
+ <Add option="-O2" />
+ <Add option="-DNDEBUG" />
+ </Compiler>
+ <Linker>
+ <Add option="-s" />
+ <Add library="OIS_static" />
+ <Add library="dinput8" />
+ <Add library="dxguid" />
+ </Linker>
+ </Target>
+ </Build>
+ <VirtualTargets>
+ <Add alias="All" targets="Debug;Release;" />
+ </VirtualTargets>
+ <Compiler>
+ <Add option="-Wall" />
+ <Add option="-mthreads" />
+ <Add option="-fmessage-length=0" />
+ <Add option="-fexceptions" />
+ <Add option="-fident" />
+ <Add option="-pipe" />
+ <Add option="-DWIN32" />
+ <Add option="-D_CONSOLE" />
+ <Add directory="..\..\includes" />
+ <Add directory="..\CommandLine\" />
+ </Compiler>
+ <Linker>
+ <Add option="-Wl,--enable-auto-image-base" />
+ <Add option="-Wl,--add-stdcall-alias" />
+ <Add directory="..\..\lib" />
+ </Linker>
+ <Unit filename="CommandLine.rc">
+ <Option compilerVar="WINDRES" />
+ <Option objectName="Win32\CommandLine\CommandLine.res" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="resource.h">
+ <Option compilerVar="CPP" />
+ <Option compile="0" />
+ <Option link="0" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="..\..\demos\OISConsole.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Extensions />
+ </Project>
+</CodeBlocks_project_file>
Added: branches/ogsector/externals/ois-1.0/Win32/CommandLine/CommandLine.rc
===================================================================
--- branches/ogsector/externals/ois-1.0/Win32/CommandLine/CommandLine.rc (rev 0)
+++ branches/ogsector/externals/ois-1.0/Win32/CommandLine/CommandLine.rc 2007-08-16 21:10:46 UTC (rev 661)
@@ -0,0 +1,99 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#ifndef IDC_STATIC
+#define IDC_STATIC (-1)
+#endif
+#include "winresrc.h"
+//#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_DIALOG1 DIALOGEX 0, 0, 100, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Capture Window"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+ LTEXT "This window is used as Input Capture Window, and to display some info. Press Q or ESC to exit or hit button 1 of joystick",
+ IDC_STATIC,7,7,82,86
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+ IDD_DIALOG1, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ TOPMARGIN, 7
+ END
+END
+#endif // APSTUDIO_INVOKED
+
+#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
Property changes on: branches/ogsector/externals/ois-1.0/Win32/CommandLine/CommandLine.rc
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/ogsector/externals/ois-1.0/Win32/CommandLine/CommandLine.vcproj
===================================================================
--- branches/ogsector/externals/ois-1.0/Win32/CommandLine/CommandLine.vcproj (rev 0)
+++ branches/ogsector/externals/ois-1.0/Win32/CommandLine/CommandLine.vcproj 2007-08-16 21:10:46 UTC (rev 661)
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.00"
+ Name="Demo_Console"
+ ProjectGUID="{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\includes;..\CommandLine\"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_STLP_DEBUG"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ois_static_d.lib"
+ OutputFile="$(OutDir)/CommandLine.exe"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="..\..\lib"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/CommandLine.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ OmitFramePointers="TRUE"
+ AdditionalIncludeDirectories="..\..\includes;..\CommandLine\"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ois_static.lib"
+ OutputFile="$(OutDir)/CommandLine.exe"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\..\lib"
+ GenerateDebugInformation="TRUE"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ </Configuration>
+ </Configurations>
+ <Files>
+ <File
+ RelativePath="CommandLine.rc">
+ </File>
+ <File
+ RelativePath="..\..\demos\OISConsole.cpp">
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Property changes on: branches/ogsector/externals/ois-1.0/Win32/CommandLine/CommandLine.vcproj
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/ogsector/externals/ois-1.0/Win32/CommandLine/CommandLine_vc8.vcproj
===================================================================
--- branches/ogsector/externals/ois-1.0/Win32/CommandLine/CommandLine_vc8.vcproj (rev 0)
+++ branches/ogsector/externals/ois-1.0/Win32/CommandLine/CommandLine_vc8.vcproj 2007-08-16 21:10:46 UTC (rev 661)
@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="Demo_Console"
+ ProjectGUID="{7AC600E2-2B46-4204-8DEB-9E49A9BAF65F}"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\includes;..\CommandLine\"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_STLP_DEBUG"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ois_static_d.lib"
+ OutputFile="$(OutDir)/CommandLine.exe"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="..\..\lib"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/CommandLine.pdb"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ OmitFramePointers="true"
+ AdditionalIncludeDirectories="..\..\includes;..\CommandLine\"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ois_static.lib"
+ OutputFile="$(OutDir)/CommandLine.exe"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\..\lib"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\includes;..\CommandLine\"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_STLP_DEBUG"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ois_d.lib"
+ OutputFile="$(OutDir)/CommandLine.exe"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="..\..\lib64"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/CommandLine.pdb"
+ SubSystem="1"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ OmitFramePointers="true"
+ AdditionalIncludeDirectories="..\..\includes;..\CommandLine\"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ois.lib"
+ OutputFile="$(OutDir)/CommandLine.exe"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\..\lib64"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="CommandLine.rc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\demos\OISConsole.cpp"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Added: branches/ogsector/externals/ois-1.0/Win32/CommandLine/resource.h
===================================================================
--- branches/ogsector/externals/ois-1.0/Win32/CommandLine/resource.h (rev 0)
+++ branches/ogsector/externals/ois-1.0/Win32/CommandLine/resource.h 2007-08-16 21:10:46 UTC (rev 661)
@@ -0,0 +1,17 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by CommandLine.rc
+//
+#define IDD_DIALOG1 101
+#define IDC_BUTTON1 1001
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 102
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1002
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
Property changes on: branches/ogsector/externals/ois-1.0/Win32/CommandLine/resource.h
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/x-c++hdr
Name: svn:eol-style
+ native
Added: branches/ogsector/externals/ois-1.0/Win32/DemoFFTest/DemoFFTest.cbp
===================================================================
--- branches/ogsector/externals/ois-1.0/Win32/DemoFFTest/DemoFFTest.cbp (rev 0)
+++ branches/ogsector/externals/ois-1.0/Win32/DemoFFTest/DemoFFTest.cbp 2007-08-16 21:10:46 UTC (rev 661)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+ <FileVersion major="1" minor="5" />
+ <Project>
+ <Option title="Demo FFTest" />
+ <Option default_target="" />
+ <Option compiler="gcc" />
+ <Option virtualFolders="" />
+ <Build>
+ <Target title="Debug">
+ <Option output=".\bin\Debug\DemoFFTest.exe" prefix_auto="0" extension_auto="0" />
+ <Option working_dir=".\bin\Debug" />
+ <Option object_output=".\obj\Debug" />
+ <Option external_deps="..\lib\libOIS_static_d.a;" />
+ <Option type="1" />
+ <Option compiler="gcc" />
+ <Option projectResourceIncludeDirsRelation="0" />
+ <Compiler>
+ <Add option="-g" />
+ <Add option="-O0" />
+ <Add option="-D_DEBUG" />
+ </Compiler>
+ <Linker>
+ <Add library="OIS_static_d" />
+ <Add library="dxguid" />
+ <Add library="dinput8" />
+ </Linker>
+ </Target>
+ <Target title="Release">
+ <Option output=".\bin\Release\DemoFFTest.exe" prefix_auto="0" extension_auto="0" />
+ <Option working_dir=".\bin\Release" />
+ <Option object_output=".\obj\Release" />
+ <Option external_deps="..\lib\libOIS_static.a;" />
+ <Option type="1" />
+ <Option compiler="gcc" />
+ <Option projectResourceIncludeDirsRelation="0" />
+ <Compiler>
+ <Add option="-O2" />
+ <Add option="-DNDEBUG" />
+ </Compiler>
+ <Linker>
+ <Add option="-s" />
+ <Add library="OIS_static" />
+ <Add library="dxguid" />
+ <Add library="dinput8" />
+ </Linker>
+ </Target>
+ </Build>
+ <VirtualTargets>
+ <Add alias="All" targets="Debug;Release;" />
+ </VirtualTargets>
+ <Compiler>
+ <Add option="-Wall" />
+ <Add option="-mthreads" />
+ <Add option="-fmessage-length=0" />
+ <Add option="-fexceptions" />
+ <Add option="-fident" />
+ <Add option="-pipe" />
+ <Add option="-DWIN32" />
+ <Add option="-D_CONSOLE" />
+ <Add directory="..\..\includes" />
+ <Add directory="..\DemoFFTest" />
+ </Compiler>
+ <Linker>
+ <Add option="-Wl,--enable-auto-image-base" />
+ <Add option="-Wl,--add-stdcall-alias" />
+ <Add directory="..\..\lib" />
+ </Linker>
+ <Unit filename="FF.rc">
+ <Option compilerVar="WINDRES" />
+ <Option objectName="Win32\DemoFFTest\FF.res" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Unit filename="..\..\demos\FFConsoleDemo.cpp">
+ <Option compilerVar="CPP" />
+ <Option target="Debug" />
+ <Option target="Release" />
+ </Unit>
+ <Extensions />
+ </Project>
+</CodeBlocks_project_file>
Added: branches/ogsector/externals/ois-1.0/Win32/DemoFFTest/DemoFFTest.vcproj
===================================================================
--- branches/ogsector/externals/ois-1.0/Win32/DemoFFTest/DemoFFTest.vcproj (rev 0)
+++ branches/ogsector/externals/ois-1.0/Win32/DemoFFTest/DemoFFTest.vcproj 2007-08-16 21:10:46 UTC (rev 661)
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.00"
+ Name="Demo_FFTest"
+ ProjectGUID="{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\includes;..\DemoFFTest"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_STLP_DEBUG"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ois_d.lib"
+ OutputFile="$(OutDir)/DemoFFTest.exe"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="..\..\dll"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/DemoFFTest.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ OmitFramePointers="TRUE"
+ AdditionalIncludeDirectories="..\..\includes;..\DemoFFTest"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ois.lib"
+ OutputFile="$(OutDir)/DemoFFTest.exe"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\..\dll"
+ GenerateDebugInformation="TRUE"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ </Configuration>
+ </Configurations>
+ <Files>
+ <File
+ RelativePath="FF.rc">
+ </File>
+ <File
+ RelativePath="..\..\demos\FFConsoleDemo.cpp">
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Added: branches/ogsector/externals/ois-1.0/Win32/DemoFFTest/DemoFFTest_vc8.vcproj
===================================================================
--- branches/ogsector/externals/ois-1.0/Win32/DemoFFTest/DemoFFTest_vc8.vcproj (rev 0)
+++ branches/ogsector/externals/ois-1.0/Win32/DemoFFTest/DemoFFTest_vc8.vcproj 2007-08-16 21:10:46 UTC (rev 661)
@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="Demo_FFTest"
+ ProjectGUID="{D1912D13-C99D-4959-ABDC-62BF71AD5A1A}"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\includes;..\DemoFFTest"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_STLP_DEBUG"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ois_d.lib"
+ OutputFile="$(OutDir)/DemoFFTest.exe"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="..\..\dll"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/DemoFFTest.pdb"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ OmitFramePointers="true"
+ AdditionalIncludeDirectories="..\..\includes;..\DemoFFTest"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ois.lib"
+ OutputFile="$(OutDir)/DemoFFTest.exe"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\..\dll"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\includes;..\DemoFFTest"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_STLP_DEBUG"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ois_d.lib"
+ OutputFile="$(OutDir)/DemoFFTest.exe"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="..\..\lib64"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/DemoFFTest.pdb"
+ SubSystem="1"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ OmitFramePointers="true"
+ AdditionalIncludeDirectories="..\..\includes;..\DemoFFTest"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ StringPooling="true"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="ois.lib"
+ OutputFile="$(OutDir)/DemoFFTest.exe"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\..\lib64"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <File
+ RelativePath="FF.rc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\demos\FFConsoleDemo.cpp"
+ >
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Added: branches/ogsector/externals/ois-1.0/Win32/DemoFFTest/FF.rc
===================================================================
--- branches/ogsector/externals/ois-1.0/Win32/DemoFFTest/FF.rc (rev 0)
+++ branches/ogsector/externals/ois-1.0/Win32/DemoFFTest/FF.rc 2007-08-16 21:10:46 UTC (rev 661)
@@ -0,0 +1,99 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+//#include "afxres.h"
+#ifndef IDC_STATIC
+#define IDC_STATIC (-1)
+#endif
+#include "winresrc.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_DIALOG1 DIALOGEX 0, 0, 100, 100
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
+CAPTION "Capture Window"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+ LTEXT "This window is used as Input Capture Window, and to display some info. Press Q or ESC to exit or hit button 1 of joystick",
+ IDC_STATIC,7,7,82,86
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+ IDD_DIALOG1, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ TOPMARGIN, 7
+ END
+END
+#endif // APSTUDIO_INVOKED
+
+#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
Added: branches/ogsector/externals/ois-1.0/Win32/DemoFFTest/resource.h
===================================================================
--- branches/ogsector/externals/ois-1.0/Win32/DemoFFTest/resource.h (rev 0)
+++ branches/ogsector/externals/ois-1.0/Win32/DemoFFTest/resource.h 2007-08-16 21:10:46 UTC (rev 661)
@@ -0,0 +1,17 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by CommandLine.rc
+//
+#define IDD_DIALOG1 101
+#define IDC_BUTTON1 1001
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 102
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1002
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
Property changes on: branches/ogsector/externals/ois-1.0/Win32/DemoFFTest/resource.h
___________________________________________________________________
Name: svn:mime-type
+ text/x-c++hdr
Name: svn:eol-style
+ native
Added: branches/ogsector/externals/ois-1.0/Win32/OIS.vcproj
===================================================================
--- branches/ogsector/externals/ois-1.0/Win32/OIS.vcproj (rev 0)
+++ branches/ogsector/externals/ois-1.0/Win32/OIS.vcproj 2007-08-16 21:10:46 UTC (rev 661)
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding = "Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.00"
+ Name="OIS"
+ ProjectGUID="{9CC704CB-4956-4479-BDEC-57CBC03F700E}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="..\lib"
+ IntermediateDirectory="..\lib\obj\debug"
+ ConfigurationType="4"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\includes"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_STLP_DEBUG"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough="StdAfx.h"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="4"
+ CallingConvention="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ AdditionalDependencies="dxguid.lib dinput8.lib"
+ OutputFile="$(OutDir)/OIS_static_d.lib"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="..\lib"
+ IntermediateDirectory="..\lib\obj\release"
+ ConfigurationType="4"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ OmitFramePointers="TRUE"
+ AdditionalIncludeDirectories="..\includes"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(IntDir)/$(TargetName).pch"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ AdditionalDependencies="dxguid.lib dinput8.lib"
+ OutputFile="$(OutDir)/OIS_static.lib"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="OIS_ReleaseDll|Win32"
+ OutputDirectory="..\dll"
+ IntermediateDirectory="..\dll\release"
+ ConfigurationType="2"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+ OmitFramePointers="TRUE"
+ AdditionalIncludeDirectories="..\includes"
+ PreprocessorDefinitions="WIN32;NDEBUG;OIS_NONCLIENT_BUILD;OIS_DYNAMIC_LIB"
+ StringPooling="TRUE"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="TRUE"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderFile="$(IntDir)/$(TargetName).pch"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="dxguid.lib dinput8.lib"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ </Configuration>
+ <Configuration
+ Name="OIS_DebugDll|Win32"
+ OutputDirectory="..\dll"
+ IntermediateDirectory="..\dll\debug"
+ ConfigurationType="2"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\includes"
+ PreprocessorDefinitions="WIN32;_DEBUG;_STLP_DEBUG;OIS_NONCLIENT_BUILD;OIS_DYNAMIC_LIB"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ RuntimeTypeInfo="TRUE"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough="StdAfx.h"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="4"
+ CallingConvention="0"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="dxguid.lib dinput8.lib"
+ OutputFile="$(OutDir)/OIS_d.dll"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ </Configuration>
+ </Configurations>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm">
+ <File
+ RelativePath="..\src\OISEffect.cpp">
+ </File>
+ <File
+ RelativePath="..\src\OISForceFeedback.cpp">
+ </File>
+ <File
+ RelativePath="..\src\OISInputManager.cpp">
+ </File>
+ <File
+ RelativePath="..\src\OISJoyStick.cpp">
+ </Fi...
[truncated message content] |
|
From: <eg...@us...> - 2007-08-16 21:07:16
|
Revision: 660
http://opengate.svn.sourceforge.net/opengate/?rev=660&view=rev
Author: egore
Date: 2007-08-16 14:07:19 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
update ois to 1.0
Modified Paths:
--------------
branches/ogsector/externals/ois
Added Paths:
-----------
branches/ogsector/externals/ois-1.0/
branches/ogsector/externals/ois-1.0/Mac/
branches/ogsector/externals/ois-1.0/Mac/SDL/
branches/ogsector/externals/ois-1.0/Mac/SDL/blank.keepme
branches/ogsector/externals/ois-1.0/Mac/XCode-1.5/
branches/ogsector/externals/ois-1.0/Mac/XCode-1.5/oisStatic.xcode/
branches/ogsector/externals/ois-1.0/Mac/XCode-1.5/oisStatic.xcode/project.pbxproj
branches/ogsector/externals/ois-1.0/Mac/XCode-2.2/
branches/ogsector/externals/ois-1.0/Mac/XCode-2.2/oisStatic.xcodeproj/
branches/ogsector/externals/ois-1.0/Mac/XCode-2.2/oisStatic.xcodeproj/project.pbxproj
branches/ogsector/externals/ois-1.0/ReadMe.txt
branches/ogsector/externals/ois-1.0/lib/
branches/ogsector/externals/ois-1.0/lib/.keepme
branches/ogsector/externals/ois-1.0/src/
branches/ogsector/externals/ois-1.0/src/OISObject.cpp
branches/ogsector/externals/ois-1.0/src/SDL/
branches/ogsector/externals/ois-1.0/src/SDL/SDLInputManager.cpp
branches/ogsector/externals/ois-1.0/src/SDL/SDLJoyStick.cpp
branches/ogsector/externals/ois-1.0/src/SDL/SDLKeyboard.cpp
branches/ogsector/externals/ois-1.0/src/SDL/SDLMouse.cpp
branches/ogsector/externals/ois-1.0/src/linux/
branches/ogsector/externals/ois-1.0/src/linux/EventHelpers.cpp
branches/ogsector/externals/ois-1.0/src/linux/LinuxForceFeedback.cpp
branches/ogsector/externals/ois-1.0/src/linux/LinuxInputManager.cpp
branches/ogsector/externals/ois-1.0/src/linux/LinuxJoyStickEvents.cpp
branches/ogsector/externals/ois-1.0/src/linux/LinuxKeyboard.cpp
branches/ogsector/externals/ois-1.0/src/linux/LinuxMouse.cpp
branches/ogsector/externals/ois-1.0/src/mac/
branches/ogsector/externals/ois-1.0/src/mac/MacHelpers.cpp
branches/ogsector/externals/ois-1.0/src/mac/MacInputManager.cpp
branches/ogsector/externals/ois-1.0/src/mac/MacKeyboard.cpp
branches/ogsector/externals/ois-1.0/src/mac/MacMouse.cpp
Removed Paths:
-------------
branches/ogsector/externals/ois-1.0RC1/
Modified: branches/ogsector/externals/ois
===================================================================
--- branches/ogsector/externals/ois 2007-08-11 11:55:33 UTC (rev 659)
+++ branches/ogsector/externals/ois 2007-08-16 21:07:19 UTC (rev 660)
@@ -1 +1 @@
-link ois-1.0RC1/
\ No newline at end of file
+link ois-1.0
\ No newline at end of file
Added: branches/ogsector/externals/ois-1.0/Mac/SDL/blank.keepme
===================================================================
Added: branches/ogsector/externals/ois-1.0/Mac/XCode-1.5/oisStatic.xcode/project.pbxproj
===================================================================
--- branches/ogsector/externals/ois-1.0/Mac/XCode-1.5/oisStatic.xcode/project.pbxproj (rev 0)
+++ branches/ogsector/externals/ois-1.0/Mac/XCode-1.5/oisStatic.xcode/project.pbxproj 2007-08-16 21:07:19 UTC (rev 660)
@@ -0,0 +1,655 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 39;
+ objects = {
+ 034768DDFF38A45A11DB9C8B = {
+ children = (
+ D2AAC06F0554671400DB518D,
+ );
+ isa = PBXGroup;
+ name = Products;
+ path = "";
+ refType = 4;
+ sourceTree = "<group>";
+ };
+//030
+//031
+//032
+//033
+//034
+//080
+//081
+//082
+//083
+//084
+ 0867D690FE84028FC02AAC07 = {
+ buildSettings = {
+ };
+ buildStyles = (
+ 4F0BB7EC011F40E904CA0E50,
+ 4F0BB7ED011F40E904CA0E50,
+ );
+ hasScannedForEncodings = 1;
+ isa = PBXProject;
+ mainGroup = 0867D691FE84028FC02AAC07;
+ productRefGroup = 034768DDFF38A45A11DB9C8B;
+ projectDirPath = "";
+ targets = (
+ D2AAC06E0554671400DB518D,
+ );
+ };
+ 0867D691FE84028FC02AAC07 = {
+ children = (
+ DFC6D5A909A05F7D00FA2ACC,
+ 08FB77ACFE841707C02AAC07,
+ DF279D9809A303DB00D6B6E6,
+ 0867D69AFE84028FC02AAC07,
+ 034768DDFF38A45A11DB9C8B,
+ );
+ isa = PBXGroup;
+ name = oisStatic;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 0867D69AFE84028FC02AAC07 = {
+ children = (
+ 08FB77AAFE841565C02AAC07,
+ );
+ isa = PBXGroup;
+ name = "External Frameworks and Libraries";
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ 08FB77AAFE841565C02AAC07 = {
+ isa = PBXFileReference;
+ lastKnownFileType = wrapper.framework;
+ name = Carbon.framework;
+ path = /System/Library/Frameworks/Carbon.framework;
+ refType = 0;
+ sourceTree = "<absolute>";
+ };
+ 08FB77ACFE841707C02AAC07 = {
+ children = (
+ DFC6D5A609A05F7600FA2ACC,
+ DFC6D5A309A05F6C00FA2ACC,
+ );
+ isa = PBXGroup;
+ name = Source;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+//080
+//081
+//082
+//083
+//084
+//4F0
+//4F1
+//4F2
+//4F3
+//4F4
+ 4F0BB7EC011F40E904CA0E50 = {
+ buildSettings = {
+ COPY_PHASE_STRIP = NO;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ ZERO_LINK = YES;
+ };
+ isa = PBXBuildStyle;
+ name = Development;
+ };
+ 4F0BB7ED011F40E904CA0E50 = {
+ buildSettings = {
+ COPY_PHASE_STRIP = YES;
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ ZERO_LINK = NO;
+ };
+ isa = PBXBuildStyle;
+ name = Deployment;
+ };
+//4F0
+//4F1
+//4F2
+//4F3
+//4F4
+//D20
+//D21
+//D22
+//D23
+//D24
+ D2AAC06B0554671400DB518D = {
+ buildActionMask = 2147483647;
+ files = (
+ DFC6D65009A060CF00FA2ACC,
+ DFC6D65109A060CF00FA2ACC,
+ DFC6D65209A060CF00FA2ACC,
+ DFC6D65309A060CF00FA2ACC,
+ DFC6D65409A060CF00FA2ACC,
+ DFC6D65509A060CF00FA2ACC,
+ DFC6D65609A060CF00FA2ACC,
+ DFC6D65709A060CF00FA2ACC,
+ DFC6D65809A060CF00FA2ACC,
+ DFC6D65909A060CF00FA2ACC,
+ DFC6D65A09A060CF00FA2ACC,
+ DFC6D65B09A060CF00FA2ACC,
+ DFC6D66209A060E900FA2ACC,
+ DFC6D66309A060E900FA2ACC,
+ DFC6D66409A060E900FA2ACC,
+ DFC6D66509A060E900FA2ACC,
+ );
+ isa = PBXHeadersBuildPhase;
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ D2AAC06C0554671400DB518D = {
+ buildActionMask = 2147483647;
+ files = (
+ DFC6D66D09A0615A00FA2ACC,
+ DFC6D66E09A0615A00FA2ACC,
+ DFC6D66F09A0615A00FA2ACC,
+ DFC6D67009A0615A00FA2ACC,
+ DFC6D67109A0615A00FA2ACC,
+ DFC6D67709A0617F00FA2ACC,
+ DFC6D67809A0617F00FA2ACC,
+ DFC6D67909A0617F00FA2ACC,
+ );
+ isa = PBXSourcesBuildPhase;
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ D2AAC06D0554671400DB518D = {
+ buildActionMask = 2147483647;
+ files = (
+ D2AAC0700554677100DB518D,
+ );
+ isa = PBXFrameworksBuildPhase;
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+ D2AAC06E0554671400DB518D = {
+ buildPhases = (
+ D2AAC06B0554671400DB518D,
+ D2AAC06C0554671400DB518D,
+ D2AAC06D0554671400DB518D,
+ );
+ buildRules = (
+ );
+ buildSettings = {
+ GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ HEADER_SEARCH_PATHS = ../../includes;
+ INSTALL_PATH = /usr/local/lib;
+ LIBRARY_STYLE = STATIC;
+ PRODUCT_NAME = ois;
+ };
+ dependencies = (
+ );
+ isa = PBXNativeTarget;
+ name = oisStatic;
+ productName = oisStatic;
+ productReference = D2AAC06F0554671400DB518D;
+ productType = "com.apple.product-type.library.static";
+ };
+ D2AAC06F0554671400DB518D = {
+ explicitFileType = archive.ar;
+ includeInIndex = 0;
+ isa = PBXFileReference;
+ path = libois.a;
+ refType = 3;
+ sourceTree = BUILT_PRODUCTS_DIR;
+ };
+ D2AAC0700554677100DB518D = {
+ fileRef = 08FB77AAFE841565C02AAC07;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+//D20
+//D21
+//D22
+//D23
+//D24
+//DF0
+//DF1
+//DF2
+//DF3
+//DF4
+ DF279D9809A303DB00D6B6E6 = {
+ children = (
+ );
+ isa = PBXGroup;
+ name = Resources;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ DFC6D5A309A05F6C00FA2ACC = {
+ children = (
+ DFC6D67409A0617F00FA2ACC,
+ DFC6D67509A0617F00FA2ACC,
+ DFC6D67609A0617F00FA2ACC,
+ );
+ isa = PBXGroup;
+ name = Mac;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ DFC6D5A609A05F7600FA2ACC = {
+ children = (
+ DFC6D66809A0615A00FA2ACC,
+ DFC6D66909A0615A00FA2ACC,
+ DFC6D66A09A0615A00FA2ACC,
+ DFC6D66B09A0615A00FA2ACC,
+ DFC6D66C09A0615A00FA2ACC,
+ );
+ isa = PBXGroup;
+ name = Base;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ DFC6D5A909A05F7D00FA2ACC = {
+ children = (
+ DFC6D5AC09A05F8700FA2ACC,
+ DFC6D5AF09A05F8D00FA2ACC,
+ );
+ isa = PBXGroup;
+ name = Include;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ DFC6D5AC09A05F8700FA2ACC = {
+ children = (
+ DFC6D64409A060CF00FA2ACC,
+ DFC6D64509A060CF00FA2ACC,
+ DFC6D64609A060CF00FA2ACC,
+ DFC6D64709A060CF00FA2ACC,
+ DFC6D64809A060CF00FA2ACC,
+ DFC6D64909A060CF00FA2ACC,
+ DFC6D64A09A060CF00FA2ACC,
+ DFC6D64B09A060CF00FA2ACC,
+ DFC6D64C09A060CF00FA2ACC,
+ DFC6D64D09A060CF00FA2ACC,
+ DFC6D64E09A060CF00FA2ACC,
+ DFC6D64F09A060CF00FA2ACC,
+ );
+ isa = PBXGroup;
+ name = Base;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ DFC6D5AF09A05F8D00FA2ACC = {
+ children = (
+ DFC6D65E09A060E900FA2ACC,
+ DFC6D65F09A060E900FA2ACC,
+ DFC6D66009A060E900FA2ACC,
+ DFC6D66109A060E900FA2ACC,
+ );
+ isa = PBXGroup;
+ name = Mac;
+ refType = 4;
+ sourceTree = "<group>";
+ };
+ DFC6D64409A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISConfig.h;
+ path = ../../includes/OISConfig.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D64509A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISEffect.h;
+ path = ../../includes/OISEffect.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D64609A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISEvents.h;
+ path = ../../includes/OISEvents.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D64709A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISException.h;
+ path = ../../includes/OISException.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D64809A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISForceFeedback.h;
+ path = ../../includes/OISForceFeedback.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D64909A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISInputManager.h;
+ path = ../../includes/OISInputManager.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D64A09A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISInterface.h;
+ path = ../../includes/OISInterface.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D64B09A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISJoyStick.h;
+ path = ../../includes/OISJoyStick.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D64C09A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISKeyboard.h;
+ path = ../../includes/OISKeyboard.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D64D09A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISMouse.h;
+ path = ../../includes/OISMouse.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D64E09A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISObject.h;
+ path = ../../includes/OISObject.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D64F09A060CF00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = OISPrereqs.h;
+ path = ../../includes/OISPrereqs.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D65009A060CF00FA2ACC = {
+ fileRef = DFC6D64409A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65109A060CF00FA2ACC = {
+ fileRef = DFC6D64509A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65209A060CF00FA2ACC = {
+ fileRef = DFC6D64609A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65309A060CF00FA2ACC = {
+ fileRef = DFC6D64709A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65409A060CF00FA2ACC = {
+ fileRef = DFC6D64809A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65509A060CF00FA2ACC = {
+ fileRef = DFC6D64909A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65609A060CF00FA2ACC = {
+ fileRef = DFC6D64A09A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65709A060CF00FA2ACC = {
+ fileRef = DFC6D64B09A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65809A060CF00FA2ACC = {
+ fileRef = DFC6D64C09A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65909A060CF00FA2ACC = {
+ fileRef = DFC6D64D09A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65A09A060CF00FA2ACC = {
+ fileRef = DFC6D64E09A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65B09A060CF00FA2ACC = {
+ fileRef = DFC6D64F09A060CF00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D65E09A060E900FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = MacHelpers.h;
+ path = ../../includes/Mac/MacHelpers.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D65F09A060E900FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = MacInputManager.h;
+ path = ../../includes/Mac/MacInputManager.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D66009A060E900FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = MacKeyboard.h;
+ path = ../../includes/Mac/MacKeyboard.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D66109A060E900FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.c.h;
+ name = MacPrereqs.h;
+ path = ../../includes/Mac/MacPrereqs.h;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D66209A060E900FA2ACC = {
+ fileRef = DFC6D65E09A060E900FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D66309A060E900FA2ACC = {
+ fileRef = DFC6D65F09A060E900FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D66409A060E900FA2ACC = {
+ fileRef = DFC6D66009A060E900FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D66509A060E900FA2ACC = {
+ fileRef = DFC6D66109A060E900FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D66809A0615A00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.cpp.cpp;
+ name = OISEffect.cpp;
+ path = ../../src/OISEffect.cpp;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D66909A0615A00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.cpp.cpp;
+ name = OISForceFeedback.cpp;
+ path = ../../src/OISForceFeedback.cpp;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D66A09A0615A00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.cpp.cpp;
+ name = OISInputManager.cpp;
+ path = ../../src/OISInputManager.cpp;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D66B09A0615A00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.cpp.cpp;
+ name = OISKeyboard.cpp;
+ path = ../../src/OISKeyboard.cpp;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D66C09A0615A00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.cpp.cpp;
+ name = OISObject.cpp;
+ path = ../../src/OISObject.cpp;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D66D09A0615A00FA2ACC = {
+ fileRef = DFC6D66809A0615A00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D66E09A0615A00FA2ACC = {
+ fileRef = DFC6D66909A0615A00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D66F09A0615A00FA2ACC = {
+ fileRef = DFC6D66A09A0615A00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D67009A0615A00FA2ACC = {
+ fileRef = DFC6D66B09A0615A00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D67109A0615A00FA2ACC = {
+ fileRef = DFC6D66C09A0615A00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D67409A0617F00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.cpp.cpp;
+ name = MacHelpers.cpp;
+ path = ../../src/Mac/MacHelpers.cpp;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D67509A0617F00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.cpp.cpp;
+ name = MacInputManager.cpp;
+ path = ../../src/Mac/MacInputManager.cpp;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D67609A0617F00FA2ACC = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.cpp.cpp;
+ name = MacKeyboard.cpp;
+ path = ../../src/Mac/MacKeyboard.cpp;
+ refType = 2;
+ sourceTree = SOURCE_ROOT;
+ };
+ DFC6D67709A0617F00FA2ACC = {
+ fileRef = DFC6D67409A0617F00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D67809A0617F00FA2ACC = {
+ fileRef = DFC6D67509A0617F00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ DFC6D67909A0617F00FA2ACC = {
+ fileRef = DFC6D67609A0617F00FA2ACC;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ };
+ rootObject = 0867D690FE84028FC02AAC07;
+}
Added: branches/ogsector/externals/ois-1.0/Mac/XCode-2.2/oisStatic.xcodeproj/project.pbxproj
===================================================================
--- branches/ogsector/externals/ois-1.0/Mac/XCode-2.2/oisStatic.xcodeproj/project.pbxproj (rev 0)
+++ branches/ogsector/externals/ois-1.0/Mac/XCode-2.2/oisStatic.xcodeproj/project.pbxproj 2007-08-16 21:07:19 UTC (rev 660)
@@ -0,0 +1,377 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 42;
+ objects = {
+
+/* Begin PBXBuildFile section */
+ 9749A39E0AA1224500076079 /* MacHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 9749A39A0AA1224500076079 /* MacHelpers.h */; };
+ 9749A39F0AA1224500076079 /* MacInputManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 9749A39B0AA1224500076079 /* MacInputManager.h */; };
+ 9749A3A00AA1224500076079 /* MacKeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = 9749A39C0AA1224500076079 /* MacKeyboard.h */; };
+ 9749A3A10AA1224500076079 /* MacPrereqs.h in Headers */ = {isa = PBXBuildFile; fileRef = 9749A39D0AA1224500076079 /* MacPrereqs.h */; };
+ 9749A3A50AA1225500076079 /* MacHelpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9749A3A20AA1225500076079 /* MacHelpers.cpp */; };
+ 9749A3A60AA1225500076079 /* MacInputManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9749A3A30AA1225500076079 /* MacInputManager.cpp */; };
+ 9749A3A70AA1225500076079 /* MacKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9749A3A40AA1225500076079 /* MacKeyboard.cpp */; };
+ 9749A3B30AA122BA00076079 /* MacMouse.h in Headers */ = {isa = PBXBuildFile; fileRef = 9749A3B20AA122BA00076079 /* MacMouse.h */; };
+ 9749A60F0AA1331A00076079 /* MacMouse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9749A60E0AA1331A00076079 /* MacMouse.cpp */; };
+ D2AAC0700554677100DB518D /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB77AAFE841565C02AAC07 /* Carbon.framework */; };
+ DFC6D65009A060CF00FA2ACC /* OISConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = DFC6D64409A060CF00FA2ACC /* OISConfig.h */; };
+ DFC6D65109A060CF00FA2ACC /* OISEffect.h in Headers */ = {isa = PBXBuildFile; fileRef = DFC6D64509A060CF00FA2ACC /* OISEffect.h */; };
+ DFC6D65209A060CF00FA2ACC /* OISEvents.h in Headers */ = {isa = PBXBuildFile; fileRef = DFC6D64609A060CF00FA2ACC /* OISEvents.h */; };
+ DFC6D65309A060CF00FA2ACC /* OISException.h in Headers */ = {isa = PBXBuildFile; fileRef = DFC6D64709A060CF00FA2ACC /* OISException.h */; };
+ DFC6D65409A060CF00FA2ACC /* OISForceFeedback.h in Headers */ = {isa = PBXBuildFile; fileRef = DFC6D64809A060CF00FA2ACC /* OISForceFeedback.h */; };
+ DFC6D65509A060CF00FA2ACC /* OISInputManager.h in Headers */ = {isa = PBXBuildFile; fileRef = DFC6D64909A060CF00FA2ACC /* OISInputManager.h */; };
+ DFC6D65609A060CF00FA2ACC /* OISInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = DFC6D64A09A060CF00FA2ACC /* OISInterface.h */; };
+ DFC6D65709A060CF00FA2ACC /* OISJoyStick.h in Headers */ = {isa = PBXBuildFile; fileRef = DFC6D64B09A060CF00FA2ACC /* OISJoyStick.h */; };
+ DFC6D65809A060CF00FA2ACC /* OISKeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = DFC6D64C09A060CF00FA2ACC /* OISKeyboard.h */; };
+ DFC6D65909A060CF00FA2ACC /* OISMouse.h in Headers */ = {isa = PBXBuildFile; fileRef = DFC6D64D09A060CF00FA2ACC /* OISMouse.h */; };
+ DFC6D65A09A060CF00FA2ACC /* OISObject.h in Headers */ = {isa = PBXBuildFile; fileRef = DFC6D64E09A060CF00FA2ACC /* OISObject.h */; };
+ DFC6D65B09A060CF00FA2ACC /* OISPrereqs.h in Headers */ = {isa = PBXBuildFile; fileRef = DFC6D64F09A060CF00FA2ACC /* OISPrereqs.h */; };
+ DFC6D66D09A0615A00FA2ACC /* OISEffect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC6D66809A0615A00FA2ACC /* OISEffect.cpp */; };
+ DFC6D66E09A0615A00FA2ACC /* OISForceFeedback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC6D66909A0615A00FA2ACC /* OISForceFeedback.cpp */; };
+ DFC6D66F09A0615A00FA2ACC /* OISInputManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC6D66A09A0615A00FA2ACC /* OISInputManager.cpp */; };
+ DFC6D67009A0615A00FA2ACC /* OISKeyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC6D66B09A0615A00FA2ACC /* OISKeyboard.cpp */; };
+ DFC6D67109A0615A00FA2ACC /* OISObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFC6D66C09A0615A00FA2ACC /* OISObject.cpp */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+ 08FB77AAFE841565C02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
+ 9749A39A0AA1224500076079 /* MacHelpers.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MacHelpers.h; path = ../../includes/mac/MacHelpers.h; sourceTree = SOURCE_ROOT; };
+ 9749A39B0AA1224500076079 /* MacInputManager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MacInputManager.h; path = ../../includes/mac/MacInputManager.h; sourceTree = SOURCE_ROOT; };
+ 9749A39C0AA1224500076079 /* MacKeyboard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MacKeyboard.h; path = ../../includes/mac/MacKeyboard.h; sourceTree = SOURCE_ROOT; };
+ 9749A39D0AA1224500076079 /* MacPrereqs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MacPrereqs.h; path = ../../includes/mac/MacPrereqs.h; sourceTree = SOURCE_ROOT; };
+ 9749A3A20AA1225500076079 /* MacHelpers.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = MacHelpers.cpp; path = ../../src/mac/MacHelpers.cpp; sourceTree = SOURCE_ROOT; };
+ 9749A3A30AA1225500076079 /* MacInputManager.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = MacInputManager.cpp; path = ../../src/mac/MacInputManager.cpp; sourceTree = SOURCE_ROOT; };
+ 9749A3A40AA1225500076079 /* MacKeyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = MacKeyboard.cpp; path = ../../src/mac/MacKeyboard.cpp; sourceTree = SOURCE_ROOT; };
+ 9749A3B20AA122BA00076079 /* MacMouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MacMouse.h; path = ../../includes/mac/MacMouse.h; sourceTree = SOURCE_ROOT; };
+ 9749A60E0AA1331A00076079 /* MacMouse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MacMouse.cpp; path = ../../src/mac/MacMouse.cpp; sourceTree = SOURCE_ROOT; };
+ D2AAC06F0554671400DB518D /* libois.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libois.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ DFC6D64409A060CF00FA2ACC /* OISConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OISConfig.h; path = ../../includes/OISConfig.h; sourceTree = SOURCE_ROOT; };
+ DFC6D64509A060CF00FA2ACC /* OISEffect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OISEffect.h; path = ../../includes/OISEffect.h; sourceTree = SOURCE_ROOT; };
+ DFC6D64609A060CF00FA2ACC /* OISEvents.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OISEvents.h; path = ../../includes/OISEvents.h; sourceTree = SOURCE_ROOT; };
+ DFC6D64709A060CF00FA2ACC /* OISException.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OISException.h; path = ../../includes/OISException.h; sourceTree = SOURCE_ROOT; };
+ DFC6D64809A060CF00FA2ACC /* OISForceFeedback.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OISForceFeedback.h; path = ../../includes/OISForceFeedback.h; sourceTree = SOURCE_ROOT; };
+ DFC6D64909A060CF00FA2ACC /* OISInputManager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OISInputManager.h; path = ../../includes/OISInputManager.h; sourceTree = SOURCE_ROOT; };
+ DFC6D64A09A060CF00FA2ACC /* OISInterface.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OISInterface.h; path = ../../includes/OISInterface.h; sourceTree = SOURCE_ROOT; };
+ DFC6D64B09A060CF00FA2ACC /* OISJoyStick.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OISJoyStick.h; path = ../../includes/OISJoyStick.h; sourceTree = SOURCE_ROOT; };
+ DFC6D64C09A060CF00FA2ACC /* OISKeyboard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OISKeyboard.h; path = ../../includes/OISKeyboard.h; sourceTree = SOURCE_ROOT; };
+ DFC6D64D09A060CF00FA2ACC /* OISMouse.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OISMouse.h; path = ../../includes/OISMouse.h; sourceTree = SOURCE_ROOT; };
+ DFC6D64E09A060CF00FA2ACC /* OISObject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OISObject.h; path = ../../includes/OISObject.h; sourceTree = SOURCE_ROOT; };
+ DFC6D64F09A060CF00FA2ACC /* OISPrereqs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OISPrereqs.h; path = ../../includes/OISPrereqs.h; sourceTree = SOURCE_ROOT; };
+ DFC6D66809A0615A00FA2ACC /* OISEffect.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = OISEffect.cpp; path = ../../src/OISEffect.cpp; sourceTree = SOURCE_ROOT; };
+ DFC6D66909A0615A00FA2ACC /* OISForceFeedback.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = OISForceFeedback.cpp; path = ../../src/OISForceFeedback.cpp; sourceTree = SOURCE_ROOT; };
+ DFC6D66A09A0615A00FA2ACC /* OISInputManager.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = OISInputManager.cpp; path = ../../src/OISInputManager.cpp; sourceTree = SOURCE_ROOT; };
+ DFC6D66B09A0615A00FA2ACC /* OISKeyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = OISKeyboard.cpp; path = ../../src/OISKeyboard.cpp; sourceTree = SOURCE_ROOT; };
+ DFC6D66C09A0615A00FA2ACC /* OISObject.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = OISObject.cpp; path = ../../src/OISObject.cpp; sourceTree = SOURCE_ROOT; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+ D2AAC06D0554671400DB518D /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ D2AAC0700554677100DB518D /* Carbon.framework in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+ 034768DDFF38A45A11DB9C8B /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ D2AAC06F0554671400DB518D /* libois.a */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
+ 0867D691FE84028FC02AAC07 /* oisStatic */ = {
+ isa = PBXGroup;
+ children = (
+ DFC6D5A909A05F7D00FA2ACC /* Include */,
+ 08FB77ACFE841707C02AAC07 /* Source */,
+ DF279D9809A303DB00D6B6E6 /* Resources */,
+ 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */,
+ 034768DDFF38A45A11DB9C8B /* Products */,
+ );
+ name = oisStatic;
+ sourceTree = "<group>";
+ };
+ 0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */ = {
+ isa = PBXGroup;
+ children = (
+ 08FB77AAFE841565C02AAC07 /* Carbon.framework */,
+ );
+ name = "External Frameworks and Libraries";
+ sourceTree = "<group>";
+ };
+ 08FB77ACFE841707C02AAC07 /* Source */ = {
+ isa = PBXGroup;
+ children = (
+ 9749A3990AA1223100076079 /* OSX */,
+ DFC6D5A609A05F7600FA2ACC /* Base */,
+ );
+ name = Source;
+ sourceTree = "<group>";
+ };
+ 9749A3980AA1222300076079 /* OSX */ = {
+ isa = PBXGroup;
+ children = (
+ 9749A39A0AA1224500076079 /* MacHelpers.h */,
+ 9749A39B0AA1224500076079 /* MacInputManager.h */,
+ 9749A39C0AA1224500076079 /* MacKeyboard.h */,
+ 9749A39D0AA1224500076079 /* MacPrereqs.h */,
+ 9749A3B20AA122BA00076079 /* MacMouse.h */,
+ );
+ name = OSX;
+ sourceTree = "<group>";
+ };
+ 9749A3990AA1223100076079 /* OSX */ = {
+ isa = PBXGroup;
+ children = (
+ 9749A3A20AA1225500076079 /* MacHelpers.cpp */,
+ 9749A3A30AA1225500076079 /* MacInputManager.cpp */,
+ 9749A3A40AA1225500076079 /* MacKeyboard.cpp */,
+ 9749A60E0AA1331A00076079 /* MacMouse.cpp */,
+ );
+ name = OSX;
+ sourceTree = "<group>";
+ };
+ DF279D9809A303DB00D6B6E6 /* Resources */ = {
+ isa = PBXGroup;
+ children = (
+ );
+ name = Resources;
+ sourceTree = "<group>";
+ };
+ DFC6D5A609A05F7600FA2ACC /* Base */ = {
+ isa = PBXGroup;
+ children = (
+ DFC6D66809A0615A00FA2ACC /* OISEffect.cpp */,
+ DFC6D66909A0615A00FA2ACC /* OISForceFeedback.cpp */,
+ DFC6D66A09A0615A00FA2ACC /* OISInputManager.cpp */,
+ DFC6D66B09A0615A00FA2ACC /* OISKeyboard.cpp */,
+ DFC6D66C09A0615A00FA2ACC /* OISObject.cpp */,
+ );
+ name = Base;
+ sourceTree = "<group>";
+ };
+ DFC6D5A909A05F7D00FA2ACC /* Include */ = {
+ isa = PBXGroup;
+ children = (
+ 9749A3980AA1222300076079 /* OSX */,
+ DFC6D5AC09A05F8700FA2ACC /* Base */,
+ );
+ name = Include;
+ sourceTree = "<group>";
+ };
+ DFC6D5AC09A05F8700FA2ACC /* Base */ = {
+ isa = PBXGroup;
+ children = (
+ DFC6D64409A060CF00FA2ACC /* OISConfig.h */,
+ DFC6D64509A060CF00FA2ACC /* OISEffect.h */,
+ DFC6D64609A060CF00FA2ACC /* OISEvents.h */,
+ DFC6D64709A060CF00FA2ACC /* OISException.h */,
+ DFC6D64809A060CF00FA2ACC /* OISForceFeedback.h */,
+ DFC6D64909A060CF00FA2ACC /* OISInputManager.h */,
+ DFC6D64A09A060CF00FA2ACC /* OISInterface.h */,
+ DFC6D64B09A060CF00FA2ACC /* OISJoyStick.h */,
+ DFC6D64C09A060CF00FA2ACC /* OISKeyboard.h */,
+ DFC6D64D09A060CF00FA2ACC /* OISMouse.h */,
+ DFC6D64E09A060CF00FA2ACC /* OISObject.h */,
+ DFC6D64F09A060CF00FA2ACC /* OISPrereqs.h */,
+ );
+ name = Base;
+ sourceTree = "<group>";
+ };
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+ D2AAC06B0554671400DB518D /* Headers */ = {
+ isa = PBXHeadersBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ DFC6D65009A060CF00FA2ACC /* OISConfig.h in Headers */,
+ DFC6D65109A060CF00FA2ACC /* OISEffect.h in Headers */,
+ DFC6D65209A060CF00FA2ACC /* OISEvents.h in Headers */,
+ DFC6D65309A060CF00FA2ACC /* OISException.h in Headers */,
+ DFC6D65409A060CF00FA2ACC /* OISForceFeedback.h in Headers */,
+ DFC6D65509A060CF00FA2ACC /* OISInputManager.h in Headers */,
+ DFC6D65609A060CF00FA2ACC /* OISInterface.h in Headers */,
+ DFC6D65709A060CF00FA2ACC /* OISJoyStick.h in Headers */,
+ DFC6D65809A060CF00FA2ACC /* OISKeyboard.h in Headers */,
+ DFC6D65909A060CF00FA2ACC /* OISMouse.h in Headers */,
+ DFC6D65A09A060CF00FA2ACC /* OISObject.h in Headers */,
+ DFC6D65B09A060CF00FA2ACC /* OISPrereqs.h in Headers */,
+ 9749A39E0AA1224500076079 /* MacHelpers.h in Headers */,
+ 9749A39F0AA1224500076079 /* MacInputManager.h in Headers */,
+ 9749A3A00AA1224500076079 /* MacKeyboard.h in Headers */,
+ 9749A3A10AA1224500076079 /* MacPrereqs.h in Headers */,
+ 9749A3B30AA122BA00076079 /* MacMouse.h in Headers */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+ D2AAC06E0554671400DB518D /* oisStatic */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = A1C0A2FB0A3A0F8800596AA5 /* Build configuration list for PBXNativeTarget "oisStatic" */;
+ buildPhases = (
+ D2AAC06B0554671400DB518D /* Headers */,
+ D2AAC06C0554671400DB518D /* Sources */,
+ D2AAC06D0554671400DB518D /* Frameworks */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = oisStatic;
+ productName = oisStatic;
+ productReference = D2AAC06F0554671400DB518D /* libois.a */;
+ productType = "com.apple.product-type.library.static";
+ };
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+ 0867D690FE84028FC02AAC07 /* Project object */ = {
+ isa = PBXProject;
+ buildConfigurationList = A1C0A2FF0A3A0F8800596AA5 /* Build configuration list for PBXProject "oisStatic" */;
+ hasScannedForEncodings = 1;
+ mainGroup = 0867D691FE84028FC02AAC07 /* oisStatic */;
+ productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */;
+ projectDirPath = "";
+ targets = (
+ D2AAC06E0554671400DB518D /* oisStatic */,
+ );
+ };
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+ D2AAC06C0554671400DB518D /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ DFC6D66D09A0615A00FA2ACC /* OISEffect.cpp in Sources */,
+ DFC6D66E09A0615A00FA2ACC /* OISForceFeedback.cpp in Sources */,
+ DFC6D66F09A0615A00FA2ACC /* OISInputManager.cpp in Sources */,
+ DFC6D67009A0615A00FA2ACC /* OISKeyboard.cpp in Sources */,
+ DFC6D67109A0615A00FA2ACC /* OISObject.cpp in Sources */,
+ 9749A3A50AA1225500076079 /* MacHelpers.cpp in Sources */,
+ 9749A3A60AA1225500076079 /* MacInputManager.cpp in Sources */,
+ 9749A3A70AA1225500076079 /* MacKeyboard.cpp in Sources */,
+ 9749A60F0AA1331A00076079 /* MacMouse.cpp in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+ A1C0A2FC0A3A0F8800596AA5 /* Development */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = NO;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ HEADER_SEARCH_PATHS = ../../includes;
+ INSTALL_PATH = /usr/local/lib;
+ LIBRARY_STYLE = STATIC;
+ PRODUCT_NAME = ois;
+ ZERO_LINK = YES;
+ };
+ name = Development;
+ };
+ A1C0A2FD0A3A0F8800596AA5 /* Deployment */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = YES;
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ HEADER_SEARCH_PATHS = ../../includes;
+ INSTALL_PATH = /usr/local/lib;
+ LIBRARY_STYLE = STATIC;
+ PRODUCT_NAME = ois;
+ ZERO_LINK = NO;
+ };
+ name = Deployment;
+ };
+ A1C0A2FE0A3A0F8800596AA5 /* Default */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ HEADER_SEARCH_PATHS = ../../includes;
+ INSTALL_PATH = /usr/local/lib;
+ LIBRARY_STYLE = STATIC;
+ PRODUCT_NAME = ois;
+ };
+ name = Default;
+ };
+ A1C0A3000A3A0F8800596AA5 /* Development */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ARCHS = (
+ ppc,
+ i386,
+ );
+ COPY_PHASE_STRIP = NO;
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ STRIP_INSTALLED_PRODUCT = NO;
+ };
+ name = Development;
+ };
+ A1C0A3010A3A0F8800596AA5 /* Deployment */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ARCHS = (
+ ppc,
+ i386,
+ );
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ };
+ name = Deployment;
+ };
+ A1C0A3020A3A0F8800596AA5 /* Default */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ARCHS = (
+ ppc,
+ i386,
+ );
+ SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ };
+ name = Default;
+ };
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+ A1C0A2FB0A3A0F8800596AA5 /* Build configuration list for PBXNativeTarget "oisStatic" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ A1C0A2FC0A3A0F8800596AA5 /* Development */,
+ A1C0A2FD0A3A0F8800596AA5 /* Deployment */,
+ A1C0A2FE0A3A0F8800596AA5 /* Default */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Default;
+ };
+ A1C0A2FF0A3A0F8800596AA5 /* Build configuration list for PBXProject "oisStatic" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ A1C0A3000A3A0F8800596AA5 /* Development */,
+ A1C0A3010A3A0F8800596AA5 /* Deployment */,
+ A1C0A3020A3A0F8800596AA5 /* Default */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Default;
+ };
+/* End XCConfigurationList section */
+ };
+ rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
+}
Added: branches/ogsector/externals/ois-1.0/ReadMe.txt
===================================================================
--- branches/ogsector/externals/ois-1.0/ReadMe.txt (rev 0)
+++ branches/ogsector/externals/ois-1.0/ReadMe.txt 2007-08-16 21:07:19 UTC (rev 660)
@@ -0,0 +1,80 @@
+======================================================================================
+================ LICENSE =============================================================
+======================================================================================
+
+The zlib/libpng License
+
+Copyright (c) 2007 Phillip Castaneda (pjcast -- www.wreckedgames.com)
+
+This software is provided 'as-is', without any express or implied warranty. In no
+event will the authors be held liable for any damages arising from the use of this
+software.
+
+Permission is granted to anyone to use this software for any purpose, including
+commercial applications, and to alter it and redistribute it freely, subject to the
+following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not claim that
+ you wrote the original software. If you use this software in a product,
+ an acknowledgment in the product documentation would be appreciated
+ but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+
+
+======================================================================================
+================ LICENSE EXPLAINED ===================================================
+======================================================================================
+In case the license was not clear enough... Basically, you can link with this lib
+which puts no restrictions on what you have to license your code as. You can modify
+this lib, and not have release your changes. Though, as explained above, <bold>
+Altered source versions must be plainly marked as such, and must not be misrepresented
+as being the original software </bold>
+
+This is to allow users the greatest flexibility in what you can use this lib for.
+
+======================================================================================
+================ INFO ================================================================
+======================================================================================
+
+Cross Platform Object Oriented Input Lib System. Meant to be very robust and
+compatiable with many systems and operating systems
+
+Win32/
+ Contains Visual Studio .Net Solution Files
+ Contains CodeBlocks project files for OIS
+
+ ---- Dependencies ------------------------------------------------------
+ DirectInput 8
+
+ SDL/
+ A test bed for an OIS InputManager with SDL as the backend. Not recommended;
+ however, useful for platforms with non-native OIS ports for temporary use.
+
+Linux/
+ ---- Dependencies ------------------------------------------------------
+ X11
+ Newer Linux Kernel (2.6+ kernel version)
+
+ Steps to build on Linux:
+ ./bootstrap
+ ./configure
+ ./make
+ sudo make install
+
+ ---- Optional Configure build options -----------------------------------
+ Nothing besides default, normal configure options
+
+LinuxCB/
+ Contains CodeBlock files for building OIS and Demos with codeblocks
+ This project file looks for Ogre and other dependencies in /usr/local/lib
+ and /usr/local/include. If installed elsewhere, modify the project
+ settings. It also installs libOIS to ~/libs
+
+Mac/
+
+ Various Macintosh projects for OIS (XCode-1.5 contaons Carbon OIS build,
+ the 2.2 project contains a SDL backed OIS)
\ No newline at end of file
Property changes on: branches/ogsector/externals/ois-1.0/ReadMe.txt
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: branches/ogsector/externals/ois-1.0/lib/.keepme
===================================================================
Added: branches/ogsector/externals/ois-1.0/src/OISObject.cpp
===================================================================
--- branches/ogsector/externals/ois-1.0/src/OISObject.cpp (rev 0)
+++ branches/ogsector/externals/ois-1.0/src/OISObject.cpp 2007-08-16 21:07:19 UTC (rev 660)
@@ -0,0 +1,23 @@
+/*
+The zlib/libpng License
+
+Copyright (c) 2006 Phillip Castaneda (pjcast -- www.wreckedgames.com)
+
+This software is provided 'as-is', without any express or implied warranty. In no event will
+the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial
+applications, and to alter it and redistribute it freely, subject to the following
+restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not claim that
+ you wrote the original software. If you use this software in a product,
+ an acknowledgment in the product documentation would be appreciated but is
+ not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+//#include "OISObject.h"
Property changes on: branches/ogsector/externals/ois-1.0/src/OISObject.cpp
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ text/x-c++src
Name: svn:eol-style
+ native
Added: branches/ogsector/externals/ois-1.0/src/SDL/SDLInputManager.cpp
===================================================================
--- branches/ogsector/externals/ois-1.0/src/SDL/SDLInputManager.cpp (rev 0)
+++ branches/ogsector/externals/ois-1.0/src/SDL/SDLInputManager.cpp 2007-08-16 21:07:19 UTC (rev 660)
@@ -0,0 +1,114 @@
+/*
+The zlib/libpng License
+
+Copyright (c) 2006 Phillip Castaneda (pjcast -- www.wreckedgames.com)
+
+This software is provided 'as-is', without any express or implied warranty. In no event will
+the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial
+applications, and to alter it and redistribute it freely, subject to the following
+restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not claim that
+ you wrote the original software. If you use this software in a product,
+ an acknowledgment in the product documentation would be appreciated but is
+ not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL/SDLInputManager.h"
+#include "SDL/SDLKeyboard.h"
+#include "SDL/SDLMouse.h"
+#include "SDL/SDLJoyStick.h"
+#include "OISException.h"
+#include "OISObject.h"
+
+using namespace OIS;
+
+const std::string SDLInputManager::iName = "SDL Input Wrapper";
+
+//--------------------------------------------------------------------------------//
+SDLInputManager::SDLInputManager() : mGrabbed(false)
+{
+}
+
+//--------------------------------------------------------------------------------//
+SDLInputManager::~SDLInputManager()
+{
+}
+
+//--------------------------------------------------------------------------------//
+void SDLInputManager::_initialize( ParamList ¶mList )
+{
+ Uint32 flags = SDL_WasInit(0);
+ if( flags == 0 )
+ OIS_EXCEPT( E_General, "SDLInputManager::SDLInputManager >> SDL Not Initialized already!");
+
+ //Ok, now we have DirectInput, parse whatever extra settings were sent to us
+ _parseConfigSettings( paramList );
+ _enumerateDevices();
+}
+
+//--------------------------------------------------------------------------------//
+void SDLInputManager::_parseConfigSettings( ParamList ¶mList )
+{
+}
+
+//--------------------------------------------------------------------------------//
+void SDLInputManager::_enumerateDevices()
+{
+}
+
+//--------------------------------------------------------------------------------//
+int SDLInputManager::numJoySticks()
+{
+ return 0;
+}
+
+//--------------------------------------------------------------------------------//
+int SDLInputManager::numMice()
+{
+ return 1;
+}
+
+//--------------------------------------------------------------------------------//
+int SDLInputManager::numKeyboards()
+{
+ return 1;
+}
+
+//----------------------------------------------------------------------------//
+Object* SDLInputManager::createInputObject( Type iType, bool bufferMode )
+{
+ Object* obj = 0;
+
+ switch( iType )
+ {
+ case OISKeyboard: obj = new SDLKeyboard( bufferMode ); break;
+ case OISMouse: obj = new SDLMouse( bufferMode ); break;
+ case OISJoyStick:
+ default: OIS_EXCEPT( E_InputDeviceNotSupported, "Type not implemented");
+ }
+
+ try {
+ obj->_initialize();
+ }
+ catch(...) {
+ delete obj;
+ throw; //rethrow
+ }
+
+ return obj;
+}
+
+//----------------------------------------------------------------------------//
+void SDLInputManager::destroyInputObject( Object* obj )
+{
+ if( obj == 0 ) return;
+
+ delete obj;
+}
Property changes on: branches/ogsector/externals/ois-1.0/src/SDL/SDLInputManager.cpp
___________________________________________________________________
Name: svn:mime-type
+ text/x-c++src
Name: svn:eol-style
+ native
Added: branches/ogsector/externals/ois-1.0/src/SDL/SDLJoyStick.cpp
===================================================================
Property changes on: branches/ogsector/externals/ois-1.0/src/SDL/SDLJoyStick.cpp
___________________________________________________________________
Name: svn:mime-type
+ text/x-c++src
Name: svn:eol-style
+ native
Added: branches/ogsector/externals/ois-1.0/src/SDL/SDLKeyboard.cpp
===================================================================
--- branches/ogsector/externals/ois-1.0/src/SDL/SDLKeyboard.cpp (rev 0)
+++ branches/ogsector/externals/ois-1.0/src/SDL/SDLKeyboard.cpp 2007-08-16 21:07:19 UTC (rev 660)
@@ -0,0 +1,377 @@
+/*
+The zlib/libpng License
+
+Copyright (c) 2006 Phillip Castaneda (pjcast -- www.wreckedgames.com)
+
+This software is provided 'as-is', without any express or implied warranty. In no event will
+the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial
+applications, and to alter it and redistribute it freely, subject to the following
+restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not claim that
+ you wrote the original software. If you use this software in a product,
+ an acknowledgment in the product documentation would be appreciated but is
+ not required.
+
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+
+ 3. This notice may not be removed or altered from any source distribution.
+*/
+#include "SDL/SDLKeyBoard.h"
+#include "SDL/SDLInputManager.h"
+#include "OISException.h"
+#include "OISEvents.h"
+#include <sstream>
+
+using namespace OIS;
+
+//-------------------------------------------------------------------//
+SDLKeyboard::SDLKeyboard( bool buffered )
+{
+ mBuffered = buffered;
+ mType = OISKeyboard;
+ listener = 0;
+
+ //Clear our keyboard state buffer
+ memset( &KeyBuffer, 0, 256 );
+}
+
+//-------------------------------------------------------------------//
+void SDLKeyboard::_initialize()
+{
+ mModifiers = 0;
+ mSDLBuff = 0;
+
+ mKeyMap.insert( KeyMap::value_type(SDLK_ESCAPE,KC_ESCAPE) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_1, KC_1) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_2, KC_2) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_3, KC_3) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_4, KC_4) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_5, KC_5) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_6, KC_6) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_7, KC_7) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_8, KC_8) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_9, KC_9) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_0, KC_0) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_MINUS, KC_MINUS) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_EQUALS, KC_EQUALS) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_BACKSPACE, KC_BACK) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_TAB, KC_TAB) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_q, KC_Q) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_w, KC_W) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_e, KC_E) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_r, KC_R) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_t, KC_T) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_y, KC_Y) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_u, KC_U) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_i, KC_I) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_o, KC_O) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_p, KC_P) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_RETURN, KC_RETURN) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_LCTRL, KC_LCONTROL));
+ mKeyMap.insert( KeyMap::value_type(SDLK_a, KC_A) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_s, KC_S) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_d, KC_D) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_f, KC_F) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_g, KC_G) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_h, KC_H) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_j, KC_J) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_k, KC_K) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_l, KC_L) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_SEMICOLON, KC_SEMICOLON) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_COLON, KC_COLON) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_QUOTE, KC_APOSTROPHE) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_BACKQUOTE, KC_GRAVE) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_LSHIFT, KC_LSHIFT) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_BACKSLASH, KC_BACKSLASH) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_SLASH, KC_SLASH) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_z, KC_Z) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_x, KC_X) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_c, KC_C) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_v, KC_V) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_b, KC_B) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_n, KC_N) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_m, KC_M) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_COMMA, KC_COMMA) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_PERIOD, KC_PERIOD));
+ mKeyMap.insert( KeyMap::value_type(SDLK_RSHIFT, KC_RSHIFT));
+ mKeyMap.insert( KeyMap::value_type(SDLK_KP_MULTIPLY, KC_MULTIPLY) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_LALT, KC_LMENU) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_SPACE, KC_SPACE));
+ mKeyMap.insert( KeyMap::value_type(SDLK_CAPSLOCK, KC_CAPITAL) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_F1, KC_F1) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_F2, KC_F2) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_F3, KC_F3) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_F4, KC_F4) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_F5, KC_F5) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_F6, KC_F6) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_F7, KC_F7) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_F8, KC_F8) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_F9, KC_F9) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_F10, KC_F10) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_NUMLOCK, KC_NUMLOCK) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_SCROLLOCK, KC_SCROLL));
+ mKeyMap.insert( KeyMap::value_type(SDLK_KP7, KC_NUMPAD7) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_KP8, KC_NUMPAD8) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_KP9, KC_NUMPAD9) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_KP_MINUS, KC_SUBTRACT) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_KP4, KC_NUMPAD4) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_KP5, KC_NUMPAD5) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_KP6, KC_NUMPAD6) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_KP_PLUS, KC_ADD) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_KP1, KC_NUMPAD1) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_KP2, KC_NUMPAD2) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_KP3, KC_NUMPAD3) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_KP0, KC_NUMPAD0) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_KP_PERIOD, KC_DECIMAL) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_F11, KC_F11) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_F12, KC_F12) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_F13, KC_F13) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_F14, KC_F14) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_F15, KC_F15) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_KP_EQUALS, KC_NUMPADEQUALS) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_KP_DIVIDE, KC_DIVIDE) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_SYSREQ, KC_SYSRQ) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_RALT, KC_RMENU) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_HOME, KC_HOME) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_UP, KC_UP) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_PAGEUP, KC_PGUP) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_LEFT, KC_LEFT) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_RIGHT, KC_RIGHT) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_END, KC_END) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_DOWN, KC_DOWN) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_PAGEDOWN, KC_PGDOWN) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_INSERT, KC_INSERT) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_DELETE, KC_DELETE) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_LSUPER, KC_LWIN) );
+ mKeyMap.insert( KeyMap::value_type(SDLK_RSUPER, KC_RWIN) );
+
+ SDL_EnableUNICODE(1);
+}
+
+//-------------------------------------------------------------------//
+SDLKeyboard::~SDLKeyboard()
+{
+}
+
+//-------------------------------------------------------------------//
+void SDLKeyboard::capture()
+{
+ SDL_Event events[OIS_SDL_KEY_BUFF];
+ int count = SDL_PeepEvents(events, OIS_SDL_KEY_BUFF, SDL_GETEVENT,
+ SDL_EVENTMASK(SDL_KEYDOWN) | SDL_EVENTMASK(SDL_KEYUP));
+
+ for( int i = 0; i < count; ++i )
+ {
+ KeyCode kc = mKeyMap[events[i].key.keysym.sym];
+ KeyBuffer[kc] = events[i].key.state;
+
+ if( mBuffered && listener )
+ {
+ if( events[i].key.state == SDL_PRESSED )
+ {
+ if( listener->keyPressed(KeyEvent(this, 0, kc, events[i].key.keysym.unicode)) == false )
+ break;
+ }
+ else
+ {
+ if( listener->keyReleased(KeyEvent(this, 0, kc, events[i].key.keysym.unicode)) == false )
+ break;
+ }
+ }
+ }
+
+ //Release Grab mode on Alt-Tab combinations (for non-window systems)
+ if( KeyBuffer[KC_RMENU] || KeyBuffer[KC_LMENU])
+ {
+ if( KeyBuffer[KC_TAB] )
+ static_cast<SDLInputManager*>(InputManager::getSingletonPtr())->_setGrabMode(false);
+ }
+}
+
+//-------------------------------------------------------------------//
+bool SDLKeyboard::isKeyDown( KeyCode key )
+{
+ return KeyBuffer[key] == 1 ? true : false;
+}
+
+//-------------------------------------------------------------------//
+const std::string& SDLKeyboard::getAsString( KeyCode kc )
+{
+ switch(kc)
+ {
+ case KC_ESCAPE: mGetString = SDL_GetKeyName(SDLK_ESCAPE); break;
+ case KC_1: mGetString = SDL_GetKeyName(SDLK_1); break;
+ case KC_2: mGetString = SDL_GetKeyName(SDLK_2); break;
+ case KC_3: mGetString = SDL_GetKeyName(SDLK_3); break;
+ case KC_4: mGetString = SDL_GetKeyName(SDLK_4); break;
+ case KC_5: mGetString = SDL_GetKeyName(SDLK_5); break;
+ case KC_6: mGetString = SDL_GetKeyName(SDLK_6); break;
+ case KC_7: mGetString = SDL_GetKeyName(SDLK_7); break;
+ case KC_8: mGetString = SDL_GetKeyName(SDLK_8); break;
+ case KC_9: mGetString = SDL_GetKeyName(SDLK_9); break;
+ case KC_0: mGetString = SDL_GetKeyName(SDLK_0); break;
+ case KC_MINUS: mGetString = SDL_GetKeyName(SDLK_MINUS); break;
+ case KC_EQUALS: mGetString = SDL_GetKeyName(SDLK_EQUALS); break;
+ case KC_BACK: mGetString = SDL_GetKeyName(SDLK_BACKSPACE); break;
+ case KC_TAB: mGetString = SDL_GetKeyName(SDLK_TAB); break;
+ case KC_Q: mGetString = SDL_GetKeyName(SDLK_q); break;
+ case KC_W: mGetString = SDL_GetKeyName(SDLK_w); break;
+ case KC_E: mGetString = SDL_GetKeyName(SDLK_e); break;
+ case KC_R: mGetString = SDL_GetKeyName(SDLK_r); break;
+ case KC_T: mGetString = SDL_GetKeyName(SDLK_t); break;
+ case KC_Y: mGetString = SDL_GetKeyName(SDLK_y); break;
+ case KC_U: mGetString = SDL_GetKeyName(SDLK_u); break;
+ case KC_I: mGetString = SDL_GetKeyName(SDLK_i); break;
+ case KC_O: mGetString = SDL_GetKeyName(SDLK_o); break;
+ case KC_P: mGetString = SDL_GetKeyName(SDLK_p); break;
+ case KC_LBRACKET: mGetString = "["; break;
+ case KC_RBRACKET: mGetString = "]"; break;
+ case KC_RETURN: mGetString = SDL_GetKeyName(SDLK_RETURN); break;
+ case KC_LCONTROL: mGetString = SDL_GetKeyName(SDLK_LCTRL); break;
+ case KC_A: mGetString = SDL_GetK...
[truncated message content] |
|
From: <spo...@us...> - 2007-08-11 11:55:36
|
Revision: 659
http://opengate.svn.sourceforge.net/opengate/?rev=659&view=rev
Author: spom_spom
Date: 2007-08-11 04:55:33 -0700 (Sat, 11 Aug 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-08-11 10:39:28 UTC (rev 658)
+++ branches/ogsector/win32/ogsectorclient/ogsectorclient.cbp 2007-08-11 11:55:33 UTC (rev 659)
@@ -63,8 +63,6 @@
<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" />
@@ -85,12 +83,16 @@
<Unit filename="..\..\src\OpcodeWrapper.h" />
<Unit filename="..\..\src\Projectile.cpp" />
<Unit filename="..\..\src\Projectile.h" />
+ <Unit filename="..\..\src\ResourceManager.cpp" />
+ <Unit filename="..\..\src\ResourceManager.h" />
<Unit filename="..\..\src\Sector.cpp" />
<Unit filename="..\..\src\Sector.h" />
<Unit filename="..\..\src\SectorObjects.cpp" />
<Unit filename="..\..\src\SectorObjects.h" />
<Unit filename="..\..\src\ShipConfigDialog.cpp" />
<Unit filename="..\..\src\ShipConfigDialog.h" />
+ <Unit filename="..\..\src\Station.cpp" />
+ <Unit filename="..\..\src\Station.h" />
<Unit filename="..\..\src\UnDockedState.cpp" />
<Unit filename="..\..\src\UnDockedState.h" />
<Unit filename="..\..\src\Vessel.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-08-11 10:39:28
|
Revision: 658
http://opengate.svn.sourceforge.net/opengate/?rev=658&view=rev
Author: spom_spom
Date: 2007-08-11 03:39:28 -0700 (Sat, 11 Aug 2007)
Log Message:
-----------
Fixed annoying bug in gamestatemanger
Modified Paths:
--------------
branches/ogsector/data/materials/advancedMaterials.program
branches/ogsector/src/DockedState.cpp
branches/ogsector/src/DockedState.h
branches/ogsector/src/GameStateManager.cpp
branches/ogsector/src/GameStateManager.h
branches/ogsector/src/OpcodeWrapper.cpp
branches/ogsector/src/SectorObjects.cpp
branches/ogsector/src/SectorObjects.h
branches/ogsector/src/Station.cpp
branches/ogsector/src/UnDockedState.cpp
branches/ogsector/src/UnDockedState.h
branches/ogsector/src/opengateclient.cpp
Modified: branches/ogsector/data/materials/advancedMaterials.program
===================================================================
--- branches/ogsector/data/materials/advancedMaterials.program 2007-08-07 19:00:24 UTC (rev 657)
+++ branches/ogsector/data/materials/advancedMaterials.program 2007-08-11 10:39:28 UTC (rev 658)
@@ -30,7 +30,7 @@
}
// A really basic ambient pass program, support for one texture coodinate set
-vertex_program BasicVertexPrograms/AmbientOneTexture cg
+vertex_program BasicVertexPrograms/AmbientOneTextureCG cg
{
source Example_Basic.cg
entry_point ambientOneTexture_vp
@@ -49,7 +49,7 @@
{
source Example_Basic.hlsl
entry_point ambientOneTexture_vp
- target vs_1_1
+ target vs_1_1 arbvp1
default_params
{
@@ -72,5 +72,5 @@
{
delegate BasicVertexPrograms/AmbientOneTextureGLSL
delegate BasicVertexPrograms/AmbientOneTextureHLSL
- delegate BasicVertexPrograms/AmbientOneTexture
+ delegate BasicVertexPrograms/AmbientOneTextureCG
}
\ No newline at end of file
Modified: branches/ogsector/src/DockedState.cpp
===================================================================
--- branches/ogsector/src/DockedState.cpp 2007-08-07 19:00:24 UTC (rev 657)
+++ branches/ogsector/src/DockedState.cpp 2007-08-11 10:39:28 UTC (rev 658)
@@ -92,7 +92,6 @@
}
void DockedState::enter( ) {
- launchUndockedState_ = false;
log_->info("Entering dockstate");
resources_->guiRenderer->setTargetSceneManager( sceneMgr_ );
resources_->guiSystem->setGUISheet( overlayRootWindow_ );
@@ -111,6 +110,8 @@
CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"Config/BackButton" )->subscribeEvent(
CEGUI::PushButton::EventClicked, CEGUI::Event::Subscriber( &DockedState::handleConfigBackButton, this ) ) ;
+ exitToUndockedState_ = false;
+ quitAllStates_ = false;
}
void DockedState::exit(){
@@ -126,19 +127,28 @@
resources_->inputManager->removeMouseListener( "DockedStateMouseListener" );
}
+void DockedState::changeToUnDockedState(){
+ exitToUndockedState_ = true;
+}
+
bool DockedState::frameStarted( const Ogre::FrameEvent & evt ){
if ( shipConfigDialog_ ) shipConfigDialog_->update( evt.timeSinceLastFrame );
return true;
}
bool DockedState::frameEnded( const Ogre::FrameEvent & evt ){
- // if ( launchUndockedState_ ) parent_->start( parent_->findByName( "UnDockedState" ) );
+ if ( exitToUndockedState_ ){
+ parent_->changeGameState( parent_->findByName( "UnDockedState" ) );
+ return false;
+ } else if ( quitAllStates_ ){
+ parent_->shutdown();
+ return false;
+ }
return true;
}
bool DockedState::keyPressed( const OIS::KeyEvent & e ){
- //** ESCAPE leads to shutdown;
if ( e.key == OIS::KC_ESCAPE) { switchConfigDialog( ); }
if ( e.key == 70 ){ // 70 == Roll
@@ -149,10 +159,7 @@
}
}
- if ( e.key == OIS::KC_F4 ){
- parent_->start( parent_->findByName( "UnDockedState" ) );
- return true;
- }
+ if ( e.key == OIS::KC_F4 ){ changeToUnDockedState(); return true; }
if ( e.key == OIS::KC_RETURN) {
CEGUI::WindowManager::getSingleton().getWindow( (CEGUI::utf8*)"ConsoleEdit")->activate();
@@ -212,7 +219,7 @@
return true;
}
- parent_->start( parent_->findByName( "UnDockedState" ) );
+ changeToUnDockedState();
return true;
}
Modified: branches/ogsector/src/DockedState.h
===================================================================
--- branches/ogsector/src/DockedState.h 2007-08-07 19:00:24 UTC (rev 657)
+++ branches/ogsector/src/DockedState.h 2007-08-11 10:39:28 UTC (rev 658)
@@ -54,6 +54,8 @@
/*! Inherit to supply state exit code. */
virtual void exit( );
+ void changeToUnDockedState();
+
virtual bool frameStarted( const Ogre::FrameEvent & evt );
virtual bool frameEnded( const Ogre::FrameEvent & evt );
@@ -78,7 +80,7 @@
DockedState();
virtual ~DockedState(){}
- inline bool handleQuit( const CEGUI::EventArgs & e ){ shutdown(); return true; }
+ inline bool handleQuit( const CEGUI::EventArgs & e ){ quitAllStates_ = true; return true;}
bool handleLaunch( const CEGUI::EventArgs & e );
bool handleShipConfigButton( const CEGUI::EventArgs & e );
bool handleMarketButton( const CEGUI::EventArgs & e );
@@ -93,7 +95,8 @@
MarketDialog * marketDialog_;
bool consoleMax_;
- bool launchUndockedState_;
+ bool exitToUndockedState_;
+ bool quitAllStates_;
};
} // namespace OpenGate
Modified: branches/ogsector/src/GameStateManager.cpp
===================================================================
--- branches/ogsector/src/GameStateManager.cpp 2007-08-07 19:00:24 UTC (rev 657)
+++ branches/ogsector/src/GameStateManager.cpp 2007-08-11 10:39:28 UTC (rev 658)
@@ -174,16 +174,11 @@
if ( state ){
shutdownRequest_ = false;
changeGameState( state );
-
- //hack-mack
- enterDockedStateHack_ = false;
}
while ( !shutdownRequest_ ){
resources_.inputManager->capture();
- if ( enterDockedStateHack_ ) start( findByName( "DockedState" ) );
-
captureNetwork();
Ogre::WindowEventUtilities::messagePump();
@@ -191,12 +186,12 @@
#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
{
MSG msg;
- while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
- if (msg.message == WM_QUIT){
+ while ( PeekMessage( & msg, NULL, 0, 0, PM_REMOVE ) ) {
+ if ( msg.message == WM_QUIT ){
shutdown();
} else {
- // TranslateMessage(&msg);
- // DispatchMessage(&msg);
+ // TranslateMessage(&msg);
+ // DispatchMessage(&msg);
}
}
}
@@ -276,16 +271,16 @@
// cleanup the current game state
if ( !stateStack_.empty() ) {
cleanup_( stateStack_.back() );
- stateStack_.back()->exit();
stateStack_.back()->rootWindow()->removeChildWindow( configDialog_->rootWindow() );
+ stateStack_.back()->exit();
stateStack_.pop_back();
}
// store and init the new state
stateStack_.push_back( state );
- init_( state );
stateStack_.back()->enter();
stateStack_.back()->rootWindow()->addChildWindow( configDialog_->rootWindow() );
+ init_( state );
}
bool GameStateManager::pushGameState( GameState * state ){
Modified: branches/ogsector/src/GameStateManager.h
===================================================================
--- branches/ogsector/src/GameStateManager.h 2007-08-07 19:00:24 UTC (rev 657)
+++ branches/ogsector/src/GameStateManager.h 2007-08-11 10:39:28 UTC (rev 658)
@@ -97,7 +97,7 @@
/*! This is a special case function to cause a shutdown. */
void shutdown( );
- bool enterDockedStateHack_;
+// bool enterDockedStateHack_;
protected:
Modified: branches/ogsector/src/OpcodeWrapper.cpp
===================================================================
--- branches/ogsector/src/OpcodeWrapper.cpp 2007-08-07 19:00:24 UTC (rev 657)
+++ branches/ogsector/src/OpcodeWrapper.cpp 2007-08-11 10:39:28 UTC (rev 658)
@@ -130,7 +130,7 @@
uint nColl = collideInSectorContext_->rayCheck( ray, rayLength, OgreOpcode::COLLTYPE_EXACT,
OgreOpcode::COLLTYPE_ALWAYS_EXACT, rayPickReport );
- std::cout << "checkCollideRay: " << " " << rayLength << " " << nColl <<std::endl;
+// std::cout << "checkCollideRay: " << " " << rayLength << " " << nColl <<std::endl;
for ( uint i = 0; i < nColl; i ++ ){
OgreOpcode::CollisionObject* col1 = rayPickReport[ i ]->this_object;
Modified: branches/ogsector/src/SectorObjects.cpp
===================================================================
--- branches/ogsector/src/SectorObjects.cpp 2007-08-07 19:00:24 UTC (rev 657)
+++ branches/ogsector/src/SectorObjects.cpp 2007-08-11 10:39:28 UTC (rev 658)
@@ -48,6 +48,7 @@
lifeTime_ = 0.0;
selectable_ = false;
+ collObj_ = NULL;
}
BaseObject::~BaseObject(){
@@ -88,7 +89,7 @@
Ogre::OverlayManager::getSingleton().destroyOverlayElement( "Radar/Map/DotA_" + name_ );
Ogre::OverlayManager::getSingleton().destroyOverlayElement( "Radar/Map/DotB_" + name_ );
- OpcodeCollisionDetection::getSingleton().destroyObject( collObj_ );
+ if ( collObj_ ) OpcodeCollisionDetection::getSingleton().destroyObject( collObj_ );
mainNodeEntityRot_->detachObject( entity_ );
sceneMgr_->destroyEntity( entity_ );
@@ -227,12 +228,14 @@
projectiles_.erase( it++ );
}
- for ( std::list < GunObject * >::iterator it = activeGuns_.begin(); it != activeGuns_.end(); ){
+ for ( std::list < GunObject * >::iterator it = activeGuns_.begin(); it != activeGuns_.end(); it++){
GunObject *gun = (*it);
- activeGuns_.remove( *(it++) );
- mainNodeEntityRot_->removeAndDestroyChild( gun->sceneNode()->getName() );
- delete gun;
+ // activeGuns_.remove( *(it++) );
+ mainNodeEntityRot_->removeAndDestroyChild( gun->sceneNode()->getName() );
+ delete gun;
}
+ activeGuns_.clear();
+
}
bool SectorObjectMoveable::update( Ogre::Real elapsedTime ){
@@ -438,6 +441,13 @@
roll_ = 0;
pitch_ = 0;
+ mass_ = 1;
+ thrust_ = 0;
+ maxThrust_ = 0;
+ armor_ = 1;
+ shield_ = 0;
+ maxShield_ = 0;
+
velocity_ = 0.0;
acceleration_ = 0.0;
shotsFired_ = 0;
@@ -468,7 +478,7 @@
void SectorObjectMoveable::updateThruster(){
if ( thrusterParticles_ ){
int nEmits = thrusterParticles_->getNumEmitters( );
- Ogre::Real thrustRate = 0;
+ Ogre::Real thrustRate = 0.0;
if ( maxThrust() > 0 ) thrustRate = (float)thrust_ / maxThrust_ * 100.0;
for ( int i = 0; i < nEmits; i ++ ){
@@ -535,6 +545,7 @@
maxShield_ = 0;
if ( vessel_->shield() ) maxShield_ = vessel_->shield()->maxDeflection();
shield_ = maxShield_;
+ lastShieldSend_ = 0;
}
bool SectorObjectMoveableLocal::update( Ogre::Real elapsedTime ){
Modified: branches/ogsector/src/SectorObjects.h
===================================================================
--- branches/ogsector/src/SectorObjects.h 2007-08-07 19:00:24 UTC (rev 657)
+++ branches/ogsector/src/SectorObjects.h 2007-08-11 10:39:28 UTC (rev 658)
@@ -375,8 +375,6 @@
std::list < GunObject * > activeGuns_;
};
-
-
/*! Movable sector objets which is controled by the client */
class SectorObjectMoveableLocal : public SectorObjectMoveable {
public:
Modified: branches/ogsector/src/Station.cpp
===================================================================
--- branches/ogsector/src/Station.cpp 2007-08-07 19:00:24 UTC (rev 657)
+++ branches/ogsector/src/Station.cpp 2007-08-11 10:39:28 UTC (rev 658)
@@ -19,6 +19,7 @@
***************************************************************************/
#include "Station.h"
+#include "Sector.h"
#include "GameStateManager.h"
#include "OpcodeWrapper.h"
@@ -75,7 +76,7 @@
return strCopyToLowerCase( strReplaceBlankToUnderscore( name_ ) ) + ".mesh";
}
-StationDockPad::StationDockPad( const std::string & name, Sector * sector, Ogre::SubEntity * dockPad, Ogre::SceneNode * dockPadNode)
+StationDockPad::StationDockPad( const std::string & name, Sector * sector, Ogre::SubEntity * dockPad, Ogre::SceneNode * dockPadNode )
: BaseObject( name, sector ), dockPadNode_( dockPadNode ){
dockPadManualObject_ = sceneMgr_->createManualObject( name_ + "/ManualObject" );
@@ -138,7 +139,7 @@
void StationDockPad::collide( BaseObject * object ){
std::cout << "StationDockPad::collide" << std::endl;
- ResourceManager::getSingleton().gameStateRoot->enterDockedStateHack_ = true;
+ sector_->listener()->changeToDockedState();
}
StationObject::StationObject( Station & station, Sector * sector )
Modified: branches/ogsector/src/UnDockedState.cpp
===================================================================
--- branches/ogsector/src/UnDockedState.cpp 2007-08-07 19:00:24 UTC (rev 657)
+++ branches/ogsector/src/UnDockedState.cpp 2007-08-11 10:39:28 UTC (rev 658)
@@ -238,7 +238,6 @@
// aniso_ = 1;
// filtering_ = TFO_BILINEAR;
- enterDockedState_ = false;
sector_->createAvatarObject( *resources_->avatar );
if ( resources_->console ){
@@ -275,7 +274,8 @@
// Now trigger the pending pass updates
Ogre::Pass::processPendingPassUpdates();
}//end_if(m_Root..
- //** end update SceneManager
+ //** end update SceneManager;
+ enterDockedState_ = false;
}
void UnDockedState::exit(){
@@ -304,6 +304,10 @@
// std::cout << "End: " << dumpSceneNodes( sceneMgr_->getRootSceneNode() ) << std::endl;
}
+void UnDockedState::changeToDockedState(){
+ enterDockedState_ = true;
+}
+
bool UnDockedState::switchConfigDialog( ){
resources_->gameStateRoot->switchConfigDialog( );
configMode_ = resources_->gameStateRoot->configDialog()->isVisible();
@@ -332,10 +336,6 @@
}
bool UnDockedState::frameStarted( const Ogre::FrameEvent & evt ) {
- //** this crashes at shutdown
- //** if ( enterDockedState_ ) parent_->start( parent_->findByName( "DockedState" ) );
- if ( enterDockedState_ ) resources_->gameStateRoot->enterDockedStateHack_ = true;
-
if ( window_->isClosed() ) return false;
timeSinceLastSectorUpdate_ += evt.timeSinceLastFrame;
@@ -362,6 +362,11 @@
}
bool UnDockedState::frameEnded( const Ogre::FrameEvent & evt ){
+ if ( enterDockedState_ ) {
+ parent_->changeGameState( parent_->findByName( "DockedState" ) );
+ return false;
+ }
+
return true;
}
@@ -426,8 +431,7 @@
sector_->avatarObject()->setScaledRoll( 0.0 );
}
//** selfdestruct and eject;
- if ( e.key == OIS::KC_F4 ) { resources_->gameStateRoot->enterDockedStateHack_ = true; }
-// if ( e.key == OIS::KC_F4 || enterDockedState_ ) { parent_->start( parent_->findByName( "DockedState" ) ); }// enterDockedState_ = true; }
+ if ( e.key == OIS::KC_F4 ) { changeToDockedState(); return true; }
if ( e.key == OIS::KC_F5 ) { duelistPilot_ = !duelistPilot_; }
if ( e.key == OIS::KC_F6 ) { duelistTarget_ = !duelistTarget_; }
if ( e.key == OIS::KC_F8 ) { sector_->avatarObject()->deathSequence( 0 ); }
@@ -1069,7 +1073,7 @@
overlayRootWindow_->hide();
hudOverlay_->hide();
} else {
- enterDockedState_ = true;
+ changeToDockedState();
}
} // if avatar
}
Modified: branches/ogsector/src/UnDockedState.h
===================================================================
--- branches/ogsector/src/UnDockedState.h 2007-08-07 19:00:24 UTC (rev 657)
+++ branches/ogsector/src/UnDockedState.h 2007-08-11 10:39:28 UTC (rev 658)
@@ -51,6 +51,8 @@
void exit();
+ void changeToDockedState();
+
bool switchConfigDialog( );
virtual void setupEventHandlers();
Modified: branches/ogsector/src/opengateclient.cpp
===================================================================
--- branches/ogsector/src/opengateclient.cpp 2007-08-07 19:00:24 UTC (rev 657)
+++ branches/ogsector/src/opengateclient.cpp 2007-08-11 10:39:28 UTC (rev 658)
@@ -36,7 +36,7 @@
int main( int argc, char * argv[ ] ) {
- int option_dialog = 1;
+ int option_dialog = 0;
int option_version = 0;
std::string username = "testuser";
std::string hostname = "localhost";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-08-07 19:00:22
|
Revision: 657
http://opengate.svn.sourceforge.net/opengate/?rev=657&view=rev
Author: spom_spom
Date: 2007-08-07 12:00:24 -0700 (Tue, 07 Aug 2007)
Log Message:
-----------
trying fix collision issues. 2nd.
Modified Paths:
--------------
branches/ogsector/src/OpcodeWrapper.cpp
Modified: branches/ogsector/src/OpcodeWrapper.cpp
===================================================================
--- branches/ogsector/src/OpcodeWrapper.cpp 2007-08-07 18:10:01 UTC (rev 656)
+++ branches/ogsector/src/OpcodeWrapper.cpp 2007-08-07 19:00:24 UTC (rev 657)
@@ -127,27 +127,29 @@
bool OpcodeCollisionDetection::checkCollideRay( BaseObject * obj, const Ogre::Ray & ray, double rayLength){
OgreOpcode::CollisionPair ** rayPickReport;
- int nColl = collideInSectorContext_->rayCheck( ray, rayLength, OgreOpcode::COLLTYPE_EXACT,
- OgreOpcode::COLLTYPE_ALWAYS_EXACT, rayPickReport );
+ uint nColl = collideInSectorContext_->rayCheck( ray, rayLength, OgreOpcode::COLLTYPE_EXACT,
+ OgreOpcode::COLLTYPE_ALWAYS_EXACT, rayPickReport );
-// std::cout << "checkCollideRay: " << " " << rayLength << std::endl;
+ std::cout << "checkCollideRay: " << " " << rayLength << " " << nColl <<std::endl;
- if ( nColl > 0 ){
- OgreOpcode::CollisionObject* col1 = rayPickReport[ 0 ]->this_object;
- OgreOpcode::CollisionObject* col2 = rayPickReport[ 0 ]->other_object;
+ for ( uint i = 0; i < nColl; i ++ ){
+ OgreOpcode::CollisionObject* col1 = rayPickReport[ i ]->this_object;
+ OgreOpcode::CollisionObject* col2 = rayPickReport[ i ]->other_object;
- std::cout << "checkCollideRay: " << static_cast< BaseObject * >(col1->getClientData())->name()
- << " " << static_cast< BaseObject * >(col2->getClientData())->name() << std::endl;
+ std::cout << "checkCollideRay: " << i << " "
+ << static_cast< BaseObject * >( col1->getClientData() )->name() << "<->"
+ << static_cast< BaseObject * >( col2->getClientData() )->name() << std::endl;
if ( obj->getTypeID() == PROJECTILE_RTTI ){
if ( dynamic_cast< Projectile * >( obj )->parent() != static_cast< BaseObject * >( col1->getClientData() ) ){
- obj->mainNode()->setPosition( rayPickReport[ 0 ]->contact );
+ obj->mainNode()->setPosition( rayPickReport[ i ]->contact );
+ obj->collide( static_cast< BaseObject * >( col2->getClientData() ) );
+ static_cast< BaseObject * >( col1->getClientData() )->collide( obj );
+ return true;
}
- }
- if ( obj != col1->getClientData() ){
+ } else if ( obj != col1->getClientData() ){
obj->collide( static_cast< BaseObject * >( col2->getClientData() ) );
static_cast< BaseObject * >( col1->getClientData() )->collide( obj );
- return true;
}
}
return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-08-07 18:10:00
|
Revision: 656
http://opengate.svn.sourceforge.net/opengate/?rev=656&view=rev
Author: spom_spom
Date: 2007-08-07 11:10:01 -0700 (Tue, 07 Aug 2007)
Log Message:
-----------
trying fix collision issues
Modified Paths:
--------------
branches/ogsector/src/OpcodeWrapper.cpp
branches/ogsector/src/OpcodeWrapper.h
branches/ogsector/src/SectorObjects.cpp
branches/ogsector/src/UnDockedState.cpp
branches/ogsector/src/UnDockedState.h
trunk/data/stations/tauseti_wake.xml
Modified: branches/ogsector/src/OpcodeWrapper.cpp
===================================================================
--- branches/ogsector/src/OpcodeWrapper.cpp 2007-08-06 19:29:24 UTC (rev 655)
+++ branches/ogsector/src/OpcodeWrapper.cpp 2007-08-07 18:10:01 UTC (rev 656)
@@ -125,21 +125,28 @@
OgreOpcode::CollisionManager::getSingletonPtr()->destroyShape( obj->getShape() );
}
-bool OpcodeCollisionDetection::checkCollideRay( Projectile * ammo, const Ogre::Ray & ray, double rayLength){
+bool OpcodeCollisionDetection::checkCollideRay( BaseObject * obj, const Ogre::Ray & ray, double rayLength){
OgreOpcode::CollisionPair ** rayPickReport;
int nColl = collideInSectorContext_->rayCheck( ray, rayLength, OgreOpcode::COLLTYPE_EXACT,
OgreOpcode::COLLTYPE_ALWAYS_EXACT, rayPickReport );
+// std::cout << "checkCollideRay: " << " " << rayLength << std::endl;
+
if ( nColl > 0 ){
OgreOpcode::CollisionObject* col1 = rayPickReport[ 0 ]->this_object;
OgreOpcode::CollisionObject* col2 = rayPickReport[ 0 ]->other_object;
- if ( ammo->parent()->name() != static_cast< BaseObject * >( col1->getClientData() )->name() ){
-
- ammo->mainNode()->setPosition( rayPickReport[ 0 ]->contact );
-
- ammo->collide( static_cast< BaseObject * >( col2->getClientData() ) );
- static_cast< BaseObject * >( col1->getClientData() )->collide( ammo );
+ std::cout << "checkCollideRay: " << static_cast< BaseObject * >(col1->getClientData())->name()
+ << " " << static_cast< BaseObject * >(col2->getClientData())->name() << std::endl;
+
+ if ( obj->getTypeID() == PROJECTILE_RTTI ){
+ if ( dynamic_cast< Projectile * >( obj )->parent() != static_cast< BaseObject * >( col1->getClientData() ) ){
+ obj->mainNode()->setPosition( rayPickReport[ 0 ]->contact );
+ }
+ }
+ if ( obj != col1->getClientData() ){
+ obj->collide( static_cast< BaseObject * >( col2->getClientData() ) );
+ static_cast< BaseObject * >( col1->getClientData() )->collide( obj );
return true;
}
}
@@ -147,8 +154,7 @@
}
void OpcodeCollisionDetection::changeCollClass( OgreOpcode::CollisionObject * collObj, const std::string & collClass ){
-
- collObj->setCollClass( OgreOpcode::CollisionManager::getSingletonPtr()->queryCollClass( collClass ) );
+ if ( collObj ) collObj->setCollClass( OgreOpcode::CollisionManager::getSingletonPtr()->queryCollClass( collClass ) );
}
OpcodeCollisionDetection & OpcodeCollisionDetection::getSingleton( ){
Modified: branches/ogsector/src/OpcodeWrapper.h
===================================================================
--- branches/ogsector/src/OpcodeWrapper.h 2007-08-06 19:29:24 UTC (rev 655)
+++ branches/ogsector/src/OpcodeWrapper.h 2007-08-07 18:10:01 UTC (rev 656)
@@ -49,7 +49,7 @@
void destroyObject( OgreOpcode::CollisionObject * obj );
- bool checkCollideRay( Projectile * ammo, const Ogre::Ray & bulletRay, double rayLength);
+ bool checkCollideRay( BaseObject * obj, const Ogre::Ray & bulletRay, double rayLength );
OgreOpcode::CollisionContext * collideInSectorContext(){ return collideInSectorContext_; }
Modified: branches/ogsector/src/SectorObjects.cpp
===================================================================
--- branches/ogsector/src/SectorObjects.cpp 2007-08-06 19:29:24 UTC (rev 655)
+++ branches/ogsector/src/SectorObjects.cpp 2007-08-07 18:10:01 UTC (rev 656)
@@ -277,6 +277,10 @@
vel_ += acc_ * elapsedTime;
mainNode_->translate( ( vel_ + interpolateVel_ ) * elapsedTime );
+ //** because of the discrete jumps between to frames we have to check for collisions via ray;
+ Ogre::Ray rayNoNextPos( mainNode_->getPosition(), vel_.normalisedCopy() );
+ OpcodeCollisionDetection::getSingleton().checkCollideRay( this, rayNoNextPos, (vel_ * elapsedTime).length() );
+
for ( std::set < Projectile * >::iterator it = projectiles_.begin(); it != projectiles_.end();){
if ( !(*it)->update( elapsedTime ) ) {
delete *it;
@@ -284,9 +288,9 @@
} else ++it;
}
- //** snap quaternion
- Ogre::Quaternion rnd( mainNode_->getOrientation() );
- mainNode_->setOrientation( round( rnd.w, 5 ), round( rnd.x, 5 ), round( rnd.y, 5 ), round( rnd.z, 5 ) );
+// //** snap quaternion
+// Ogre::Quaternion rnd( mainNode_->getOrientation() );
+// mainNode_->setOrientation( round( rnd.w, 5 ), round( rnd.x, 5 ), round( rnd.y, 5 ), round( rnd.z, 5 ) );
return true;
}
Modified: branches/ogsector/src/UnDockedState.cpp
===================================================================
--- branches/ogsector/src/UnDockedState.cpp 2007-08-06 19:29:24 UTC (rev 655)
+++ branches/ogsector/src/UnDockedState.cpp 2007-08-07 18:10:01 UTC (rev 656)
@@ -59,6 +59,7 @@
mainCamera_ = sceneMgr_->createCamera( "MainCamera" );
mainCamera_->setNearClipDistance( 1 );
+ cameraZoom_ = 75.0;
secondCamera_ = sceneMgr_->createCamera( "SecondCamera" );
secondCamera_->setNearClipDistance( 1 );
@@ -199,12 +200,9 @@
timeSinceLastNetworkUpdate_ = 0.0;
timeSinceLastHudUpdate_ = 0.0;
- cameraRotateX_ = 0;
- cameraRotateY_ = 0;
-// cameraRotateScale_ = 0.0f;
-// cameraMoveSpeed_ = 100;
-// cameraMoveScale_ = 0.0f;
-// cameraTranslate_ = Ogre::Vector3::ZERO;
+ cameraRotateX_ = 0.0;
+ cameraRotateY_ = 0.0;
+ cameraZoom_ = 75.0;
// targetPointer_ = mainCamera_->getSceneManager()->getRootSceneNode()->createChildSceneNode( "TargetPointer" );
// BillboardSet* mySet = mainCamera_->getSceneManager()->createBillboardSet("mySet");
@@ -588,9 +586,11 @@
} // if avatar;
if ( e.state.Z.rel < -10 ){ // mouse wheel up
- setTarget( sector_->nextTarget() );
+ if ( cameraMode_ == 1 ) cameraZoom_ = max( 20.0f, cameraZoom_ - 5 );
+ else setTarget( sector_->nextTarget() );
} else if ( e.state.Z.rel > 10 ) {
- setTarget( sector_->prevTarget() );
+ if ( cameraMode_ == 1 ) cameraZoom_ = min( 500.0f, cameraZoom_ + 5 );
+ else setTarget( sector_->prevTarget() );
}
} else {
CEGUI::System::getSingleton().injectMouseMove( e.state.X.rel,e.state.Y.rel );
@@ -598,7 +598,7 @@
return true;
}
-bool UnDockedState::mousePressed( const OIS::MouseEvent &e , OIS::MouseButtonID id ){
+bool UnDockedState::mousePressed( const OIS::MouseEvent & e , OIS::MouseButtonID id ){
if ( !configMode_ ){
if ( sector_->avatarObject() != NULL ){
// std::cout << "Mouse Button: " << id << std::endl;
@@ -725,6 +725,7 @@
cameraRotateX_ = 0;
cameraRotateY_ = 0;
cameraViewKey_ = 1;
+ cameraZoom_ = 75;
if ( sector_->avatarObject() != NULL ){
sector_->avatarObject()->setVisible( true );
break;
@@ -808,9 +809,12 @@
Ogre::Vector3 camPos( Ogre::Math::Sin( cameraRotateX_ ) * Ogre::Math::Cos( cameraRotateY_ ),
Ogre::Math::Sin( cameraRotateX_ ) * Ogre::Math::Sin( cameraRotateY_ ),
Ogre::Math::Cos( cameraRotateX_ ) );
- // std::cout << camPos << std::endl;
- mainCamera_->setPosition( avatarPos + camPos * 75.0 );
+ camPos.normalise();
+ // std::cout << camPos << std::endl;
+ // mainCamera_->setPosition( avatarPos + camPos * 75.0 );
+ mainCamera_->setPosition( avatarPos + avatarOrient * camPos * cameraZoom_ );
+
mainCamera_->lookAt( sector_->avatarObject()->mainNode()->getPosition( ) );
// mainCamera_->setOrientation( avatarOrient );
Modified: branches/ogsector/src/UnDockedState.h
===================================================================
--- branches/ogsector/src/UnDockedState.h 2007-08-06 19:29:24 UTC (rev 655)
+++ branches/ogsector/src/UnDockedState.h 2007-08-07 18:10:01 UTC (rev 656)
@@ -183,6 +183,7 @@
double timeSinceLastHudUpdate_;
int cameraMode_;
int cameraViewKey_;
+ Ogre::Real cameraZoom_;
Ogre::Degree cameraRotateX_;
Ogre::Degree cameraRotateY_;
Modified: trunk/data/stations/tauseti_wake.xml
===================================================================
(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-08-06 19:29:26
|
Revision: 655
http://opengate.svn.sourceforge.net/opengate/?rev=655&view=rev
Author: ultrasick
Date: 2007-08-06 12:29:24 -0700 (Mon, 06 Aug 2007)
Log Message:
-----------
added George (creator of the octavia light 3d model and the magnetic components 3d model) and james smith (creator of the jgmapper tool and provider of the sector data (jgdata.xml)
Modified Paths:
--------------
trunk/data/misc/credits.txt
Modified: trunk/data/misc/credits.txt
===================================================================
--- trunk/data/misc/credits.txt 2007-08-06 19:25:29 UTC (rev 654)
+++ trunk/data/misc/credits.txt 2007-08-06 19:29:24 UTC (rev 655)
@@ -31,3 +31,10 @@
... www.a1freesoundeffects.com for
the sonar ping sound file we used
in the open source splash screen!
+
+... James Smith for the huge sector
+ database provided with the
+ Jumpgate Mapper tool!
+
+... George Max for helping out with some
+ commodities!
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-08-06 19:25:27
|
Revision: 654
http://opengate.svn.sourceforge.net/opengate/?rev=654&view=rev
Author: spom_spom
Date: 2007-08-06 12:25:29 -0700 (Mon, 06 Aug 2007)
Log Message:
-----------
win compatibility commit
Modified Paths:
--------------
branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
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-08-06 19:12:55
|
Revision: 653
http://opengate.svn.sourceforge.net/opengate/?rev=653&view=rev
Author: spom_spom
Date: 2007-08-06 12:12:55 -0700 (Mon, 06 Aug 2007)
Log Message:
-----------
some small fixes
Modified Paths:
--------------
branches/ogsector/data/materials/gradientshader.material
branches/ogsector/src/Station.cpp
branches/ogsector/src/Station.h
Modified: branches/ogsector/data/materials/gradientshader.material
===================================================================
--- branches/ogsector/data/materials/gradientshader.material 2007-08-05 21:45:05 UTC (rev 652)
+++ branches/ogsector/data/materials/gradientshader.material 2007-08-06 19:12:55 UTC (rev 653)
@@ -1,4 +1,4 @@
-vertex_program shader/gradientVP cg
+vertex_program shader/gradientVP_CG cg
{
source gradientshader.cg
entry_point gradient_vp
@@ -11,27 +11,37 @@
}
}
-fragment_program shader/gradientFP cg
+vertex_program shader/gradientVP_Unified unified
{
+ delegate shader/gradientVP_CG
+}
+
+fragment_program shader/gradientFP_CG cg
+{
source gradientshader.cg
entry_point main_fp
- profiles vs_1_1 arbfp1
+ profiles ps_1_1 arbfp1
}
+vertex_program shader/gradientFP_Unified unified
+{
+ delegate shader/gradientFP_CG
+}
+
material shader/gradient
{
technique
{
pass
{
- scene_blend alpha_blend
- depth_write off
- vertex_program_ref shader/gradientVP
+ scene_blend alpha_blend
+ depth_write off
+ vertex_program_ref shader/gradientVP_Unified
{
param_named_auto customParamColour custom 0
param_named_auto customParamRadius custom 1
}
- fragment_program_ref shader/gradientFP
+ fragment_program_ref shader/gradientFP_Unified
{
}
}
Modified: branches/ogsector/src/Station.cpp
===================================================================
--- branches/ogsector/src/Station.cpp 2007-08-05 21:45:05 UTC (rev 652)
+++ branches/ogsector/src/Station.cpp 2007-08-06 19:12:55 UTC (rev 653)
@@ -20,6 +20,8 @@
#include "Station.h"
#include "GameStateManager.h"
+#include "OpcodeWrapper.h"
+
#include <OgreString.h>
#include <OgreMesh.h>
#include <OgreSubMesh.h>
@@ -28,73 +30,94 @@
#include <OgreMeshManager.h>
#include <OgreSceneManager.h>
#include <OgreManualObject.h>
-#include <OpcodeWrapper.h>
namespace OpenGate{
+void readSubEntity( Ogre::SubEntity * entity, std::vector< Ogre::Vector3 > & verts,
+ std::vector< Triangle > & tris ){
+
+ Ogre::VertexData * vd = entity->getSubMesh()->vertexData;
+ const Ogre::VertexElement * posElem = vd->vertexDeclaration->findElementBySemantic( Ogre::VES_POSITION );
+ Ogre::HardwareVertexBufferSharedPtr vbuf = vd->vertexBufferBinding->getBuffer( posElem->getSource() );
+ unsigned char * vertex = static_cast< unsigned char * >( vbuf->lock( Ogre::HardwareBuffer::HBL_READ_ONLY ) );
+
+ float * pReal;
+ for( uint j = 0; j < vd->vertexCount; ++j, vertex += vbuf->getVertexSize() ){
+ posElem->baseVertexPointerToElement( vertex, & pReal);
+ verts.push_back( Ogre::Vector3( pReal[ 0 ], pReal[ 1 ], pReal[ 2 ] ) );
+ }
+ vbuf->unlock();
+
+ Ogre::IndexData * index_data = entity->getSubMesh()->indexData;
+ uint numTris = index_data->indexCount / 3;
+ Ogre::HardwareIndexBufferSharedPtr ibuf = index_data->indexBuffer;
+ bool use32bitindexes = (ibuf->getType() == Ogre::HardwareIndexBuffer::IT_32BIT );
+
+ Uint32 * pLong = static_cast< Uint32 * >( ibuf->lock( Ogre::HardwareBuffer::HBL_READ_ONLY ) );
+ Uint16 * pShort = reinterpret_cast< Uint16 * >( pLong );
+
+ for ( uint k = 0; k < numTris; k++ ) {
+ tris.push_back( Triangle() );
+ if ( use32bitindexes ) {
+ tris.back().a = pLong[ k * 3 ];
+ tris.back().b = pLong[ k * 3 + 1 ];
+ tris.back().c = pLong[ k * 3 + 2 ];
+ } else {
+ tris.back().a = pShort[ k * 3 ];
+ tris.back().b = pShort[ k * 3 + 1 ];
+ tris.back().c = pShort[ k * 3 + 2 ];
+ }
+ }
+ ibuf->unlock();
+}
+
std::string Station::meshName( ){
return strCopyToLowerCase( strReplaceBlankToUnderscore( name_ ) ) + ".mesh";
}
-
StationDockPad::StationDockPad( const std::string & name, Sector * sector, Ogre::SubEntity * dockPad, Ogre::SceneNode * dockPadNode)
: BaseObject( name, sector ), dockPadNode_( dockPadNode ){
dockPadManualObject_ = sceneMgr_->createManualObject( name_ + "/ManualObject" );
- //** collect vertex data;
- Ogre::VertexData * vd = dockPad->getSubMesh()->vertexData;
- const Ogre::VertexElement * posElem = vd->vertexDeclaration->findElementBySemantic( Ogre::VES_POSITION );
-
- Ogre::HardwareVertexBufferSharedPtr vbuf = vd->vertexBufferBinding->getBuffer( posElem->getSource() );
- unsigned char * vertex = static_cast< unsigned char * >( vbuf->lock( Ogre::HardwareBuffer::HBL_READ_ONLY ) );
-
+ std::vector < Ogre::Vector3 > verts;
+ std::vector < Triangle > tris;
+ readSubEntity( dockPad, verts, tris );
+
dockPadManualObject_->begin( dockPad->getMaterialName(), Ogre::RenderOperation::OT_TRIANGLE_LIST);
- float * pReal;
Ogre::Real xmin( 9e99 ), xmax( -9e99 ), ymin( 9e99 ), ymax( -9e99 ), zmin( 9e99 ), zmax( -9e99 );
dockPosition_ = Ogre::Vector3::ZERO;
- for( uint j = 0; j < vd->vertexCount; ++j, vertex += vbuf->getVertexSize() ){
- posElem->baseVertexPointerToElement( vertex, & pReal);
- dockPosition_ += Ogre::Vector3( pReal[ 0 ], pReal[ 1 ], pReal[ 2 ] );
+ for( uint i = 0; i < verts.size(); i++ ){
+ dockPosition_ += verts[ i ];
- xmin = min( xmin, pReal[ 0 ] ); xmax = max( xmax, pReal[ 0 ] );
- ymin = min( ymin, pReal[ 1 ] ); ymax = max( ymax, pReal[ 1 ] );
- zmin = min( zmin, pReal[ 2 ] ); zmax = max( zmax, pReal[ 2 ] );
+ xmin = min( xmin, verts[ i ][ 0 ] ); xmax = max( xmax, verts[ i ][ 0 ] );
+ ymin = min( ymin, verts[ i ][ 1 ] ); ymax = max( ymax, verts[ i ][ 1 ] );
+ zmin = min( zmin, verts[ i ][ 2 ] ); zmax = max( zmax, verts[ i ][ 2 ] );
- dockPadManualObject_->position( pReal[ 0 ], pReal[ 1 ], pReal[ 2 ] );
+ dockPadManualObject_->position( verts[ i ] ); //pReal[ 0 ], pReal[ 1 ], pReal[ 2 ] );
}
- vbuf->unlock();
- dockPosition_ /= vd->vertexCount;
+ dockPosition_ /= verts.size();
radius_ = max( xmax-xmin, ymax-ymin );
radius_ = max( radius_, zmax - zmin );
radius_ /= 2.0;
- Ogre::IndexData * index_data = dockPad->getSubMesh()->indexData;
- uint numTris = index_data->indexCount / 3;
- Ogre::HardwareIndexBufferSharedPtr ibuf = index_data->indexBuffer;
- bool use32bitindexes = (ibuf->getType() == Ogre::HardwareIndexBuffer::IT_32BIT );
+ dockDirection_ = Ogre::Vector3::ZERO;
+ for ( uint i = 0; i < tris.size(); i++ ) {
+ dockPadManualObject_->triangle( tris[ i ].a, tris[ i ].b, tris[ i ].c );
+ dockDirection_ += ( ( verts[ tris[ i ].b ] - verts[ tris[ i ].a ] )
+ .crossProduct( verts[ tris[ i ].c ] - verts[ tris[ i ].a ] ) ).normalisedCopy();
+ }
+
+ dockDirection_ /= tris.size();
- Uint32 * pLong = static_cast< Uint32 * >( ibuf->lock( Ogre::HardwareBuffer::HBL_READ_ONLY ) );
- Uint16 * pShort = reinterpret_cast< Uint16 * >( pLong );
-
- if ( use32bitindexes ) {
- for ( uint k = 0; k < numTris; k++ ) {
- dockPadManualObject_->triangle( pLong[ k*3 ], pLong[ k*3+1 ], pLong[ k*3+2 ] );
- }
- } else {
- for ( size_t k = 0; k < numTris; k++ ) {
- dockPadManualObject_->triangle( pShort[ k*3 ], pShort[ k*3+1 ], pShort[ k*3+2 ] );
- }
- }
- ibuf->unlock();
dockPadManualObject_->end();
dockPadMesh_ = dockPadManualObject_->convertToMesh( name_ + "/DockPadMesh" );
dockPadEntity_ = sceneMgr_->createEntity( name_ + "/DockPadEntity", dockPadMesh_->getName() );
dockPadNode_->attachObject( dockPadEntity_ );
- dockPadNode_->translate(-0.01, 0.0, 0.0);
+// dockPadNode_->translate(-0.01, 0.0, 0.0);
collObj_ = OpcodeCollisionDetection::getSingleton().createObject( dockPadEntity_, this, "DockPad" );
}
@@ -145,56 +168,23 @@
} else {
if ( entity()->getSubEntity( i )->getMaterialName() == "Station/LaunchPad" ){
- launchPadNode_= mainNodeEntityRot_->createChildSceneNode( name_ + "/LaunchPadNode" );
-
- Ogre::VertexData * vd = entity()->getSubEntity( i )->getSubMesh()->vertexData;
- const Ogre::VertexElement * posElem = vd->vertexDeclaration->findElementBySemantic( Ogre::VES_POSITION );
-
- Ogre::HardwareVertexBufferSharedPtr vbuf = vd->vertexBufferBinding->getBuffer( posElem->getSource() );
- unsigned char * vertex = static_cast< unsigned char * >( vbuf->lock( Ogre::HardwareBuffer::HBL_READ_ONLY ) );
-
- float * pReal;
-
std::vector < Ogre::Vector3 > verts;
- for( uint j = 0; j < vd->vertexCount; ++j, vertex += vbuf->getVertexSize() ){
- posElem->baseVertexPointerToElement( vertex, & pReal);
- verts.push_back( Ogre::Vector3( pReal[ 0 ], pReal[ 1 ], pReal[ 2 ] ) );
- }
- vbuf->unlock();
+ std::vector < Triangle > tris;
+ readSubEntity( entity()->getSubEntity( i ), verts, tris );
- Ogre::IndexData * index_data = entity()->getSubEntity( i )->getSubMesh()->indexData;
- uint numTris = index_data->indexCount / 3;
- Ogre::HardwareIndexBufferSharedPtr ibuf = index_data->indexBuffer;
- bool use32bitindexes = (ibuf->getType() == Ogre::HardwareIndexBuffer::IT_32BIT );
-
- Uint32 * pLong = static_cast< Uint32 * >( ibuf->lock( Ogre::HardwareBuffer::HBL_READ_ONLY ) );
- Uint16 * pShort = reinterpret_cast< Uint16 * >( pLong );
-
- numTris = 6;
- Ogre::Vector3 normVector( Ogre::Vector3::ZERO );
- if ( use32bitindexes ) {
- for ( uint k = 0; k < numTris; k++ ) {
- std::cout << pLong[ k*3 ] << " " << pLong[ k*3+1 ] << " " << pLong[ k*3+2 ] << std::endl;
- }
- } else {
- for ( size_t k = 0; k < numTris; k++ ) {
-// std::cout << pShort[ k*3 ] << " " << pShort[ k*3+1 ] << " " << pShort[ k*3+2 ] << std::endl;
-// std::cout << p1 << p2 << p3 << std::endl;
- Ogre::Vector3 p1( verts[ pShort[ k*3 ] ] );
- Ogre::Vector3 p2( verts[ pShort[ k * 3 + 1 ] ] );
- Ogre::Vector3 p3( verts[ pShort[ k * 3 + 2 ] ] );
- normVector+=( ( p2 - p1 ).crossProduct( p3 - p1 ) ).normalisedCopy();
- }
- }
- ibuf->unlock();
- normVector /= 6.0;
-
Ogre::Vector3 launchPadPosition( Ogre::Vector3::ZERO );
- std::cout << verts.size() << std::endl;
- for ( int j = 0; j < 18; j ++ ) launchPadPosition += verts[j];
+ for ( int j = 0; j < 18; j ++ ) launchPadPosition += verts[ j ];
launchPadPosition /= 18;
+
+ launchPadNode_= mainNodeEntityRot_->createChildSceneNode( name_ + "/LaunchPadNode" );
launchPadNode_->translate( launchPadPosition );
+ Ogre::Vector3 normVector( Ogre::Vector3::ZERO );
+ for ( int j = 0; j < 6; j ++ ){
+ normVector += ( ( verts[ tris[ j ].b ] - verts[ tris[ j ].a ] )
+ .crossProduct( verts[ tris[ j ].c ] - verts[ tris[ j ].a ] ) ).normalisedCopy();
+ }
+ normVector /= 6.0;
launchPadNode_->setDirection( normVector );
}
}
@@ -204,7 +194,7 @@
setBaseSize( station_->baseSize() );
if ( dockPad_ ){
- createRings( dockPad_->dockPosition(), dockPad_->radius() );
+ createRings( dockPad_->dockPosition(), dockPad_->radius(), dockPad_->dockDirection() );
ringNode_->setVisible( false );
}
}
Modified: branches/ogsector/src/Station.h
===================================================================
--- branches/ogsector/src/Station.h 2007-08-05 21:45:05 UTC (rev 652)
+++ branches/ogsector/src/Station.h 2007-08-06 19:12:55 UTC (rev 653)
@@ -29,6 +29,11 @@
namespace OpenGate{
+struct Triangle{
+ int a, b, c;
+};
+
+void readSubEntity( Ogre::SubEntity * entity, std::vector< Ogre::Vector3 > & verts, std::vector< Triangle > & tris );
//!
/*!*/
class Station : public Entity{
@@ -56,6 +61,8 @@
Ogre::Vector3 dockPosition( ) const { return dockPosition_; }
+ Ogre::Vector3 dockDirection( ) const { return dockDirection_; }
+
Ogre::Real radius() const { return radius_; }
protected:
@@ -65,6 +72,7 @@
Ogre::SceneNode * dockPadNode_;
Ogre::Vector3 dockPosition_;
+ Ogre::Vector3 dockDirection_;
Ogre::Real radius_;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-08-05 21:45:07
|
Revision: 652
http://opengate.svn.sourceforge.net/opengate/?rev=652&view=rev
Author: spom_spom
Date: 2007-08-05 14:45:05 -0700 (Sun, 05 Aug 2007)
Log Message:
-----------
Add the docking capability for stations.
Modified Paths:
--------------
branches/ogsector/src/BaseDialog.cpp
branches/ogsector/src/BaseDialog.h
branches/ogsector/src/ConfigDialog.cpp
branches/ogsector/src/Console.cpp
branches/ogsector/src/Console.h
branches/ogsector/src/DockedState.cpp
branches/ogsector/src/Entity.cpp
branches/ogsector/src/Entity.h
branches/ogsector/src/EntityManager.cpp
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/MarketDialog.cpp
branches/ogsector/src/OpcodeWrapper.cpp
branches/ogsector/src/OpcodeWrapper.h
branches/ogsector/src/Sector.cpp
branches/ogsector/src/Sector.h
branches/ogsector/src/SectorObjects.cpp
branches/ogsector/src/SectorObjects.h
branches/ogsector/src/ShipConfigDialog.cpp
branches/ogsector/src/UnDockedState.cpp
branches/ogsector/src/Vessel.cpp
branches/ogsector/src/Vessel.h
branches/ogsector/src/VesselManager.cpp
branches/ogsector/src/common.h
trunk/data/misc/testsector.xml
trunk/data/stations/tauseti_wake.mesh
trunk/data/stations/tauseti_wake.xml
trunk/data/stations/tauseti_wake_2.blend
Added Paths:
-----------
branches/ogsector/doc/
branches/ogsector/doc/Doxyfile
branches/ogsector/src/ResourceManager.cpp
branches/ogsector/src/ResourceManager.h
branches/ogsector/src/Station.cpp
branches/ogsector/src/Station.h
Removed Paths:
-------------
branches/ogsector/Doxyfile
branches/ogsector/src/DeviceManager.cpp
branches/ogsector/src/DeviceManager.h
Deleted: branches/ogsector/Doxyfile
===================================================================
--- branches/ogsector/Doxyfile 2007-08-02 23:02:18 UTC (rev 651)
+++ branches/ogsector/Doxyfile 2007-08-05 21:45:05 UTC (rev 652)
@@ -1,277 +0,0 @@
-# Doxyfile 1.5.2
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-DOXYFILE_ENCODING = UTF-8
-PROJECT_NAME = opengate
-PROJECT_NUMBER = 0.0.1
-OUTPUT_DIRECTORY = /home/cbrill/source/opengate/branches/ogsector/doc/
-CREATE_SUBDIRS = NO
-OUTPUT_LANGUAGE = English
-BRIEF_MEMBER_DESC = YES
-REPEAT_BRIEF = YES
-ABBREVIATE_BRIEF = "The $name class" \
- "The $name widget" \
- "The $name file" \
- is \
- provides \
- specifies \
- contains \
- represents \
- a \
- an \
- the
-ALWAYS_DETAILED_SEC = NO
-INLINE_INHERITED_MEMB = NO
-FULL_PATH_NAMES = YES
-STRIP_FROM_PATH = /home/cbrill/
-STRIP_FROM_INC_PATH =
-SHORT_NAMES = NO
-JAVADOC_AUTOBRIEF = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP = NO
-INHERIT_DOCS = YES
-SEPARATE_MEMBER_PAGES = NO
-TAB_SIZE = 8
-ALIASES =
-OPTIMIZE_OUTPUT_FOR_C = NO
-OPTIMIZE_OUTPUT_JAVA = NO
-BUILTIN_STL_SUPPORT = NO
-CPP_CLI_SUPPORT = NO
-DISTRIBUTE_GROUP_DOC = NO
-SUBGROUPING = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL = NO
-EXTRACT_PRIVATE = YES
-EXTRACT_STATIC = YES
-EXTRACT_LOCAL_CLASSES = YES
-EXTRACT_LOCAL_METHODS = NO
-HIDE_UNDOC_MEMBERS = YES
-HIDE_UNDOC_CLASSES = YES
-HIDE_FRIEND_COMPOUNDS = NO
-HIDE_IN_BODY_DOCS = NO
-INTERNAL_DOCS = NO
-CASE_SENSE_NAMES = YES
-HIDE_SCOPE_NAMES = NO
-SHOW_INCLUDE_FILES = YES
-INLINE_INFO = YES
-SORT_MEMBER_DOCS = YES
-SORT_BRIEF_DOCS = NO
-SORT_BY_SCOPE_NAME = NO
-GENERATE_TODOLIST = YES
-GENERATE_TESTLIST = YES
-GENERATE_BUGLIST = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS =
-MAX_INITIALIZER_LINES = 30
-SHOW_USED_FILES = YES
-SHOW_DIRECTORIES = NO
-FILE_VERSION_FILTER =
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET = NO
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_IF_DOC_ERROR = YES
-WARN_NO_PARAMDOC = NO
-WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE =
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT = /home/cbrill/source/opengate/branches/ogsector/src/
-INPUT_ENCODING = UTF-8
-FILE_PATTERNS = *.c \
- *.cc \
- *.cxx \
- *.cpp \
- *.c++ \
- *.d \
- *.java \
- *.ii \
- *.ixx \
- *.ipp \
- *.i++ \
- *.inl \
- *.h \
- *.hh \
- *.hxx \
- *.hpp \
- *.h++ \
- *.idl \
- *.odl \
- *.cs \
- *.php \
- *.php3 \
- *.inc \
- *.m \
- *.mm \
- *.dox \
- *.py \
- *.C \
- *.CC \
- *.C++ \
- *.II \
- *.I++ \
- *.H \
- *.HH \
- *.H++ \
- *.CS \
- *.PHP \
- *.PHP3 \
- *.M \
- *.MM \
- *.PY
-RECURSIVE = YES
-EXCLUDE =
-EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS =
-EXCLUDE_SYMBOLS =
-EXAMPLE_PATH =
-EXAMPLE_PATTERNS = *
-EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_PATTERNS =
-FILTER_SOURCE_FILES = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER = NO
-INLINE_SOURCES = NO
-STRIP_CODE_COMMENTS = YES
-REFERENCED_BY_RELATION = NO
-REFERENCES_RELATION = NO
-REFERENCES_LINK_SOURCE = YES
-USE_HTAGS = NO
-VERBATIM_HEADERS = NO
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = NO
-COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML = YES
-HTML_OUTPUT = html
-HTML_FILE_EXTENSION = .html
-HTML_HEADER =
-HTML_FOOTER =
-HTML_STYLESHEET =
-HTML_ALIGN_MEMBERS = YES
-GENERATE_HTMLHELP = NO
-CHM_FILE =
-HHC_LOCATION =
-GENERATE_CHI = NO
-BINARY_TOC = NO
-TOC_EXPAND = NO
-DISABLE_INDEX = NO
-ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = NO
-TREEVIEW_WIDTH = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX = NO
-LATEX_OUTPUT = latex
-LATEX_CMD_NAME = latex
-MAKEINDEX_CMD_NAME = makeindex
-COMPACT_LATEX = NO
-PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = NO
-USE_PDFLATEX = NO
-LATEX_BATCHMODE = NO
-LATEX_HIDE_INDICES = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF = NO
-RTF_OUTPUT = rtf
-COMPACT_RTF = NO
-RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN = NO
-MAN_OUTPUT = man
-MAN_EXTENSION = .3
-MAN_LINKS = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML = NO
-XML_OUTPUT = xml
-XML_SCHEMA =
-XML_DTD =
-XML_PROGRAMLISTING = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD = NO
-PERLMOD_LATEX = NO
-PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING = YES
-MACRO_EXPANSION = NO
-EXPAND_ONLY_PREDEF = NO
-SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED =
-EXPAND_AS_DEFINED =
-SKIP_FUNCTION_MACROS = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-TAGFILES =
-GENERATE_TAGFILE =
-ALLEXTERNALS = NO
-EXTERNAL_GROUPS = YES
-PERL_PATH = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS = NO
-MSCGEN_PATH =
-HIDE_UNDOC_RELATIONS = YES
-HAVE_DOT = NO
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = YES
-GROUP_GRAPHS = YES
-UML_LOOK = NO
-TEMPLATE_RELATIONS = NO
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
-CALL_GRAPH = NO
-CALLER_GRAPH = NO
-GRAPHICAL_HIERARCHY = YES
-DIRECTORY_GRAPH = YES
-DOT_IMAGE_FORMAT = png
-DOT_PATH =
-DOTFILE_DIRS =
-DOT_GRAPH_MAX_NODES = 50
-DOT_TRANSPARENT = NO
-DOT_MULTI_TARGETS = NO
-GENERATE_LEGEND = YES
-DOT_CLEANUP = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-SEARCHENGINE = NO
Added: branches/ogsector/doc/Doxyfile
===================================================================
--- branches/ogsector/doc/Doxyfile (rev 0)
+++ branches/ogsector/doc/Doxyfile 2007-08-05 21:45:05 UTC (rev 652)
@@ -0,0 +1,277 @@
+# Doxyfile 1.5.2
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+DOXYFILE_ENCODING = UTF-8
+PROJECT_NAME = opengate
+PROJECT_NUMBER = 0.0.1
+OUTPUT_DIRECTORY = ./
+CREATE_SUBDIRS = NO
+OUTPUT_LANGUAGE = English
+BRIEF_MEMBER_DESC = YES
+REPEAT_BRIEF = YES
+ABBREVIATE_BRIEF = "The $name class" \
+ "The $name widget" \
+ "The $name file" \
+ is \
+ provides \
+ specifies \
+ contains \
+ represents \
+ a \
+ an \
+ the
+ALWAYS_DETAILED_SEC = NO
+INLINE_INHERITED_MEMB = NO
+FULL_PATH_NAMES = YES
+STRIP_FROM_PATH =
+STRIP_FROM_INC_PATH =
+SHORT_NAMES = NO
+JAVADOC_AUTOBRIEF = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP = NO
+INHERIT_DOCS = YES
+SEPARATE_MEMBER_PAGES = NO
+TAB_SIZE = 8
+ALIASES =
+OPTIMIZE_OUTPUT_FOR_C = NO
+OPTIMIZE_OUTPUT_JAVA = NO
+BUILTIN_STL_SUPPORT = NO
+CPP_CLI_SUPPORT = NO
+DISTRIBUTE_GROUP_DOC = NO
+SUBGROUPING = YES
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL = YES
+EXTRACT_PRIVATE = YES
+EXTRACT_STATIC = YES
+EXTRACT_LOCAL_CLASSES = YES
+EXTRACT_LOCAL_METHODS = YES
+HIDE_UNDOC_MEMBERS = YES
+HIDE_UNDOC_CLASSES = YES
+HIDE_FRIEND_COMPOUNDS = NO
+HIDE_IN_BODY_DOCS = NO
+INTERNAL_DOCS = NO
+CASE_SENSE_NAMES = YES
+HIDE_SCOPE_NAMES = NO
+SHOW_INCLUDE_FILES = YES
+INLINE_INFO = YES
+SORT_MEMBER_DOCS = YES
+SORT_BRIEF_DOCS = NO
+SORT_BY_SCOPE_NAME = NO
+GENERATE_TODOLIST = YES
+GENERATE_TESTLIST = YES
+GENERATE_BUGLIST = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS =
+MAX_INITIALIZER_LINES = 30
+SHOW_USED_FILES = YES
+SHOW_DIRECTORIES = NO
+FILE_VERSION_FILTER =
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET = NO
+WARNINGS = YES
+WARN_IF_UNDOCUMENTED = YES
+WARN_IF_DOC_ERROR = YES
+WARN_NO_PARAMDOC = NO
+WARN_FORMAT = "$file:$line: $text"
+WARN_LOGFILE =
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT = ../src/
+INPUT_ENCODING = UTF-8
+FILE_PATTERNS = *.c \
+ *.cc \
+ *.cxx \
+ *.cpp \
+ *.c++ \
+ *.d \
+ *.java \
+ *.ii \
+ *.ixx \
+ *.ipp \
+ *.i++ \
+ *.inl \
+ *.h \
+ *.hh \
+ *.hxx \
+ *.hpp \
+ *.h++ \
+ *.idl \
+ *.odl \
+ *.cs \
+ *.php \
+ *.php3 \
+ *.inc \
+ *.m \
+ *.mm \
+ *.dox \
+ *.py \
+ *.C \
+ *.CC \
+ *.C++ \
+ *.II \
+ *.I++ \
+ *.H \
+ *.HH \
+ *.H++ \
+ *.CS \
+ *.PHP \
+ *.PHP3 \
+ *.M \
+ *.MM \
+ *.PY
+RECURSIVE = YES
+EXCLUDE =
+EXCLUDE_SYMLINKS = NO
+EXCLUDE_PATTERNS =
+EXCLUDE_SYMBOLS =
+EXAMPLE_PATH =
+EXAMPLE_PATTERNS = *
+EXAMPLE_RECURSIVE = NO
+IMAGE_PATH =
+INPUT_FILTER =
+FILTER_PATTERNS =
+FILTER_SOURCE_FILES = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER = NO
+INLINE_SOURCES = NO
+STRIP_CODE_COMMENTS = YES
+REFERENCED_BY_RELATION = NO
+REFERENCES_RELATION = NO
+REFERENCES_LINK_SOURCE = YES
+USE_HTAGS = NO
+VERBATIM_HEADERS = NO
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX = NO
+COLS_IN_ALPHA_INDEX = 5
+IGNORE_PREFIX =
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML = YES
+HTML_OUTPUT = html
+HTML_FILE_EXTENSION = .html
+HTML_HEADER =
+HTML_FOOTER =
+HTML_STYLESHEET =
+HTML_ALIGN_MEMBERS = YES
+GENERATE_HTMLHELP = NO
+CHM_FILE =
+HHC_LOCATION =
+GENERATE_CHI = NO
+BINARY_TOC = NO
+TOC_EXPAND = NO
+DISABLE_INDEX = NO
+ENUM_VALUES_PER_LINE = 4
+GENERATE_TREEVIEW = NO
+TREEVIEW_WIDTH = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX = NO
+LATEX_OUTPUT = latex
+LATEX_CMD_NAME = latex
+MAKEINDEX_CMD_NAME = makeindex
+COMPACT_LATEX = NO
+PAPER_TYPE = a4wide
+EXTRA_PACKAGES =
+LATEX_HEADER =
+PDF_HYPERLINKS = NO
+USE_PDFLATEX = NO
+LATEX_BATCHMODE = NO
+LATEX_HIDE_INDICES = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF = NO
+RTF_OUTPUT = rtf
+COMPACT_RTF = NO
+RTF_HYPERLINKS = NO
+RTF_STYLESHEET_FILE =
+RTF_EXTENSIONS_FILE =
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN = NO
+MAN_OUTPUT = man
+MAN_EXTENSION = .3
+MAN_LINKS = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML = NO
+XML_OUTPUT = xml
+XML_SCHEMA =
+XML_DTD =
+XML_PROGRAMLISTING = YES
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD = NO
+PERLMOD_LATEX = NO
+PERLMOD_PRETTY = YES
+PERLMOD_MAKEVAR_PREFIX =
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING = YES
+MACRO_EXPANSION = NO
+EXPAND_ONLY_PREDEF = NO
+SEARCH_INCLUDES = YES
+INCLUDE_PATH =
+INCLUDE_FILE_PATTERNS =
+PREDEFINED =
+EXPAND_AS_DEFINED =
+SKIP_FUNCTION_MACROS = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+TAGFILES =
+GENERATE_TAGFILE =
+ALLEXTERNALS = NO
+EXTERNAL_GROUPS = YES
+PERL_PATH = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS = YES
+MSCGEN_PATH =
+HIDE_UNDOC_RELATIONS = YES
+HAVE_DOT = YES
+CLASS_GRAPH = YES
+COLLABORATION_GRAPH = YES
+GROUP_GRAPHS = YES
+UML_LOOK = NO
+TEMPLATE_RELATIONS = NO
+INCLUDE_GRAPH = YES
+INCLUDED_BY_GRAPH = YES
+CALL_GRAPH = NO
+CALLER_GRAPH = NO
+GRAPHICAL_HIERARCHY = YES
+DIRECTORY_GRAPH = YES
+DOT_IMAGE_FORMAT = png
+DOT_PATH =
+DOTFILE_DIRS =
+DOT_GRAPH_MAX_NODES = 50
+DOT_TRANSPARENT = NO
+DOT_MULTI_TARGETS = NO
+GENERATE_LEGEND = YES
+DOT_CLEANUP = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine
+#---------------------------------------------------------------------------
+SEARCHENGINE = NO
Modified: branches/ogsector/src/BaseDialog.cpp
===================================================================
--- branches/ogsector/src/BaseDialog.cpp 2007-08-02 23:02:18 UTC (rev 651)
+++ branches/ogsector/src/BaseDialog.cpp 2007-08-05 21:45:05 UTC (rev 652)
@@ -19,7 +19,7 @@
***************************************************************************/
#include "BaseDialog.h"
-#include "DeviceManager.h"
+#include "ResourceManager.h"
#include <OgreRenderWindow.h>
@@ -40,24 +40,24 @@
float windowHeight( const CEGUI::Window * child ){
if ( child->getParent() ) return child->getHeight().asAbsolute( windowHeight( child->getParent() ) );
- return child->getHeight().asAbsolute( DeviceManager::getSingleton().renderWindow->getHeight() );
+ return child->getHeight().asAbsolute( ResourceManager::getSingleton().renderWindow->getHeight() );
}
float windowWidth( const CEGUI::Window * child ){
if ( child->getParent() ) return child->getWidth().asAbsolute( windowWidth( child->getParent() ) );
- return child->getWidth().asAbsolute( DeviceManager::getSingleton().renderWindow->getWidth() );
+ return child->getWidth().asAbsolute( ResourceManager::getSingleton().renderWindow->getWidth() );
}
BaseDialog::BaseDialog( const std::string & layout )
: rootWindow_( CEGUI::WindowManager::getSingleton().loadWindowLayout( layout ) ),
- devices_( DeviceManager::getSingletonPtr() ), visible_( false ) {
+ resources_( ResourceManager::getSingletonPtr() ), visible_( false ) {
hide();
}
BaseDialog::~BaseDialog(){
- if ( devices_->guiSystem ){
- if ( devices_->guiSystem->getGUISheet() ){
- devices_->guiSystem->getGUISheet()->removeChildWindow( rootWindow_ );
+ if ( resources_->guiSystem ){
+ if ( resources_->guiSystem->getGUISheet() ){
+ resources_->guiSystem->getGUISheet()->removeChildWindow( rootWindow_ );
}
}
CEGUI::WindowManager::getSingleton().destroyWindow( rootWindow_ );
Modified: branches/ogsector/src/BaseDialog.h
===================================================================
--- branches/ogsector/src/BaseDialog.h 2007-08-02 23:02:18 UTC (rev 651)
+++ branches/ogsector/src/BaseDialog.h 2007-08-05 21:45:05 UTC (rev 652)
@@ -70,7 +70,7 @@
protected:
CEGUI::Window * rootWindow_;
- DeviceManager * devices_;
+ ResourceManager * resources_;
bool visible_;
Modified: branches/ogsector/src/ConfigDialog.cpp
===================================================================
--- branches/ogsector/src/ConfigDialog.cpp 2007-08-02 23:02:18 UTC (rev 651)
+++ branches/ogsector/src/ConfigDialog.cpp 2007-08-05 21:45:05 UTC (rev 652)
@@ -55,12 +55,12 @@
}
bool ConfigDialog::handleQuitButton( const CEGUI::EventArgs & e ){
- devices_->gameStateRoot->shutdown();
+ resources_->gameStateRoot->shutdown();
return true;
}
void ConfigDialog::fillCreditsWindow( ){
- std::string fileName = devices_->findFullFileName( "credits.txt" );
+ std::string fileName = resources_->findFullFileName( "credits.txt" );
std::fstream file; file.open( fileName.c_str() );
Modified: branches/ogsector/src/Console.cpp
===================================================================
--- branches/ogsector/src/Console.cpp 2007-08-02 23:02:18 UTC (rev 651)
+++ branches/ogsector/src/Console.cpp 2007-08-05 21:45:05 UTC (rev 652)
@@ -19,7 +19,7 @@
***************************************************************************/
#include "common.h"
-#include "DeviceManager.h"
+#include "ResourceManager.h"
#include "Console.h"
#include "LogManager.h"
#include "networkClient.h"
@@ -32,7 +32,7 @@
Console::Console( )
: rootWindow_( CEGUI::WindowManager::getSingleton().loadWindowLayout( "opengateConsole.layout" ) ),
- devices_( DeviceManager::getSingletonPtr() ) {
+ resources_( ResourceManager::getSingletonPtr() ) {
consoleLineLength_ = 95;
@@ -60,9 +60,9 @@
}
void Console::start( ){
- if ( devices_->guiSystem ){
- if ( devices_->guiSystem->getGUISheet() ){
- devices_->guiSystem->getGUISheet()->addChildWindow( rootWindow_ );
+ if ( resources_->guiSystem ){
+ if ( resources_->guiSystem->getGUISheet() ){
+ resources_->guiSystem->getGUISheet()->addChildWindow( rootWindow_ );
}
}
@@ -71,9 +71,9 @@
}
void Console::stop( ){
- if ( devices_->guiSystem ){
- if ( devices_->guiSystem->getGUISheet() ){
- devices_->guiSystem->getGUISheet()->removeChildWindow( rootWindow_ );
+ if ( resources_->guiSystem ){
+ if ( resources_->guiSystem->getGUISheet() ){
+ resources_->guiSystem->getGUISheet()->removeChildWindow( rootWindow_ );
}
}
InputManager::getSingleton().removeKeyListener( "ConsoleKeyListener" );
@@ -106,10 +106,10 @@
it = commands_.find( commandline[ 0 ] );
if ( it != commands_.end() ){
- (devices_->gameStateRoot->*it->second)( commandline );
+ (resources_->gameStateRoot->*it->second)( commandline );
} else {
MessageBodyChat chat( std::string( text.c_str() ) );
- devices_->network->send( chat );
+ resources_->network->send( chat );
}
editBox_->setText("");
}
@@ -122,7 +122,7 @@
CEGUI::System::getSingleton().injectChar( e.text );
if ( e.key == OIS::KC_LCONTROL) {
- devices_->setGlobalKeyModifier( KEY_LCONTROL );
+ resources_->setGlobalKeyModifier( KEY_LCONTROL );
}
return true;
}
@@ -130,7 +130,7 @@
bool Console::keyReleased( const OIS::KeyEvent & e ){
CEGUI::System::getSingleton().injectKeyUp( e.key );
if ( e.key == OIS::KC_LCONTROL) {
- devices_->setGlobalKeyModifier( KEY_NONE );
+ resources_->setGlobalKeyModifier( KEY_NONE );
}
return true;
}
Modified: branches/ogsector/src/Console.h
===================================================================
--- branches/ogsector/src/Console.h 2007-08-02 23:02:18 UTC (rev 651)
+++ branches/ogsector/src/Console.h 2007-08-05 21:45:05 UTC (rev 652)
@@ -68,7 +68,7 @@
CEGUI::Window * rootWindow_;
- DeviceManager * devices_;
+ ResourceManager * resources_;
CEGUI::Editbox * editBox_;
CEGUI::Listbox * listBox_;
Deleted: branches/ogsector/src/DeviceManager.cpp
===================================================================
--- branches/ogsector/src/DeviceManager.cpp 2007-08-02 23:02:18 UTC (rev 651)
+++ branches/ogsector/src/DeviceManager.cpp 2007-08-05 21:45:05 UTC (rev 652)
@@ -1,135 +0,0 @@
-/***************************************************************************
- * 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 "tinyxml/tinyxml.h"
-#include "DeviceManager.h"
-#include "LogManager.h"
-#include <OgreArchiveManager.h>
-#include <OgreFileSystem.h>
-
-namespace OpenGate{
-
-template<> DeviceManager * Ogre::Singleton< DeviceManager >::ms_Singleton = 0;
-
-DeviceManager::DeviceManager( ) : modifier_( KEY_NONE ){
- log_ = LogManager::getSingletonPtr();
-
- ogreRoot = NULL;
- renderWindow = NULL;
- inputManager = NULL;
- guiRenderer = NULL;
- guiSystem = NULL;
- console = NULL;
- network = NULL;
- gameStateRoot = NULL;
- avatar = NULL;
- languageSuffix_ = "en";
-
- mapping_ = true;
-}
-
-DeviceManager::~DeviceManager( ) {
-}
-
-std::string DeviceManager::factionName( int id ) {
- if ( factionIDs_.count( id ) ){
- return factionIDs_[ id ];
- }
- return "unknown";
-}
-
-void DeviceManager::loadGlobalIDs( const std::string & fileName ){
-
-// Ogre::FileSystemArchive * pArch = new Ogre::FileSystemArchive( (*resourcePaths_.begin()), "FileSystem" );
-// Ogre::StringVectorPtr file = pArch->find( fileName, true, false);
-
-// std::string fileFullName( fileName );
-// if ( (*file).size() > 0 ){
-// fileFullName = (*resourcePaths_.begin() ) + "/" + (*file)[ 0 ] ;
-// }
-
-// for ( unsigned int i = 0; i < (*file).size(); i ++ ){
-// log_->info( std::string( "Found ressource: " ) + (*resourcePaths_.begin() ) + "/" + (*file)[ i ] );
-// }
-// delete pArch;
-
- TiXmlDocument doc( findFullFileName( fileName ) );
- bool loadOkay = doc.LoadFile();
-
- if ( !loadOkay ) {
- log_->fatal( std::string( "Failed to load id file: " + fileName ) );
- return;
- }
-
- TiXmlHandle docHandle( &doc );
- TiXmlElement *pElem, *pElemId, *pElemName;
- TiXmlHandle hRoot( 0 );
-
- pElem = docHandle.FirstChildElement().Element();
- hRoot = TiXmlHandle( pElem );
-
- if ( !pElem ) {
- log_->fatal( fileName + " cannot read first node." );
- return;
- }
-
- if ( strcmp( "container", pElem->Value() ) != 0 ) {
- log_->fatal( fileName + " is no container description" );
- return;
- }
-
- for ( pElem = hRoot.FirstChild( "faction" ).Element(); pElem != 0; pElem = pElem->NextSiblingElement("faction") ) {
- pElemId = pElem->FirstChildElement( "faction_id" );
- pElemName = pElem->FirstChildElement( "name_en" );
- if ( pElemId && pElemName ) {
- factionIDs_[ toInt( pElemId->FirstChild()->Value() ) ] = pElemName->FirstChild()->Value();
- }
- }
-}
-
-std::string DeviceManager::findFullFileName( const std::string & fileName ){
-
- Ogre::FileSystemArchive pArch = Ogre::FileSystemArchive( (*resourcePaths_.begin()), "FileSystem" );
- Ogre::StringVectorPtr file = pArch.find( fileName, true, false);
-
- if ( (*file).size() > 0 ){
- return (*resourcePaths_.begin() ) + "/" + (*file)[ 0 ] ;
- }
-
-// for ( unsigned int i = 0; i < (*file).size(); i ++ ){
-// log_->info( std::string( "Found ressource: " ) + (*resourcePaths_.begin() ) + "/" + (*file)[ i ] );
-// }
- return "unknown";
-}
-
-
-DeviceManager & DeviceManager::getSingleton( ){
- assert( ms_Singleton );
- return ( *ms_Singleton );
-}
-
-DeviceManager * DeviceManager::getSingletonPtr( ){
- if ( ms_Singleton == NULL ){
- std::cerr << "DeviceManager not initialized." << std::endl;
- }
- return ms_Singleton;
-}
-
-} //namespace OpenGate
Deleted: branches/ogsector/src/DeviceManager.h
===================================================================
--- branches/ogsector/src/DeviceManager.h 2007-08-02 23:02:18 UTC (rev 651)
+++ branches/ogsector/src/DeviceManager.h 2007-08-05 21:45:05 UTC (rev 652)
@@ -1,125 +0,0 @@
-/***************************************************************************
- * 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_DEVICEMANAGER__H
-#define _OPENGATE_DEVICEMANAGER__H
-
-#include <OgreSingleton.h>
-
-namespace CEGUI {
- class OgreCEGUIRenderer;
- class System;
-}
-
-namespace OpenGate{
-
-enum EntityType{NONE,ENTITY,VESSEL,COMMODITY,POWERPLANT,ENGINE,RADAR,ECM,CAPACITOR,SHIELD,GUN,MISSILE,MODX};
-enum GunType{UNKNOWN,LASER,MININGLASER,BULLET};
-
-/*!
- * \brief This is a storage to handle current status of several things
- *
- * \todo Describe what it is used for, I don't really get it.
- * The class holds all global information about games devices and ids
- * \author Carsten <spo...@us...>
- */
-
-class NetworkClient;
-class InputManager;
-class LogManager;
-class GameState;
-class GameStateManager;
-class Avatar;
-class Console;
-
-enum GlobalKeyModifier{KEY_NONE, KEY_LCONTROL};
-
-class DeviceManager : public Ogre::Singleton< DeviceManager > {
-public:
- DeviceManager( );
-
- ~DeviceManager( );
-
- /*! This method returns the single instance of the LogManager */
- static DeviceManager & getSingleton( void );
-
- /*! This method return a pointer to the single instance of the LogManager */
- static DeviceManager * getSingletonPtr( void );
-
- void setGlobalKeyModifier( GlobalKeyModifier modifier ){ modifier_ = modifier; }
- GlobalKeyModifier globalKeyModifier( ) const { return modifier_; }
-
- std::string languageSuffix() const { return languageSuffix_; }
- std::string className( int id ) const { return "unknown"; }
-
- void loadGlobalIDs( const std::string & fileName );
-
- std::string factionName( int id );
-
- std::string categoryName( EntityType rtti ) const {
- switch( rtti ){
- case COMMODITY: return "Commodity";
- case POWERPLANT: return "Powerplant";
- case CAPACITOR: return "Capacitor";
- case ENGINE: return "Engine";
- case SHIELD: return "Shield";
- case RADAR: return "Radar";
- case ECM: return "ECM";
- case GUN: return "GUN";
- case MISSILE: return "MISSILE";
- case MODX: return "MODx";
- default: return "unknown";
- }
- return "unknown";
- }
-
- Ogre::Root * ogreRoot;
- Ogre::RenderWindow * renderWindow;
- CEGUI::OgreCEGUIRenderer * guiRenderer;
- CEGUI::System * guiSystem;
- InputManager * inputManager;
- NetworkClient * network;
- Console * console;
- GameStateManager * gameStateRoot;
- Avatar * avatar;
-
- /*! Find file in resources and returns full name */
- std::string findFullFileName( const std::string & fileName );
-
- std::set < std::string > & resourcePaths() { return resourcePaths_; }
-
- void setMappingCapability( bool mapping ) { mapping_ = mapping; }
- bool mappingCapability() const { return mapping_; }
-
-protected:
- LogManager * log_;
-
- GlobalKeyModifier modifier_;
- std::string languageSuffix_;
-
- std::map< int, std::string > factionIDs_;
- std::set < std::string > resourcePaths_;
-
- bool mapping_;
-};
-
-} //namespace OpenGate
-
-#endif // _OPENGATE_DEVICEMANAGER__H
Modified: branches/ogsector/src/DockedState.cpp
===================================================================
--- branches/ogsector/src/DockedState.cpp 2007-08-02 23:02:18 UTC (rev 651)
+++ branches/ogsector/src/DockedState.cpp 2007-08-05 21:45:05 UTC (rev 652)
@@ -39,17 +39,17 @@
}
void DockedState::createContent(){
- sceneMgr_ = devices_->ogreRoot->createSceneManager( Ogre::ST_GENERIC, "DockedSceneManagerInstance" );
+ sceneMgr_ = resources_->ogreRoot->createSceneManager( Ogre::ST_GENERIC, "DockedSceneManagerInstance" );
Ogre::Camera * camera = sceneMgr_->createCamera( "StationCamera" );
camera->setPosition( Ogre::Vector3( 0, 0, 10 ) );
camera->lookAt( Ogre::Vector3( 0, 0, 0 ) );
camera->setNearClipDistance( 1 );
-// Ogre::Viewport * vp = devices_->renderWindow->addViewport( sceneMgr_->getCamera( "StationCamera" ), 0, 0.0, 0.0, 1.0f, 1.0f );
+// Ogre::Viewport * vp = resources_->renderWindow->addViewport( sceneMgr_->getCamera( "StationCamera" ), 0, 0.0, 0.0, 1.0f, 1.0f );
// vp->setBackgroundColour( Ogre::ColourValue( 0, 0, 0) );
-// camera->setAspectRatio( (Ogre::Real)devices_->renderWindow->getViewport( 0 )->getActualWidth() /
-// (Ogre::Real)devices_->renderWindow->getViewport( 0 )->getActualHeight() );
+// camera->setAspectRatio( (Ogre::Real)resources_->renderWindow->getViewport( 0 )->getActualWidth() /
+// (Ogre::Real)resources_->renderWindow->getViewport( 0 )->getActualHeight() );
overlayRootWindow_ = CEGUI::WindowManager::getSingleton().loadWindowLayout((CEGUI::utf8*)"opengateDocked.layout");
@@ -88,24 +88,24 @@
sceneMgr_->destroyManualObject( "BackgroundObject" );
sceneMgr_->getRootSceneNode()->removeAndDestroyChild( "Background" );
CEGUI::WindowManager::getSingleton().destroyWindow( overlayRootWindow_ );
- devices_->ogreRoot->destroySceneManager( sceneMgr_ );
+ resources_->ogreRoot->destroySceneManager( sceneMgr_ );
}
void DockedState::enter( ) {
launchUndockedState_ = false;
log_->info("Entering dockstate");
- devices_->guiRenderer->setTargetSceneManager( sceneMgr_ );
- devices_->guiSystem->setGUISheet( overlayRootWindow_ );
+ resources_->guiRenderer->setTargetSceneManager( sceneMgr_ );
+ resources_->guiSystem->setGUISheet( overlayRootWindow_ );
overlayRootWindow_->show();
- devices_->console->start();
+ resources_->console->start();
- devices_->inputManager->addKeyListener( this, "DockedStateKeyListener" );
- devices_->inputManager->addMouseListener( this, "DockedStateMouseListener" );
+ resources_->inputManager->addKeyListener( this, "DockedStateKeyListener" );
+ resources_->inputManager->addMouseListener( this, "DockedStateMouseListener" );
- devices_->guiSystem->setDefaultMouseCursor( (CEGUI::utf8*)"opengate", (CEGUI::utf8*)"MouseArrow" );
+ resources_->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 );
+ Ogre::Viewport * vp = resources_->renderWindow->addViewport( sceneMgr_->getCamera( "StationCamera" ), 0, 0.0, 0.0, 1.0f, 1.0f );
vp->setBackgroundColour( Ogre::ColourValue( 0, 0, 0) );
minimiseConsole( );
@@ -119,11 +119,11 @@
log_->info("Exiting dockstate");
overlayRootWindow_->hide();
- devices_->console->stop();
+ resources_->console->stop();
- devices_->renderWindow->removeAllViewports();
- devices_->inputManager->removeKeyListener( "DockedStateKeyListener" );
- devices_->inputManager->removeMouseListener( "DockedStateMouseListener" );
+ resources_->renderWindow->removeAllViewports();
+ resources_->inputManager->removeKeyListener( "DockedStateKeyListener" );
+ resources_->inputManager->removeMouseListener( "DockedStateMouseListener" );
}
bool DockedState::frameStarted( const Ogre::FrameEvent & evt ){
@@ -199,15 +199,15 @@
CEGUI::PushButton::EventClicked, DockedState::handleMinimiseConsole );
wmgr.getWindow( (CEGUI::utf8*)"Docked/MainWindow/ConsoleBackground" )->subscribeEvent(
- CEGUI::Window::EventSized, CEGUI::Event::Subscriber(&Console::handleResize, devices_->console ) ) ;
+ CEGUI::Window::EventSized, CEGUI::Event::Subscriber(&Console::handleResize, resources_->console ) ) ;
}
bool DockedState::handleLaunch( const CEGUI::EventArgs & e ){
- if ( !devices_->avatar->vessel()->powerPlant() ) {
+ if ( !resources_->avatar->vessel()->powerPlant() ) {
log_->warn( "You have to equip a power plant first." );
return true;
}
- if ( !devices_->avatar->vessel()->engine() ) {
+ if ( !resources_->avatar->vessel()->engine() ) {
log_->warn( "You have to equip an engine first." );
return true;
}
@@ -228,7 +228,7 @@
}
bool DockedState::switchConfigDialog( ){
- devices_->gameStateRoot->switchConfigDialog( );
+ resources_->gameStateRoot->switchConfigDialog( );
return true;
}
Modified: branches/ogsector/src/Entity.cpp
===================================================================
--- branches/ogsector/src/Entity.cpp 2007-08-02 23:02:18 UTC (rev 651)
+++ branches/ogsector/src/Entity.cpp 2007-08-05 21:45:05 UTC (rev 652)
@@ -26,7 +26,7 @@
#include <CEGUIExceptions.h>
#include <CEGUIBase.h>
-#include "DeviceManager.h"
+#include "ResourceManager.h"
namespace OpenGate{
@@ -39,15 +39,31 @@
size_ = 1;
rtti_ = ENTITY;
factionID_ = 1;
+ baseSize_ = Ogre::Vector3::ZERO;
+ baseYaw_ = 0;
+ basePitch_ = 0;
+ baseRoll_ = 0;
+
imageInitialised_ = false;
- setFactionName_( DeviceManager::getSingleton().factionName( factionID_ ) );
+ setFactionName_( ResourceManager::getSingleton().factionName( factionID_ ) );
}
void Entity::setFactionID( int id ){
factionID_ = id;
- setFactionName_( DeviceManager::getSingleton().factionName( factionID_ ) );
+ setFactionName_( ResourceManager::getSingleton().factionName( factionID_ ) );
}
+void Entity::setBaseSize( float length, float width, float height ){
+ baseSize_[ 0 ] = length;
+ baseSize_[ 1 ] = width;
+ baseSize_[ 2 ] = height;
+}
+
+ /*! If size is a scalar value, the length of the entity. */
+void Entity::setBaseSize( float size ){ baseSize_[ 2 ] = size; }
+
+Ogre::Vector3 Entity::baseSize( ) const { return baseSize_; }
+
void Entity::loadImages_( ) {
imageInitialised_ = true;
bool haveSmall = true;
@@ -74,7 +90,7 @@
CEGUI::Texture * texture = NULL;
try {
- texture = dynamic_cast< CEGUI::OgreCEGUIRenderer * >( DeviceManager::getSingleton().guiRenderer )->createTexture( imageName, "General");
+ texture = dynamic_cast< CEGUI::OgreCEGUIRenderer * >( ResourceManager::getSingleton().guiRenderer )->createTexture( imageName, "General");
} catch( CEGUI::Exception & e ){
if ( verbose ) LogManager::getSingleton().warn( e.getMessage().c_str() );
fail = true;
Modified: branches/ogsector/src/Entity.h
===================================================================
--- branches/ogsector/src/Entity.h 2007-08-02 23:02:18 UTC (rev 651)
+++ branches/ogsector/src/Entity.h 2007-08-05 21:45:05 UTC (rev 652)
@@ -21,13 +21,14 @@
#ifndef _OPENGATE_ENTITY_H
#define _OPENGATE_ENTITY_H
-
#include <set>
#include <string>
#include "LogManager.h"
-#include "DeviceManager.h"
+#include "ResourceManager.h"
+#include <OgreVector3.h>
+
namespace OpenGate{
class Commodity;
@@ -65,6 +66,22 @@
inline void setID( int id ){ id_ = id; }
inline int id( ) const { return id_; }
+ void setBaseSize( float length, float width, float height );
+
+ /*! If size is a scalar value, the length of the entity. */
+ void setBaseSize( float size );
+
+ Ogre::Vector3 baseSize( ) const;
+
+ inline void setBaseYaw( Ogre::Real baseYaw ){ baseYaw_ = baseYaw; }
+ inline Ogre::Real baseYaw( ) const { return baseYaw_; }
+
+ inline void setBasePitch( Ogre::Real basePitch ){ basePitch_ = basePitch; }
+ inline Ogre::Real basePitch( ) const { return basePitch_; }
+
+ inline void setBaseRoll( Ogre::Real baseRoll ){ baseRoll_ = baseRoll; }
+ inline Ogre::Real baseRoll( ) const { return baseRoll_; }
+
inline void setTechLevel( int level ){ techLevel_ = level; }
inline int techLevel( ) const { return techLevel_; }
@@ -104,6 +121,12 @@
std::string factionName_;
int factionID_;
+ //** geometric parameters
+ Ogre::Vector3 baseSize_;
+ Ogre::Real baseYaw_;
+ Ogre::Real basePitch_;
+ Ogre::Real baseRoll_;
+
std::string imageFileName_;
std::string ceguiSmallImageName_;
std::string ceguiImageName_;
@@ -149,12 +172,12 @@
inline void setEfficiency( double efficiency ) { efficiency_ = efficiency; }
inline double efficiency( ) const { return efficiency_; }
- inline void setPowerConsumption( Uint32 powerConsumption ) {
+ virtual void setPowerConsumption( Uint32 powerConsumption ) {
powerConsumption_ = powerConsumption;
//** if input power is < 1000, then input is scaled in kW
if ( powerConsumption_ < 1e3 ) powerConsumption_ *= 1000;
}
- virtual inline Uint32 powerConsumption( ) { return powerConsumption_; }
+ virtual Uint32 powerConsumption( ) const { return powerConsumption_; }
protected:
Equipment() : Entity(), manufacturer_( "unkown" ) {
@@ -223,7 +246,7 @@
}
inline Uint32 maxThrust( ) { return maxThrust_; }
- virtual Uint32 powerConsumption( ) const { return (Uint32)rint(( (float)maxThrust_ / efficiency_ )); }
+ virtual Uint32 powerConsumption( ) const { return (Uint32)rint( (float)maxThrust_ / efficiency_ ); }
private:
/*! Stores the maximum thrust of this engine */
Modified: branches/ogsector/src/EntityManager.cpp
===================================================================
--- branches/ogsector/src/EntityManager.cpp 2007-08-02 23:02:18 UTC (rev 651)
+++ branches/ogsector/src/EntityManager.cpp 2007-08-05 21:45:05 UTC (rev 652)
@@ -19,7 +19,7 @@
***************************************************************************/
#include "EntityManager.h"
-#include "DeviceManager.h"
+#include "ResourceManager.h"
#include "tinyxml/tinyxml.h"
#include <OgreArchive.h>
#include <OgreArchiveManager.h>
@@ -212,7 +212,7 @@
}
//** Mandatory elements;
- pElem = hRoot.ChildElement( "name_" + DeviceManager::getSingleton().languageSuffix(), 0 ).Element();
+ pElem = hRoot.ChildElement( "name_" + ResourceManager::getSingleton().languageSuffix(), 0 ).Element();
if ( !pElem ){ //** fallback to english
pElem = hRoot.ChildElement( "name_en", 0 ).Element();
}
@@ -246,7 +246,7 @@
//** Generic elements
pElem = hRoot.ChildElement( "class_id", 0 ).Element();
- if ( pElem ) entity->setClassName( DeviceManager::getSingleton().className( toInt( pElem->FirstChild()->Value() ) ) );
+ if ( pElem ) entity->setClassName( ResourceManager::getSingleton().className( toInt( pElem->FirstChild()->Value() ) ) );
pElem = hRoot.ChildElement( "techlevel", 0 ).Element();
if ( pElem ) entity->setTechLevel( toInt( pElem->FirstChild()->Value() ) );
@@ -271,7 +271,7 @@
pElem = hRoot.ChildElement( "power_input", 0 ).Element();
if ( pElem ) powerConsumption = toInt( pElem->FirstChild()->Value() );
- pElem = hRoot.ChildElement( "description_" + DeviceManager::getSingleton().languageSuffix(), 0 ).Element();
+ pElem = hRoot.ChildElement( "description_" + ResourceManager::getSingleton().languageSuffix(), 0 ).Element();
if ( !pElem ){ //** fallback to english
pElem = hRoot.ChildElement( "description_en", 0 ).Element();
}
@@ -465,7 +465,7 @@
return NULL;
}
- pElem = hRoot.ChildElement( "name_" + DeviceManager::getSingleton().languageSuffix(), 0 ).Element();
+ pElem = hRoot.ChildElement( "name_" + ResourceManager::getSingleton().languageSuffix(), 0 ).Element();
if ( !pElem ){
//** Fallback to english
pElem = hRoot.ChildElement( "name_en", 0 ).Element();
@@ -492,7 +492,7 @@
//** Generic data
pElem = hRoot.ChildElement( "class_id", 0 ).Element();
- if ( pElem ) entity->setClassName( DeviceManager::getSingleton().className( toInt( pElem->FirstChild()->Value() ) ) );
+ if ( pElem ) entity->setClassName( ResourceManager::getSingleton().className( toInt( pElem->FirstChild()->Value() ) ) );
pElem = hRoot.ChildElement( "techlevel", 0 ).Element();
if ( pElem ) entity->setTechLevel( toInt( pElem->FirstChild()->Value() ) );
@@ -507,7 +507,7 @@
if ( pElem ) entity->setFactionID( toInt( pElem->FirstChild()->Value() ) );
//** Additional Data
- pElem = hRoot.ChildElement( "description_" + DeviceManager::getSingleton().languageSuffix(), 0 ).Element();
+ pElem = hRoot.ChildElement( "description_" + ResourceManager::getSingleton().languageSuffix(), 0 ).Element();
if ( pElem ) entity->setDescription( pElem->FirstChild()->Value() );
//** Specific Data
Modified: branches/ogsector/src/GameState.h
===================================================================
--- branches/ogsector/src/GameState.h 2007-08-02 23:02:18 UTC (rev 651)
+++ branches/ogsector/src/GameState.h 2007-08-05 21:45:05 UTC (rev 652)
@@ -37,7 +37,7 @@
#include <OgreFrameListener.h>
#include <string>
-#include "DeviceManager.h"
+#include "ResourceManager.h"
#include "InputManager.h"
namespace OpenGate{
@@ -99,7 +99,7 @@
void destroy( void ){ destroyContent(); delete this; }
/*! Initialize the game state with device information. */
- void init( ) { devices_ = DeviceManager::getSingletonPtr(); createContent(); }
+ void init( ) { resources_ = ResourceManager::getSingletonPtr(); createContent(); }
/*! Returns the gamestate name */
std::string name() const { return name_; }
@@ -180,13 +180,12 @@
/*! Stores the GameStateManager which is managing this state. */
GameStateListener * parent_;
- std::string name_;
+ ResourceManager * resources_;
- /** Keeps a method of device interaction. */
- DeviceManager * devices_;
-
LogManager * log_;
+ std::string name_;
+
CEGUI::Window * overlayRootWindow_;
};
Modified: branches/ogsector/src/GameStateManager.cpp
===================================================================
--- branches/ogsector/src/GameStateManager.cpp 2007-08-02 23:02:18 UTC (rev 651)
+++ branches/ogsector/src/GameStateManager.cpp 2007-08-05 21:45:05 UTC (rev 652)
@@ -45,7 +45,7 @@
class NetworkClient;
GameStateManager::GameStateManager( NetworkClient & nw, bool dialog ) {
- devices_.network = & nw;
+ resources_.network = & nw;
log_ = NULL;
vesselManager_ = NULL;
configDialog_ = NULL;
@@ -53,7 +53,7 @@
//** without any gamestate, shutdown immediately;
shutdownRequest_ = true;
- initialiseDevices_( dialog );
+ initialiseResources( dialog );
shutdownRequest_ = false;
//** start for test purposes;
@@ -69,9 +69,7 @@
// Ogre::SceneManager* sceneMgr = devices_.ogreRoot->createSceneManager(Ogre::ST_GENERIC);
// Ogre::Camera* camera = sceneMgr->createCamera("SimpleCamera");
-// Ogre::Viewport* viewPort = devices_.renderWindow->addViewport(camera);
-// Ogre::FrameListener frameListener;
-// devices_.ogreRoot->addFrameListener(&frameListener);
+// resources_.ogreRoot->addFrameListener(&frameListener);
// camera->setPosition( Ogre::Vector3( 0, 0, 200 ) );
// camera->lookAt( Ogre::Vector3( 0, 0, -300 ) );
// camera->setNearClipDistance( 1 );
@@ -102,7 +100,7 @@
// mainNode->attachObject( shape );
// devices_.ogreRoot->startRendering();
// while( 1 ){
-// devices_.ogreRoot->renderOneFrame( );
+// resources_.ogreRoot->renderOneFrame( );
// }
//** end just for test purposes
@@ -110,8 +108,8 @@
}
GameStateManager::~GameStateManager( ){
-// delete devices_->guiSystem;
-// delete devices_->guiRenderer;
+// delete resources_->guiSystem;
+// delete resources_->guiRenderer;
while ( !stateStack_.empty() ){
cleanup_( stateStack_.back() );
@@ -123,10 +121,10 @@
states_.pop_back();
}
- if ( devices_.console ){
+ if ( resources_.console ){
log_->info( "Shutdown console." );
- delete devices_.console;
- devices_.console = NULL;
+ delete resources_.console;
+ resources_.console = NULL;
}
if ( commodityManager_ ){
log_->info( "Shutdown commoditymanager." );
@@ -143,17 +141,17 @@
delete vesselManager_;
vesselManager_ = NULL;
}
- if ( devices_.inputManager ) {
+ if ( resources_.inputManager ) {
log_->info( "Shutdown inputmanager." );
- delete devices_.inputManager;
- devices_.inputManager = NULL;
+ delete resources_.inputManager;
+ resources_.inputManager = NULL;
}
log_->info( "Shutdown renderWindow." );
- if ( devices_.renderWindow ) delete devices_.renderWindow;
+ if ( resources_.renderWindow ) delete resources_.renderWindow;
log_->info( "Shutdown ogreRoot." );
//** segfault caused by destroying ShipConfigDialog::ceguiTex_
- // if ( devices_.ogreRoot ) delete devices_.ogreRoot;
+ // if ( resources_.ogreRoot ) delete resources_.ogreRoot;
}
void GameStateManager::switchConfigDialog( ){
@@ -182,7 +180,7 @@
}
while ( !shutdownRequest_ ){
- devices_.inputManager->capture();
+ resources_.inputManager->capture();
if ( enterDockedStateHack_ ) start( findByName( "DockedState" ) );
@@ -203,7 +201,7 @@
}
}
#endif
- devices_.ogreRoot->renderOneFrame( );
+ resources_.ogreRoot->renderOneFrame( );
}
}
@@ -211,7 +209,7 @@
//** start capture network;
std::vector < std::vector < char > > msgs;
std::vector < MessageBodyShipMovement * > movements;
- devices_.network->pull( msgs );
+ resources_.network->pull( msgs );
Sector * sector = NULL;
if ( stateStack_.back()->name() == "UnDockedState" ){
@@ -230,9 +228,9 @@
switch ( msgs[ i ][ 0 ] ){
case PROTO_CHAT:{
- devices_.network->ping();
+ resources_.network->ping();
MessageBodyChat msg( &msgs[ i ][ 0 ] );
- log_->chat( devices_.network->userName( msg.senderID() ), msg.message() );
+ log_->chat( resources_.network->userName( msg.senderID() ), msg.message() );
} break;
case PROTO_SHIP_REGISTER:
if ( sector ) sector->receiveVesselRegister( &msgs[ i ][ 0 ] ); break;
@@ -329,71 +327,73 @@
}
void GameStateManager::init_( GameState * state ) {
- devices_.ogreRoot->addFrameListener( state );
+ resources_.ogreRoot->addFrameListener( state );
}
void GameStateManager::cleanup_( GameState * state ){
- devices_.ogreRoot->removeFrameListener( state );
+ resources_.ogreRoot->removeFrameListener( state );
}
-bool GameStateManager::initialiseDevices_( bool dialog ){
+bool GameStateManager::initialiseResources( bool dialog ){
log_ = LogManager::getSingletonPtr();
- devices_.ogreRoot = new Ogre::Root;
+ resources_.ogreRoot = new Ogre::Root;
if ( !initialiseOgreEngine_( dialog ) ) return false;
if ( !initialiseOgreResources_() ) return false;
- const Ogre::RenderSystemCapabilities * caps = DeviceManager::getSingleton().ogreRoot->getRenderSystem()->getCapabilities();
+ const Ogre::RenderSystemCapabilities * caps = ResourceManager::getSingleton().ogreRoot->getRenderSystem()->getCapabilities();
if ( !caps->hasCapability( Ogre::RSC_VERTEX_PROGRAM ) ) {
log_->warn("Your card does not support vertex programs.");
- DeviceManager::getSingleton().setMappingCapability( false );
+ ResourceManager::getSingleton().setMappingCapability( false );
}
if ( !( caps->hasCapability( Ogre::RSC_FRAGMENT_PROGRAM ) || caps->hasCapability( Ogre::RSC_DOT3 ) ) ) {
log_->warn("Your card does not support dot3 blending or fragment programs." );
- DeviceManager::getSingleton().setMappingCapability( false );
+ ResourceManager::getSingleton().setMappingCapability( false );
}
if ( !initialiseCEGUIEngine_( ) ) return false;
if ( !initialiseInputManager_() ) return false;
- devices_.console = new Console( );
- devices_.ogreRoot->addFrameListener( devices_.console );
- LogManager::getSingleton().setConsole( devices_.console );
+ resources_.console = new Console( );
+ resources_.ogreRoot->addFrameListener( resources_.console );
+ LogManager::getSingleton().setConsole( resources_.console );
- devices_.console->addCommand( "/q", &GameStateManager::CMD_shutdown, "Shutting down the client. Shortcut for /quit" );
- devices_.console->addCommand( "/quit", &GameStateManager::CMD_shutdown, "Shutting down the client" );
- devices_.console->addCommand( "/help", &GameStateManager::CMD_printHelp, "Show this help" );
- devices_.console->addCommand( "/time", &GameStateManager::CMD_printTime, "Show current system time" );
- devices_.console->addCommand( "/ai", &GameStateManager::CMD_spawnAi, "[name] Spawn ai subject. /ai help show all available ships." );
+ resources_.console->addCommand( "/q", &GameStateManager::CMD_shutdown, "Shutting down the client. Shortcut for /quit" );
+ resources_.console->addCommand( "/quit", &GameStateManager::CMD_shutdown, "Shutting down the client" );
+ resources_.console->addCommand( "/help", &GameStateManager::CMD_printHelp, "Show this help" );
+ resources_.c...
[truncated message content] |
|
From: <ult...@us...> - 2007-08-02 23:02:17
|
Revision: 651
http://opengate.svn.sourceforge.net/opengate/?rev=651&view=rev
Author: ultrasick
Date: 2007-08-02 16:02:18 -0700 (Thu, 02 Aug 2007)
Log Message:
-----------
removed some notes because i added more objects to opacma
*huh !?!? I thought I already commited the changes some time ago*
well never mind
Modified Paths:
--------------
trunk/data/misc/jgdata.xml
Modified: trunk/data/misc/jgdata.xml
===================================================================
(Binary files differ)
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.
