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-02 22:58:21
|
Revision: 650
http://opengate.svn.sourceforge.net/opengate/?rev=650&view=rev
Author: ultrasick
Date: 2007-08-02 15:58:23 -0700 (Thu, 02 Aug 2007)
Log Message:
-----------
changing "required experience" to "required points"
+ adding the octavius ranks
Modified Paths:
--------------
trunk/data/rankings/octavius.xml
trunk/data/rankings/quantar.xml
trunk/data/rankings/tauseti.xml
Modified: trunk/data/rankings/octavius.xml
===================================================================
(Binary files differ)
Modified: trunk/data/rankings/quantar.xml
===================================================================
(Binary files differ)
Modified: trunk/data/rankings/tauseti.xml
===================================================================
(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-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.
|
|
From: <spo...@us...> - 2007-07-30 19:58:06
|
Revision: 648
http://opengate.svn.sourceforge.net/opengate/?rev=648&view=rev
Author: spom_spom
Date: 2007-07-30 12:58:06 -0700 (Mon, 30 Jul 2007)
Log Message:
-----------
Add: very basic station texture for testing purposes
Modified Paths:
--------------
branches/ogsector/data/materials/advancedMaterials.material
branches/ogsector/src/OpcodeWrapper.cpp
branches/ogsector/src/Sector.cpp
trunk/data/misc/testsector.xml
trunk/data/stations/tauseti_wake.blend
trunk/data/stations/tauseti_wake.mesh
Added Paths:
-----------
branches/ogsector/data/materials/station.material
branches/ogsector/data/textures/stationTileBackground.png
branches/ogsector/data/textures/stationTileBackgroundBump.png
branches/ogsector/data/textures/stationTileIconBump.png
branches/ogsector/data/textures/stationTube.png
branches/ogsector/data/textures/stationTubePad.png
trunk/data/stations/tauseti_wake_2.blend
Modified: branches/ogsector/data/materials/advancedMaterials.material
===================================================================
--- branches/ogsector/data/materials/advancedMaterials.material 2007-07-28 20:27:12 UTC (rev 647)
+++ branches/ogsector/data/materials/advancedMaterials.material 2007-07-30 19:58:06 UTC (rev 648)
@@ -1,4 +1,4 @@
-material TausetiTile/BumpMapping
+material StationTileBackground/BumpMapping
{
// This is the preferred technique which uses both vertex and
@@ -54,7 +54,7 @@
// Base bump map
texture_unit
{
- texture tausetiTileBump.png
+ texture stationTileBackgroundBump.png
colour_op replace
}
// Normalisation cube map
@@ -84,7 +84,7 @@
scene_blend dest_colour zero
texture_unit
{
- texture tausetiTile.png
+ texture stationTileBackground.png
}
}
@@ -137,7 +137,7 @@
// Base bump map
texture_unit
{
- texture tausetiTileBump.png
+ texture stationTileBackgroundBump.png
colour_op replace
}
// Normalisation cube map, with dot product on bump map
@@ -167,7 +167,7 @@
scene_blend dest_colour zero
texture_unit
{
- texture tausetiTile.png
+ texture stationTileBackground.png
}
}
@@ -175,15 +175,192 @@
}
}
-material TausetiTile
+material StationTileIcon/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 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
+ 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 stationTileBackground.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 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 StationTile
{
receive_shadows on
technique
{
pass
{
-// ambient 0.500000 0.500000 0.500000 1.000000
-// diffuse 0.900000 0.900000 0.900000 1.000000
+ 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
{
Added: branches/ogsector/data/materials/station.material
===================================================================
--- branches/ogsector/data/materials/station.material (rev 0)
+++ branches/ogsector/data/materials/station.material 2007-07-30 19:58:06 UTC (rev 648)
@@ -0,0 +1,89 @@
+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
+ 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 stationTube.png
+ }
+ }
+ }
+}
+
+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
+{
+ 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 stationTubePad.png
+ }
+ }
+ }
+}
+
+material Station/LaunchPad
+{
+ 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 stationTubePad.png
+ }
+ }
+ }
+}
Added: branches/ogsector/data/textures/stationTileBackground.png
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/data/textures/stationTileBackground.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/data/textures/stationTileBackgroundBump.png
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/data/textures/stationTileBackgroundBump.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/data/textures/stationTileIconBump.png
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/data/textures/stationTileIconBump.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/data/textures/stationTube.png
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/data/textures/stationTube.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/data/textures/stationTubePad.png
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/data/textures/stationTubePad.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/ogsector/src/OpcodeWrapper.cpp
===================================================================
--- branches/ogsector/src/OpcodeWrapper.cpp 2007-07-28 20:27:12 UTC (rev 647)
+++ branches/ogsector/src/OpcodeWrapper.cpp 2007-07-30 19:58:06 UTC (rev 648)
@@ -41,7 +41,8 @@
OgreOpcode::CollisionManager::getSingletonPtr()->addCollType( "Bullet", "Bullet", OgreOpcode::COLLTYPE_IGNORE );
OgreOpcode::CollisionManager::getSingletonPtr()->addCollType( "SectorObject", "Bullet", OgreOpcode::COLLTYPE_EXACT );
- OgreOpcode::CollisionManager::getSingletonPtr()->addCollType( "SectorObject", "SectorObject", OgreOpcode::COLLTYPE_CONTACT );
+ OgreOpcode::CollisionManager::getSingletonPtr()->addCollType( "SectorObject", "SectorObject", OgreOpcode::COLLTYPE_EXACT );
+// OgreOpcode::CollisionManager::getSingletonPtr()->addCollType( "SectorObject", "SectorObject", OgreOpcode::COLLTYPE_CONTACT );
// OgreOpcode::CollisionManager::getSingletonPtr()->addCollType( "SectorObject", "SectorObject", OgreOpcode::COLLTYPE_QUICK );
collideInSectorContext_ = OgreOpcode::CollisionManager::getSingletonPtr()->getDefaultContext();
Modified: branches/ogsector/src/Sector.cpp
===================================================================
--- branches/ogsector/src/Sector.cpp 2007-07-28 20:27:12 UTC (rev 647)
+++ branches/ogsector/src/Sector.cpp 2007-07-30 19:58:06 UTC (rev 648)
@@ -34,6 +34,7 @@
#include <OgreRenderSystemCapabilities.h>
#include <OgreRenderSystem.h>
#include <OgreMesh.h>
+#include <OgreSubEntity.h>
#include <OgreMeshManager.h>
@@ -138,6 +139,41 @@
sceneMgr_->setAmbientLight( Ogre::ColourValue( 0.2, 0.2, 0.2 ) );
+
+ Ogre::MeshPtr pMesh = Ogre::MeshManager::getSingleton().load( "tauseti_wake.mesh",
+ 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);
+ }
+ SectorObject *obj = createStaticObject("tauseti_wake.mesh", "ogrehead", Ogre::Vector3( 0.0, 0.0, 100 ) );
+
+// pMesh->getSubMesh( 1 )->setMaterialName("Asteroid/BumpMapping");
+
+// pMesh->getSubMesh( 1 )->updateMaterialUsingTextureAliases();
+
+
+ std::cout << "subentitynames:" << std::endl;
+
+ for ( int i = 0; i < obj->entity()->getNumSubEntities(); i ++ ){
+ // std::cout << pMesh->getSubMesh( i )->getName() << std::endl;
+ std::cout << obj->entity()->getSubEntity( i )->getMaterialName() << std::endl;
+ }
+
+ if ( DeviceManager::getSingleton().mappingCapability() ){
+ obj->entity()->getSubEntity( 0 )->setMaterialName("StationTileBackground/BumpMapping");
+ obj->entity()->getSubEntity( 1 )->setMaterialName("StationTileIcon/BumpMapping");
+ }
+ obj->mainNode()->scale(50, 50, 50 );
+ obj->mainNode()->setPosition( 1000.0, 0.0, -200.0 );
+
+
+
populate( "testsector.xml" );
// createCircle();
Modified: trunk/data/misc/testsector.xml
===================================================================
--- trunk/data/misc/testsector.xml 2007-07-28 20:27:12 UTC (rev 647)
+++ trunk/data/misc/testsector.xml 2007-07-30 19:58:06 UTC (rev 648)
@@ -19,14 +19,14 @@
<!-- <texture>desired front direction</texture> -->
<!-- </sectorobject> -->
+<!-- <sectorobject> -->
+<!-- <name>tauseti wake</name> -->
+<!-- <mesh>tauseti_wake</mesh> -->
+<!-- <position>1000.0, 0.0, -200.0</position> -->
+<!-- <scale>100, 100, 100</scale> -->
+<!-- <material>TausetiTile/BumpMapping</material> -->
+<!-- </sectorobject> -->
<sectorobject>
- <name>tauseti wake</name>
- <mesh>tauseti_wake</mesh>
- <position>1000.0, 0.0, -200.0</position>
- <scale>100, 100, 100</scale>
- <material>TausetiTile/BumpMapping</material>
- </sectorobject>
- <sectorobject>
<name>astro with bump</name>
<mesh>asteroid01</mesh>
<position> -250, 0, 440</position>
Modified: trunk/data/stations/tauseti_wake.blend
===================================================================
(Binary files differ)
Modified: trunk/data/stations/tauseti_wake.mesh
===================================================================
(Binary files differ)
Added: trunk/data/stations/tauseti_wake_2.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/stations/tauseti_wake_2.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-07-28 20:27:19
|
Revision: 647
http://opengate.svn.sourceforge.net/opengate/?rev=647&view=rev
Author: spom_spom
Date: 2007-07-28 13:27:12 -0700 (Sat, 28 Jul 2007)
Log Message:
-----------
fixed typo
Modified Paths:
--------------
branches/ogsector/win32/ogsectorclient/resources.cfg
Modified: branches/ogsector/win32/ogsectorclient/resources.cfg
===================================================================
--- branches/ogsector/win32/ogsectorclient/resources.cfg 2007-07-28 19:38:45 UTC (rev 646)
+++ branches/ogsector/win32/ogsectorclient/resources.cfg 2007-07-28 20:27:12 UTC (rev 647)
@@ -9,7 +9,7 @@
FileSystem=../../data/asteroids
Zip=../../data/simpleSkybox.zip
FileSystem=../../data/MediaFromOgre
-FileSystem=../../data/MediaFromOgre/AdvancedMaterial
+FileSystem=../../data/MediaFromOgre/AdvancedMaterials
FileSystem=../../data/gui
FileSystem=../../data/gui/fonts/
FileSystem=../../data/gui/layouts/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-07-28 19:38:49
|
Revision: 646
http://opengate.svn.sourceforge.net/opengate/?rev=646&view=rev
Author: ultrasick
Date: 2007-07-28 12:38:45 -0700 (Sat, 28 Jul 2007)
Log Message:
-----------
uploading anomaly
Added Paths:
-----------
trunk/data/misc/anomaly.png
trunk/templates/data/misc/anomaly.blend
Added: trunk/data/misc/anomaly.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/misc/anomaly.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/templates/data/misc/anomaly.blend
===================================================================
(Binary files differ)
Property changes on: trunk/templates/data/misc/anomaly.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-07-28 16:48:10
|
Revision: 645
http://opengate.svn.sourceforge.net/opengate/?rev=645&view=rev
Author: spom_spom
Date: 2007-07-28 09:48:10 -0700 (Sat, 28 Jul 2007)
Log Message:
-----------
forgot an entry. Now normalmapping with direct3d or opengl should work with cards: geforce >3 and ati radeon >8500, otherwise fallback to general textures.
Modified Paths:
--------------
branches/ogsector/win32/ogsectorclient/resources.cfg
Modified: branches/ogsector/win32/ogsectorclient/resources.cfg
===================================================================
--- branches/ogsector/win32/ogsectorclient/resources.cfg 2007-07-28 15:29:45 UTC (rev 644)
+++ branches/ogsector/win32/ogsectorclient/resources.cfg 2007-07-28 16:48:10 UTC (rev 645)
@@ -9,6 +9,7 @@
FileSystem=../../data/asteroids
Zip=../../data/simpleSkybox.zip
FileSystem=../../data/MediaFromOgre
+FileSystem=../../data/MediaFromOgre/AdvancedMaterial
FileSystem=../../data/gui
FileSystem=../../data/gui/fonts/
FileSystem=../../data/gui/layouts/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-07-28 15:29:44
|
Revision: 644
http://opengate.svn.sourceforge.net/opengate/?rev=644&view=rev
Author: spom_spom
Date: 2007-07-28 08:29:45 -0700 (Sat, 28 Jul 2007)
Log Message:
-----------
win compatibility commit
Modified Paths:
--------------
branches/ogsector/win32/ogsectorclient/ogre.cfg
branches/ogsector/win32/ogsectorclient/ogsectorclient.cbp
branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
branches/ogsector/win32/ogsectorclient/resources.cfg
Modified: branches/ogsector/win32/ogsectorclient/ogre.cfg
===================================================================
--- branches/ogsector/win32/ogsectorclient/ogre.cfg 2007-07-28 14:21:14 UTC (rev 643)
+++ branches/ogsector/win32/ogsectorclient/ogre.cfg 2007-07-28 15:29:45 UTC (rev 644)
@@ -5,9 +5,9 @@
Anti aliasing=None
Floating-point mode=Fastest
Full Screen=Yes
-Rendering Device=NVIDIA GeForce 7600 GT
+Rendering Device=NVIDIA GeForce4 420 Go (Toshiba)
VSync=No
-Video Mode=1280 x 1024 @ 32-bit colour
+Video Mode=1024 x 768 @ 16-bit colour
[OpenGL Rendering Subsystem]
Colour Depth=32
Modified: branches/ogsector/win32/ogsectorclient/ogsectorclient.cbp
===================================================================
--- branches/ogsector/win32/ogsectorclient/ogsectorclient.cbp 2007-07-28 14:21:14 UTC (rev 643)
+++ branches/ogsector/win32/ogsectorclient/ogsectorclient.cbp 2007-07-28 15:29:45 UTC (rev 644)
@@ -99,6 +99,8 @@
<Unit filename="..\..\src\VesselManager.h" />
<Unit filename="..\..\src\common.cpp" />
<Unit filename="..\..\src\common.h" />
+ <Unit filename="..\..\src\metaserver.cpp" />
+ <Unit filename="..\..\src\metaserver.h" />
<Unit filename="..\..\src\networkClient.cpp" />
<Unit filename="..\..\src\networkClient.h" />
<Unit filename="..\..\src\networkProtocol.cpp" />
Modified: branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
===================================================================
(Binary files differ)
Modified: branches/ogsector/win32/ogsectorclient/resources.cfg
===================================================================
--- branches/ogsector/win32/ogsectorclient/resources.cfg 2007-07-28 14:21:14 UTC (rev 643)
+++ branches/ogsector/win32/ogsectorclient/resources.cfg 2007-07-28 15:29:45 UTC (rev 644)
@@ -28,7 +28,8 @@
FileSystem=../../../../trunk/data/engines
FileSystem=../../../../trunk/data/capacitors
FileSystem=../../../../trunk/data/radars
-FileSystem=../../../../trunk/data/shields
+FileSystem=../../../../trunk/data/shield
FileSystem=../../../../trunk/data/ECMs
FileSystem=../../../../trunk/data/power_plants
FileSystem=../../../../trunk/data/guns
+FileSystem=../../../../trunk/data/stations
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-07-28 14:21:12
|
Revision: 643
http://opengate.svn.sourceforge.net/opengate/?rev=643&view=rev
Author: spom_spom
Date: 2007-07-28 07:21:14 -0700 (Sat, 28 Jul 2007)
Log Message:
-----------
add tauseti wake with normalmapping texture for testing purposes
Modified Paths:
--------------
branches/ogsector/data/asteroids/asteroid.material
branches/ogsector/ogre.cfg
branches/ogsector/resources.cfg
branches/ogsector/src/DeviceManager.cpp
branches/ogsector/src/DeviceManager.h
branches/ogsector/src/EntityManager.cpp
branches/ogsector/src/GameStateManager.cpp
branches/ogsector/src/Sector.cpp
trunk/data/misc/testsector.xml
Added Paths:
-----------
branches/ogsector/data/materials/advancedMaterials.material
branches/ogsector/data/materials/advancedMaterials.program
branches/ogsector/data/textures/tausetiTile.png
branches/ogsector/data/textures/tausetiTileBump.png
trunk/data/stations/tauseti_wake.mesh
Modified: branches/ogsector/data/asteroids/asteroid.material
===================================================================
--- branches/ogsector/data/asteroids/asteroid.material 2007-07-27 16:55:08 UTC (rev 642)
+++ branches/ogsector/data/asteroids/asteroid.material 2007-07-28 14:21:14 UTC (rev 643)
@@ -1,34 +1,3 @@
-vertex_program Asteroid/BumpMapVP cg
-{
- source Example_BumpMapping.cg
- entry_point main_vp
- profiles vs_1_1 arbvp1
-}
-
-// Bump map fragment program, support for this is optional
-fragment_program Asteroid/BumpMapFP cg
-{
- source Example_BumpMapping.cg
- entry_point main_fp
- profiles vs_1_1 arbfp1 fp20
-}
-
-// Bump map with specular vertex program, support for this is required
-vertex_program Asteroid/BumpMapVPSpecular cg
-{
- source Example_BumpMapping.cg
- entry_point specular_vp
- profiles vs_1_1 arbvp1
-}
-
-// Bump map fragment program, support for this is optional
-fragment_program Asteroid/BumpMapFPSpecular cg
-{
- source Example_BumpMapping.cg
- entry_point specular_fp
- profiles vs_1_1 arbfp1 fp20
-}
-
material Asteroid/BumpMapping
{
@@ -48,7 +17,7 @@
// 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 Ogre/BasicVertexPrograms/AmbientOneTexture
+ vertex_program_ref BasicVertexPrograms/AmbientOneTextureUnified
{
param_named_auto worldViewProj worldviewproj_matrix
param_named_auto ambient ambient_light_colour
@@ -70,14 +39,14 @@
scene_blend add
// Vertex program reference
- vertex_program_ref Asteroid/BumpMapVP
+ vertex_program_ref BumpMapVP
{
param_named_auto lightPosition light_position_object_space 0
param_named_auto worldViewProj worldviewproj_matrix
}
// Fragment program
- fragment_program_ref Asteroid/BumpMapFP
+ fragment_program_ref BumpMapFP
{
param_named_auto lightDiffuse light_diffuse_colour 0
}
@@ -107,7 +76,7 @@
// 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 Ogre/BasicVertexPrograms/AmbientOneTexture
+ vertex_program_ref BasicVertexPrograms/AmbientOneTextureUnified
{
param_named_auto worldViewProj worldviewproj_matrix
param_named ambient float4 1 1 1 1
@@ -138,7 +107,7 @@
// 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 Ogre/BasicVertexPrograms/AmbientOneTexture
+ vertex_program_ref BasicVertexPrograms/AmbientOneTextureUnified
{
param_named_auto worldViewProj worldviewproj_matrix
param_named_auto ambient ambient_light_colour
@@ -159,7 +128,7 @@
scene_blend add
// Vertex program reference
- vertex_program_ref Asteroid/BumpMapVP
+ vertex_program_ref BumpMapVP
{
param_named_auto lightPosition light_position_object_space 0
param_named_auto worldViewProj worldviewproj_matrix
@@ -190,7 +159,7 @@
// 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 Ogre/BasicVertexPrograms/AmbientOneTexture
+ vertex_program_ref BasicVertexPrograms/AmbientOneTextureUnified
{
param_named_auto worldViewProj worldviewproj_matrix
param_named ambient float4 1 1 1 1
Added: branches/ogsector/data/materials/advancedMaterials.material
===================================================================
--- branches/ogsector/data/materials/advancedMaterials.material (rev 0)
+++ branches/ogsector/data/materials/advancedMaterials.material 2007-07-28 14:21:14 UTC (rev 643)
@@ -0,0 +1,195 @@
+material TausetiTile/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 tausetiTileBump.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 tausetiTile.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 tausetiTileBump.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 tausetiTile.png
+ }
+
+ }
+
+ }
+}
+
+material TausetiTile
+{
+ 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 tausetiTile.png
+ }
+ }
+ }
+}
+
Added: branches/ogsector/data/materials/advancedMaterials.program
===================================================================
--- branches/ogsector/data/materials/advancedMaterials.program (rev 0)
+++ branches/ogsector/data/materials/advancedMaterials.program 2007-07-28 14:21:14 UTC (rev 643)
@@ -0,0 +1,76 @@
+vertex_program BumpMapVP cg
+{
+ source Example_BumpMapping.cg
+ entry_point main_vp
+ profiles vs_1_1 arbvp1
+}
+
+// Bump map fragment program, support for this is optional
+fragment_program BumpMapFP cg
+{
+ source Example_BumpMapping.cg
+ entry_point main_fp
+ profiles vs_1_1 arbfp1 fp20
+}
+
+// Bump map with specular vertex program, support for this is required
+vertex_program BumpMapVPSpecular cg
+{
+ source Example_BumpMapping.cg
+ entry_point specular_vp
+ profiles vs_1_1 arbvp1
+}
+
+// Bump map fragment program, support for this is optional
+fragment_program BumpMapFPSpecular cg
+{
+ source Example_BumpMapping.cg
+ entry_point specular_fp
+ profiles vs_1_1 arbfp1 fp20
+}
+
+// A really basic ambient pass program, support for one texture coodinate set
+vertex_program BasicVertexPrograms/AmbientOneTexture cg
+{
+ source Example_Basic.cg
+ entry_point ambientOneTexture_vp
+ profiles vs_1_1 arbvp1
+
+ default_params
+ {
+ param_named_auto worldViewProj worldviewproj_matrix
+ param_named_auto ambient ambient_light_colour
+ }
+
+}
+
+// A really basic ambient pass program, support for one texture coodinate set
+vertex_program BasicVertexPrograms/AmbientOneTextureHLSL hlsl
+{
+ source Example_Basic.hlsl
+ entry_point ambientOneTexture_vp
+ target vs_1_1
+
+ default_params
+ {
+ param_named_auto worldViewProj worldviewproj_matrix
+ param_named_auto ambient ambient_light_colour
+ }
+}
+// A really basic ambient pass program, support for one texture coodinate set
+vertex_program BasicVertexPrograms/AmbientOneTextureGLSL glsl
+{
+ source AmbientOneTexture.glsl
+
+ default_params
+ {
+ param_named_auto ambient ambient_light_colour
+ }
+}
+
+vertex_program BasicVertexPrograms/AmbientOneTextureUnified unified
+{
+ delegate BasicVertexPrograms/AmbientOneTextureGLSL
+ delegate BasicVertexPrograms/AmbientOneTextureHLSL
+ delegate BasicVertexPrograms/AmbientOneTexture
+}
\ No newline at end of file
Added: branches/ogsector/data/textures/tausetiTile.png
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/data/textures/tausetiTile.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/data/textures/tausetiTileBump.png
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/data/textures/tausetiTileBump.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/ogsector/ogre.cfg
===================================================================
--- branches/ogsector/ogre.cfg 2007-07-27 16:55:08 UTC (rev 642)
+++ branches/ogsector/ogre.cfg 2007-07-28 14:21:14 UTC (rev 643)
@@ -1,7 +1,7 @@
Render System=OpenGL Rendering Subsystem
[OpenGL Rendering Subsystem]
-FSAA=0
+FSAA=6
Full Screen=No
RTT Preferred Mode=FBO
Video Mode=1024 x 768
Modified: branches/ogsector/resources.cfg
===================================================================
--- branches/ogsector/resources.cfg 2007-07-27 16:55:08 UTC (rev 642)
+++ branches/ogsector/resources.cfg 2007-07-28 14:21:14 UTC (rev 643)
@@ -17,7 +17,7 @@
FileSystem=../../trunk/data/ships/quantar/storm
FileSystem=../../trunk/data/ships/tauseti/lady_kickstart
FileSystem=../../trunk/data/ships/squadrok/squid
-FileSystem=../../trunk/data/stations/tauseti
+FileSystem=../../trunk/data/stations
FileSystem=../../trunk/data/misc/asteroids
FileSystem=./data
Modified: branches/ogsector/src/DeviceManager.cpp
===================================================================
--- branches/ogsector/src/DeviceManager.cpp 2007-07-27 16:55:08 UTC (rev 642)
+++ branches/ogsector/src/DeviceManager.cpp 2007-07-28 14:21:14 UTC (rev 643)
@@ -41,6 +41,8 @@
gameStateRoot = NULL;
avatar = NULL;
languageSuffix_ = "en";
+
+ mapping_ = true;
}
DeviceManager::~DeviceManager( ) {
Modified: branches/ogsector/src/DeviceManager.h
===================================================================
--- branches/ogsector/src/DeviceManager.h 2007-07-27 16:55:08 UTC (rev 642)
+++ branches/ogsector/src/DeviceManager.h 2007-07-28 14:21:14 UTC (rev 643)
@@ -105,6 +105,9 @@
std::set < std::string > & resourcePaths() { return resourcePaths_; }
+ void setMappingCapability( bool mapping ) { mapping_ = mapping; }
+ bool mappingCapability() const { return mapping_; }
+
protected:
LogManager * log_;
@@ -114,6 +117,7 @@
std::map< int, std::string > factionIDs_;
std::set < std::string > resourcePaths_;
+ bool mapping_;
};
} //namespace OpenGate
Modified: branches/ogsector/src/EntityManager.cpp
===================================================================
--- branches/ogsector/src/EntityManager.cpp 2007-07-27 16:55:08 UTC (rev 642)
+++ branches/ogsector/src/EntityManager.cpp 2007-07-28 14:21:14 UTC (rev 643)
@@ -201,6 +201,7 @@
case 7: entity = new Shield(); break;
case 8: entity = new Radar(); break;
case 10: entity = new Gun(); break;
+ case 11: entity = new Gun(); break;
default:
log_->fatal( fileName + " category_id " + toStr( category ) + " unknown." );
return NULL;
Modified: branches/ogsector/src/GameStateManager.cpp
===================================================================
--- branches/ogsector/src/GameStateManager.cpp 2007-07-27 16:55:08 UTC (rev 642)
+++ branches/ogsector/src/GameStateManager.cpp 2007-07-28 14:21:14 UTC (rev 643)
@@ -345,6 +345,17 @@
if ( !initialiseOgreResources_() ) return false;
+ const Ogre::RenderSystemCapabilities * caps = DeviceManager::getSingleton().ogreRoot->getRenderSystem()->getCapabilities();
+
+ if ( !caps->hasCapability( Ogre::RSC_VERTEX_PROGRAM ) ) {
+ log_->warn("Your card does not support vertex programs.");
+ DeviceManager::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 );
+ }
+
if ( !initialiseCEGUIEngine_( ) ) return false;
if ( !initialiseInputManager_() ) return false;
Modified: branches/ogsector/src/Sector.cpp
===================================================================
--- branches/ogsector/src/Sector.cpp 2007-07-27 16:55:08 UTC (rev 642)
+++ branches/ogsector/src/Sector.cpp 2007-07-28 14:21:14 UTC (rev 643)
@@ -136,43 +136,8 @@
planetNode_->setPosition( Ogre::Vector3( 20000.0, 10000.0, 50000 ) );
}
- // Build tangent vectors, all our meshes use only 1 texture coordset
- // Note we can build into VES_TANGENT now (SM2+)
-
- sceneMgr_->setAmbientLight( Ogre::ColourValue( 0.0, 0.0, 0.0 ) );
-
- const Ogre::RenderSystemCapabilities * caps = DeviceManager::getSingleton().ogreRoot->getRenderSystem()->getCapabilities();
- bool mapping = true;
- if ( !caps->hasCapability( Ogre::RSC_VERTEX_PROGRAM ) ) {
- log_->warn("Your card does not support vertex programs.");
- mapping = 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." );
- mapping = false;
- }
-
- Ogre::MeshPtr pMesh = Ogre::MeshManager::getSingleton().load( "asteroid01.mesh",
- 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);
- }
-
- SectorObject *a1 = createStaticObject( "asteroid01.mesh", "astro with bump", Ogre::Vector3( -250, 0, 440 ) );
- a1->mainNode()->scale( 20, 20, 20 );
-
- SectorObject *a2 = createStaticObject( "asteroid01.mesh", "astro without bump", Ogre::Vector3( -250, 0, 500 ) );
- a2->mainNode()->scale( 20, 20, 20 );
-
- if ( mapping ) a1->entity()->setMaterialName("Asteroid/BumpMapping");
- else { a1->entity()->setMaterialName("Asteroid"); }
- a2->entity()->setMaterialName("Asteroid");
-
-
+ sceneMgr_->setAmbientLight( Ogre::ColourValue( 0.2, 0.2, 0.2 ) );
+
populate( "testsector.xml" );
// createCircle();
@@ -296,6 +261,17 @@
pSubElem = pElem->FirstChildElement( "mesh" );
if ( pSubElem ){
mesh = std::string( pSubElem->FirstChild()->Value() ) + ".mesh";
+
+ Ogre::MeshPtr pMesh = Ogre::MeshManager::getSingleton().load( mesh,
+ 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);
+ }
+
} else {
log_->warn( "missing mesh for sectorobject " + name );
continue;
@@ -328,6 +304,12 @@
size = toVector3( pSubElem->FirstChild()->Value(), ',' );
}
+ std::string material;
+ pSubElem = pElem->FirstChildElement( "material" );
+ if ( pSubElem ){
+ material = pSubElem->FirstChild()->Value();
+ }
+
SectorObject * obj = createStaticObject( mesh, name, pos );
if ( size.length() > 0 ) {
obj->setBaseSize( size );
@@ -335,6 +317,14 @@
obj->scale( scale );
}
+ if ( material.size() > 0 ) {
+ if ( ! DeviceManager::getSingleton().mappingCapability() ){
+ obj->entity()->setMaterialName( material.substr( 0, material.rfind("/BumpMapping") ) );
+ } else {
+ obj->entity()->setMaterialName( material );
+ }
+ }
+
if ( direction.length() > 0 ){
obj->mainNode()->lookAt( Ogre::Vector3( obj->mainNode()->getPosition() * direction), Ogre::Node::TS_WORLD );
}
Modified: trunk/data/misc/testsector.xml
===================================================================
--- trunk/data/misc/testsector.xml 2007-07-27 16:55:08 UTC (rev 642)
+++ trunk/data/misc/testsector.xml 2007-07-28 14:21:14 UTC (rev 643)
@@ -5,7 +5,7 @@
<skybox>OpenGate/SimpleSkyBox3</skybox>
<!-- show all vessels -->
- <vesselschool>all</vesselschool>
+<!-- <vesselschool>all</vesselschool> -->
<!-- <sectorobject> -->
<!-- Mandatory -->
@@ -16,96 +16,118 @@
<!-- <size>desired size of this object</size> -->
<!-- <scale>scaling factor for the ogre mesh</size> -->
<!-- <direction>desired front direction</direction> -->
+<!-- <texture>desired front direction</texture> -->
<!-- </sectorobject> -->
<sectorobject>
- <name>ogreheadStation1</name>
- <mesh>ogrehead</mesh>
- <position>5000.0, 1000.0, 0.0</position>
- <size>500, 500, 500</size>
+ <name>tauseti wake</name>
+ <mesh>tauseti_wake</mesh>
+ <position>1000.0, 0.0, -200.0</position>
+ <scale>100, 100, 100</scale>
+ <material>TausetiTile/BumpMapping</material>
</sectorobject>
<sectorobject>
- <name>ogrehead1</name>
- <mesh>ogrehead</mesh>
- <position>100,0,0</position>
- <size>10, 10, 10</size>
- <direction>1,0,0</direction>
+ <name>astro with bump</name>
+ <mesh>asteroid01</mesh>
+ <position> -250, 0, 440</position>
+ <scale>20, 20, 20</scale>
+ <material>Asteroid/BumpMapping</material>
</sectorobject>
<sectorobject>
- <name>ogrehead2</name>
- <mesh>ogrehead</mesh>
- <position>-100.0, 0, 0.0</position>
- <size>10, 10, 10</size>
- <direction>1,0,0</direction>
+ <name>astro without bump</name>
+ <mesh>asteroid01</mesh>
+ <position> -250, 0, 500</position>
+ <scale>20, 20, 20</scale>
+ <material>Asteroid</material>
</sectorobject>
- <sectorobject>
- <name>astro6</name>
- <mesh>ice_oval_6</mesh>
- <position>0.0, -10, 0.0</position>
- <scale>3, 3, 3</scale>
- <direction>0,0,1</direction>
- </sectorobject>
- <sectorobject>
- <name>astro7</name>
- <mesh>ice_oval_7</mesh>
- <position>10.0, 0, 0.0</position>
- <scale>3, 3, 3</scale>
- <direction>0,0,1</direction>
- </sectorobject>
- <sectorobject>
- <name>astro8</name>
- <mesh>ice_oval_8</mesh>
- <position>20.0, 0, 0.0</position>
- <scale>3, 3, 3</scale>
- <direction>0,0,1</direction>
- </sectorobject>
- <sectorobject>
- <name>astro9</name>
- <mesh>ice_oval_9</mesh>
- <position>30.0, 0, 0.0</position>
- <scale>3, 3, 3</scale>
- <direction>0,0,1</direction>
- </sectorobject>
- <sectorobject>
- <name>astro10</name>
- <mesh>ice_oval_10</mesh>
- <position>40.0, 0, 0.0</position>
- <scale>1, 1, 1</scale>
- <direction>0,0,1</direction>
- </sectorobject>
- <sectorobject>
- <name>astro1</name>
- <mesh>normal_oval_1</mesh>
- <position>0.0, 10, 0.0</position>
- <scale>3, 3, 3</scale>
- <direction>0,0,1</direction>
- </sectorobject>
- <sectorobject>
- <name>astro2</name>
- <mesh>normal_oval_2</mesh>
- <position>10.0, 10, 0.0</position>
- <scale>4, 4, 4</scale>
- <direction>0,0,1</direction>
- </sectorobject>
- <sectorobject>
- <name>astro3</name>
- <mesh>normal_oval_3</mesh>
- <position>20.0, 10, 0.0</position>
- <scale>3, 3, 3</scale>
- <direction>0,0,1</direction>
- </sectorobject>
- <sectorobject>
- <name>astro4</name>
- <mesh>normal_oval_4</mesh>
- <position>30.0, 10, 0.0</position>
- <scale>3, 3, 3</scale>
- <direction>0,0,1</direction>
- </sectorobject>
- <sectorobject>
- <name>astro5</name>
- <mesh>normal_oval_5</mesh>
- <position>40.0, 10, 0.0</position>
- <scale>1, 1, 1</scale>
- <direction>0,0,1</direction>
- </sectorobject>
+<!-- <sectorobject> -->
+<!-- <name>ogreheadStation1</name> -->
+<!-- <mesh>ogrehead</mesh> -->
+<!-- <position>5000.0, 1000.0, 0.0</position> -->
+<!-- <size>500, 500, 500</size> -->
+<!-- </sectorobject> -->
+<!-- <sectorobject> -->
+<!-- <name>ogrehead1</name> -->
+<!-- <mesh>ogrehead</mesh> -->
+<!-- <position>100,0,0</position> -->
+<!-- <size>10, 10, 10</size> -->
+<!-- <direction>1,0,0</direction> -->
+<!-- </sectorobject> -->
+<!-- <sectorobject> -->
+<!-- <name>ogrehead2</name> -->
+<!-- <mesh>ogrehead</mesh> -->
+<!-- <position>-100.0, 0, 0.0</position> -->
+<!-- <size>10, 10, 10</size> -->
+<!-- <direction>1,0,0</direction> -->
+<!-- </sectorobject> -->
+<!-- <sectorobject> -->
+<!-- <name>astro6</name> -->
+<!-- <mesh>ice_oval_6</mesh> -->
+<!-- <position>0.0, -10, 0.0</position> -->
+<!-- <scale>3, 3, 3</scale> -->
+<!-- <direction>0,0,1</direction> -->
+<!-- </sectorobject> -->
+<!-- <sectorobject> -->
+<!-- <name>astro7</name> -->
+<!-- <mesh>ice_oval_7</mesh> -->
+<!-- <position>10.0, 0, 0.0</position> -->
+<!-- <scale>3, 3, 3</scale> -->
+<!-- <direction>0,0,1</direction> -->
+<!-- </sectorobject> -->
+<!-- <sectorobject> -->
+<!-- <name>astro8</name> -->
+<!-- <mesh>ice_oval_8</mesh> -->
+<!-- <position>20.0, 0, 0.0</position> -->
+<!-- <scale>3, 3, 3</scale> -->
+<!-- <direction>0,0,1</direction> -->
+<!-- </sectorobject> -->
+<!-- <sectorobject> -->
+<!-- <name>astro9</name> -->
+<!-- <mesh>ice_oval_9</mesh> -->
+<!-- <position>30.0, 0, 0.0</position> -->
+<!-- <scale>3, 3, 3</scale> -->
+<!-- <direction>0,0,1</direction> -->
+<!-- </sectorobject> -->
+<!-- <sectorobject> -->
+<!-- <name>astro10</name> -->
+<!-- <mesh>ice_oval_10</mesh> -->
+<!-- <position>40.0, 0, 0.0</position> -->
+<!-- <scale>1, 1, 1</scale> -->
+<!-- <direction>0,0,1</direction> -->
+<!-- </sectorobject> -->
+<!-- <sectorobject> -->
+<!-- <name>astro1</name> -->
+<!-- <mesh>normal_oval_1</mesh> -->
+<!-- <position>0.0, 10, 0.0</position> -->
+<!-- <scale>3, 3, 3</scale> -->
+<!-- <direction>0,0,1</direction> -->
+<!-- </sectorobject> -->
+<!-- <sectorobject> -->
+<!-- <name>astro2</name> -->
+<!-- <mesh>normal_oval_2</mesh> -->
+<!-- <position>10.0, 10, 0.0</position> -->
+<!-- <scale>4, 4, 4</scale> -->
+<!-- <direction>0,0,1</direction> -->
+<!-- </sectorobject> -->
+<!-- <sectorobject> -->
+<!-- <name>astro3</name> -->
+<!-- <mesh>normal_oval_3</mesh> -->
+<!-- <position>20.0, 10, 0.0</position> -->
+<!-- <scale>3, 3, 3</scale> -->
+<!-- <direction>0,0,1</direction> -->
+<!-- </sectorobject> -->
+<!-- <sectorobject> -->
+<!-- <name>astro4</name> -->
+<!-- <mesh>normal_oval_4</mesh> -->
+<!-- <position>30.0, 10, 0.0</position> -->
+<!-- <scale>3, 3, 3</scale> -->
+<!-- <direction>0,0,1</direction> -->
+<!-- </sectorobject> -->
+<!-- <sectorobject> -->
+<!-- <name>astro5</name> -->
+<!-- <mesh>normal_oval_5</mesh> -->
+<!-- <position>40.0, 10, 0.0</position> -->
+<!-- <scale>1, 1, 1</scale> -->
+<!-- <direction>0,0,1</direction> -->
+<!-- </sectorobject> -->
</sector>
Added: trunk/data/stations/tauseti_wake.mesh
===================================================================
(Binary files differ)
Property changes on: trunk/data/stations/tauseti_wake.mesh
___________________________________________________________________
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-07-27 16:55:07
|
Revision: 642
http://opengate.svn.sourceforge.net/opengate/?rev=642&view=rev
Author: ultrasick
Date: 2007-07-27 09:55:08 -0700 (Fri, 27 Jul 2007)
Log Message:
-----------
bug fixed (vectors weren't placed very good)
Modified Paths:
--------------
trunk/data/ships/tauseti/lady_kickstart/17_+_18.png
trunk/templates/data/ships/tauseti/lady_kickstart/parts/17_+_18.pspimage
Modified: trunk/data/ships/tauseti/lady_kickstart/17_+_18.png
===================================================================
(Binary files differ)
Modified: trunk/templates/data/ships/tauseti/lady_kickstart/parts/17_+_18.pspimage
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-07-27 16:17:21
|
Revision: 641
http://opengate.svn.sourceforge.net/opengate/?rev=641&view=rev
Author: ultrasick
Date: 2007-07-27 09:17:19 -0700 (Fri, 27 Jul 2007)
Log Message:
-----------
reverted because accidently uploaded an old file
Modified Paths:
--------------
trunk/data/guns/excavator.xml
Modified: trunk/data/guns/excavator.xml
===================================================================
(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-07-27 15:55:31
|
Revision: 640
http://opengate.svn.sourceforge.net/opengate/?rev=640&view=rev
Author: spom_spom
Date: 2007-07-27 08:55:32 -0700 (Fri, 27 Jul 2007)
Log Message:
-----------
win compatibility commit
Modified Paths:
--------------
branches/ogsector/src/Sector.cpp
branches/ogsector/src/metaserver.cpp
branches/ogsector/src/opengateclient.cpp
branches/ogsector/win32/ogsectorclient/ogsectorclient.exe
branches/ogsector/win32/ogsectorclient/resources.cfg
branches/ogsector/win32/ogsectorclient/runClient.bat
Modified: branches/ogsector/src/Sector.cpp
===================================================================
--- branches/ogsector/src/Sector.cpp 2007-07-27 15:12:58 UTC (rev 639)
+++ branches/ogsector/src/Sector.cpp 2007-07-27 15:55:32 UTC (rev 640)
@@ -61,7 +61,7 @@
// };
-Sector::Sector( Ogre::SceneManager * sceneMgr, NetworkClient * network )
+Sector::Sector( Ogre::SceneManager * sceneMgr, NetworkClient * network )
: sceneMgr_( sceneMgr ), network_( network ) {
log_ = LogManager::getSingletonPtr();
@@ -76,29 +76,29 @@
if ( !collisionDetection_ ) collisionDetection_ = new OpcodeCollisionDetection( sceneMgr_ );
//*** starfield test 1
-// Ogre::ManualObject* myManualObject = sceneMgr_->createManualObject("manual1");
-// Ogre::SceneNode* myManualObjectNode = sceneMgr_->getRootSceneNode()->createChildSceneNode("manual1_node");
-
-// Ogre::MaterialPtr myManualObjectMaterial = Ogre::MaterialManager::getSingleton().create("manual1Material","debugger");
-// myManualObjectMaterial->setReceiveShadows( false );
-// myManualObjectMaterial->getTechnique(0)->setLightingEnabled( true );
-// myManualObjectMaterial->getTechnique(0)->getPass(0)->setDiffuse(1.0, 1.0, 1.0, 1.0);
-// myManualObjectMaterial->getTechnique(0)->getPass(0)->setAmbient(1.0, 1.0, 1.0);
-// myManualObjectMaterial->getTechnique(0)->getPass(0)->setSelfIllumination(1.0, 1.0, 1.0);
-// myManualObject->begin("manual1Material", Ogre::RenderOperation::OT_POINT_LIST);
+// Ogre::ManualObject* myManualObject = sceneMgr_->createManualObject("manual1");
+// Ogre::SceneNode* myManualObjectNode = sceneMgr_->getRootSceneNode()->createChildSceneNode("manual1_node");
+
+// Ogre::MaterialPtr myManualObjectMaterial = Ogre::MaterialManager::getSingleton().create("manual1Material","debugger");
+// myManualObjectMaterial->setReceiveShadows( false );
+// myManualObjectMaterial->getTechnique(0)->setLightingEnabled( true );
+// myManualObjectMaterial->getTechnique(0)->getPass(0)->setDiffuse(1.0, 1.0, 1.0, 1.0);
+// myManualObjectMaterial->getTechnique(0)->getPass(0)->setAmbient(1.0, 1.0, 1.0);
+// myManualObjectMaterial->getTechnique(0)->getPass(0)->setSelfIllumination(1.0, 1.0, 1.0);
+// myManualObject->begin("manual1Material", Ogre::RenderOperation::OT_POINT_LIST);
// for ( int i = 0; i < 3000; i ++ ){
// myManualObject->position(Ogre::Vector3(Ogre::Math::RangeRandom(-1,1),
// Ogre::Math::RangeRandom(-1,1),
// Ogre::Math::RangeRandom(-1,1)).normalisedCopy() *
// Ogre::Math::RangeRandom(10000,40000) );
// }
-// myManualObject->end();
+// myManualObject->end();
// myManualObjectNode->attachObject(myManualObject);
//*** end starfield test 1
//*** starfield test 2
-// starsNode_ = sceneMgr_->getRootSceneNode()->createChildSceneNode("StarfieldNode");
+// starsNode_ = sceneMgr_->getRootSceneNode()->createChildSceneNode("StarfieldNode");
// Ogre::BillboardSet* mySet = sceneMgr_->createBillboardSet("StarfieldNode");
// mySet->setMaterialName( "OpenGate/Star");
// for ( int i = 0; i < 1000; i ++ ){
@@ -115,10 +115,10 @@
if ( 1 ) {
planetNode_ = sceneMgr_->getRootSceneNode()->createChildSceneNode( "PlanetNode" );
Ogre::ManualObject * planet = sceneMgr_->createManualObject( "Planet" );
- // planet->setUseIdentityProjection( true );
+ // planet->setUseIdentityProjection( true );
// planet->setUseIdentityView( true );
-
- planet->begin( "OpenGate/RedPlanet", Ogre::RenderOperation::OT_TRIANGLE_LIST);
+
+ planet->begin( "OpenGate/RedPlanet", Ogre::RenderOperation::OT_TRIANGLE_LIST);
planet->position( Ogre::Vector3( -1.0, -1.0, 200.0 ) );
planet->textureCoord( 0, 0 );
planet->position( Ogre::Vector3( 1.0, -1.0, 200.0 ) );
@@ -129,32 +129,33 @@
planet->textureCoord( 0, 1 );
planet->quad( 0, 1, 2, 3 );
planet->end();
- Ogre::AxisAlignedBox aabInf; aabInf.setInfinite();
+ Ogre::AxisAlignedBox aabInf; aabInf.setInfinite();
planet->setBoundingBox( aabInf );
planetNode_->attachObject( planet );
planetNode_->scale( 20000, 20000, 1 );
planetNode_->setPosition( Ogre::Vector3( 20000.0, 10000.0, 50000 ) );
}
- // Build tangent vectors, all our meshes use only 1 texture coordset
+ // Build tangent vectors, all our meshes use only 1 texture coordset
// Note we can build into VES_TANGENT now (SM2+)
-
+
sceneMgr_->setAmbientLight( Ogre::ColourValue( 0.0, 0.0, 0.0 ) );
-
+
const Ogre::RenderSystemCapabilities * caps = DeviceManager::getSingleton().ogreRoot->getRenderSystem()->getCapabilities();
+ bool mapping = true;
if ( !caps->hasCapability( Ogre::RSC_VERTEX_PROGRAM ) ) {
- OGRE_EXCEPT(Ogre::Exception::ERR_NOT_IMPLEMENTED, "Your card does not support vertex programs.",
- "GameStateManager::GameStateManager");
+ log_->warn("Your card does not support vertex programs.");
+ mapping = false;
}
if ( !( caps->hasCapability( Ogre::RSC_FRAGMENT_PROGRAM ) || caps->hasCapability( Ogre::RSC_DOT3 ) ) ) {
- OGRE_EXCEPT(Ogre::Exception::ERR_NOT_IMPLEMENTED, "Your card does not support dot3 blending or fragment programs.",
- "GameStateManager::GameStateManager" );
+ log_->warn("Your card does not support dot3 blending or fragment programs." );
+ mapping = false;
}
Ogre::MeshPtr pMesh = Ogre::MeshManager::getSingleton().load( "asteroid01.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) ) {
@@ -167,7 +168,8 @@
SectorObject *a2 = createStaticObject( "asteroid01.mesh", "astro without bump", Ogre::Vector3( -250, 0, 500 ) );
a2->mainNode()->scale( 20, 20, 20 );
- a1->entity()->setMaterialName("Asteroid/BumpMapping");
+ if ( mapping ) a1->entity()->setMaterialName("Asteroid/BumpMapping");
+ else { a1->entity()->setMaterialName("Asteroid"); }
a2->entity()->setMaterialName("Asteroid");
@@ -180,19 +182,19 @@
}
Sector::~Sector( ){
-
+
for ( std::map< long, SectorObjectMoveable * >::iterator it = movableObjects_.begin(); it != movableObjects_.end();){
// log_->info( "Destructing: " + it->second->name() );
destructMoveableObject( (it++)->second );
// log_->info( "done: " );
}
-
+
for ( std::set< SectorObject * >::iterator it = sectorObjects_.begin(); it != sectorObjects_.end(); ){
// log_->info( "Destructing: " + (*it)->name() );
if ( (*it)->isOnRadar() && radar_ ){
Ogre::Overlay * radar = Ogre::OverlayManager::getSingleton().getByName( "Radar" );
- Ogre::OverlayContainer * radarMap = radar->getChild( "Radar/Map" );
+ Ogre::OverlayContainer * radarMap = radar->getChild( "Radar/Map" );
radarMap->removeChild( (*it)->dotA()->getName() );
radarMap->removeChild( (*it)->dotB()->getName() );
}
@@ -216,19 +218,19 @@
void Sector::populate( const std::string & fileName ){
TiXmlDocument doc( DeviceManager::getSingleton().findFullFileName( fileName ) );
bool loadOkay = doc.LoadFile();
-
+
if ( !loadOkay ) {
log_->fatal( std::string( "Failed to load sector file: " + fileName ) );
return;
}
-
+
TiXmlHandle docHandle( &doc );
TiXmlElement *pElem, *pSubElem;
TiXmlHandle hRoot( 0 );
pElem = docHandle.FirstChildElement().Element();
hRoot = TiXmlHandle( pElem );
-
+
if ( !pElem ) {
log_->fatal( fileName + " cannot read first node." );
return;
@@ -264,9 +266,9 @@
std::set < Vessel * > vessels( VesselManager::getSingleton().factionVessels( (*factIt) ) );
int vesselCounter = 0;
for ( std::set < Vessel * >::iterator it = vessels.begin(); it != vessels.end(); it ++ ){
- SectorObject * obj = createStaticObject( (*it)->meshPtr().get()->getName(),
+ SectorObject * obj = createStaticObject( (*it)->meshPtr().get()->getName(),
(*it)->factionName() + "/" + (*it)->name(),
- Ogre::Vector3( -1000.0, 50 * factionCounter,
+ Ogre::Vector3( -1000.0, 50 * factionCounter,
-100.0 + 100 * vesselCounter ) );
obj->setBaseRot( (*it)->baseYaw(), (*it)->basePitch(), (*it)->baseRoll() );
@@ -277,9 +279,9 @@
}
}
}
-
- for ( pElem = hRoot.FirstChild( "sectorobject" ).Element(); pElem != 0;
+
+ for ( pElem = hRoot.FirstChild( "sectorobject" ).Element(); pElem != 0;
pElem = pElem->NextSiblingElement("sectorobject") ) {
std::string name;
pSubElem = pElem->FirstChildElement( "name" );
@@ -341,7 +343,7 @@
void Sector::update( Ogre::Real elapsedTime ){
if ( collisionDetection_ ) collisionDetection_->update( elapsedTime );
-
+
if ( avatar_ ) {
if ( planetNode_ ){
Ogre::Vector3 src = planetNode_->getWorldOrientation() * Ogre::Vector3::UNIT_Z;
@@ -360,52 +362,52 @@
if ( radar_ ){
Ogre::Overlay * radar = Ogre::OverlayManager::getSingleton().getByName( "Radar" );
- Ogre::OverlayContainer * radarMap = radar->getChild( "Radar/Map" );
-
+ Ogre::OverlayContainer * radarMap = radar->getChild( "Radar/Map" );
+
int dotAWidth = 4;
int dotAHeight = 2;
float radarRange = 5000;
float radarWidth = radarMap->getWidth() * Ogre::OverlayManager::getSingleton().getViewportWidth();
float radarHeight = radarMap->getHeight() * Ogre::OverlayManager::getSingleton().getViewportHeight();
- float xScale = radarRange / ( radarWidth / 2.0 );
- float yScale = radarRange / ( radarHeight / 2.0 );
-
+ float xScale = radarRange / ( radarWidth / 2.0 );
+ float yScale = radarRange / ( radarHeight / 2.0 );
+
for ( std::set< SectorObject * >::iterator it = sectorObjects_.begin(); it != sectorObjects_.end(); it++){
-
+
Ogre::Vector3 relativPosition( (*it)->mainNode()->getPosition( ) - avatar_->mainNode()->getPosition( ) );
Ogre::OverlayElement * dotA = (*it)->dotA();
Ogre::OverlayElement * dotB = (*it)->dotB();
if ( relativPosition.length() < radarRange ){
-
- Ogre::Quaternion q;
- q.FromAngleAxis( -avatar_->mainNode()->getOrientation( ).getYaw(), Ogre::Vector3::UNIT_Y);
+
+ Ogre::Quaternion q;
+ q.FromAngleAxis( -avatar_->mainNode()->getOrientation( ).getYaw(), Ogre::Vector3::UNIT_Y);
relativPosition = q * relativPosition;
// Ogre::Quaternion r( Ogre::Degree(20), Ogre::Vector3::UNIT_Z);
// relativPosition = r * relativPosition;
// std::cout << relativPosition << std::endl;
- Ogre::Plane viewPlane( avatar_->mainNode()->getOrientation().yAxis().normalisedCopy(),
+ Ogre::Plane viewPlane( avatar_->mainNode()->getOrientation().yAxis().normalisedCopy(),
avatar_->mainNode()->getPosition() );
-
+
float distToPlane = viewPlane.getDistance( (*it)->mainNode()->getPosition( ) ) / yScale;
-
- dotA->setPosition( radarWidth / 2.0 + relativPosition[ 0 ] / xScale - dotAWidth / 2,
- radarHeight / 2.0 + relativPosition[ 2 ] / yScale - dotAHeight / 2 - distToPlane );
-
+
+ dotA->setPosition( radarWidth / 2.0 + relativPosition[ 0 ] / xScale - dotAWidth / 2,
+ radarHeight / 2.0 + relativPosition[ 2 ] / yScale - dotAHeight / 2 - distToPlane );
+
if ( distToPlane < 0 ) distToPlane = 0;
-
- dotB->setHeight( fabs( distToPlane ) );
- dotB->setPosition( radarWidth / 2.0 + relativPosition[ 0 ] / xScale,
+
+ dotB->setHeight( fabs( distToPlane ) );
+ dotB->setPosition( radarWidth / 2.0 + relativPosition[ 0 ] / xScale,
- distToPlane + radarHeight / 2.0 + relativPosition[ 2 ] / yScale );
-
+
if ( (*it)->isOnRadar() == false ){
- radarMap->addChild( dotA );
+ radarMap->addChild( dotA );
radarMap->addChild( dotB );
(*it)->onRadar( true );
- }
+ }
} else { // if not in radarrange
if ( (*it)->isOnRadar() == true ){
radarMap->removeChild( dotA->getName() );
@@ -447,7 +449,7 @@
}
}
-SectorObjectMoveable * Sector::createMoveableObject( const Ogre::String & name, int userID, int childID,
+SectorObjectMoveable * Sector::createMoveableObject( const Ogre::String & name, int userID, int childID,
Vessel & vessel ){
SectorObjectMoveable * obj = new SectorObjectMoveable( name, this, userID, childID, new Vessel( vessel ) );
sectorObjects_.insert( obj );
@@ -462,7 +464,7 @@
if ( obj->isOnRadar() && radar_ ){
Ogre::Overlay * radar = Ogre::OverlayManager::getSingleton().getByName( "Radar" );
- Ogre::OverlayContainer * radarMap = radar->getChild( "Radar/Map" );
+ Ogre::OverlayContainer * radarMap = radar->getChild( "Radar/Map" );
radarMap->removeChild( obj->dotA()->getName() );
radarMap->removeChild( obj->dotB()->getName() );
}
@@ -517,7 +519,7 @@
}
-SectorObjectMoveableAi * Sector::createAiMoveableObject( const Ogre::String & name, int userID, int childID,
+SectorObjectMoveableAi * Sector::createAiMoveableObject( const Ogre::String & name, int userID, int childID,
Vessel & vessel ){
SectorObjectMoveableAi * obj = new SectorObjectMoveableAi( name, this, userID, childID, new Vessel( vessel ) );
sectorObjects_.insert( obj );
@@ -532,8 +534,8 @@
int childID = 1;
while ( localAiObjects_.count( createGlobalID( network_->userID(), childID ) ) ){ childID ++; }
- SectorObjectMoveableAi *obj = createAiMoveableObject( network_->userName() + "_Spawn" + toStr( childID ),
- network_->userID(), childID,
+ SectorObjectMoveableAi *obj = createAiMoveableObject( network_->userName() + "_Spawn" + toStr( childID ),
+ network_->userID(), childID,
*VesselManager::getSingleton().vessel( vesselName ) );
if ( avatar_ ) obj->setTarget( avatar_ );
@@ -549,7 +551,7 @@
obj->setThrust( obj->maxThrust() );
// obj->mainNode()->setPosition( 0.0f, 0.0f, 200.0f);
-
+
sendVesselRegister( obj );
sendVesselMovement( obj );
}
@@ -563,13 +565,13 @@
avatar_->mainNode()->setPosition( 0.0, 0.0, 500.0 );
avatar_->mainNode()->setOrientation( Ogre::Quaternion( 1.0, 0.0, 0.0, 0.0 ) );
// avatar_->setVelocity( Ogre::Vector3( 0.0, 0.0, -20.0 ) );
-
+
avatar_->setVisible( false );
sendVesselRegister( avatar_ );
}
void Sector::destructAvatarObject( ){
- for ( std::map< long, SectorObjectMoveableAi * >::iterator it = localAiObjects_.begin();
+ for ( std::map< long, SectorObjectMoveableAi * >::iterator it = localAiObjects_.begin();
it != localAiObjects_.end(); it ++ ){
if ( it->second->target() == avatar_ ){
@@ -652,22 +654,22 @@
Ogre::Real thickness = 200.0; // Of course this must be less than the radius value.
Ogre::Real nSegments = 96;
Ogre::Real dPhi = 2.0 * 3.141592 / nSegments;
-
+
circle->begin( "shader/gradient", Ogre::RenderOperation::OT_TRIANGLE_LIST);
circle->getSection( 0 )->setCustomParameter( 0, Ogre::Vector4( 23./255, 118./255, 9./255, 0.1 ) );
circle->getSection( 0 )->setCustomParameter( 1, Ogre::Vector4( radius, 0, 0, 0 ) );
-
+
unsigned point_index = 0;
for ( int segment = 0; segment < nSegments; segment++ ) {
Ogre::Real theta = segment * dPhi;
- circle->position( radius * cos( theta ),
+ circle->position( radius * cos( theta ),
0,
radius * sin( theta ) );
- circle->position( (radius - thickness) * cos( theta ),
+ circle->position( (radius - thickness) * cos( theta ),
0,
(radius - thickness) * sin( theta ) );
-
+
if ( segment > 0 ){
point_index = (segment+1)*2-1;
circle->quad( point_index, point_index-1, point_index-3, point_index-2 );
@@ -676,7 +678,7 @@
}
circle->quad( 1, 0, (uint)nSegments*2-2, (uint)nSegments*2-1 );
circle->quad( 1, (uint)nSegments*2-1, (uint)nSegments*2-2, 0 );
- circle->end();
+ circle->end();
object->translate( 0, 0, 50);
object->pitch( Ogre::Degree( 10 ) );
@@ -694,7 +696,7 @@
Ogre::Real thickness = 4; // Of course this must be less than the radius value.
Ogre::Real nSegments = 32;
Ogre::Real dPhi = 2.0 * 3.141592 / nSegments;
-
+
unsigned point_index = 0;
int nRings = 10;
@@ -706,13 +708,13 @@
for ( int segment = 0; segment < nSegments; segment++ ) {
Ogre::Real theta = segment * dPhi;
- circle->position( radius * cos( theta ),
- -radius + i * radius /( nRings / 2.0 ),
+ circle->position( radius * cos( theta ),
+ -radius + i * radius /( nRings / 2.0 ),
radius * sin( theta ) );
- circle->position( (radius - thickness) * cos( theta ),
- -radius + i * radius / ( nRings / 2.0 ),
+ circle->position( (radius - thickness) * cos( theta ),
+ -radius + i * radius / ( nRings / 2.0 ),
(radius - thickness) * sin( theta ) );
-
+
if ( segment > 0 ){
point_index = (segment+1)*2-1;
circle->quad( point_index, point_index-1, point_index-3, point_index-2 );
@@ -721,9 +723,9 @@
}
circle->quad( 1, 0, (uint)nSegments*2-2, (uint)nSegments*2-1 );
circle->quad( 1, (uint)nSegments*2-1, (uint)nSegments*2-2, 0 );
- circle->end();
+ circle->end();
}
-
+
object->translate( -2000, -200, -300);
object->attachObject( circle );
}
@@ -740,7 +742,7 @@
void Sector::sendAllVesselInfos( ){
if ( avatar_ ){
sendVesselStatus( avatar_ );
-
+
for ( std::map< long, SectorObjectMoveableAi * >::iterator it = localAiObjects_.begin(); it != localAiObjects_.end(); it ++ ){
if ( it->second->target() == avatar_ ){
sendVesselMovement( it->second );
@@ -761,7 +763,7 @@
obj->scaledPitch(),
obj->scaledRoll(),
0 );
-
+
network_->send( msg );
}
}
@@ -769,7 +771,7 @@
void Sector::sendVesselRegister( SectorObjectMoveableLocal * obj ){
if ( obj ) {
log_->info( std::string( "Send register " ) + obj->name() + " id:" + toStr( obj->vessel()->id() ) );
- MessageBodyShipRegister msg( obj->userID(), obj->childID(), obj->name(), obj->mainNode()->getPosition(),
+ MessageBodyShipRegister msg( obj->userID(), obj->childID(), obj->name(), obj->mainNode()->getPosition(),
obj->vessel()->id(), obj->mass(), obj->maxShield(), obj->maxThrust() );
network_->send( msg );
}
@@ -777,11 +779,11 @@
}
void Sector::receiveVesselRegister( const MessageBodyShipRegister & msg ){
-
+
if ( !movableObjects_.count( createGlobalID( msg.senderID(), msg.childID() ) ) ){
if ( msg.childID() == 0 ){
log_->info( "Create player object " + msg.name()+ " " + toStr( msg.senderID() ) + " VesselID: " + toStr( msg.vesselID() ) );
- SectorObjectMoveable * obj = createMoveableObject( msg.name(), msg.senderID(), msg.childID(),
+ SectorObjectMoveable * obj = createMoveableObject( msg.name(), msg.senderID(), msg.childID(),
*VesselManager::getSingleton().vessel( msg.vesselID() ) );
obj->mainNode()->setPosition( msg.position() );
obj->setMass( msg.mass() );
@@ -789,23 +791,23 @@
obj->setMaxThrust( msg.maxThrust() );
} else {
- log_->info( "Create ai object " + msg.name()+ " " + toStr( msg.senderID() ) + " " +
+ log_->info( "Create ai object " + msg.name()+ " " + toStr( msg.senderID() ) + " " +
toStr( (int)msg.childID() ) + " " + toStr( msg.vesselID() ) );
-
- SectorObjectMoveableAi * obj = createAiMoveableObject( msg.name(), msg.senderID(), msg.childID(),
+
+ SectorObjectMoveableAi * obj = createAiMoveableObject( msg.name(), msg.senderID(), msg.childID(),
*VesselManager::getSingleton().vessel( msg.vesselID() ) );
obj->mainNode()->setPosition( msg.position() );
-
+
if ( movableObjects_.count( createGlobalID( msg.senderID(), 0 ) ) ){
log_->info( "ai object target: " + movableObjects_[ createGlobalID( msg.senderID(), 0 ) ]->name() );
obj->setTarget( movableObjects_[ createGlobalID( msg.senderID(), 0 ) ] );
- }
+ }
}
sendAllVesselInfos( );
} else {
- log_->warn( std::string( "Registering: object allready exist: " ) +
+ log_->warn( std::string( "Registering: object allready exist: " ) +
movableObjects_[ createGlobalID( msg.senderID(), msg.childID() ) ]->name() );
}
@@ -827,9 +829,9 @@
SectorObjectMoveable *obj = movableObjects_[ createGlobalID( msg.senderID(), msg.childID() ) ];
destructMoveableObject( obj );
-
+
} else {
- log_->warn( std::string( "Deregistering request for unknown object: " ) +
+ log_->warn( std::string( "Deregistering request for unknown object: " ) +
toStr( msg.senderID() ) + ": " + toStr( (int)msg.childID() ) );
}
}
@@ -847,7 +849,7 @@
SectorObjectMoveable *obj = movableObjects_[ createGlobalID( msg.senderID(), msg.childID() ) ];
obj->deathSequence( 0.0 );
} else {
- log_->warn( std::string( "Died vessel request for unknown object: " ) +
+ log_->warn( std::string( "Died vessel request for unknown object: " ) +
toStr( msg.senderID() ) + ": " + toStr( (int)msg.childID() ) );
}
}
@@ -858,8 +860,8 @@
//** we sort the movement messaged
for ( size_t i = 0; i < movements.size(); i ++ ){
-// LogManager::getSingleton().debug( std::string( "Movement: " ) +
-// movableObjects_[ createGlobalID( movements[ i ]->senderID(), movements[ i ]->childID() )]->name() + " " + toStr( movements[ i ]->senderID() ) + " " + toStr( (int)movements[ i ]->childID() ) +
+// LogManager::getSingleton().debug( std::string( "Movement: " ) +
+// movableObjects_[ createGlobalID( movements[ i ]->senderID(), movements[ i ]->childID() )]->name() + " " + toStr( movements[ i ]->senderID() ) + " " + toStr( (int)movements[ i ]->childID() ) +
// " " + toStr( movements[ i ]->position() ) );
if ( movements[ i ]->senderID() != network_->userID() ){
@@ -875,7 +877,7 @@
it->second->setFlightProperties( (*i->second) );
} else {
std::cerr << "Requested non existant object for shipmovement: "
- << network_->userName( i->second->senderID() ) << " at: "
+ << network_->userName( i->second->senderID() ) << " at: "
<< i->second->position() << " this should not happen." << std::endl;
}
}
@@ -947,7 +949,7 @@
void Sector::sendProjectile( const Projectile & projectile ){
if ( network_->online() ){
MessageBodyShipProjectileFired msg( projectile.parent().childID(), projectile.shotCount(),
- projectile.position(), projectile.velocity(),
+ projectile.position(), projectile.velocity(),
projectile.damage(), projectile.lifeTime() );
network_->send( msg );
}
@@ -959,7 +961,7 @@
std::map< long, SectorObjectMoveable * >::iterator it;
if ( ( it = movableObjects_.find( createGlobalID( msg.senderID(), msg.childID() ) ) ) != movableObjects_.end() ){
// Projectile * pro = new Projectile( it->second, msg.shotCount(), msg.velocity().length(), msg.damage(), msg.liveTime() );
-// it->second->addProjectile( pro );
+// it->second->addProjectile( pro );
} else {
log_->warn( "Unknown shooter" );
}
Modified: branches/ogsector/src/metaserver.cpp
===================================================================
--- branches/ogsector/src/metaserver.cpp 2007-07-27 15:12:58 UTC (rev 639)
+++ branches/ogsector/src/metaserver.cpp 2007-07-27 15:55:32 UTC (rev 640)
@@ -19,9 +19,13 @@
***************************************************************************/
#include "metaserver.h"
-#include <boost/regex.hpp>
-#include "config.h"
+//#include <boost/regex.hpp>
+//#include "config.h"
+#ifndef PACKAGE_VERSION
+#define PACKAGE_VERSION
+#endif
+
namespace OpenGate{
MetaConnection::MetaConnection(asio::io_service & io_service) :
@@ -166,8 +170,14 @@
asio::write(socket_, request);
// Read the response status line.
- asio::read_until(socket_, response, boost::regex("\r\n"));
+#ifdef WIN32
+ // we dont have boost:regex within win32, i will fix this later (carsten)
+//asio::read_until(socket_, response, "\n");
+ #else
+ asio::read_until(socket_, response, boost::regex("\r\n"));
+ #endif
+
// Check that response is OK.
std::istream response_stream(&response);
std::string http_version;
@@ -186,7 +196,12 @@
}
// Read the response headers, which are terminated by a blank line.
+ #ifdef WIN32
+ // we dont have boost:regex within win32, i will fix this later (carsten)
+//asio::read_until(socket_, response, "\n");
+ #else
asio::read_until(socket_, response, boost::regex("\r\n\r\n"));
+ #endif
// Process the response headers. (to get the crap of the response before reading the body!)
std::string header;
Modified: branches/ogsector/src/opengateclient.cpp
===================================================================
--- branches/ogsector/src/opengateclient.cpp 2007-07-27 15:12:58 UTC (rev 639)
+++ branches/ogsector/src/opengateclient.cpp 2007-07-27 15:55:32 UTC (rev 640)
@@ -111,7 +111,9 @@
hostname = optarg;
break;
case 'v':
- log->info ( std::string (PACKAGE_STRING) );
+#ifdef PACKAGE_STRING
+ log->info ( std::string (PACKAGE_STRING) );
+#endif
delete log;
return EXIT_SUCCESS;
case '?':
@@ -125,7 +127,7 @@
abort();
}
}
-
+
log->info("Starting up");
#ifdef PACKAGE_STRING
@@ -150,15 +152,15 @@
}
OpenGate::NetworkClient nw( io_service, hostname );
-
+
if ( nw.online() ){
// //** waiting for userid;
asio::thread t( boost::bind( & asio::io_service::run, & io_service ) );
-
+
while( nw.online() && nw.userID() == 0 ){
myMSleep( 100 );
}
-
+
log->info( std::string( "Userid: " + toStr(nw.userID() ) ) );
log->info( std::string( "Login user: " + username + " to: " + nw.hostname() ) );
nw.login( username );
@@ -182,8 +184,8 @@
#endif
}
-
+
nw.close();
delete log;
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-27 15:12:58 UTC (rev 639)
+++ branches/ogsector/win32/ogsectorclient/resources.cfg 2007-07-27 15:55:32 UTC (rev 640)
@@ -6,6 +6,7 @@
FileSystem=../../data
FileSystem=../../data/materials
FileSystem=../../data/textures
+FileSystem=../../data/asteroids
Zip=../../data/simpleSkybox.zip
FileSystem=../../data/MediaFromOgre
FileSystem=../../data/gui
Modified: branches/ogsector/win32/ogsectorclient/runClient.bat
===================================================================
--- branches/ogsector/win32/ogsectorclient/runClient.bat 2007-07-27 15:12:58 UTC (rev 639)
+++ branches/ogsector/win32/ogsectorclient/runClient.bat 2007-07-27 15:55:32 UTC (rev 640)
@@ -1 +1 @@
-ogsectorclient fraps 192.168.1.2 --ogreconfig=1
+ogsectorclient -c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-07-27 15:13:02
|
Revision: 639
http://opengate.svn.sourceforge.net/opengate/?rev=639&view=rev
Author: spom_spom
Date: 2007-07-27 08:12:58 -0700 (Fri, 27 Jul 2007)
Log Message:
-----------
Add asteroid with experimental bump mapping. fixed some small issues.
Modified Paths:
--------------
branches/ogsector/data/MediaFromOgre/AdvancedMaterials/Examples-Advanced.material
branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout
branches/ogsector/data/gui/schemes/opengate.scheme
branches/ogsector/data/materials/squid.material
branches/ogsector/externals/ois-1.0RC1/Makefile.in
branches/ogsector/externals/ois-1.0RC1/demos/Makefile.in
branches/ogsector/externals/ois-1.0RC1/includes/Makefile.in
branches/ogsector/externals/ois-1.0RC1/src/Makefile.in
branches/ogsector/ogre.cfg
branches/ogsector/resources.cfg
branches/ogsector/src/DeviceManager.h
branches/ogsector/src/Entity.h
branches/ogsector/src/EntityManager.cpp
branches/ogsector/src/GameStateManager.cpp
branches/ogsector/src/MarketDialog.cpp
branches/ogsector/src/OpcodeWrapper.cpp
branches/ogsector/src/Projectile.cpp
branches/ogsector/src/Sector.cpp
branches/ogsector/src/Sector.h
branches/ogsector/src/SectorObjects.cpp
branches/ogsector/src/SectorObjects.h
branches/ogsector/src/UnDockedState.cpp
branches/ogsector/src/opengateclient.cpp
trunk/data/guns/excavator.xml
trunk/data/misc/testsector.xml
trunk/data/ships/quantar/storm/storm.material
trunk/data/ships/tauseti/lady_kickstart/lady_kickstart.material
Added Paths:
-----------
branches/ogsector/data/asteroids/
branches/ogsector/data/asteroids/asteroid.material
branches/ogsector/data/asteroids/asteroid.png
branches/ogsector/data/asteroids/asteroid01.blend
branches/ogsector/data/asteroids/asteroid01.mesh
branches/ogsector/data/asteroids/asteroidBump.png
Modified: branches/ogsector/data/MediaFromOgre/AdvancedMaterials/Examples-Advanced.material
===================================================================
--- branches/ogsector/data/MediaFromOgre/AdvancedMaterials/Examples-Advanced.material 2007-07-17 18:14:16 UTC (rev 638)
+++ branches/ogsector/data/MediaFromOgre/AdvancedMaterials/Examples-Advanced.material 2007-07-27 15:12:58 UTC (rev 639)
@@ -1,3 +1,74 @@
+// -------------------------------
+// Cel Shading Section
+// -------------------------------
+vertex_program Ogre/CelShadingVP cg
+{
+ source Example_CelShading.cg
+ entry_point main_vp
+ profiles vs_1_1 arbvp1
+
+ default_params
+ {
+ param_named_auto lightPosition light_position_object_space 0
+ param_named_auto eyePosition camera_position_object_space
+ param_named_auto worldViewProj worldviewproj_matrix
+ param_named shininess float 10
+ }
+}
+
+fragment_program Ogre/CelShadingFP cg
+{
+ source Example_CelShading.cg
+ entry_point main_fp
+ profiles ps_1_1 arbfp1 fp20
+}
+
+
+material Examples/CelShading
+{
+ technique
+ {
+ pass
+ {
+ vertex_program_ref Ogre/CelShadingVP
+ {
+ // map shininess from custom renderable param 1
+ param_named_auto shininess custom 1
+ }
+ fragment_program_ref Ogre/CelShadingFP
+ {
+ // map diffuse from custom renderable param 2
+ param_named_auto diffuse custom 2
+ // map specular from custom renderable param 2
+ param_named_auto specular custom 3
+ }
+ texture_unit
+ {
+ texture cel_shading_diffuse.png 1d
+ tex_address_mode clamp
+ filtering none
+ }
+ texture_unit
+ {
+ texture cel_shading_specular.png 1d
+ tex_address_mode clamp
+ filtering none
+ tex_coord_set 1
+ }
+ texture_unit
+ {
+ texture cel_shading_edge.png 1d
+ tex_address_mode clamp
+ filtering none
+ tex_coord_set 2
+ }
+ }
+ }
+
+}
+
+
+
//------------------------
// Bump mapping section
//------------------------
@@ -497,3 +568,600 @@
}
}
+//---------------------------
+// Projective texture section
+//---------------------------
+
+
+vertex_program Examples/TexProjectionVP cg
+{
+ source Example_Projection.cg
+ entry_point generalPurposeProjection_vp
+ profiles vs_1_1 arbvp1
+}
+
+fragment_program Examples/TexProjectionFP cg
+{
+ source Example_Projection.cg
+ entry_point generalPurposeProjection_fp
+ // sorry, ps_1_1 can't do this, fp20 can though
+ profiles ps_2_0 arbfp1 fp20
+}
+
+material Examples/GeneralTexProjection
+{
+ technique
+ {
+ pass
+ {
+
+ vertex_program_ref Examples/TexProjectionVP
+ {
+ param_named_auto worldViewProjMatrix worldviewproj_matrix
+ param_named_auto worldMatrix world_matrix
+ // You'll need to update the tex projection, I suggest using
+ // the Frustum class
+ //param_named_auto texWorldViewProj worldviewproj_matrix
+ }
+ fragment_program_ref Examples/TexProjectionFP
+ {
+ // no params
+ }
+ texture_unit
+ {
+ // Project the OGRE logo
+ texture ogrelogo.png
+ tex_address_mode clamp
+ }
+ }
+
+
+ }
+
+}
+
+//----------------------------
+// Distortion effects
+//----------------------------
+
+vertex_program Examples/FresnelRefractReflectVP cg
+{
+ source Example_Fresnel.cg
+ entry_point main_vp
+ profiles vs_1_1 arbvp1
+}
+vertex_program Examples/FresnelRefractReflectVPold cg
+{
+ source Example_Fresnel.cg
+ entry_point main_vp_old
+ profiles vs_1_1 arbvp1
+}
+
+fragment_program Examples/FresnelRefractReflectFP cg
+{
+ source Example_Fresnel.cg
+ entry_point main_fp
+ // sorry, ps_1_1 and fp20 can't do this
+ profiles ps_2_0 arbfp1
+}
+
+fragment_program Examples/FresnelRefractReflectPS asm
+{
+ source Example_FresnelPS.asm
+ // sorry, only for ps_1_4 :)
+ syntax ps_1_4
+
+}
+
+material Examples/FresnelReflectionRefraction
+{
+ // ps_2_0 / arbfp1
+ technique
+ {
+ pass
+ {
+
+ vertex_program_ref Examples/FresnelRefractReflectVP
+ {
+ param_named_auto worldViewProjMatrix worldviewproj_matrix
+ param_named_auto eyePosition camera_position_object_space
+ param_named_auto timeVal time 0.05
+ param_named scroll float 1
+ param_named scale float 1
+ param_named noise float 1
+ // scroll and noisePos will need updating per frame
+ }
+ fragment_program_ref Examples/FresnelRefractReflectFP
+ {
+ param_named fresnelBias float -0.1
+ param_named fresnelScale float 1.8
+ param_named fresnelPower float 8
+ param_named tintColour float4 0 0.0.05 0.05 1
+ param_named noiseScale float 0.05
+ }
+ // Noise
+ texture_unit
+ {
+ // Perlin noise volume
+ texture waves2.dds
+ // min / mag filtering, no mip
+ filtering linear linear none
+ }
+ // Reflection
+ texture_unit
+ {
+ // Will be filled in at runtime
+ texture Reflection
+ tex_address_mode clamp
+ // needed by ps.1.4
+ tex_coord_set 1
+ }
+ // Refraction
+ texture_unit
+ {
+ // Will be filled in at runtime
+ texture Refraction
+ tex_address_mode clamp
+ // needed by ps.1.4
+ tex_coord_set 2
+ }
+ }
+
+
+ }
+
+ // ATI 8500 +
+ technique
+ {
+ pass
+ {
+ vertex_program_ref Examples/FresnelRefractReflectVPold
+ {
+ param_named_auto worldViewProjMatrix worldviewproj_matrix
+ param_named_auto eyePosition camera_position_object_space
+ param_named fresnelBias float -0.3
+ param_named fresnelScale float 1.4
+ param_named fresnelPower float 8
+ param_named_auto timeVal time_0_1 20
+ param_named scroll float 1
+ param_named scale float 4
+ param_named noise float 1
+ // scroll and noisePos will need updating per frame
+ }
+
+ // for ATI RADEON 8500 - 9200
+ fragment_program_ref Examples/FresnelRefractReflectPS
+ {
+ // distortionRange
+ param_indexed 0 float 0.025
+ // tintColour
+ param_indexed 1 float4 0.05 0.12 0.15 1
+ }
+
+ // Noise
+ texture_unit
+ {
+ // Perlin noise volume
+ texture perlinvolume.dds 3d
+ // min / mag filtering, no mip
+ filtering linear linear none
+ }
+ // Reflection
+ texture_unit
+ {
+ // Will be filled in at runtime
+ texture Reflection
+ tex_address_mode clamp
+ // needed by ps.1.4
+ tex_coord_set 1
+ }
+ // Refraction
+ texture_unit
+ {
+ // Will be filled in at runtime
+ texture Refraction
+ tex_address_mode clamp
+ // needed by ps.1.4
+ tex_coord_set 2
+ }
+ }
+ }
+}
+
+// Normal-mapped Athene statue
+material Examples/Athene/NormalMapped
+{
+
+ // 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 Ogre/BasicVertexPrograms/AmbientOneTexture
+ {
+ 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 Examples/BumpMapVP
+ {
+ param_named_auto lightPosition light_position_object_space 0
+ param_named_auto worldViewProj worldviewproj_matrix
+ }
+
+ // Fragment program
+ fragment_program_ref Examples/BumpMapFP
+ {
+ param_named_auto lightDiffuse light_diffuse_colour 0
+ }
+
+ // texture shadow receiver program
+ shadow_receiver_vertex_program_ref Examples/BumpMapVPShadowRcv
+ {
+ param_named_auto lightPosition light_position_object_space 0
+ param_named_auto worldViewProj worldviewproj_matrix
+ param_named_auto worldMatrix world_matrix
+ param_named_auto texViewProj texture_viewproj_matrix
+ }
+ // Additive texture shadow receiver program
+ shadow_receiver_fragment_program_ref Examples/BumpMapFPShadowRcv
+ {
+ param_named_auto lightDiffuse light_diffuse_colour 0
+ }
+
+ // Base bump map
+ texture_unit
+ {
+ texture atheneNormalMap.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 Ogre/BasicVertexPrograms/AmbientOneTexture
+ {
+ param_named_auto worldViewProj worldviewproj_matrix
+ param_named ambient float4 1 1 1 1
+ }
+ scene_blend dest_colour zero
+ texture_unit
+ {
+ texture egyptrockyfull.jpg
+ }
+
+ }
+ }
+
+ // 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 Ogre/BasicVertexPrograms/AmbientOneTexture
+ {
+ 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 Examples/BumpMapVP
+ {
+ param_named_auto lightPosition light_position_object_space 0
+ param_named_auto worldViewProj worldviewproj_matrix
+ }
+
+ // Base bump map
+ texture_unit
+ {
+ texture atheneNormalMap.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 Ogre/BasicVertexPrograms/AmbientOneTexture
+ {
+ param_named_auto worldViewProj worldviewproj_matrix
+ param_named ambient float4 1 1 1 1
+ }
+ scene_blend dest_colour zero
+ texture_unit
+ {
+ texture egyptrockyfull.jpg
+ }
+
+ }
+
+ }
+}
+
+// Basic Athene statue
+material Examples/Athene/Basic
+{
+
+ technique
+ {
+ pass
+ {
+ ambient 0.3 0.3 0.3
+ diffuse 1.0 1.0 0.9
+
+ texture_unit
+ {
+ texture egyptrockyfull.jpg
+ }
+
+ }
+ }
+}
+
+
+// Any number of lights, diffuse and specular
+material Examples/Athene/NormalMappedSpecular
+{
+
+ // 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 Ogre/BasicVertexPrograms/AmbientOneTexture
+ {
+ 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 Examples/BumpMapVPSpecular
+ {
+ param_named_auto lightPosition light_position_object_space 0
+ param_named_auto eyePosition camera_position_object_space
+ param_named_auto worldViewProj worldviewproj_matrix
+ }
+
+ // Fragment program
+ fragment_program_ref Examples/BumpMapFPSpecular
+ {
+ param_named_auto lightDiffuse light_diffuse_colour 0
+ param_named_auto lightSpecular light_specular_colour 0
+ }
+
+ // Base bump map
+ texture_unit
+ {
+ texture atheneNormalMap.png
+ colour_op replace
+ }
+ // Normalisation cube map
+ texture_unit
+ {
+ cubic_texture nm.png combinedUVW
+ tex_coord_set 1
+ tex_address_mode clamp
+ }
+ // Normalisation cube map #2
+ texture_unit
+ {
+ cubic_texture nm.png combinedUVW
+ tex_coord_set 2
+ tex_address_mode clamp
+ }
+ }
+
+ // 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 Ogre/BasicVertexPrograms/AmbientOneTexture
+ {
+ param_named_auto worldViewProj worldviewproj_matrix
+ param_named ambient float4 1 1 1 1
+ }
+ scene_blend dest_colour zero
+ texture_unit
+ {
+ texture egyptrockyfull.jpg
+ }
+
+ }
+ }
+
+ // This is the fallback which cards which don't have fragment program
+ // support will use, NB does not support specular colour
+ // 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 Ogre/BasicVertexPrograms/AmbientOneTexture
+ {
+ 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 Examples/BumpMapVP
+ {
+ param_named_auto lightPosition light_position_object_space 0
+ param_named_auto worldViewProj worldviewproj_matrix
+ }
+
+ // Base bump map
+ texture_unit
+ {
+ texture atheneNormalMap.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 Ogre/BasicVertexPrograms/AmbientOneTexture
+ {
+ param_named_auto worldViewProj worldviewproj_matrix
+ param_named ambient float4 1 1 1 1
+ }
+ scene_blend dest_colour zero
+ texture_unit
+ {
+ texture egyptrockyfull.jpg
+ }
+
+ }
+
+ }
+}
+
Added: branches/ogsector/data/asteroids/asteroid.material
===================================================================
--- branches/ogsector/data/asteroids/asteroid.material (rev 0)
+++ branches/ogsector/data/asteroids/asteroid.material 2007-07-27 15:12:58 UTC (rev 639)
@@ -0,0 +1,226 @@
+vertex_program Asteroid/BumpMapVP cg
+{
+ source Example_BumpMapping.cg
+ entry_point main_vp
+ profiles vs_1_1 arbvp1
+}
+
+// Bump map fragment program, support for this is optional
+fragment_program Asteroid/BumpMapFP cg
+{
+ source Example_BumpMapping.cg
+ entry_point main_fp
+ profiles vs_1_1 arbfp1 fp20
+}
+
+// Bump map with specular vertex program, support for this is required
+vertex_program Asteroid/BumpMapVPSpecular cg
+{
+ source Example_BumpMapping.cg
+ entry_point specular_vp
+ profiles vs_1_1 arbvp1
+}
+
+// Bump map fragment program, support for this is optional
+fragment_program Asteroid/BumpMapFPSpecular cg
+{
+ source Example_BumpMapping.cg
+ entry_point specular_fp
+ profiles vs_1_1 arbfp1 fp20
+}
+
+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 Ogre/BasicVertexPrograms/AmbientOneTexture
+ {
+ 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 Asteroid/BumpMapVP
+ {
+ param_named_auto lightPosition light_position_object_space 0
+ param_named_auto worldViewProj worldviewproj_matrix
+ }
+
+ // Fragment program
+ fragment_program_ref Asteroid/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 Ogre/BasicVertexPrograms/AmbientOneTexture
+ {
+ 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 Ogre/BasicVertexPrograms/AmbientOneTexture
+ {
+ 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 Asteroid/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 Ogre/BasicVertexPrograms/AmbientOneTexture
+ {
+ 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
+{
+ 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 asteroid.png
+ }
+ }
+ }
+}
+
Added: branches/ogsector/data/asteroids/asteroid.png
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/data/asteroids/asteroid.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/data/asteroids/asteroid01.blend
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/data/asteroids/asteroid01.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/data/asteroids/asteroid01.mesh
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/data/asteroids/asteroid01.mesh
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ogsector/data/asteroids/asteroidBump.png
===================================================================
(Binary files differ)
Property changes on: branches/ogsector/data/asteroids/asteroidBump.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout
===================================================================
--- branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout 2007-07-17 18:14:16 UTC (rev 638)
+++ branches/ogsector/data/gui/layouts/dialogs/MarketDialog.layout 2007-07-27 15:12:58 UTC (rev 639)
@@ -1,15 +1,17 @@
<?xml version="1.0" ?>
<GUILayout>
- <Window Type="opengate/StaticGreenImage" Name="MarketDialog">
-<!-- <Window Type="opengate/StaticGreenImage" Name="MarketDialog"> -->
+<!-- used ingame -->
+ <Window Type="opengate/StaticGreenImage" Name="MarketDialog">
<Property Name="MousePassThroughEnabled" Value="True" />
- <Property Name="UnifiedPosition" Value="{{0.0,100},{0.0,115}}" />
- <Property Name="UnifiedSize" Value="{{1.0,-167},{1.0,-217}}" />
- <Property Name="Text" Value="Market" />
+ <Property Name="UnifiedPosition" Value="{{0.0, 100},{0.0, 115}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, -167},{1.0, -217}}" />
+ <Property Name="Text" Value="Market" />
<!-- ********************* -->
<!-- Item Detailed View -->
<!-- ********************* -->
+
+<!-- used ingame -->
<Window Type="opengate/StaticGreenImage" Name="MarketItemDetailedView">
<Property Name="UnifiedPosition" Value="{{0,220},{0.0,10}}" />
<Property Name="UnifiedSize" Value="{{1.0,-230},{1.0,-170}}" />
@@ -131,7 +133,7 @@
</Window>
</Window>
<Window Type="opengate/StaticLabel" Name="MarketItemDetailedView/TextFrame/Amount">
- <Property Name="UnifiedPosition" Value="{{0.0, 0},{1.0, -60}}" />
+ <Property Name="UnifiedPosition" Value="{{0.0, 0},{1.0, -60}}" />
<Property Name="UnifiedSize" Value="{{1.0, 0},{0.0, 20}}" />
<Property Name="Text" Value="Amount available:" />
<Window Type="opengate/StaticLabel" Name="MarketItemDetailedView/TextFrame/Amount/Text">
@@ -174,7 +176,7 @@
<Property Name="RiseOnClick" Value="False" />
<Property Name="MousePassThroughEnabled" Value="True" />
</Window>
- <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/NotNowButton">
+ <Window Type="opengate/ImageButton" Name="MarketItemDetailedView/NotNowButton">
<Property Name="UnifiedPosition" Value="{{1.0, -80},{1.0, -26}}" />
<Property Name="UnifiedSize" Value="{{0.0, 80},{0.0, 20}}" />
<Property Name="Text" Value="Not now" />
@@ -186,12 +188,12 @@
<Property Name="RiseOnClick" Value="False" />
<Property Name="MousePassThroughEnabled" Value="True" />
</Window>
- <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/AcceptButton">
+ <Window Type="opengate/ImageButton" Name="MarketItemDetailedView/AcceptButton">
<Property Name="UnifiedPosition" Value="{{1.0, -170},{1.0, -26}}" />
<Property Name="UnifiedSize" Value="{{0.0, 80},{0.0, 20}}" />
<Property Name="Text" Value="Accept now" />
</Window>
- <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/Decrease100">
+ <Window Type="opengate/ImageButton" Name="MarketItemDetailedView/Decrease100">
<Property Name="UnifiedPosition" Value="{{0.0, 0},{1.0, -24}}" />
<Property Name="UnifiedSize" Value="{{0.0, 22},{0.0, 17}}" />
<Property Name="Visible" Value="False" />
@@ -199,7 +201,7 @@
<Property Name="HoverImage" Value="set:opengate image:MarketDecrease100Hover" />
<Property Name="PushedImage" Value="set:opengate image:MarketDecrease100Pushed" />
</Window>
- <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/Decrease10">
+ <Window Type="opengate/ImageButton" Name="MarketItemDetailedView/Decrease10">
<Property Name="UnifiedPosition" Value="{{0.0, 25},{1.0, -24}}" />
<Property Name="UnifiedSize" Value="{{0.0, 22},{0.0, 17}}" />
<Property Name="Visible" Value="False" />
@@ -207,7 +209,7 @@
<Property Name="HoverImage" Value="set:opengate image:MarketDecrease10Hover" />
<Property Name="PushedImage" Value="set:opengate image:MarketDecrease10Pushed" />
</Window>
- <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/Decrease1">
+ <Window Type="opengate/ImageButton" Name="MarketItemDetailedView/Decrease1">
<Property Name="UnifiedPosition" Value="{{0.0, 50},{1.0, -24}}" />
<Property Name="UnifiedSize" Value="{{0.0, 22},{0.0, 17}}" />
<Property Name="NormalImage" Value="set:opengate image:MarketDecrease1Normal" />
@@ -226,14 +228,14 @@
<Property Name="UnifiedPosition" Value="{{0.0, 76},{1.0, -24}}" />
<Property Name="UnifiedSize" Value="{{0.0, 41},{0.0, 17}}" />
</Window>
- <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/Increase1">
+ <Window Type="opengate/ImageButton" Name="MarketItemDetailedView/Increase1">
<Property Name="UnifiedPosition" Value="{{0.0, 120},{1.0, -24}}" />
<Property Name="UnifiedSize" Value="{{0.0, 22},{0.0, 17}}" />
<Property Name="NormalImage" Value="set:opengate image:MarketIncrease1Normal" />
<Property Name="HoverImage" Value="set:opengate image:MarketIncrease1Hover" />
<Property Name="PushedImage" Value="set:opengate image:MarketIncrease1Pushed" />
</Window>
- <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/Increase10">
+ <Window Type="opengate/ImageButton" Name="MarketItemDetailedView/Increase10">
<Property Name="UnifiedPosition" Value="{{0.0, 145},{1.0, -24}}" />
<Property Name="UnifiedSize" Value="{{0.0, 22},{0.0, 17}}" />
<Property Name="Visible" Value="False" />
@@ -241,7 +243,7 @@
<Property Name="HoverImage" Value="set:opengate image:MarketIncrease10Hover" />
<Property Name="PushedImage" Value="set:opengate image:MarketIncrease10Pushed" />
</Window>
- <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/Increase100">
+ <Window Type="opengate/ImageButton" Name="MarketItemDetailedView/Increase100">
<Property Name="UnifiedPosition" Value="{{0.0, 170},{1.0, -24}}" />
<Property Name="UnifiedSize" Value="{{0.0, 22},{0.0, 17}}" />
<Property Name="Visible" Value="False" />
@@ -249,7 +251,7 @@
<Property Name="HoverImage" Value="set:opengate image:MarketIncrease100Hover" />
<Property Name="PushedImage" Value="set:opengate image:MarketIncrease100Pushed" />
</Window>
- <Window Type="opengate/EmptyButton" Name="MarketItemDetailedView/SellAll">
+ <Window Type="opengate/ImageButton" Name="MarketItemDetailedView/SellAll">
<Property Name="UnifiedPosition" Value="{{0.0, 195},{1.0, -24}}" />
<Property Name="UnifiedSize" Value="{{0.0, 22},{0.0, 17}}" />
<Property Name="NormalImage" Value="set:opengate image:MarketSellAllNormal" />
@@ -471,6 +473,7 @@
<Property Name="Text" Value="" />
</Window>
</Window>
+
<!-- ********************* -->
<!-- Catagorie Selection -->
<!-- ********************* -->
@@ -615,287 +618,314 @@
</Window>
</Window>
</Window>
+
<!-- ********************* -->
<!-- Market Item Selection -->
<!-- ********************* -->
- <Window Type="opengate/StaticGreenImage" Name="MarketWindow">
- <Property Name="UnifiedPosition" Value="{{0,225},{0.0,10}}" />
- <Property Name="UnifiedSize" Value="{{1.0,-496},{1.0,-170}}" />
- <Property Name="BackgroundEnabled" Value="False" />
- <Property Name="FrameEnabled" Value="False" />
- <Window Type="opengate/StaticGreenImage" Name="MarketItemWindow">
- <Property Name="UnifiedPosition" Value="{{0.0, 0},{0.0, 31}}" />
+
+<!-- used ingame -->
+ <Window Type="opengate/StaticWindow" Name="MarketWindow">
+ <Property Name="UnifiedPosition" Value="{{0.0, 225},{0.0, 10}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, -496},{1.0, -170}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+<!-- used ingame -->
+ <Window Type="opengate/StaticWindow" Name="MarketWindow/ItemFrame">
+ <Property Name="UnifiedPosition" Value="{{0.0, 0},{0.0, 31}}" />
<Property Name="UnifiedSize" Value="{{1.0, -31},{1.0, -31}}" />
<Property Name="BackgroundEnabled" Value="False" />
<Property Name="FrameEnabled" Value="False" />
- </Window>
- <Window Type="opengate/StaticGreenImage" Name="MarketItemWindowTopLeft">
- <Property Name="UnifiedPosition" Value="{{0.0,0},{0.0,0}}" />
- <Property Name="UnifiedSize" Value="{{0.0,31},{0.0,31}}" />
- <Property Name="BackgroundEnabled" Value="False" />
- <Property Name="FrameEnabled" Value="False" />
- <Property Name="Image" Value="set:opengate image:StaticGreenTopLeft"/>
- </Window>
- <Window Type="opengate/StaticGreenImage" Name="MarketItemWindowTop">
- <Property Name="UnifiedPosition" Value="{{0.0,31},{0.0,0}}" />
- <Property Name="UnifiedSize" Value="{{1.0,-62},{0.0,31}}" />
- <Property Name="BackgroundEnabled" Value="False" />
- <Property Name="FrameEnabled" Value="False" />
+ </Window>
+ <Window Type="opengate/StaticImage" Name="MarketWindow/TopFrame/LeftImage">
+ <Property Name="UnifiedPosition" Value="{{0.0, 0},{0.0, 0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 31},{0.0, 31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenTopLeft"/>
+ </Window>
+ <Window Type="opengate/StaticImage" Name="MarketWindow/TopFrame/TopImage">
+ <Property Name="UnifiedPosition" Value="{{0.0, 31},{0.0, 0}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, -62},{0.0, 31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
<Property Name="Image" Value="set:opengate image:StaticGreenTop"/>
- <Window Type="opengate/StaticLabel" Name="MarketItem/Title">
+<!-- used ingame -->
+ <Window Type="opengate/StaticLabel" Name="MarketWindow/Title">
<Property Name="UnifiedPosition" Value="{{0.0, 0},{0.0, 7}}" />
<Property Name="UnifiedSize" Value="{{0.0, 100},{1.0, 0}}" />
<Property Name="Text" Value="Public market" />
- <Property Name="Font" Value="BlueHighway-14" />
- </Window>
- <Window Type="opengate/StaticImage" Name="MarketItemSortCategoryHighlight">
- <Property Name="UnifiedPosition" Value="{{0.0,100},{0.0,8}}" />
- <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
- <Property Name="BackgroundEnabled" Value="False" />
- <Property Name="FrameEnabled" Value="False" />
- <Property Name="AlwaysOnTop" Value="True" />
+ <Property Name="Font" Value="BlueHighway-14" />
+ </Window>
+<!-- used ingame -->
+ <Window Type="opengate/StaticImage" Name="MarketWindow/Sort/CategoryHighlightImage">
+ <Property Name="UnifiedPosition" Value="{{0.0, 100},{0.0, 8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 16},{0.0, 16}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="AlwaysOnTop" Value="True" />
<Property Name="MousePassThroughEnabled" Value="True" />
- <Property Name="Image" Value="set:opengate image:MarketItemSortHighlight" />
+ <Property Name="Image" Value="set:opengate image:MarketItemSortHighlight" />
</Window>
- <Window Type="opengate/EmptyButton" Name="MarketItemSortAlphaAscend">
- <Property Name="UnifiedPosition" Value="{{0.0,100},{0.0,8}}" />
- <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
- <Property Name="NormalImage" Value="set:opengate image:MarketItemSortAlphaAscendNormal" />
- <Property Name="HoverImage" Value="set:opengate image:MarketItemSortAlphaAscendHover" />
- <Property Name="PushedImage" Value="set:opengate image:MarketItemSortAlphaAscendHover" />
+<!-- used ingame -->
+ <Window Type="opengate/ImageButton" Name="MarketWindow/Sort/AlphaAscendButton">
+ <Property Name="UnifiedPosition" Value="{{0.0, 100},{0.0, 8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 16},{0.0, 16}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketItemSortAlphaAscendNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketItemSortAlphaAscendHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketItemSortAlphaAscendHover" />
</Window>
- <Window Type="opengate/EmptyButton" Name="MarketItemSortAlphaDescend">
- <Property Name="UnifiedPosition" Value="{{0.0,100},{0.0,8}}" />
- <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
- <Property Name="NormalImage" Value="set:opengate image:MarketItemSortAlphaDescendNormal" />
- <Property Name="HoverImage" Value="set:opengate image:MarketItemSortAlphaDescendHover" />
- <Property Name="PushedImage" Value="set:opengate image:MarketItemSortAlphaDescendHover" />
- <Property Name="Visible" Value="False" />
+<!-- used ingame -->
+ <Window Type="opengate/ImageButton" Name="MarketWindow/Sort/AlphaDescendButton">
+ <Property Name="UnifiedPosition" Value="{{0.0, 100},{0.0, 8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 16},{0.0, 16}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketItemSortAlphaDescendNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketItemSortAlphaDescendHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketItemSortAlphaDescendHover" />
+ <Property Name="Visible" Value="False" />
</Window>
- <Window Type="opengate/EmptyButton" Name="MarketItemSortCost">
- <Property Name="UnifiedPosition" Value="{{0.0,118},{0.0,8}}" />
- <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
- <Property Name="NormalImage" Value="set:opengate image:MarketItemSortCostNormal" />
- <Property Name="HoverImage" Value="set:opengate image:MarketItemSortCostHover" />
- <Property Name="PushedImage" Value="set:opengate image:MarketItemSortCostHover" />
- <Property Name="Disabled" Value="True" />
+<!-- used ingame -->
+ <Window Type="opengate/ImageButton" Name="MarketWindow/Sort/CostButton">
+ <Property Name="UnifiedPosition" Value="{{0.0, 118},{0.0, 8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 16},{0.0, 16}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketItemSortCostNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketItemSortCostHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketItemSortCostHover" />
+ <Property Name="Disabled" Value="True" />
</Window>
- <Window Type="opengate/EmptyButton" Name="MarketItemSortSizeAscend">
- <Property Name="UnifiedPosition" Value="{{0.0,136},{0.0,8}}" />
- <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
- <Property Name="NormalImage" Value="set:opengate image:MarketItemSortSizeAscendNormal" />
- <Property Name="HoverImage" Value="set:opengate image:MarketItemSortSizeAscendHover" />
- <Property Name="PushedImage" Value="set:opengate image:MarketItemSortSizeAscendHover" />
+<!-- used ingame -->
+ <Window Type="opengate/ImageButton" Name="MarketWindow/Sort/SizeAscendButton">
+ <Property Name="UnifiedPosition" Value="{{0.0, 136},{0.0, 8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 16},{0.0, 16}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketItemSortSizeAscendNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketItemSortSizeAscendHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketItemSortSizeAscendHover" />
</Window>
- <Window Type="opengate/EmptyButton" Name="MarketItemSortSizeDescend">
- <Property Name="UnifiedPosition" Value="{{0.0,136},{0.0,8}}" />
- <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
- <Property Name="NormalImage" Value="set:opengate image:MarketItemSortSizeDescendNormal" />
- <Property Name="HoverImage" Value="set:opengate image:MarketItemSortSizeDescendHover" />
- <Property Name="PushedImage" Value="set:opengate image:MarketItemSortSizeDescendHover" />
- <Property Name="Visible" Value="False" />
+<!-- used ingame -->
+ <Window Type="opengate/ImageButton" Name="MarketWindow/Sort/SizeDescendButton">
+ <Property Name="UnifiedPosition" Value="{{0.0, 136},{0.0, 8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 16},{0.0, 16}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketItemSortSizeDescendNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketItemSortSizeDescendHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketItemSortSizeDescendHover" />
+ <Property Name="Visible" Value="False" />
</Window>
- <Window Type="opengate/EmptyButton" Name="MarketItemSortRank">
- <Property Name="UnifiedPosition" Value="{{0.0,154},{0.0,8}}" />
- <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
- <Property Name="NormalImage" Value="set:opengate image:MarketItemSortRankNormal" />
- <Property Name="HoverImage" Value="set:opengate image:MarketItemSortRankHover" />
- <Property Name="PushedImage" Value="set:opengate image:MarketItemSortRankHover" />
+<!-- used ingame -->
+ <Window Type="opengate/ImageButton" Name="MarketWindow/Sort/RankButton">
+ <Property Name="UnifiedPosition" Value="{{0.0, 154},{0.0, 8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 16},{0.0, 16}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketItemSortRankNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketItemSortRankHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketItemSortRankHover" />
</Window>
- <Window Type="opengate/EmptyButton" Name="MarketItemSortAmountAscend">
- <Property Name="UnifiedPosition" Value="{{0.0,172},{0.0,8}}" />
- <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
- <Property Name="NormalImage" Value="set:opengate image:MarketItemSortAmountAscendNormal" />
- <Property Name="HoverImage" Value="set:opengate image:MarketItemSortAmountAscendHover" />
- <Property Name="PushedImage" Value="set:opengate image:MarketItemSortAmountAscendHover" />
- <Property Name="Disabled" Value="True" />
+<!-- used ingame -->
+ <Window Type="opengate/ImageButton" Name="MarketWindow/Sort/AmountAscendButton">
+ <Property Name="UnifiedPosition" Value="{{0.0, 172},{0.0, 8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 16},{0.0, 16}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketItemSortAmountAscendNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketItemSortAmountAscendHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketItemSortAmountAscendHover" />
+ <Property Name="Disabled" Value="True" />
</Window>
- <Window Type="opengate/EmptyButton" Name="MarketItemSortAmountDescend">
- <Property Name="UnifiedPosition" Value="{{0.0,172},{0.0,8}}" />
- <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
- <Property Name="NormalImage" Value="set:opengate image:MarketItemSortAmountDescendNormal" />
- <Property Name="HoverImage" Value="set:opengate image:MarketItemSortAmountDescendHover" />
- <Property Name="PushedImage" Value="set:opengate image:MarketItemSortAmountDescendHover" />
- <Property Name="Visible" Value="False" />
- <Property Name="Disabled" Value="True" />
+<!-- used ingame -->
+ <Window Type="opengate/ImageButton" Name="MarketWindow/Sort/AmountDescendButton">
+ <Property Name="UnifiedPosition" Value="{{0.0, 172},{0.0, 8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 16},{0.0, 16}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketItemSortAmountDescendNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketItemSortAmountDescendHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketItemSortAmountDescendHover" />
+ <Property Name="Visible" Value="False" />
+ <Property Name="Disabled" Value="True" />
</Window>
- <Window Type="opengate/StaticImage" Name="MarketItemSortHighlight">
- <Property Name="UnifiedPosition" Value="{{0.0,195},{0.0,8}}" />
- <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
- <Property Name="BackgroundEnabled" Value="False" />
- <Property Name="FrameEnabled" Value="False" />
- <Property Name="AlwaysOnTop" Value="True" />
- <Property Name="Image" Value="set:opengate image:MarketItemSortHighlight" />
- <Property Name="Disabled" Value="True" />
+<!-- used ingame -->
+ <Window Type="opengate/StaticImage" Name="MarketWindow/Sort/OrderHighlightImage">
+ <Property Name="UnifiedPosition" Value="{{0.0, 195},{0.0, 8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 16},{0.0, 16}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="AlwaysOnTop" Value="True" />
+ <Property Name="Image" Value="set:opengate image:MarketItemSortHighlight" />
+ <Property Name="Disabled" Value="True" />
</Window>
- <Window Type="opengate/EmptyButton" Name="MarketItemSortAscend">
- <Property Name="UnifiedPosition" Value="{{0.0,195},{0.0,8}}" />
- <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
- <Property Name="NormalImage" Value="set:opengate image:MarketItemSortAscendNormal" />
- <Property Name="HoverImage" Value="set:opengate image:MarketItemSortAscendHover" />
- <Property Name="PushedImage" Value="set:opengate image:MarketItemSortAscendHover" />
+<!-- used ingame -->
+ <Window Type="opengate/ImageButton" Name="MarketWindow/Sort/AscendOrderButton">
+ <Property Name="UnifiedPosition" Value="{{0.0, 195},{0.0, 8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 16},{0.0, 16}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketItemSortAscendNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketItemSortAscendHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketItemSortAscendHover" />
</Window>
- <Window Type="opengate/EmptyButton" Name="MarketItemSortDescend">
- <Property Name="UnifiedPosition" Value="{{0.0,213},{0.0,8}}" />
- <Property Name="UnifiedSize" Value="{{0.0,16},{0.0,16}}" />
- <Property Name="NormalImage" Value="set:opengate image:MarketItemSortDescendNormal" />
- <Property Name="HoverImage" Value="set:opengate image:MarketItemSortDescendHover" />
- <Property Name="PushedImage" Value="set:opengate image:MarketItemSortDescendHover" />
+<!-- used ingame -->
+ <Window Type="opengate/ImageButton" Name="MarketWindow/Sort/DescendOrderButton">
+ <Property Name="UnifiedPosition" Value="{{0.0, 213},{0.0, 8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 16},{0.0, 16}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketItemSortDescendNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketItemSortDescendHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketItemSortDescendHover" />
</Window>
- <Window Type="opengate/EmptyButton" Name="MarketItemSortShowAll">
- <Property Name="UnifiedPosition" Value="{{1.0,-61},{0.0,8}}" />
- <Property Name="UnifiedSize" Value="{{0.0,61},{0.0,16}}" />
- <Property Name="NormalImage" Value="set:opengate image:MarketItemSortShowAllNormal" />
- <Property Name="HoverImage" Value="set:opengate image:MarketItemSortDescendHover" />
- <Property Name="PushedImage" Value="set:opengate image:MarketItemSortShowAllHover" />
- <Property Name="Disabled" Value="True" />
+<!-- used ingame -->
+ <Window Type="opengate/StaticImage" Name="MarketWindow/Sort/ShowAllHighlightImage">
+ <Property Name="UnifiedPosition" Value="{{1.0, -61},{0.0, 8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 61},{0.0, 16}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:MarketItemSortShowAllHighlight" />
</Window>
- <Window Type="opengate/StaticImage" Name="MarketItemSortShowAllHighlight">
- <Property Name="UnifiedPosition" Value="{{1.0,-61},{0.0,8}}" />
- <Property Name="UnifiedSize" Value="{{0.0,61},{0.0,16}}" />
- <Property Name="BackgroundEnabled" Value="False" />
- <Property Name="FrameEnabled" Value="False" />
- <Property Name="Image" Value="set:opengate image:MarketItemSortShowAllHighlight" />
+<!-- used ingame -->
+ <Window Type="opengate/ImageButton" Name="MarketWindow/Sort/ShowAllButton">
+ <Property Name="UnifiedPosition" Value="{{1.0, -61},{0.0, 8}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 61},{0.0, 16}}" />
+ <Property Name="NormalImage" Value="set:opengate image:MarketItemSortShowAllNormal" />
+ <Property Name="HoverImage" Value="set:opengate image:MarketItemSortDescendHover" />
+ <Property Name="PushedImage" Value="set:opengate image:MarketItemSortShowAllHover" />
+ <Property Name="Disabled" Value="True" />
</Window>
</Window>
- <Window Type="opengate/StaticGreenImage" Name="MarketItemWindowBottom">
- <Property Name="UnifiedPosition" Value="{{0.0,0},{0.0,31}}" />
- <Property Name="UnifiedSize" Value="{{1.0,-31},{0.0,1}}" />
- <Property Name="BackgroundEnabled" Value="False" />
- <Property Name="FrameEnabled" Value="False" />
- <Property Name="Image" Value="set:opengate image:StaticGreenHorizLine"/>
+
+ <Window Type="opengate/StaticImage" Name="MarketWindow/TopFrame/BottomImage">
+ <Property Name="UnifiedPosition" Value="{{0.0, 0},{0.0, 31}}" />
+ <Property Name="UnifiedSize" Value="{{1.0, -31},{0.0, 1}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenHorizLine"/>
</Window>
- <Window Type="opengate/StaticGreenImage" Name="MarketItemWindowTopRight">
- <Property Name="UnifiedPosition" Value="{{1.0,-31},{0.0,0}}" />
- <Property Name="UnifiedSize" Value="{{0.0,31},{0.0,31}}" />
- <Property Name="BackgroundEnabled" Value="False" />
- <Property Name="FrameEnabled" Value="False" />
- <Property Name="Image" Value="set:opengate image:StaticGreenTopRight"/>
+ <Window Type="opengate/StaticImage" Name="MarketWindow/TopFrame/RightImage">
+ <Property Name="UnifiedPosition" Value="{{1.0, -31},{0.0, 0}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 31},{0.0, 31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenTopRight"/>
</Window>
- <Window Type="opengate/StaticGreenImage" Name="MarketItemWindowRight">
- <Property Name="UnifiedPosition" Value="{{1.0,-31},{0.0,31}}" />
- <Property Name="UnifiedSize" Value="{{0.0,31},{1.0,-62}}" />
- <Property Name="RiseOnClick" Value="False" />
- <Property Name="BackgroundEnabled" Value="False" />
- <Property Name="FrameEnabled" Value="False" />
- <Property Name="Image" Value="set:opengate image:StaticGreenRight"/>
+ <Window Type="opengate/StaticImage" Name="MarketWindow/RightFrame/RightImage">
+ <Property Name="UnifiedPosition" Value="{{1.0, -31},{0.0, 31}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 31},{1.0, -62}}" />
+ <Property Name="RiseOnClick" Value="False" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenRight"/>
</Window>
- <Window Type="opengate/StaticGreenImage" Name="MarketItemWindowBottomRight">
- <Property Name="UnifiedPosition" Value="{{1.0,-31},{1.0,-31}}" />
- <Property Name="UnifiedSize" Value="{{0.0,31},{0.0,31}}" />
- <Property Name="BackgroundEnabled" Value="False" />
- <Property Name="FrameEnabled" Value="False" />
- <Property Name="Image" Value="set:opengate image:StaticGreenBottomRight"/>
+ <Window Type="opengate/StaticImage" Name="MarketWindow/RightFrame/BottomImage">
+ <Property Name="UnifiedPosition" Value="{{1.0, -31},{1.0, -31}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 31},{0.0, 31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenBottomRight"/>
</Window>
- <Window Type="opengate/StaticGreenImage" Name="MarketItemWindowLeft">
- <Property Name="UnifiedPosition" Value="{{1.0,-31},{0.0,31}}" />
- <Property Name="UnifiedSize" Value="{{0.0,1},{1.0,-31}}" />
- <Property Name="BackgroundEnabled" Value="False" />
- <Property Name="FrameEnabled" Value="False" />
- <Property Name="Image" Value="set:opengate image:StaticGreenVertLine"/>
+ <Window Type="opengate/StaticImage" Name="MarketWindow/RightFrame/LeftImage">
+ <Property Name="UnifiedPosition" Value="{{1.0, -31},{0.0, 31}}" />
+ <Property Name="UnifiedSize" Value="{{0.0, 1},{1.0, -31}}" />
+ <Property Name="BackgroundEnabled" Value="False" />
+ <Property Name="FrameEnabled" Value="False" />
+ <Property Name="Image" Value="set:opengate image:StaticGreenVertLine"/>
</Window>
- <Window Type="opengate/EmptyButton" Name="MarketItemWindow/UpButton">
- <Property Name="UnifiedPosition" Value="{{1.0,-23},{0.0,32}}" />
- <Property Name="UnifiedSize" Value="{{0.0,14},{ 0.0,56}}" />
- <Property Name="NormalImage" Value="set:opengate image:ScrollThumbUpNormal" />
- <Property Name="HoverImage" Value="set:opengate image:ScrollThumbUpHover" />
- <Property Name="Pushed...
[truncated message content] |
|
From: <ult...@us...> - 2007-07-17 18:14:15
|
Revision: 638
http://svn.sourceforge.net/opengate/?rev=638&view=rev
Author: ultrasick
Date: 2007-07-17 11:14:16 -0700 (Tue, 17 Jul 2007)
Log Message:
-----------
changed file type from "text" to "application/xml"
Property Changed:
----------------
trunk/data/commodities/unsigned_box.xml
Property changes on: trunk/data/commodities/unsigned_box.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-07-17 18:09:13
|
Revision: 637
http://svn.sourceforge.net/opengate/?rev=637&view=rev
Author: ultrasick
Date: 2007-07-17 11:09:16 -0700 (Tue, 17 Jul 2007)
Log Message:
-----------
added mission specific commodity "unsigned box"
Added Paths:
-----------
trunk/data/commodities/unsigned_box.blend
trunk/data/commodities/unsigned_box.xml
trunk/data/commodities/unsigned_box_290x290.png
trunk/data/commodities/unsigned_box_76x76.png
Added: trunk/data/commodities/unsigned_box.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/unsigned_box.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/commodities/unsigned_box.xml
===================================================================
--- trunk/data/commodities/unsigned_box.xml (rev 0)
+++ trunk/data/commodities/unsigned_box.xml 2007-07-17 18:09:16 UTC (rev 637)
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+
+<container>
+ <object_id>740</object_id>
+ <category_id>1</category_id>
+ <class_id>14</class_id>
+ <name_de>unbeschriftete Box</name_de>
+ <name_en>unsigned box</name_en>
+ <mass>1420</mass>
+ <melting_point>varies</melting_point>
+ <faction_id>0</faction_id>
+ <production_center>various</production_center>
+</container>
\ No newline at end of file
Property changes on: trunk/data/commodities/unsigned_box.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/data/commodities/unsigned_box_290x290.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/unsigned_box_290x290.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/commodities/unsigned_box_76x76.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/commodities/unsigned_box_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-07-17 18:07:39
|
Revision: 636
http://svn.sourceforge.net/opengate/?rev=636&view=rev
Author: ultrasick
Date: 2007-07-17 11:07:41 -0700 (Tue, 17 Jul 2007)
Log Message:
-----------
added class: "mission specific" for the commodities
Modified Paths:
--------------
trunk/data/misc/ids.xml
Modified: trunk/data/misc/ids.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-07-08 14:09:29
|
Revision: 635
http://svn.sourceforge.net/opengate/?rev=635&view=rev
Author: ultrasick
Date: 2007-07-08 07:09:30 -0700 (Sun, 08 Jul 2007)
Log Message:
-----------
added category: jumpgates
+added category: beacons
+added category: anomalies
Modified Paths:
--------------
trunk/data/misc/ids.xml
Modified: trunk/data/misc/ids.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-07-08 13:58:27
|
Revision: 634
http://svn.sourceforge.net/opengate/?rev=634&view=rev
Author: ultrasick
Date: 2007-07-08 06:58:29 -0700 (Sun, 08 Jul 2007)
Log Message:
-----------
added category: mining laser
+ removed incorrect conflux activity data
+ removed distance data between 2 jumpgates
+ added notes which objects (stations and buildings) I didn't add to opacma jet)
Modified Paths:
--------------
trunk/data/misc/ids.xml
trunk/data/misc/jgdata.xml
Modified: trunk/data/misc/ids.xml
===================================================================
(Binary files differ)
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.
|
|
From: <ult...@us...> - 2007-07-07 21:01:31
|
Revision: 633
http://svn.sourceforge.net/opengate/?rev=633&view=rev
Author: ultrasick
Date: 2007-07-07 14:01:31 -0700 (Sat, 07 Jul 2007)
Log Message:
-----------
removing old wings3d files
Removed Paths:
-------------
trunk/data/weapons/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-07-07 20:58:57
|
Revision: 632
http://svn.sourceforge.net/opengate/?rev=632&view=rev
Author: ultrasick
Date: 2007-07-07 13:58:58 -0700 (Sat, 07 Jul 2007)
Log Message:
-----------
uploading Liar and T-G-28 (S-W-28), wasn't able to bring the textures from the wings3d files into blender so I used something else
Added Paths:
-----------
trunk/data/guns/liar.blend
trunk/data/guns/liar.xml
trunk/data/guns/liar_290x290.png
trunk/data/guns/liar_76x76.png
trunk/data/guns/t-g-28.blend
trunk/data/guns/t-g-28.xml
trunk/data/guns/t-g-28_290x290.png
trunk/data/guns/t-g-28_76x76.png
Added: trunk/data/guns/liar.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/guns/liar.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/guns/liar.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/guns/liar.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/guns/liar_290x290.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/guns/liar_290x290.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/guns/liar_76x76.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/guns/liar_76x76.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/guns/t-g-28.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/guns/t-g-28.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/guns/t-g-28.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/guns/t-g-28.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/guns/t-g-28_290x290.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/guns/t-g-28_290x290.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/guns/t-g-28_76x76.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/guns/t-g-28_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: Gary L. <Ult...@gm...> - 2007-07-07 19:29:57
|
eg...@us... wrote: > Added Paths: > ----------- > trunk/data/guns/excavator.blend looks nice! made some changes and reused the model for the duster |
|
From: <ult...@us...> - 2007-07-07 19:28:13
|
Revision: 631
http://svn.sourceforge.net/opengate/?rev=631&view=rev
Author: ultrasick
Date: 2007-07-07 12:28:12 -0700 (Sat, 07 Jul 2007)
Log Message:
-----------
fixing some bugs
Modified Paths:
--------------
trunk/data/guns/excavator.blend
trunk/data/guns/excavator.xml
trunk/data/guns/excavator_290x290.png
trunk/data/guns/excavator_76x76.png
Added Paths:
-----------
trunk/data/guns/duster.blend
trunk/data/guns/duster.xml
trunk/data/guns/duster_290x290.png
trunk/data/guns/duster_76x76.png
Property Changed:
----------------
trunk/data/guns/excavator.xml
Added: trunk/data/guns/duster.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/guns/duster.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/guns/duster.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/guns/duster.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/guns/duster_290x290.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/guns/duster_290x290.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/guns/duster_76x76.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/guns/duster_76x76.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/guns/excavator.blend
===================================================================
(Binary files differ)
Modified: trunk/data/guns/excavator.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/guns/excavator.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Modified: trunk/data/guns/excavator_290x290.png
===================================================================
(Binary files differ)
Modified: trunk/data/guns/excavator_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-07-07 17:06:07
|
Revision: 630
http://svn.sourceforge.net/opengate/?rev=630&view=rev
Author: ultrasick
Date: 2007-07-07 10:06:09 -0700 (Sat, 07 Jul 2007)
Log Message:
-----------
camera adjustments
+ uploading the octavius core which wheren't in svn jet
+ uploading data fromo opacma
Modified Paths:
--------------
trunk/data/stations/tauseti_core.blend
trunk/data/stations/tauseti_wake.blend
Added Paths:
-----------
trunk/data/stations/octavius_core.blend
trunk/data/stations/octavius_core.xml
trunk/data/stations/tauseti_core.xml
Added: trunk/data/stations/octavius_core.blend
===================================================================
(Binary files differ)
Property changes on: trunk/data/stations/octavius_core.blend
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/stations/octavius_core.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/stations/octavius_core.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Modified: trunk/data/stations/tauseti_core.blend
===================================================================
(Binary files differ)
Added: trunk/data/stations/tauseti_core.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/stations/tauseti_core.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Modified: trunk/data/stations/tauseti_wake.blend
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-07-07 12:47:42
|
Revision: 629
http://svn.sourceforge.net/opengate/?rev=629&view=rev
Author: ultrasick
Date: 2007-07-07 05:47:43 -0700 (Sat, 07 Jul 2007)
Log Message:
-----------
adding required political status (but not in the prostheses.xml, uranium.xml and not in the zinc.xml)
+ added faction id in prostheses.xml, uranium.xml and zinc.xml
+ changed damage value from 240 to 192 from the bender gun (using in game value instead of jossh value)
+ changed fire delay value from 0.8 to 0.6 from the bender gun (using in game value instead of jossh value)
Modified Paths:
--------------
trunk/data/commodities/prostheses.xml
trunk/data/commodities/uranium.xml
trunk/data/commodities/zinc.xml
trunk/data/guns/bender.xml
trunk/data/power_plants/gatherer.xml
trunk/data/power_plants/t-p-16.xml
trunk/data/radars/knocker.xml
trunk/data/radars/night_watchman.xml
Modified: trunk/data/commodities/prostheses.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/uranium.xml
===================================================================
(Binary files differ)
Modified: trunk/data/commodities/zinc.xml
===================================================================
(Binary files differ)
Modified: trunk/data/guns/bender.xml
===================================================================
(Binary files differ)
Modified: trunk/data/power_plants/gatherer.xml
===================================================================
(Binary files differ)
Modified: trunk/data/power_plants/t-p-16.xml
===================================================================
(Binary files differ)
Modified: trunk/data/radars/knocker.xml
===================================================================
(Binary files differ)
Modified: trunk/data/radars/night_watchman.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-07-07 11:21:16
|
Revision: 628
http://svn.sourceforge.net/opengate/?rev=628&view=rev
Author: ultrasick
Date: 2007-07-07 04:21:18 -0700 (Sat, 07 Jul 2007)
Log Message:
-----------
adding required political status
+ changeing efficiency value for T-E-15 from 80% to 79% (using in game value instead of jossh value)
+ changeing efficiency value for Kydango from 80% to 76% (using in game value instead of jossh value)
Modified Paths:
--------------
trunk/data/capacitors/summoner.xml
trunk/data/engines/money.xml
trunk/data/engines/t-e-15.xml
trunk/data/power_plants/contender.xml
trunk/data/power_plants/contender_xpr.xml
trunk/data/power_plants/spud.xml
trunk/data/radars/cyclops.xml
trunk/data/radars/hall_monitor.xml
trunk/data/radars/outlook.xml
trunk/data/radars/t-r-9.xml
trunk/data/shields/alpaa.xml
trunk/data/shields/flatiron.xml
trunk/data/shields/himelea.xml
trunk/data/shields/kydango.xml
trunk/data/shields/pod.xml
trunk/data/shields/shelter.xml
trunk/data/shields/t-s-13.xml
Modified: trunk/data/capacitors/summoner.xml
===================================================================
(Binary files differ)
Modified: trunk/data/engines/money.xml
===================================================================
(Binary files differ)
Modified: trunk/data/engines/t-e-15.xml
===================================================================
(Binary files differ)
Modified: trunk/data/power_plants/contender.xml
===================================================================
(Binary files differ)
Modified: trunk/data/power_plants/contender_xpr.xml
===================================================================
(Binary files differ)
Modified: trunk/data/power_plants/spud.xml
===================================================================
(Binary files differ)
Modified: trunk/data/radars/cyclops.xml
===================================================================
(Binary files differ)
Modified: trunk/data/radars/hall_monitor.xml
===================================================================
(Binary files differ)
Modified: trunk/data/radars/outlook.xml
===================================================================
(Binary files differ)
Modified: trunk/data/radars/t-r-9.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/alpaa.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/flatiron.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/himelea.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/kydango.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/pod.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/shelter.xml
===================================================================
(Binary files differ)
Modified: trunk/data/shields/t-s-13.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-07-07 09:05:30
|
Revision: 627
http://svn.sourceforge.net/opengate/?rev=627&view=rev
Author: ultrasick
Date: 2007-07-07 02:05:33 -0700 (Sat, 07 Jul 2007)
Log Message:
-----------
adding political status
Modified Paths:
--------------
trunk/data/capacitors/outlet.xml
trunk/data/capacitors/sponge.xml
trunk/data/capacitors/t-c-15.xml
trunk/data/capacitors/tank.xml
Modified: trunk/data/capacitors/outlet.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/sponge.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/t-c-15.xml
===================================================================
(Binary files differ)
Modified: trunk/data/capacitors/tank.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.
