Menu
▾
▴
[Opengate-svn] SF.net SVN: opengate: [649] branches/ogsector
|
From: <spo...@us...> - 2007-07-30 20:08:35
|
Revision: 649
http://opengate.svn.sourceforge.net/opengate/?rev=649&view=rev
Author: spom_spom
Date: 2007-07-30 13:08:38 -0700 (Mon, 30 Jul 2007)
Log Message:
-----------
win compatibility commit
Modified Paths:
--------------
branches/ogsector/src/GameStateManager.cpp
branches/ogsector/win32/ogsectorclient/ogre.cfg
branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
branches/ogsector/win32/ogsectorclient/resources.cfg
Modified: branches/ogsector/src/GameStateManager.cpp
===================================================================
--- branches/ogsector/src/GameStateManager.cpp 2007-07-30 19:58:06 UTC (rev 648)
+++ branches/ogsector/src/GameStateManager.cpp 2007-07-30 20:08:38 UTC (rev 649)
@@ -59,7 +59,7 @@
//** start for test purposes;
// const Ogre::RenderSystemCapabilities * caps = Ogre::Root::getSingleton().getRenderSystem()->getCapabilities();
// if ( !caps->hasCapability( Ogre::RSC_VERTEX_PROGRAM ) ) {
-// OGRE_EXCEPT(Ogre::Exception::ERR_NOT_IMPLEMENTED, "Your card does not support vertex programs.",
+// OGRE_EXCEPT(Ogre::Exception::ERR_NOT_IMPLEMENTED, "Your card does not support vertex programs.",
// "GameStateManager::GameStateManager");
// }
// if ( !( caps->hasCapability( Ogre::RSC_FRAGMENT_PROGRAM ) || caps->hasCapability( Ogre::RSC_DOT3 ) ) ) {
@@ -67,11 +67,11 @@
// "GameStateManager::GameStateManager" );
// }
-// Ogre::SceneManager* sceneMgr = devices_.ogreRoot->createSceneManager(Ogre::ST_GENERIC);
-// Ogre::Camera* camera = sceneMgr->createCamera("SimpleCamera");
+// 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);
+// devices_.ogreRoot->addFrameListener(&frameListener);
// camera->setPosition( Ogre::Vector3( 0, 0, 200 ) );
// camera->lookAt( Ogre::Vector3( 0, 0, -300 ) );
// camera->setNearClipDistance( 1 );
@@ -87,9 +87,9 @@
// light->attachObject( l );
// Ogre::MeshPtr pMesh = Ogre::MeshManager::getSingleton().load( "ogrehead.mesh",
-// Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
-// Ogre::HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY,
-// Ogre::HardwareBuffer::HBU_STATIC_WRITE_ONLY,
+// 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) ) {
@@ -100,7 +100,7 @@
// shape->setMaterialName("Examples/BumpMapping/MultiLight");
// mainNode->attachObject( shape );
-// devices_.ogreRoot->startRendering();
+// devices_.ogreRoot->startRendering();
// while( 1 ){
// devices_.ogreRoot->renderOneFrame( );
// }
@@ -179,12 +179,12 @@
//hack-mack
enterDockedStateHack_ = false;
- }
+ }
while ( !shutdownRequest_ ){
devices_.inputManager->capture();
- if ( enterDockedStateHack_ ) start( findByName( "DockedState" ) );
+ if ( enterDockedStateHack_ ) start( findByName( "DockedState" ) );
captureNetwork();
@@ -221,13 +221,13 @@
if ( msgs.size() > 0 ) {
// LogManager::getSingleton().debug( std::string( "Pullcount: " ) + toStr( msgs.size() ) );
for ( size_t i = 0; i < msgs.size(); i ++ ){
-
+
// LogManager::getSingleton().debug( std::string( "Pull: " ) + toStr( (int)msgs[ i ][ 0 ] ) );
// if ( msgs[ i ][ 0 ] == PROTO_SHIPMOVEMENT ) {
// MessageBodyShipMovement m( &msgs[ i ][ 0 ] );
// std::cout << m << std::endl;
// }
-
+
switch ( msgs[ i ][ 0 ] ){
case PROTO_CHAT:{
devices_.network->ping();
@@ -314,7 +314,7 @@
stateStack_.back()->exit();
stateStack_.pop_back();
}
-
+
// resume previous game state or quit if there isn't one
if ( !stateStack_.empty() ) {
init_( stateStack_.back() );
@@ -365,7 +365,7 @@
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( "/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." );
@@ -461,31 +461,31 @@
unsigned long hWnd;
devices_.renderWindow->getCustomAttribute( "WINDOW", &hWnd );
devices_.inputManager->init( hWnd );
- devices_.inputManager->setWindowExtents( devices_.renderWindow->getWidth( ),
+ devices_.inputManager->setWindowExtents( devices_.renderWindow->getWidth( ),
devices_.renderWindow->getHeight( ) );
return true;
}
-void GameStateManager::CMD_shutdown( const std::vector < std::string > & argv ){
- shutdown();
+void GameStateManager::CMD_shutdown( const std::vector < std::string > & argv ){
+ shutdown();
}
-void GameStateManager::CMD_printHelp( const std::vector < std::string > & argv ){
- devices_.console->printHelp();
+void GameStateManager::CMD_printHelp( const std::vector < std::string > & argv ){
+ devices_.console->printHelp();
}
-void GameStateManager::CMD_printTime( const std::vector < std::string > & argv ){
+void GameStateManager::CMD_printTime( const std::vector < std::string > & argv ){
std::time_t now = std::time( 0 );
struct tm * time = localtime( &now );
devices_.console->print( asctime( time ) );
}
-void GameStateManager::CMD_spawnAi( const std::vector < std::string > & argv ){
+void GameStateManager::CMD_spawnAi( const std::vector < std::string > & argv ){
std::string aiName = "Squid";
if ( argv.size() > 1 ){
aiName = argv[ 1 ];
}
-
+
bool showHelp = false;
if ( aiName != "help" ){
if ( stateStack_.back()->name() == "UnDockedState" ){
@@ -511,4 +511,4 @@
}
}
-} // namespace OpenGate
+} // namespace OpenGate
Modified: branches/ogsector/win32/ogsectorclient/ogre.cfg
===================================================================
--- branches/ogsector/win32/ogsectorclient/ogre.cfg 2007-07-30 19:58:06 UTC (rev 648)
+++ branches/ogsector/win32/ogsectorclient/ogre.cfg 2007-07-30 20:08:38 UTC (rev 649)
@@ -1,4 +1,4 @@
-Render System=OpenGL Rendering Subsystem
+Render System=Direct3D9 Rendering Subsystem
[Direct3D9 Rendering Subsystem]
Allow NVPerfHUD=No
Modified: branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
===================================================================
(Binary files differ)
Modified: branches/ogsector/win32/ogsectorclient/resources.cfg
===================================================================
--- branches/ogsector/win32/ogsectorclient/resources.cfg 2007-07-30 19:58:06 UTC (rev 648)
+++ branches/ogsector/win32/ogsectorclient/resources.cfg 2007-07-30 20:08:38 UTC (rev 649)
@@ -29,7 +29,7 @@
FileSystem=../../../../trunk/data/engines
FileSystem=../../../../trunk/data/capacitors
FileSystem=../../../../trunk/data/radars
-FileSystem=../../../../trunk/data/shield
+FileSystem=../../../../trunk/data/shields
FileSystem=../../../../trunk/data/ECMs
FileSystem=../../../../trunk/data/power_plants
FileSystem=../../../../trunk/data/guns
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
