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-09-27 18:52:19
|
Revision: 800
http://opengate.svn.sourceforge.net/opengate/?rev=800&view=rev
Author: ultrasick
Date: 2007-09-27 11:52:22 -0700 (Thu, 27 Sep 2007)
Log Message:
-----------
ups, my mistake
Modified Paths:
--------------
trunk/src/metaserver.cpp
Modified: trunk/src/metaserver.cpp
===================================================================
--- trunk/src/metaserver.cpp 2007-09-27 18:50:12 UTC (rev 799)
+++ trunk/src/metaserver.cpp 2007-09-27 18:52:22 UTC (rev 800)
@@ -315,7 +315,7 @@
case -101: log_->warn ( std::string ("no action given") ); return -3;
case -102: log_->warn ( std::string ("action given but unknown") ); return -3;
case -103: log_->warn ( std::string ("database is not available") ); return -3;
- case -14: log_->warn ( std::string ("ip was not a server") ); return -3;
+ case -14: log_->warn ( std::string ("ip was not a server") ); return -3;
default:
if (returncode > 0) {
return returncode;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-09-27 18:50:10
|
Revision: 799
http://opengate.svn.sourceforge.net/opengate/?rev=799&view=rev
Author: ultrasick
Date: 2007-09-27 11:50:12 -0700 (Thu, 27 Sep 2007)
Log Message:
-----------
corrected an error message
Modified Paths:
--------------
trunk/src/metaserver.cpp
Modified: trunk/src/metaserver.cpp
===================================================================
--- trunk/src/metaserver.cpp 2007-09-27 17:32:13 UTC (rev 798)
+++ trunk/src/metaserver.cpp 2007-09-27 18:50:12 UTC (rev 799)
@@ -178,8 +178,8 @@
case -1: log_->warn ( std::string ("no user_id given") ); return -3;
case -2: log_->warn ( std::string ("no user_ip given") ); return -3;
case -3: log_->warn ( std::string ("user_id doesn't exist") ); return -3;
- case -4: log_->warn ( std::string ("password incorrect") ); return -3;
- case -5: log_->warn ( std::string ("user was already offline") ); return -3;
+ case -4: log_->warn ( std::string ("user_ip incorrect") ); return -3;
+ case -5: log_->warn ( std::string ("user was already offline") ); return 1;
default:
if (returncode > 0) {
return returncode;
@@ -315,7 +315,7 @@
case -101: log_->warn ( std::string ("no action given") ); return -3;
case -102: log_->warn ( std::string ("action given but unknown") ); return -3;
case -103: log_->warn ( std::string ("database is not available") ); return -3;
- case -14: log_->warn ( std::string ("ip was not a server") ); return -3;
+ case -14: log_->warn ( std::string ("ip was not a server") ); return -3;
default:
if (returncode > 0) {
return returncode;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-09-27 17:32:20
|
Revision: 798
http://opengate.svn.sourceforge.net/opengate/?rev=798&view=rev
Author: spom_spom
Date: 2007-09-27 10:32:13 -0700 (Thu, 27 Sep 2007)
Log Message:
-----------
no compilation problems
Modified Paths:
--------------
trunk/src/metaserver.cpp
trunk/src/opengateserver.cpp
Modified: trunk/src/metaserver.cpp
===================================================================
--- trunk/src/metaserver.cpp 2007-09-26 20:28:50 UTC (rev 797)
+++ trunk/src/metaserver.cpp 2007-09-27 17:32:13 UTC (rev 798)
@@ -29,10 +29,9 @@
namespace OpenGate{
- MetaConnection::MetaConnection(asio::io_service & io_service, LogManagerBase & log ) :
+MetaConnection::MetaConnection(asio::io_service & io_service, LogManagerBase & log ) :
io_service_( io_service ), socket_( io_service ), resolver_( io_service ), log_( &log ) {
- // Get instance to the log manager
hostname_ = std::string( "opacma.ontheserver.de" );
log_->info( std::string( "Querying " ) + hostname_);
@@ -237,7 +236,6 @@
}
}
-
} catch ( asio::error & e) {
log_->fatal( std::string( "asio::error: " ) + e.what() );
return -5;
@@ -358,8 +356,8 @@
// Read the response status line.
#ifdef WIN32
- // we dont have boost:regex within win32, i will fix this later (carsten)
- //asio::read_until(socket_, response, "\n");
+ // 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
@@ -383,7 +381,7 @@
// 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)
+ // 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"));
Modified: trunk/src/opengateserver.cpp
===================================================================
--- trunk/src/opengateserver.cpp 2007-09-26 20:28:50 UTC (rev 797)
+++ trunk/src/opengateserver.cpp 2007-09-27 17:32:13 UTC (rev 798)
@@ -42,8 +42,8 @@
if ( metaPtr ) {
logMgr->info("Remove server from server list!");
int error = 0;
- if ((error = metaPtr->remove_game_server()) < 0) {
- logMgr->warn( std::string("Could not remove game server " + toStr (error)) );
+ if ( (error = metaPtr->remove_game_server() ) < 0) {
+ logMgr->warn( std::string("Could not remove game server " + toStr ( error ) ) );
}
}
if ( serverPtr ) {
@@ -78,7 +78,7 @@
//** das k\xF6nnte mal vielleicht als option rausreichen, das man wie beim clienten die Wahl hat;
//** -M = (withMetaServer = true);
- bool withMetaServer = false;
+ bool withMetaServer = true;
try {
asio::io_service io_service;
@@ -90,7 +90,11 @@
int error = 0;
if ((error = meta.add_game_server()) < 0) {
logMgr->warn( std::string("Could not add game server " + toStr (error) ) );
- }
+ }
+
+ //** ein bissle mehr verbose output, kommt sp\xE4ter wieder weg.;
+ std::list< std::string > serverOnline( meta.list_game_server() );
+ copy( serverOnline.begin(), serverOnline.end(), std::ostream_iterator< std::string >( std::cout, " " ) );
}
tcp::endpoint endpoint( tcp::v4(), OG_PORT );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-09-26 20:29:05
|
Revision: 797
http://opengate.svn.sourceforge.net/opengate/?rev=797&view=rev
Author: egore
Date: 2007-09-26 13:28:50 -0700 (Wed, 26 Sep 2007)
Log Message:
-----------
2007-09-26 Christoph Brill <eg...@us...>
* src/metaserver.cpp: beautify the log and indent the ifdefs
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/metaserver.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-09-25 21:38:54 UTC (rev 796)
+++ trunk/ChangeLog 2007-09-26 20:28:50 UTC (rev 797)
@@ -1,3 +1,6 @@
+2007-09-26 Christoph Brill <eg...@us...>
+ * src/metaserver.cpp: beautify the log and indent the ifdefs
+
2007-09-24 Christoph Brill <eg...@us...>
* src/common.cpp, src/common.h: add method to split strings with a
given delimiter
Modified: trunk/src/metaserver.cpp
===================================================================
--- trunk/src/metaserver.cpp 2007-09-25 21:38:54 UTC (rev 796)
+++ trunk/src/metaserver.cpp 2007-09-26 20:28:50 UTC (rev 797)
@@ -57,6 +57,7 @@
}
MetaConnection::~MetaConnection() {
+ log_->info ( "Shutting down metaserver connection " );
// asio doesn't need a cleanup, right?
}
@@ -230,7 +231,7 @@
if (returncode > 0) {
return returncode;
} else {
- log_->warn ( std::string ("unkown return code for") + parameters + toStr( returncode ) );
+ log_->warn ( std::string ("unkown return code for ") + parameters + toStr( returncode ) );
return -4;
}
}
@@ -357,13 +358,12 @@
// Read the response status line.
#ifdef WIN32
- // we dont have boost:regex within win32, i will fix this later (carsten)
-//asio::read_until(socket_, response, "\n");
- #else
+ // 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
+#endif
-
// Check that response is OK.
std::istream response_stream(&response);
std::string http_version;
@@ -382,12 +382,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
+#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
+#endif
// Process the response headers. (to get the crap of the response before reading the body!)
std::string header;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-09-25 21:38:57
|
Revision: 796
http://opengate.svn.sourceforge.net/opengate/?rev=796&view=rev
Author: spom_spom
Date: 2007-09-25 14:38:54 -0700 (Tue, 25 Sep 2007)
Log Message:
-----------
win compatibility commit
Modified Paths:
--------------
trunk/resources.cfg
trunk/win32/ogsectorclient/ogsectorclient.cbp
trunk/win32/ogsectorclient/ogsectorclient.exe
trunk/win32/ogsectorclient/resources.cfg
Modified: trunk/resources.cfg
===================================================================
--- trunk/resources.cfg 2007-09-25 20:44:19 UTC (rev 795)
+++ trunk/resources.cfg 2007-09-25 21:38:54 UTC (rev 796)
@@ -1,9 +1,6 @@
-# Resource locations to be added to the 'boostrap' path
-# This also contains the minimum you need to use the Ogre example framework
[Bootstrap]
FileSystem=./data/startup
-# Resource locations to be added to the default path
[General]
FileSystem=./data/
FileSystem=./data/commodities
Modified: trunk/win32/ogsectorclient/ogsectorclient.cbp
===================================================================
--- trunk/win32/ogsectorclient/ogsectorclient.cbp 2007-09-25 20:44:19 UTC (rev 795)
+++ trunk/win32/ogsectorclient/ogsectorclient.cbp 2007-09-25 21:38:54 UTC (rev 796)
@@ -16,8 +16,8 @@
<Add option="-O2" />
<Add option="-DNDEBUG" />
<Add option="-D_WIN32_WINNT=0x0500" />
- <Add directory="..\..\..\..\..\asio-0.3.7\include" />
- <Add directory="..\..\..\..\..\boost_1_33_1" />
+ <Add directory="..\..\..\..\asio-0.3.7\include" />
+ <Add directory="..\..\..\..\boost_1_33_1" />
<Add directory="C:\OgreSDK\include\CEGUI" />
<Add directory="C:\Programme\OpenAL 1.1 SDK\include" />
<Add directory="include" />
@@ -80,10 +80,14 @@
<Unit filename="..\..\src\GameState.h" />
<Unit filename="..\..\src\GameStateManager.cpp" />
<Unit filename="..\..\src\GameStateManager.h" />
+ <Unit filename="..\..\src\InitState.cpp" />
+ <Unit filename="..\..\src\InitState.h" />
<Unit filename="..\..\src\InputManager.cpp" />
<Unit filename="..\..\src\InputManager.h" />
<Unit filename="..\..\src\LogManager.cpp" />
<Unit filename="..\..\src\LogManager.h" />
+ <Unit filename="..\..\src\LogManagerBase.cpp" />
+ <Unit filename="..\..\src\LogManagerBase.h" />
<Unit filename="..\..\src\MarketDialog.cpp" />
<Unit filename="..\..\src\MarketDialog.h" />
<Unit filename="..\..\src\OpcodeWrapper.cpp" />
@@ -110,6 +114,8 @@
<Unit filename="..\..\src\VesselManager.h" />
<Unit filename="..\..\src\common.cpp" />
<Unit filename="..\..\src\common.h" />
+ <Unit filename="..\..\src\commonWithOgre.cpp" />
+ <Unit filename="..\..\src\commonWithOgre.h" />
<Unit filename="..\..\src\metaserver.cpp" />
<Unit filename="..\..\src\metaserver.h" />
<Unit filename="..\..\src\networkClient.cpp" />
Modified: trunk/win32/ogsectorclient/ogsectorclient.exe
===================================================================
(Binary files differ)
Modified: trunk/win32/ogsectorclient/resources.cfg
===================================================================
--- trunk/win32/ogsectorclient/resources.cfg 2007-09-25 20:44:19 UTC (rev 795)
+++ trunk/win32/ogsectorclient/resources.cfg 2007-09-25 21:38:54 UTC (rev 796)
@@ -1,38 +1,34 @@
[Bootstrap]
-FileSystem=../../../../trunk/data/startup
+FileSystem=../../data/startup
-# Resource locations to be added to the default path
[General]
-FileSystem=./
-FileSystem=../../data
+FileSystem=../../data/
+FileSystem=../../data/commodities
+FileSystem=../../data/capacitors
+FileSystem=../../data/engines
+FileSystem=../../data/radars
+FileSystem=../../data/shields
+FileSystem=../../data/ecms
+FileSystem=../../data/power_plants
+FileSystem=../../data/guns
+FileSystem=../../data/ships/octavius/apteryx
+FileSystem=../../data/ships/quantar/storm
+FileSystem=../../data/ships/tauseti/lady_kickstart
+FileSystem=../../data/ships/squadrok/squid
+FileSystem=../../data/stations
FileSystem=../../data/materials
FileSystem=../../data/textures
FileSystem=../../data/asteroids
-Zip=../../data/simpleSkybox.zip
-FileSystem=../../data/MediaFromOgre
-FileSystem=../../data/MediaFromOgre/AdvancedMaterials
+FileSystem=../../data/misc
FileSystem=../../data/gui
-FileSystem=../../data/gui/fonts/
-FileSystem=../../data/gui/layouts/
-FileSystem=../../data/gui/imagesets/
-FileSystem=../../data/gui/schemes/
-FileSystem=../../data/gui/looknfeel/
+FileSystem=../../data/gui/fonts
+FileSystem=../../data/gui/layouts
+FileSystem=../../data/gui/imagesets
+FileSystem=../../data/gui/schemes
+FileSystem=../../data/gui/looknfeel
+FileSystem=../../data/gui/overlays
-Zip=../../data/fonts.zip
-FileSystem=../../../../trunk/data/
-FileSystem=../../../../trunk/data/misc
-FileSystem=../../../../trunk/data/misc/asteroids
-FileSystem=../../../../trunk/data/commodities
-FileSystem=../../../../trunk/data/ships/octavius/apteryx
-FileSystem=../../../../trunk/data/ships/quantar/storm
-FileSystem=../../../../trunk/data/ships/tauseti/lady_kickstart
-FileSystem=../../../../trunk/data/ships/squadrok/squid
-FileSystem=../../../../trunk/data/engines
-FileSystem=../../../../trunk/data/capacitors
-FileSystem=../../../../trunk/data/radars
-FileSystem=../../../../trunk/data/shields
-FileSystem=../../../../trunk/data/ECMs
-FileSystem=../../../../trunk/data/power_plants
-FileSystem=../../../../trunk/data/guns
-FileSystem=../../../../trunk/data/stations
-FileSystem=../../../../trunk/data/sounds
+Zip=../../data/skybox/simpleSkybox.zip
+
+FileSystem=../../data/MediaFromOgre
+FileSystem=../../data/MediaFromOgre/AdvancedMaterials
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-09-25 20:45:16
|
Revision: 795
http://opengate.svn.sourceforge.net/opengate/?rev=795&view=rev
Author: ultrasick
Date: 2007-09-25 13:44:19 -0700 (Tue, 25 Sep 2007)
Log Message:
-----------
added some tasks:
* moving the templates dir from /data/templates to /templates
* upload a "fight" sound track I've still didn't commit jet
* move nebulae etc. from the screen shot section of our project page to the templates dir.
Modified Paths:
--------------
trunk/TODO.gluck
Modified: trunk/TODO.gluck
===================================================================
--- trunk/TODO.gluck 2007-09-25 20:05:32 UTC (rev 794)
+++ trunk/TODO.gluck 2007-09-25 20:44:19 UTC (rev 795)
@@ -4,4 +4,7 @@
* production center "Amananth" linkt zu sektor "Amananth"
* sektoren in opacma aufnehmen (asteroiden fehlen + random bilder fehlen)
* stationen werden in der sectors.xml nicht richtig exportiert
-* werbung f\xFCr dark raus
\ No newline at end of file
+* werbung f\xFCr dark raus
+* data/templates -> templates
+* "Beat under control" ogg erzeugen und beide hochladen
+* nebulars aus screenshotsektion nehmen und ins templates verzeichnis laden
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-09-25 20:05:33
|
Revision: 794
http://opengate.svn.sourceforge.net/opengate/?rev=794&view=rev
Author: spom_spom
Date: 2007-09-25 13:05:32 -0700 (Tue, 25 Sep 2007)
Log Message:
-----------
Fixed a server related segfault
Modified Paths:
--------------
trunk/configure.ac
trunk/src/commonWithOgre.h
trunk/src/networkProtocol.cpp
trunk/src/networkProtocol.h
trunk/src/networkServer.cpp
trunk/src/opengateserver.cpp
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-09-24 22:15:55 UTC (rev 793)
+++ trunk/configure.ac 2007-09-25 20:05:32 UTC (rev 794)
@@ -74,10 +74,14 @@
exit 1
],[])
-AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -I$OGSECTOR_EXTERNALS_PATH/include"])
-AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -I$OGSECTOR_EXTERNALS_PATH/ogreopcode/include"])
-AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -I$OGSECTOR_EXTERNALS_PATH/ogreopcode/opcode132"])
-AC_SUBST([LDFLAGS], ["${LDFLAGS} -L$OGSECTOR_EXTERNALS_PATH/lib/ -lOpcode -lOgreOpcode"])
+#AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -I$OGSECTOR_EXTERNALS_PATH/include"])
+#AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -I$OGSECTOR_EXTERNALS_PATH/ogreopcode/include"])
+#AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -I$OGSECTOR_EXTERNALS_PATH/ogreopcode/opcode132"])
+#AC_SUBST([LDFLAGS], ["${LDFLAGS} -L$OGSECTOR_EXTERNALS_PATH/lib/ -lOpcode -lOgreOpcode"])
+
+AC_SUBST([OgreOpcode_CFLAGS], ["-I$OGSECTOR_EXTERNALS_PATH/include -I$OGSECTOR_EXTERNALS_PATH/ogreopcode/include -I$OGSECTOR_EXTERNALS_PATH/ogreopcode/opcode132"])
+AC_SUBST([OgreOpcode_LIBS], ["-L$OGSECTOR_EXTERNALS_PATH/lib/ -lOpcode -lOgreOpcode"])
+
# TODO: end fix
AC_OUTPUT([
Modified: trunk/src/commonWithOgre.h
===================================================================
--- trunk/src/commonWithOgre.h 2007-09-24 22:15:55 UTC (rev 793)
+++ trunk/src/commonWithOgre.h 2007-09-25 20:05:32 UTC (rev 794)
@@ -33,25 +33,20 @@
#define _OPENGATE_COMMONWITHOGRE__H
#include "common.h"
+#include "networkProtocol.h"
#include <OgrePrerequisites.h>
#include <OgreVector3.h>
#include <OgreQuaternion.h>
-inline Ogre::Vector3 toOgreVec( const std::vector < float > & vec ){
- if ( vec.size() == 3 ){
- return Ogre::Vector3( &vec[ 0 ] );
- } else {
- return Ogre::Vector3::ZERO;
- }
+namespace OpenGate{
+
+inline Ogre::Vector3 toOgreVec( const struct FVector3 & vec ){
+ return Ogre::Vector3( vec.v );
}
-inline Ogre::Quaternion toOgreQuat( const std::vector < float > & vec ){
- if ( vec.size() == 4 ){
- return Ogre::Quaternion( (Ogre::Real*)&vec[ 0 ] );
- } else {
- return Ogre::Quaternion::ZERO;
- }
+inline Ogre::Quaternion toOgreQuat( const struct FVector4 & vec ){
+ return Ogre::Quaternion( (Ogre::Real*)vec.v );
}
/*! For debugging purposes dump scene node tree to a string */
@@ -60,6 +55,8 @@
// /*! For debugging purposes dump scene node tree to a string */
std::string dumpSceneNodes( Ogre::Node * n );
+} // namespace OpenGate
+
#endif
Modified: trunk/src/networkProtocol.cpp
===================================================================
--- trunk/src/networkProtocol.cpp 2007-09-24 22:15:55 UTC (rev 793)
+++ trunk/src/networkProtocol.cpp 2007-09-25 20:05:32 UTC (rev 794)
@@ -28,14 +28,15 @@
MessageBodyShipRegister::MessageBodyShipRegister( const Uint32 senderID, const Uint8 childID, const std::string & name,
const Float * pos, Uint16 vesselID,
Uint32 mass, Uint32 maxShield, Uint32 maxThrust )
- : MessageBodyShipBase( childID ), name_( name ), pos_( 3 ), vesselID_( vesselID ),
+ : MessageBodyShipBase( childID ), name_( name ), vesselID_( vesselID ),
mass_( mass ), maxShield_( maxShield ), maxThrust_( maxThrust ){
senderID_ = senderID;
type_ = (Uint8)PROTO_SHIP_REGISTER;
- pos_[ 0 ] = pos[ 0 ]; pos_[ 1 ] = pos[ 1 ]; pos_[ 2 ] = pos[ 2 ];
+ pos_.v[ 0 ] = pos[ 0 ]; pos_.v[ 1 ] = pos[ 1 ]; pos_.v[ 2 ] = pos[ 2 ];
}
-MessageBodyShipRegister::MessageBodyShipRegister( const char * data ) : MessageBodyShipBase( data ){
+ MessageBodyShipRegister::MessageBodyShipRegister( const char * data )
+ : MessageBodyShipBase( data ){
int count = MessageBodyShipBase::dataSize();
readFromData( nameLength_, data, count );
@@ -70,13 +71,12 @@
MessageBodyShipMovement::MessageBodyShipMovement( Uint8 childID, const Float * pos,
const Float * vel, const Float * orient,
Uint32 thrust, float yaw, float pitch, float roll, int seq )
- : MessageBodyShipBase( childID ), pos_( 3 ), vel_( 3 ), orient_( 4 ),
- thrust_( thrust ), yaw_( yaw ), pitch_( pitch ), roll_( roll ), seqNr_( seq ) {
+ : MessageBodyShipBase( childID ), thrust_( thrust ), yaw_( yaw ), pitch_( pitch ), roll_( roll ), seqNr_( seq ) {
type_ = (Uint8)PROTO_SHIP_MOVEMENT;
- pos_[ 0 ] = pos[ 0 ]; pos_[ 1 ] = pos[ 1 ]; pos_[ 2 ] = pos[ 2 ];
- vel_[ 0 ] = vel[ 0 ]; vel_[ 1 ] = vel[ 1 ]; vel_[ 2 ] = vel[ 2 ];
- orient_[ 0 ] = orient[ 0 ]; orient_[ 1 ] = orient[ 1 ];
- orient_[ 2 ] = orient[ 2 ]; orient_[ 3 ] = orient[ 3 ];
+ pos_.v[ 0 ] = pos[ 0 ]; pos_.v[ 1 ] = pos[ 1 ]; pos_.v[ 2 ] = pos[ 2 ];
+ vel_.v[ 0 ] = vel[ 0 ]; vel_.v[ 1 ] = vel[ 1 ]; vel_.v[ 2 ] = vel[ 2 ];
+ orient_.v[ 0 ] = orient[ 0 ]; orient_.v[ 1 ] = orient[ 1 ];
+ orient_.v[ 2 ] = orient[ 2 ]; orient_.v[ 3 ] = orient[ 3 ];
}
MessageBodyShipMovement::MessageBodyShipMovement( const char * data ) : MessageBodyShipBase( data ){
@@ -120,11 +120,10 @@
MessageBodyShipProjectileFired::MessageBodyShipProjectileFired( Uint8 childID, Uint16 shotCount, const Float * pos,
const Float * vel, Uint32 damage, Float liveTime )
- : MessageBodyShipBase( childID ), shotCount_( shotCount ), pos_( 3 ), vel_( 3 ),
- damage_( damage ), liveTime_( liveTime ) {
+ : MessageBodyShipBase( childID ), shotCount_( shotCount ), damage_( damage ), liveTime_( liveTime ) {
type_ = (Uint8)PROTO_SHIP_PROJECTILEFIRED;
- pos_[ 0 ] = pos[ 0 ]; pos_[ 1 ] = pos[ 1 ]; pos_[ 2 ] = pos[ 2 ];
- vel_[ 0 ] = vel[ 0 ]; vel_[ 1 ] = vel[ 1 ]; vel_[ 2 ] = vel[ 2 ];
+ pos_.v[ 0 ] = pos[ 0 ]; pos_.v[ 1 ] = pos[ 1 ]; pos_.v[ 2 ] = pos[ 2 ];
+ vel_.v[ 0 ] = vel[ 0 ]; vel_.v[ 1 ] = vel[ 1 ]; vel_.v[ 2 ] = vel[ 2 ];
}
Modified: trunk/src/networkProtocol.h
===================================================================
--- trunk/src/networkProtocol.h 2007-09-24 22:15:55 UTC (rev 793)
+++ trunk/src/networkProtocol.h 2007-09-25 20:05:32 UTC (rev 794)
@@ -34,15 +34,28 @@
// typedef Ogre::Vector3 FVector3;
// typedef Ogre::Quaternion FVector4;
// typedef Ogre::Real Float;
-typedef std::vector< float > FVector3;
-typedef std::vector< float > FVector4;
+// typedef std::vector< float > FVector3;
+// typedef std::vector< float > FVector4;
typedef float Float;
-inline std::ostream & operator << ( std::ostream & str, const std::vector< float > & vec ){
- for ( int i = 0; i < vec.size(); i ++ ) str << vec[ i ] << " ";
+struct FVector3{
+ Float v[ 3 ];
+};
+
+struct FVector4{
+ Float v[ 4 ];
+};
+
+inline std::ostream & operator << ( std::ostream & str, const FVector3 & vec ){
+ for ( int i = 0; i < 3; i ++ ) str << vec.v[ i ] << " ";
return str;
}
+inline std::ostream & operator << ( std::ostream & str, const FVector4 & vec ){
+ for ( int i = 0; i < 4; i ++ ) str << vec.v[ i ] << " ";
+ return str;
+}
+
#define OG_PORT 1234
#define PROTO_BASE 1
Modified: trunk/src/networkServer.cpp
===================================================================
--- trunk/src/networkServer.cpp 2007-09-24 22:15:55 UTC (rev 793)
+++ trunk/src/networkServer.cpp 2007-09-25 20:05:32 UTC (rev 794)
@@ -172,7 +172,7 @@
FVector3 pos( msgIn.position() );
log_->info( std::string( "receiveShipRegister from " ) + toStr( senderID ) + " " + name + " " +
- " " + toStr( vesselID ) );
+ " " + toStr( vesselID ) + " at: " + toStr( pos ) );
UserObject *obj;
obj = createUserObject( user, name, userID, childID, vesselID );
@@ -198,7 +198,7 @@
log_->info( std::string( "\tSend register: " ) + obj->userName() + " <- " + it->second->name() );
MessageBodyShipRegister msg( it->second->userID(), it->second->childID(),
- it->second->name(), &it->second->position()[0],
+ it->second->name(), it->second->position().v,
it->second->vesselID(),
it->second->mass(), it->second->maxShield(), it->second->maxThrust() );
obj->parent()->send( msg );
@@ -206,7 +206,7 @@
}
//** second register the new object to all existing objects in range;
- MessageBodyShipRegister msg( obj->userID(), obj->childID(), obj->name(), &obj->position()[ 0 ], obj->vesselID(),
+ MessageBodyShipRegister msg( obj->userID(), obj->childID(), obj->name(), obj->position().v, obj->vesselID(),
obj->mass(), obj->maxShield(), obj->maxThrust() );
// ** atm just global;
for ( std::map < long, UserObject * >::iterator it = userObjects_.begin(); it != userObjects_.end(); it ++ ){
Modified: trunk/src/opengateserver.cpp
===================================================================
--- trunk/src/opengateserver.cpp 2007-09-24 22:15:55 UTC (rev 793)
+++ trunk/src/opengateserver.cpp 2007-09-25 20:05:32 UTC (rev 794)
@@ -76,17 +76,24 @@
signal( SIGTERM, signal_term );
signal( SIGINT, signal_interrupt );
+ //** das k\xF6nnte mal vielleicht als option rausreichen, das man wie beim clienten die Wahl hat;
+ //** -M = (withMetaServer = true);
+ bool withMetaServer = false;
+
try {
asio::io_service io_service;
io_servicePtr = &io_service;
- OpenGate::MetaConnection meta( io_service, *logMgr );
+ if ( withMetaServer ){
+ OpenGate::MetaConnection meta( io_service, *logMgr );
metaPtr = &meta;
- int error = 0;
- if ((error = meta.add_game_server()) < 0) {
- logMgr->warn( std::string("Could not add game server " + toStr (error) ) );
+ int error = 0;
+ if ((error = meta.add_game_server()) < 0) {
+ logMgr->warn( std::string("Could not add game server " + toStr (error) ) );
+ }
}
tcp::endpoint endpoint( tcp::v4(), OG_PORT );
+
Server server( io_service, endpoint, *logMgr );
serverPtr = &server;
io_service.run();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-09-24 22:15:51
|
Revision: 793
http://opengate.svn.sourceforge.net/opengate/?rev=793&view=rev
Author: spom_spom
Date: 2007-09-24 15:15:55 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
remove ogre dependencies from servercode.
Modified Paths:
--------------
trunk/src/LogManager.cpp
trunk/src/LogManager.h
trunk/src/Makefile.am
trunk/src/Sector.cpp
trunk/src/SectorObjects.cpp
trunk/src/VesselManager.cpp
trunk/src/common.cpp
trunk/src/common.h
trunk/src/metaserver.cpp
trunk/src/metaserver.h
trunk/src/networkProtocol.cpp
trunk/src/networkProtocol.h
trunk/src/networkServer.cpp
trunk/src/networkServer.h
trunk/src/networkServerUser.cpp
trunk/src/networkServerUser.h
trunk/src/opengateclient.cpp
trunk/src/opengateserver.cpp
Added Paths:
-----------
trunk/src/LogManagerBase.cpp
trunk/src/LogManagerBase.h
trunk/src/commonWithOgre.cpp
trunk/src/commonWithOgre.h
Modified: trunk/src/LogManager.cpp
===================================================================
--- trunk/src/LogManager.cpp 2007-09-24 20:40:42 UTC (rev 792)
+++ trunk/src/LogManager.cpp 2007-09-24 22:15:55 UTC (rev 793)
@@ -25,29 +25,12 @@
template<> LogManager * Ogre::Singleton< LogManager >::ms_Singleton = 0;
-LogManager::LogManager( ) {
+LogManager::LogManager( ) : LogManagerBase() {
console_ = NULL;
- haveLogFile_ = false;
- haveChatLogFile_ = false;
- haveConsole_ = false;
}
-LogManager::~LogManager( ) {
- if ( haveLogFile_ ) logFile_.close();
- if ( haveChatLogFile_ ) chatLogFile_.close();
-}
+LogManager::~LogManager( ) { }
-void LogManager::setLogFile( const std::string & logFileName ){
- logFile_.open( logFileName.c_str(), std::fstream::trunc );
- haveLogFile_ = true;
-}
-
-void LogManager::setChatLogFile( const std::string & chatLogFileName ){
- chatLogFile_.open( chatLogFileName.c_str(), std::fstream::app );
- chatLogFile_ << "\n" << timeStamp() << "Starting new session" << std::endl;
- haveChatLogFile_ = true;
-}
-
void LogManager::setConsole( Console * console ){
if ( console ){
console_ = console;
@@ -57,68 +40,10 @@
}
}
-std::string LogManager::timeStamp() {
- std::time_t now = std::time( 0 );
- struct tm * time = localtime( &now );
-
- return std::string("["
- + toStr( time->tm_year + 1900 ) + "."
- + toStr( time->tm_mon + 1 ) + "."
- + toStr( time->tm_mday ) + "-"
- + toStr( time->tm_hour ) + ":"
- + toStr( time->tm_min ) + ":"
- + toStr( time->tm_sec ) + "]" );
-}
-
-void LogManager::chat( const std::string & name, const std::string & msg ){
- std::string logMsg( name + ": " + msg );
-
- if ( haveChatLogFile_ ) chatLogFile_ << timeStamp() << " " << logMsg << std::endl;
- writeToConsole_( logMsg );
- cout( logMsg );
-}
-
-void LogManager::info( const std::string & msg ){
- std::string logMsg( "INFO: " + msg );
- writeToConsole_( logMsg );
- write_( logMsg );
-}
-
-void LogManager::debug( const std::string & msg ){
- std::string logMsg( "DEBUG: " + msg );
- writeToConsole_( logMsg );
- write_( logMsg );
-}
-
-void LogManager::warn( const std::string & msg ){
- std::string logMsg( "WARN: " + msg );
- writeToConsole_( logMsg );
- write_( logMsg );
-}
-
-void LogManager::fatal( const std::string & msg ){
- std::string logMsg( "FATAL: " + msg );
- writeToConsole_( logMsg );
- write_( logMsg );
-}
-
-void LogManager::cout( const std::string & msg ){
- std::cout << msg << std::endl;
-}
-
-void LogManager::fout( const std::string & msg ){
- write_( msg );
-}
-
void LogManager::writeToConsole_( const std::string & msg ){
if ( haveConsole_ ) console_->print( msg );
}
-void LogManager::write_( const std::string & msg ){
- std::cout << msg << std::endl;
- if ( haveLogFile_ ) logFile_ << timeStamp() << ": " << msg << std::endl;
-}
-
LogManager & LogManager::getSingleton( ){
assert( ms_Singleton );
return ( *ms_Singleton );
@@ -131,31 +56,4 @@
return ms_Singleton;
}
-// LogManager & LogManager::operator - ( LogType logType ) {
-// logType_ = logType;
-// return *this;
-// }
-
-// class Flush{
-// public:
-// Flush( LogManager & log ){
-// }
-// };
-
-// LogManager & LogManager::operator << ( const Flush & flush ) {
-// switch( logType_ ){
-// case Chat:
-// chatLogFile_ << std::endl;
-// case Info:
-// case Fatal:
-// // if ( console_ ) (*console_) << x;
-// case Debug:
-// std::cout << std::endl;
-// logFile_ << std::endl;
-// break;
-// }
-// return *this;
-// }
-
-
} //namespace OpenGate
Modified: trunk/src/LogManager.h
===================================================================
--- trunk/src/LogManager.h 2007-09-24 20:40:42 UTC (rev 792)
+++ trunk/src/LogManager.h 2007-09-24 22:15:55 UTC (rev 793)
@@ -21,141 +21,38 @@
#ifndef _OPENGATE_LOGMANAGER__H
#define _OPENGATE_LOGMANAGER__H
-#include <iostream>
-#include <fstream>
-#include <string>
-
#include <OgreSingleton.h>
+#include "LogManagerBase.h"
-#include "common.h"
-
namespace OpenGate{
class Console;
-enum LogType{ None, Info, Chat, Debug, Fatal};
-
-/*!
- * \brief This class handles all the logging in Opengate
- *
- * Opengate has several possibilities of logging. The three main logging methods
- * are persistent logging, session logging and console logging. Persistent
- * logging is done in a file. All messages are logged into a file. These file
- * will always get the messages appended. This way no message is overwritten and
- * therefore is persistent. It can be used for chatlogs for example.
- * The session logging is done similar to the persistent logging. It is also
- * written to a file but this file will be empty each time Opengate starts. The
- * console logging is not put into any file.
- * The logmanager knows if he has a storage for the persistent logging (see
- * setChatLogFile() ) and also if he has a file for session logging (see
- * setLogFile() ). You can also add an Console for the so called console
- * logging (see setConsole()).
- *
- * Opengate also supports different levels of importance for the logging. These
- * levels are handled like this:
- * <table>
- * <tr><td>Level</td><td>Persistent log</td><td>Session log (and stdout)</td><td>Console log</td><td>Description</td></tr>
- * <tr><td>info</td><td> </td><td>X</td><td>X</td><td>General interesting information (i.e. "player connected")</td></tr>
- * <tr><td>chat</td><td>X</td><td>X</td><td>X</td><td>Chat from and to other users</td></tr>
- * <tr><td>debug</td><td> </td><td>X</td><td> </td><td>Messages that indicate internal things that might be interesting for developers</td></tr>
- * <tr><td>warning</td><td> </td><td>X</td><td> </td><td>Messages interesting for developers</td></tr>
- * <tr><td>fatal</td><td> </td><td>X</td><td>X</td><td>Messages when really bad things happen</td></tr>
- * </table>
- * \author Carsten <spo...@us... >
- */
-class LogManager : public Ogre::Singleton< LogManager >, public std::ostream {
+class LogManager : public Ogre::Singleton< LogManager >, public LogManagerBase{
public:
- LogManager( );
+ LogManager();
- virtual ~LogManager( );
+ virtual ~LogManager();
- /*! Open a session log file with the given filename \param logFileName The name of the file */
- void setLogFile( const std::string & logFileName );
+ /*! This method returns the single instance of the LogManager */
+ static LogManager & getSingleton( void );
- /*! Open the persistent log file for the chatlog with the given filename \param logFileName The name of the file */
- void setChatLogFile( const std::string & chatLogFileName );
-
/*! Use the given Console console to write the logs to it \param console The given Console */
void setConsole( Console * console );
- /*! Create a timestamp \return A timestamp in the format [YYYY.MM.DD-HH.MM.SS] */
- std::string timeStamp();
-
- /*! Protocol a message with info-level importance */
- void info( const std::string & msg );
-
- /*! Protocol a chat-message */
- void chat( const std::string & name, const std::string & msg );
-
- /*! Protocol a message with debug-level importance */
- void debug( const std::string & msg );
-
- /*! Protocol a message with warn-level importance */
- void warn( const std::string & msg );
-
- /*! Protocol a message with fatal-level importance */
- void fatal( const std::string & msg );
-
- /*! Write to std::out only. For debug purposes only.*/
- void cout( const std::string & msg );
-
- /*! Write to logfile only. */
- void fout( const std::string & msg );
-
- /*! This method returns the single instance of the LogManager */
- static LogManager & getSingleton( void );
-
/*! This method return a pointer to the single instance of the LogManager */
static LogManager * getSingletonPtr( void );
-// LogManager & operator - ( LogType type );
-// template < class T > LogManager & operator << ( const T & x );
-// // LogManager & operator << ( const std::endl & endl ){}
-// LogManager & operator << ( const Flush & flush );
+ /*! This method writes the given message to the console */
-// template < class T > LogManager & operator << ( LogManager & log, const T & val );
-
-// template<typename _CharT, typename _Traits> basic_ostream<_CharT, _Traits>& endl(basic_ostream<_CharT, _Traits>& __os)
-// { return
-// flush( __os.put(__os.widen('\n') ) ) ; }
-
protected:
- /*! This method writes the given message to stdout and (if available) to a logfile */
- void write_( const std::string & msg );
+ virtual void writeToConsole_( const std::string & msg );
- /*! This method writes the given message to the console */
- void writeToConsole_( const std::string & msg );
-
- /*! Handle to the session log file */
- std::ofstream logFile_;
- /*! Handle to the persistent log file */
- std::ofstream chatLogFile_;
-
/*! Handle to the console log */
Console * console_;
-
- /*! True, if we have a session log file */
- bool haveLogFile_;
- /*! True, if we have a persistent log file */
- bool haveChatLogFile_;
- /*! True, if we have a console log */
- bool haveConsole_;
};
-inline LogManager & endl( LogManager & log ){
- std::cout << "LogManager & operator:: endl" << std::endl;
- return log;
-}
-
-template < class T > LogManager & operator << ( LogManager & log, const T & val ){
- std::cout << "LogManager & operator const val" << std::endl;
- std::cout << val << std::endl;
-// if ( haveLogFile_ ) logFile_ << timeStamp() << ": " << val;
- return log;
-}
-
-
} //namespace OpenGate
#endif // _OPENGATE_LOGMANAGER__H
Added: trunk/src/LogManagerBase.cpp
===================================================================
--- trunk/src/LogManagerBase.cpp (rev 0)
+++ trunk/src/LogManagerBase.cpp 2007-09-24 22:15:55 UTC (rev 793)
@@ -0,0 +1,105 @@
+/***************************************************************************
+ * Copyright (C) 2006-2007 by OpenGate development team *
+ * spo...@us... *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+
+#include "LogManagerBase.h"
+
+namespace OpenGate{
+
+LogManagerBase::LogManagerBase( ) {
+ haveLogFile_ = false;
+ haveChatLogFile_ = false;
+ haveConsole_ = false;
+}
+
+LogManagerBase::~LogManagerBase( ) {
+ if ( haveLogFile_ ) logFile_.close();
+ if ( haveChatLogFile_ ) chatLogFile_.close();
+}
+
+void LogManagerBase::setLogFile( const std::string & logFileName ){
+ logFile_.open( logFileName.c_str(), std::fstream::trunc );
+ haveLogFile_ = true;
+}
+
+void LogManagerBase::setChatLogFile( const std::string & chatLogFileName ){
+ chatLogFile_.open( chatLogFileName.c_str(), std::fstream::app );
+ chatLogFile_ << "\n" << timeStamp() << "Starting new session" << std::endl;
+ haveChatLogFile_ = true;
+}
+
+std::string LogManagerBase::timeStamp() {
+ std::time_t now = std::time( 0 );
+ struct tm * time = localtime( &now );
+
+ return std::string("["
+ + toStr( time->tm_year + 1900 ) + "."
+ + toStr( time->tm_mon + 1 ) + "."
+ + toStr( time->tm_mday ) + "-"
+ + toStr( time->tm_hour ) + ":"
+ + toStr( time->tm_min ) + ":"
+ + toStr( time->tm_sec ) + "]" );
+}
+
+void LogManagerBase::chat( const std::string & name, const std::string & msg ){
+ std::string logMsg( name + ": " + msg );
+
+ if ( haveChatLogFile_ ) chatLogFile_ << timeStamp() << " " << logMsg << std::endl;
+ writeToConsole_( logMsg );
+ cout( logMsg );
+}
+
+void LogManagerBase::info( const std::string & msg ){
+ std::string logMsg( "INFO: " + msg );
+ writeToConsole_( logMsg );
+ write_( logMsg );
+}
+
+void LogManagerBase::debug( const std::string & msg ){
+ std::string logMsg( "DEBUG: " + msg );
+ writeToConsole_( logMsg );
+ write_( logMsg );
+}
+
+void LogManagerBase::warn( const std::string & msg ){
+ std::string logMsg( "WARN: " + msg );
+ writeToConsole_( logMsg );
+ write_( logMsg );
+}
+
+void LogManagerBase::fatal( const std::string & msg ){
+ std::string logMsg( "FATAL: " + msg );
+ writeToConsole_( logMsg );
+ write_( logMsg );
+}
+
+void LogManagerBase::cout( const std::string & msg ){
+ std::cout << msg << std::endl;
+}
+
+void LogManagerBase::fout( const std::string & msg ){
+ write_( msg );
+}
+
+void LogManagerBase::write_( const std::string & msg ){
+ std::cout << msg << std::endl;
+ if ( haveLogFile_ ) logFile_ << timeStamp() << ": " << msg << std::endl;
+}
+
+} //namespace OpenGate
Added: trunk/src/LogManagerBase.h
===================================================================
--- trunk/src/LogManagerBase.h (rev 0)
+++ trunk/src/LogManagerBase.h 2007-09-24 22:15:55 UTC (rev 793)
@@ -0,0 +1,143 @@
+/***************************************************************************
+ * Copyright (C) 2006-2007 by OpenGate development team *
+ * spo...@us... *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+
+#ifndef _OPENGATE_LOGMANAGERBASE__H
+#define _OPENGATE_LOGMANAGERBASE__H
+
+#include <iostream>
+#include <fstream>
+#include <string>
+
+#include "common.h"
+
+namespace OpenGate{
+
+enum LogType{ None, Info, Chat, Debug, Fatal};
+
+/*!
+ * \brief This class handles all the logging in Opengate
+ *
+ * Opengate has several possibilities of logging. The three main logging methods
+ * are persistent logging, session logging and console logging. Persistent
+ * logging is done in a file. All messages are logged into a file. These file
+ * will always get the messages appended. This way no message is overwritten and
+ * therefore is persistent. It can be used for chatlogs for example.
+ * The session logging is done similar to the persistent logging. It is also
+ * written to a file but this file will be empty each time Opengate starts. The
+ * console logging is not put into any file.
+ * The logmanager knows if he has a storage for the persistent logging (see
+ * setChatLogFile() ) and also if he has a file for session logging (see
+ * setLogFile() ). You can also add an Console for the so called console
+ * logging (see setConsole()).
+ *
+ * Opengate also supports different levels of importance for the logging. These
+ * levels are handled like this:
+ * <table>
+ * <tr><td>Level</td><td>Persistent log</td><td>Session log (and stdout)</td><td>Console log</td><td>Description</td></tr>
+ * <tr><td>info</td><td> </td><td>X</td><td>X</td><td>General interesting information (i.e. "player connected")</td></tr>
+ * <tr><td>chat</td><td>X</td><td>X</td><td>X</td><td>Chat from and to other users</td></tr>
+ * <tr><td>debug</td><td> </td><td>X</td><td> </td><td>Messages that indicate internal things that might be interesting for developers</td></tr>
+ * <tr><td>warning</td><td> </td><td>X</td><td> </td><td>Messages interesting for developers</td></tr>
+ * <tr><td>fatal</td><td> </td><td>X</td><td>X</td><td>Messages when really bad things happen</td></tr>
+ * </table>
+ * \author Carsten <spo...@us... >
+ */
+class LogManagerBase : public std::ostream {
+public:
+ LogManagerBase( );
+
+ virtual ~LogManagerBase( );
+
+ /*! Open a session log file with the given filename \param logFileName The name of the file */
+ void setLogFile( const std::string & logFileName );
+
+ /*! Open the persistent log file for the chatlog with the given filename \param logFileName The name of the file */
+ void setChatLogFile( const std::string & chatLogFileName );
+
+ /*! Create a timestamp \return A timestamp in the format [YYYY.MM.DD-HH.MM.SS] */
+ std::string timeStamp();
+
+ /*! Protocol a message with info-level importance */
+ void info( const std::string & msg );
+
+ /*! Protocol a chat-message */
+ void chat( const std::string & name, const std::string & msg );
+
+ /*! Protocol a message with debug-level importance */
+ void debug( const std::string & msg );
+
+ /*! Protocol a message with warn-level importance */
+ void warn( const std::string & msg );
+
+ /*! Protocol a message with fatal-level importance */
+ void fatal( const std::string & msg );
+
+ /*! Write to std::out only. For debug purposes only.*/
+ void cout( const std::string & msg );
+
+ /*! Write to logfile only. */
+ void fout( const std::string & msg );
+
+// LogManagerBase & operator - ( LogType type );
+// template < class T > LogManagerBase & operator << ( const T & x );
+// // LogManagerBase & operator << ( const std::endl & endl ){}
+// LogManagerBase & operator << ( const Flush & flush );
+
+// template < class T > LogManagerBase & operator << ( LogManagerBase & log, const T & val );
+
+// template<typename _CharT, typename _Traits> basic_ostream<_CharT, _Traits>& endl(basic_ostream<_CharT, _Traits>& __os)
+// { return
+// flush( __os.put(__os.widen('\n') ) ) ; }
+
+protected:
+
+ /*! This method writes the given message to stdout and (if available) to a logfile */
+ virtual void write_( const std::string & msg );
+
+ virtual void writeToConsole_( const std::string & msg ){ }
+
+ /*! Handle to the session log file */
+ std::ofstream logFile_;
+ /*! Handle to the persistent log file */
+ std::ofstream chatLogFile_;
+
+ /*! True, if we have a session log file */
+ bool haveLogFile_;
+ /*! True, if we have a persistent log file */
+ bool haveChatLogFile_;
+ /*! True, if we have a console log */
+ bool haveConsole_;
+};
+
+inline LogManagerBase & endl( LogManagerBase & log ){
+ std::cout << "LogManager & operator:: endl" << std::endl;
+ return log;
+}
+
+template < class T > LogManagerBase & operator << ( LogManagerBase & log, const T & val ){
+ std::cout << "LogManager & operator const val" << std::endl;
+ std::cout << val << std::endl;
+// if ( haveLogFile_ ) logFile_ << timeStamp() << ": " << val;
+ return log;
+}
+
+} //namespace OpenGate
+
+#endif // _OPENGATE_LOGMANAGERBASE__H
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2007-09-24 20:40:42 UTC (rev 792)
+++ trunk/src/Makefile.am 2007-09-24 22:15:55 UTC (rev 793)
@@ -7,6 +7,8 @@
opengateclient.cpp \
common.h \
common.cpp \
+ commonWithOgre.h \
+ commonWithOgre.cpp \
networkProtocol.h \
networkProtocol.cpp \
networkClient.h \
@@ -39,6 +41,8 @@
InitState.cpp \
LogManager.h \
LogManager.cpp \
+ LogManagerBase.h \
+ LogManagerBase.cpp \
MarketDialog.h \
MarketDialog.cpp \
OpcodeWrapper.h \
@@ -73,21 +77,20 @@
$(freealut_LIBS) \
$(vorbisfile_LIBS) \
$(OIS_LIBS) \
- -L$(OGSECTOR_EXTERNALS_PATH)/lib/
+ $(OgreOpcode_LIBS)
+# -L$(OGSECTOR_EXTERNALS_PATH)/lib/
opengateclient_CXXFLAGS = \
$(OGRE_CFLAGS) \
- $(CEGUI_CFLAGS)
+ $(CEGUI_CFLAGS) \
+ $(OgreOpcode_CFLAGS)
opengateserver_SOURCES = \
opengateserver.cpp \
common.h \
common.cpp \
- LogManager.h \
- LogManager.cpp \
- Console.h \
- InputManager.h \
- InputManager.cpp \
+ LogManagerBase.h \
+ LogManagerBase.cpp \
networkProtocol.h \
networkProtocol.cpp \
networkServer.h \
@@ -97,12 +100,12 @@
metaserver.h \
metaserver.cpp
-opengateserver_LDFLAGS = \
- $(OGRE_LIBS) \
- $(OIS_LIBS)
+opengateserver_LDFLAGS =
+# $(OGRE_LIBS) \
+# $(OIS_LIBS)
-opengateserver_CXXFLAGS = \
- $(OGRE_CFLAGS)
+opengateserver_CXXFLAGS =
+# $(OGRE_CFLAGS)
testopenalmanager_SOURCES = \
testopenalmanager.cpp \
@@ -122,6 +125,8 @@
Entity.cpp \
LogManager.h \
LogManager.cpp \
+ LogManagerBase.h \
+ LogManagerBase.cpp \
InputManager.h \
InputManager.cpp \
OpenALSoundManager.h \
Modified: trunk/src/Sector.cpp
===================================================================
--- trunk/src/Sector.cpp 2007-09-24 20:40:42 UTC (rev 792)
+++ trunk/src/Sector.cpp 2007-09-24 22:15:55 UTC (rev 793)
@@ -36,6 +36,8 @@
#include <OgreRenderSystem.h>
#include <OgreMeshManager.h>
+#include "commonWithOgre.h"
+
namespace OpenGate{
// class StarField : public Ogre::SimpleRenderable {
@@ -258,7 +260,7 @@
Ogre::Vector3 pos( 0.0, 0.0, 0.0);
pSubElem = pElem->FirstChildElement( "position" );
if ( pSubElem ){
- pos = toVector3( pSubElem->FirstChild()->Value(), ',' );
+ pos = Ogre::Vector3( &toVector3( pSubElem->FirstChild()->Value(), ',' )[ 0 ] );
} else {
log_->warn( "missing pos for station " + name );
continue;
@@ -268,7 +270,7 @@
Ogre::Vector3 targetDirection( 0.0, 0.0, 0.0);
pSubElem = pElem->FirstChildElement( "direction" );
if ( pSubElem ){
- targetDirection = toVector3( pSubElem->FirstChild()->Value(), ',' );
+ targetDirection = Ogre::Vector3( &toVector3( pSubElem->FirstChild()->Value(), ',' )[0]);
Ogre::Quaternion rot = ( obj->mainNode()->getOrientation().zAxis()* -1.0).getRotationTo( targetDirection );
obj->mainNode()->rotate( rot );
}
@@ -310,7 +312,7 @@
Ogre::Vector3 pos( 0.0, 0.0, 0.0);
pSubElem = pElem->FirstChildElement( "position" );
if ( pSubElem ){
- pos = toVector3( pSubElem->FirstChild()->Value(), ',' );
+ pos = Ogre::Vector3( &toVector3( pSubElem->FirstChild()->Value(), ',' )[ 0 ] );
} else {
log_->warn( "missing pos for sectorobject " + name );
continue;
@@ -319,19 +321,19 @@
Ogre::Vector3 scale( 1.0, 1.0, 1.0) ;
pSubElem = pElem->FirstChildElement( "scale" );
if ( pSubElem ){
- scale = toVector3( pSubElem->FirstChild()->Value(), ',' );
+ scale = Ogre::Vector3( &toVector3( pSubElem->FirstChild()->Value(), ',' )[ 0 ] );
}
Ogre::Vector3 direction( 0.0, 0.0, 0.0 );
pSubElem = pElem->FirstChildElement( "direction" );
if ( pSubElem ){
- direction = toVector3( pSubElem->FirstChild()->Value(), ',' );
+ direction = Ogre::Vector3( &toVector3( pSubElem->FirstChild()->Value(), ',' )[ 0 ] );
}
Ogre::Vector3 size( 0.0, 0.0, 0.0) ;
pSubElem = pElem->FirstChildElement( "size" );
if ( pSubElem ){
- size = toVector3( pSubElem->FirstChild()->Value(), ',' );
+ size = Ogre::Vector3( &toVector3( pSubElem->FirstChild()->Value(), ',' )[ 0 ] );
}
std::string material;
@@ -787,9 +789,9 @@
void Sector::sendVesselMovement( SectorObjectMoveableLocal * obj ){
if ( obj ){
MessageBodyShipMovement msg( obj->childID(),
- obj->mainNode()->getPosition(),
- obj->velocity(),
- obj->mainNode()->getOrientation(),
+ obj->mainNode()->getPosition().ptr(),
+ obj->velocity().ptr(),
+ obj->mainNode()->getOrientation().ptr(),
obj->thrust(),
obj->scaledYaw(),
obj->scaledPitch(),
@@ -803,7 +805,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().ptr(),
obj->vessel()->id(), obj->mass(), obj->maxShield(), obj->maxThrust() );
network_->send( msg );
}
@@ -817,7 +819,7 @@
log_->info( "Create player object " + msg.name()+ " " + toStr( msg.senderID() ) + " VesselID: " + toStr( msg.vesselID() ) );
SectorObjectMoveable * obj = createMoveableObject( msg.name(), msg.senderID(), msg.childID(),
*VesselManager::getSingleton().vessel( msg.vesselID() ) );
- obj->mainNode()->setPosition( msg.position() );
+ obj->mainNode()->setPosition( toOgreVec( msg.position() ) );
obj->setMass( msg.mass() );
obj->setMaxShield( msg.maxShield() );
obj->setMaxThrust( msg.maxThrust() );
@@ -828,7 +830,7 @@
SectorObjectMoveableAi * obj = createAiMoveableObject( msg.name(), msg.senderID(), msg.childID(),
*VesselManager::getSingleton().vessel( msg.vesselID() ) );
- obj->mainNode()->setPosition( msg.position() );
+ obj->mainNode()->setPosition( toOgreVec( msg.position() ) );
if ( movableObjects_.count( createGlobalID( msg.senderID(), 0 ) ) ){
log_->info( "ai object target: " + movableObjects_[ createGlobalID( msg.senderID(), 0 ) ]->name() );
@@ -981,7 +983,7 @@
void Sector::sendProjectile( const Projectile & projectile ){
if ( network_->online() ){
MessageBodyShipProjectileFired msg( projectile.parent().childID(), projectile.shotCount(),
- projectile.position(), projectile.velocity(),
+ projectile.position().ptr(), projectile.velocity().ptr(),
projectile.damage(), projectile.lifeTime() );
network_->send( msg );
}
Modified: trunk/src/SectorObjects.cpp
===================================================================
--- trunk/src/SectorObjects.cpp 2007-09-24 20:40:42 UTC (rev 792)
+++ trunk/src/SectorObjects.cpp 2007-09-24 22:15:55 UTC (rev 793)
@@ -18,7 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#include "common.h"
+#include "commonWithOgre.h"
#include "Sector.h"
#include "SectorObjects.h"
#include "Projectile.h"
@@ -336,9 +336,9 @@
void SectorObjectMoveable::setFlightProperties( const MessageBodyShipMovement & msg ){
if ( forceMovement_ ){
- mainNode_->setPosition( msg.position() );
- mainNode_->setOrientation( msg.orientation() );
- vel_ = msg.velocity();
+ mainNode_->setPosition( toOgreVec( msg.position() ) );
+ mainNode_->setOrientation( toOgreQuat( msg.orientation() ) );
+ vel_ = toOgreVec( msg.velocity() );
setThrust( msg.thrust() );
setScaledYaw( msg.yaw() );
setScaledPitch( msg.pitch() );
@@ -366,14 +366,14 @@
setScaledRoll( msg.roll() );
setScaledPitch( msg.pitch() );
- vel_ = msg.velocity();
+ vel_ = toOgreVec( msg.velocity() );
setThrust( msg.thrust() );
- Ogre::Vector3 srcP = mainNode_->getPosition( );
- Ogre::Quaternion srcQ = mainNode_->getOrientation( );
- Ogre::Vector3 destP = msg.position( );
+ Ogre::Vector3 srcP( mainNode_->getPosition( ) );
+ Ogre::Quaternion srcQ( mainNode_->getOrientation( ) );
+ Ogre::Vector3 destP( toOgreVec( msg.position( ) ) );
- Ogre::Quaternion diff = Ogre::Quaternion::nlerp( 1, srcQ, msg.orientation() );
+ Ogre::Quaternion diff = Ogre::Quaternion::nlerp( 1, srcQ, toOgreQuat( msg.orientation() ) );
interpolateRot_ = diff * srcQ.Inverse();
// if ( msg.childID() > 0 ){
Modified: trunk/src/VesselManager.cpp
===================================================================
--- trunk/src/VesselManager.cpp 2007-09-24 20:40:42 UTC (rev 792)
+++ trunk/src/VesselManager.cpp 2007-09-24 22:15:55 UTC (rev 793)
@@ -30,7 +30,7 @@
TiXmlElement * pElem;
for ( pElem = hRoot->FirstChild( key ).Element(); pElem != 0; pElem = pElem->NextSiblingElement( key ) ) {
if ( pElem ) {
- mountPoints.push_back( toVector3( pElem->GetText(), ' ' ) );
+ mountPoints.push_back( Ogre::Vector3( &toVector3( pElem->GetText(), ' ' )[ 0 ]) );
}
}
return mountPoints;
Modified: trunk/src/common.cpp
===================================================================
--- trunk/src/common.cpp 2007-09-24 20:40:42 UTC (rev 792)
+++ trunk/src/common.cpp 2007-09-24 22:15:55 UTC (rev 793)
@@ -19,9 +19,6 @@
***************************************************************************/
#include "common.h"
-#include <OgreSceneNode.h>
-#include <OgreVector3.h>
-#include <OgreMovableObject.h>
long createGlobalID( int userId, int childId ) { return childId * MAXUSERID + userId; }
@@ -51,8 +48,8 @@
return subStrings;
}
-Ogre::Vector3 toVector3( const std::string & vecStr, const char delimiter ){
- Ogre::Vector3 vect( 0.0, 0.0, 0.0 );
+std::vector < float > toVector3( const std::string & vecStr, const char delimiter ){
+ std::vector < float > vect( 3, 0.0 );
int pos = 0, nextPos = 0, count = 0;
std::string str;
while ( ( nextPos = vecStr.find( delimiter, pos ) ) != (int)std::string::npos ){
@@ -70,36 +67,6 @@
return vect;
}
-
-void dumpSceneNodes( std::stringstream & ss, Ogre::Node * n, int level ) {
- for ( int i = 0; i < level; i++ ) {
- ss << " ";
- }
- ss << "SceneNode: " << n->getName() << std::endl;
-
- Ogre::SceneNode::ObjectIterator object_it = ((Ogre::SceneNode *)n)->getAttachedObjectIterator();
- Ogre::Node::ChildNodeIterator node_it = n->getChildIterator();
-
- Ogre::MovableObject *m;
- while ( object_it.hasMoreElements() ){
- for ( int i = 0; i < level + 2; i++ ) {
- ss << " ";
- }
- m = object_it.getNext();
- ss << m->getMovableType() << ": " << m->getName() << std::endl;
- }
- while ( node_it.hasMoreElements() ) {
- dumpSceneNodes( ss, node_it.getNext(), level + 2 );
- }
-}
-
-std::string dumpSceneNodes( Ogre::Node * n ) {
- std::stringstream ss;
- ss << std::endl << "Node Hierarchy:" << std::endl;
- dumpSceneNodes( ss, n, 0 );
- return ss.str();
-}
-
int split(const std::string& input, const std::string& delimiter, std::list<std::string>& results) {
int pos = 0;
int offset = 0;
Modified: trunk/src/common.h
===================================================================
--- trunk/src/common.h 2007-09-24 20:40:42 UTC (rev 792)
+++ trunk/src/common.h 2007-09-24 22:15:55 UTC (rev 793)
@@ -36,13 +36,12 @@
#include <config.h>
#endif
-#include <OgrePrerequisites.h>
-
#include <sstream>
#include <fstream>
#include <iostream>
#include <vector>
#include <string>
+#include <list>
#include <cmath>
#include <algorithm>
#include <sys/timeb.h>
@@ -133,7 +132,7 @@
}
/*! Convert string to OgreVector3, Example: ToVector3( "3.3, 4.45, 5.23", ',' ) */
-Ogre::Vector3 toVector3( const std::string & vecStr, const char delimiter = ',' );
+std::vector< float > toVector3( const std::string & vecStr, const char delimiter = ',' );
/*!
* \brief This method converts a string to int
@@ -178,12 +177,6 @@
*/
void myMSleep( int s );
-/*! For debugging purposes dump scene node tree to a string */
-void dumpSceneNodes( std::stringstream & ss, Ogre::Node * n, int level );
-
-/*! For debugging purposes dump scene node tree to a string */
-std::string dumpSceneNodes( Ogre::Node * n );
-
class Stopwatch {
public:
Stopwatch() { state = undefined; }
Added: trunk/src/commonWithOgre.cpp
===================================================================
--- trunk/src/commonWithOgre.cpp (rev 0)
+++ trunk/src/commonWithOgre.cpp 2007-09-24 22:15:55 UTC (rev 793)
@@ -0,0 +1,54 @@
+/***************************************************************************
+ * Copyright (C) 2006-2007 by OpenGate development team *
+ * spo...@us... *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+
+#include "commonWithOgre.h"
+
+#include <OgreSceneNode.h>
+#include <OgreVector3.h>
+#include <OgreMovableObject.h>
+
+void dumpSceneNodes( std::stringstream & ss, Ogre::Node * n, int level ) {
+ for ( int i = 0; i < level; i++ ) {
+ ss << " ";
+ }
+ ss << "SceneNode: " << n->getName() << std::endl;
+
+ Ogre::SceneNode::ObjectIterator object_it = ((Ogre::SceneNode *)n)->getAttachedObjectIterator();
+ Ogre::Node::ChildNodeIterator node_it = n->getChildIterator();
+
+ Ogre::MovableObject *m;
+ while ( object_it.hasMoreElements() ){
+ for ( int i = 0; i < level + 2; i++ ) {
+ ss << " ";
+ }
+ m = object_it.getNext();
+ ss << m->getMovableType() << ": " << m->getName() << std::endl;
+ }
+ while ( node_it.hasMoreElements() ) {
+ dumpSceneNodes( ss, node_it.getNext(), level + 2 );
+ }
+}
+
+std::string dumpSceneNodes( Ogre::Node * n ) {
+ std::stringstream ss;
+ ss << std::endl << "Node Hierarchy:" << std::endl;
+ dumpSceneNodes( ss, n, 0 );
+ return ss.str();
+}
Added: trunk/src/commonWithOgre.h
===================================================================
--- trunk/src/commonWithOgre.h (rev 0)
+++ trunk/src/commonWithOgre.h 2007-09-24 22:15:55 UTC (rev 793)
@@ -0,0 +1,65 @@
+/***************************************************************************
+ * Copyright (C) 2006-2007 by OpenGate development team *
+ * spo...@us... *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program; if not, write to the *
+ * Free Software Foundation, Inc., *
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ ***************************************************************************/
+
+/*!
+ * \file
+ *
+ * \brief This file contains several functions that can be used in common with ogre.
+ *
+ * For example you can find methods here that are used to enable opengate to be
+ * cross platform.
+ *
+ * \author Carsten <spo...@us...>
+ */
+
+#ifndef _OPENGATE_COMMONWITHOGRE__H
+#define _OPENGATE_COMMONWITHOGRE__H
+
+#include "common.h"
+
+#include <OgrePrerequisites.h>
+#include <OgreVector3.h>
+#include <OgreQuaternion.h>
+
+inline Ogre::Vector3 toOgreVec( const std::vector < float > & vec ){
+ if ( vec.size() == 3 ){
+ return Ogre::Vector3( &vec[ 0 ] );
+ } else {
+ return Ogre::Vector3::ZERO;
+ }
+}
+
+inline Ogre::Quaternion toOgreQuat( const std::vector < float > & vec ){
+ if ( vec.size() == 4 ){
+ return Ogre::Quaternion( (Ogre::Real*)&vec[ 0 ] );
+ } else {
+ return Ogre::Quaternion::ZERO;
+ }
+}
+
+/*! For debugging purposes dump scene node tree to a string */
+void dumpSceneNodes( std::stringstream & ss, Ogre::Node * n, int level );
+
+// /*! For debugging purposes dump scene node tree to a string */
+std::string dumpSceneNodes( Ogre::Node * n );
+
+#endif
+
+
Modified: trunk/src/metaserver.cpp
===================================================================
--- trunk/src/metaserver.cpp 2007-09-24 20:40:42 UTC (rev 792)
+++ trunk/src/metaserver.cpp 2007-09-24 22:15:55 UTC (rev 793)
@@ -19,6 +19,7 @@
***************************************************************************/
#include "metaserver.h"
+#include "LogManagerBase.h"
//#include <boost/regex.hpp>
//#include "config.h"
@@ -28,11 +29,10 @@
namespace OpenGate{
-MetaConnection::MetaConnection(asio::io_service & io_service) :
- io_service_( io_service ), socket_( io_service ), resolver_( io_service ) {
+ MetaConnection::MetaConnection(asio::io_service & io_service, LogManagerBase & log ) :
+ io_service_( io_service ), socket_( io_service ), resolver_( io_service ), log_( &log ) {
// Get instance to the log manager
- log_ = LogManager::getSingletonPtr();
hostname_ = std::string( "opacma.ontheserver.de" );
log_->info( std::string( "Querying " ) + hostname_);
Modified: trunk/src/metaserver.h
===================================================================
--- trunk/src/metaserver.h 2007-09-24 20:40:42 UTC (rev 792)
+++ trunk/src/metaserver.h 2007-09-24 22:15:55 UTC (rev 793)
@@ -22,15 +22,16 @@
#define _OPENGATE_METASERVER__H
#include <asio.hpp>
-#include "LogManager.h"
using asio::ip::tcp;
namespace OpenGate{
+ class LogManagerBase;
+
class MetaConnection {
public:
- MetaConnection(asio::io_service & io_service);
+ MetaConnection(asio::io_service & io_service, LogManagerBase & log);
~MetaConnection();
int login( const std::string & userName, const std::string & passwd = "" );
@@ -43,7 +44,7 @@
private:
- LogManager *log_;
+ LogManagerBase *log_;
std::string hostname_;
asio::io_service & io_service_;
Modified: trunk/src/networkProtocol.cpp
===================================================================
--- trunk/src/networkProtocol.cpp 2007-09-24 20:40:42 UTC (rev 792)
+++ trunk/src/networkProtocol.cpp 2007-09-24 22:15:55 UTC (rev 793)
@@ -20,18 +20,19 @@
#include "networkProtocol.h"
-#include <OgreVector3.h>
-#include <OgreQuaternion.h>
+// #include <OgreVector3.h>
+// #include <OgreQuaternion.h>
namespace OpenGate{
MessageBodyShipRegister::MessageBodyShipRegister( const Uint32 senderID, const Uint8 childID, const std::string & name,
- const Ogre::Vector3 & pos, Uint16 vesselID,
+ const Float * pos, Uint16 vesselID,
Uint32 mass, Uint32 maxShield, Uint32 maxThrust )
- : MessageBodyShipBase( childID ), name_( name ), pos_( pos ), vesselID_( vesselID ),
+ : MessageBodyShipBase( childID ), name_( name ), pos_( 3 ), vesselID_( vesselID ),
mass_( mass ), maxShield_( maxShield ), maxThrust_( maxThrust ){
senderID_ = senderID;
type_ = (Uint8)PROTO_SHIP_REGISTER;
+ pos_[ 0 ] = pos[ 0 ]; pos_[ 1 ] = pos[ 1 ]; pos_[ 2 ] = pos[ 2 ];
}
MessageBodyShipRegister::MessageBodyShipRegister( const char * data ) : MessageBodyShipBase( data ){
@@ -62,16 +63,20 @@
writeToOut( out_, maxThrust_ );
}
-Ogre::Vector3 MessageBodyShipRegister::position() const { return pos_; }
+FVector3 MessageBodyShipRegister::position() const { return pos_; }
-MessageBodyShipMovement::MessageBodyShipMovement( Uint8 childID, const Ogre::Vector3 & pos,
- const Ogre::Vector3 & vel, const Ogre::Quaternion & orient,
+MessageBodyShipMovement::MessageBodyShipMovement( Uint8 childID, const Float * pos,
+ const Float * vel, const Float * orient,
Uint32 thrust, float yaw, float pitch, float roll, int seq )
- : MessageBodyShipBase( childID ), pos_( pos ), vel_( vel ), orient_( orient ),
+ : MessageBodyShipBase( childID ), pos_( 3 ), vel_( 3 ), orient_( 4 ),
thrust_( thrust ), yaw_( yaw ), pitch_( pitch ), roll_( roll ), seqNr_( seq ) {
type_ = (Uint8)PROTO_SHIP_MOVEMENT;
+ pos_[ 0 ] = pos[ 0 ]; pos_[ 1 ] = pos[ 1 ]; pos_[ 2 ] = pos[ 2 ];
+ vel_[ 0 ] = vel[ 0 ]; vel_[ 1 ] = vel[ 1 ]; vel_[ 2 ] = vel[ 2 ];
+ orient_[ 0 ] = orient[ 0 ]; orient_[ 1 ] = orient[ 1 ];
+ orient_[ 2 ] = orient[ 2 ]; orient_[ 3 ] = orient[ 3 ];
}
MessageBodyShipMovement::MessageBodyShipMovement( const char * data ) : MessageBodyShipBase( data ){
@@ -106,19 +111,21 @@
return str;
}
-Ogre::Vector3 MessageBodyShipMovement::velocity() const { return vel_; }
+FVector3 MessageBodyShipMovement::velocity() const { return vel_; }
-Ogre::Vector3 MessageBodyShipMovement::position() const { return pos_; }
+FVector3 MessageBodyShipMovement::position() const { return pos_; }
-Ogre::Quaternion MessageBodyShipMovement::orientation() const { return orient_; }
+FVector4 MessageBodyShipMovement::orientation() const { return orient_; }
+MessageBodyShipProjectileFired::MessageBodyShipProjectileFired( Uint8 childID, Uint16 shotCount, const Float * pos,
+ const Float * vel, Uint32 damage, Float liveTime )
+ : MessageBodyShipBase( childID ), shotCount_( shotCount ), pos_( 3 ), vel_( 3 ),
+ damage_( damage ), liveTime_( liveTime ) {
+ type_ = (Uint8)PROTO_SHIP_PROJECTILEFIRED;
+ pos_[ 0 ] = pos[ 0 ]; pos_[ 1 ] = pos[ 1 ]; pos_[ 2 ] = pos[ 2 ];
+ vel_[ 0 ] = vel[ 0 ]; vel_[ 1 ] = vel[ 1 ]; vel_[ 2 ] = vel[ 2 ];
-MessageBodyShipProjectileFired::MessageBodyShipProjectileFired( Uint8 childID, Uint16 shotCount, const Ogre::Vector3 & pos,
- const Ogre::Vector3 & vel, Uint32 damage, Ogre::Real liveTime )
- : MessageBodyShipBase( childID ), shotCount_( shotCount ), pos_( pos ),
- vel_( vel ), damage_( damage ), liveTime_( liveTime ) {
- type_ = (Uint8)PROTO_SHIP_PROJECTILEFIRED;
}
MessageBodyShipProjectileFired::MessageBodyShipProjectileFired( const char * data )
@@ -140,9 +147,9 @@
writeToOut( out_, liveTime_ );
}
-Ogre::Vector3 MessageBodyShipProjectileFired::position() const { return pos_; }
+FVector3 MessageBodyShipProjectileFired::position() const { return pos_; }
-Ogre::Vector3 MessageBodyShipProjectileFired::velocity() const { return vel_; }
+FVector3 MessageBodyShipProjectileFired::velocity() const { return vel_; }
} // namespace OpenGate{
Modified: trunk/src/networkProtocol.h
===================================================================
--- trunk/src/networkProtocol.h 2007-09-24 20:40:42 UTC (rev 792)
+++ trunk/src/networkProtocol.h 2007-09-24 22:15:55 UTC (rev 793)
@@ -21,7 +21,8 @@
#ifndef _OPENGATE_NETWORK_PROTOCOL__H
#define _OPENGATE_NETWORK_PROTOCOL__H
-#include <OgreVector3.h>
+//#include <OgreVector3.h>
+
#include "common.h"
#include <iostream>
@@ -30,6 +31,18 @@
namespace OpenGate{
+// typedef Ogre::Vector3 FVector3;
+// typedef Ogre::Quaternion FVector4;
+// typedef Ogre::Real Float;
+typedef std::vector< float > FVector3;
+typedef std::vector< float > FVector4;
+typedef float Float;
+
+inline std::ostream & operator << ( std::ostream & str, const std::vector< float > & vec ){
+ for ( int i = 0; i < vec.size(); i ++ ) str << vec[ i ] << " ";
+ return str;
+}
+
#define OG_PORT 1234
#define PROTO_BASE 1
@@ -305,7 +318,7 @@
public:
MessageBodyShipRegister( const Uint32 senderID, const Uint8 childID, const std::string & name,
- const Ogre::Vector3 & pos, Uint16 vesselID, Uint32 mass, Uint32 maxShield, Uint32 maxThrust );
+ const Float * pos, Uint16 vesselID, Uint32 mass, Uint32 maxShield, Uint32 maxThrust );
MessageBodyShipRegister( const char * data );
@@ -315,7 +328,7 @@
inline std::string name() const { return name_; }
- Ogre::Vector3 position() const;
+ FVector3 position() const;
inline Uint16 vesselID() const { return vesselID_; }
@@ -330,7 +343,7 @@
std::string name_;
- Ogre::Vector3 pos_;
+ FVector3 pos_;
Uint16 vesselID_;
Uint32 mass_;
@@ -386,8 +399,7 @@
class MessageBodyShipMovement : public MessageBodyShipBase {
public:
- MessageBodyShipMovement( Uint8 childID, const Ogre::Vector3 & pos, const Ogre::Vector3 & vel,
- const Ogre::Quaternion & orient,
+ MessageBodyShipMovement( Uint8 childID, const Float * pos, const Float * vel, const Float * orient,
Uint32 thrust, float yaw, float pitch, float roll, int seq );
MessageBodyShipMovement( const char * data );
@@ -396,11 +408,11 @@
void createOutStream();
- Ogre::Vector3 velocity() const;
+ FVector3 velocity() const;
- Ogre::Vector3 position() const;
+ FVector3 position() const;
- Ogre::Quaternion orientation() const;
+ FVector4 orientation() const;
inline Uint32 thrust() const { return thrust_; }
@@ -415,9 +427,9 @@
friend std::ostream & operator << ( std::ostream & str, const MessageBodyShipMovement & msg );
protected:
- Ogre::Vector3 pos_;
- Ogre::Vector3 vel_;
- Ogre::Quaternion orient_;
+ FVector3 pos_;
+ FVector3 vel_;
+ FVector4 orient_;
Uint32 thrust_;
@@ -481,8 +493,8 @@
class MessageBodyShipProjectileFired : public MessageBodyShipBase {
public:
- MessageBodyShipProjectileFired( Uint8 childID, Uint16 shotCount, const Ogre::Vector3 & pos,
- const Ogre::Vector3 & vel, Uint32 damage, Ogre::Real liveTime );
+ MessageBodyShipProjectileFired( Uint8 childID, Uint16 shotCount, const Float * pos, const Float * vel,
+ Uint32 damage, Float liveTime );
MessageBodyShipProjectileFired( const char * data );
@@ -491,17 +503,17 @@
void createOutStream();
Uint16 shotCount() const { return shotCount_ ; }
- Ogre::Vector3 position() const;
- Ogre::Vector3 velocity() const;
+ FVector3 position() const;
+ FVector3 velocity() const;
Uint32 damage() const { return damage_; }
- Ogre::Real liveTime() const { return liveTime_; }
+ Float liveTime() const { return liveTime_; }
protected:
Uint16 shotCount_;
- Ogre::Vector3 pos_;
- Ogre::Vector3 vel_;
+ FVector3 pos_;
+ FVector3 vel_;
Uint32 damage_;
- Ogre::Real liveTime_;
+ Float liveTime_;
};
class MessageBodyShipAmmoHit : public MessageBodyShipBase {
Modified: trunk/src/networkServer.cpp
===================================================================
--- trunk/src/networkServer.cpp 2007-09-24 20:40:42 UTC (rev 792)
+++ trunk/src/networkServer.cpp 2007-09-24 22:15:55 UTC (rev 793)
@@ -22,6 +22,7 @@
#include "networkServer.h"
#include <iostream>
#include <string>
+#include "LogManagerBase.h"
#include <boost/bind.hpp>
@@ -29,10 +30,9 @@
namespace OpenGate{
-Server::Server( asio::io_service & io_service, const tcp::endpoint & endpoint )
- : io_service_( io_service ), acceptor_( io_service ), userIDCounter_( 1000 ) {
+Server::Server( asio::io_service & io_service, const tcp::endpoint & endpoint, LogManagerBase & log )
+ : io_service_( io_service ), acceptor_( io_service ), userIDCounter_( 1000 ), log_( & log ) {
- log_ = LogManager::getSingletonPtr();
acceptor_.open( endpoint.protocol() );
acceptor_.set_option( asio::ip::tcp::acceptor::reuse_address( true ) );
acceptor_.bind( endpoint );
@@ -164,12 +164,12 @@
}
void Server::receiveShipRegister( UserSession * user, const MessageBodyShipRegister & msgIn ){
- std::string name = msgIn.name();
+ std::string name( msgIn.name() );
int userID = user->userID();
int childID = msgIn.childID();
int vesselID = msgIn.vesselID();
int senderID = msgIn.senderID();
- Ogre::Vector3 pos = msgIn.position();
+ FVector3 pos( msgIn.position() );
log_->info( std::string( "receiveShipRegister from " ) + toStr( senderID ) + " " + name + " " +
" " + toStr( vesselID ) );
@@ -198,7 +198,7 @@
log_->info( std::string( "\tSend register: " ) + obj->userName() + " <- " + it->second->name() );
MessageBodyShipRegister msg( it->second->userID(), it->second->childID(),
- it->second->name(), it->second->position(),
+ it->second->name(), &it->second->position()[0],
it->second->vesselID(),
it->second->mass(), it->second->maxShield(), it->second->maxThrust() );
obj->parent()->send( msg );
@@ -206,7 +206,7 @@
}
//** second register the new object to all existing objects in range;
- MessageBodyShipRegister msg( obj->userID(), obj->childID(), obj->name(), obj->position(), obj->vesselID(),
+ MessageBodyShipRegister msg( obj->userID(), obj->childID(), obj->name(), &obj->position()[ 0 ], obj->vesselID(),
obj->mass(), obj->maxShield(), obj->maxThrust() );
// ** atm just global;
for ( std::map < long, UserObject * >::iterator it = userObjects_.begin(); it != userObjects_.end(); it ++ ){
Modified: trunk/src/networkServer.h
===================================================================
--- trunk/src/networkServer.h 2007-09-24 20:40:42 UTC (rev 792)
+++ trunk/src/networkServer.h 2007-09-24 22:15:55 UTC (rev 793)
@@ -27,7 +27,6 @@
#include <asio.hpp>
#include <boost/bind.hpp>
-#include "LogManager.h"
#include "networkProtocol.h"
#include "networkServerUser.h"
@@ -35,6 +34,7 @@
namespace OpenGate{
+class LogManagerBase;
class UserSession;
class UserObject;
@@ -58,7 +58,7 @@
class Server{
public:
- Server( asio::io_service & io_service, const tcp::endpoint & endpoint );
+ Server( asio::io_service & io_service, const tcp::endpoint & endpoint, LogManagerBase & log );
~Server();
@@ -96,7 +96,7 @@
std::set < std::string > userNames_;
UserSessionGroup allUsers_;
- LogManager * log_;
+ LogManagerBase * log_;
};
} // namespace OpenGate
Modified: trunk/src/networkServerUser.cpp
===================================================================
--- trunk/src/networkServerUser.cpp 2007-09-24 20:40:42 UTC (rev 792)
+++ trunk/src/networkServerUser.cpp 2007-09-24 22:15:55 UTC (rev 793)
@@ -100,8 +100,7 @@
}
}
} else {
- LogManager::getSingleton().info( std::string( "Received msg for unknown object: " )
- + userName() + " child: " + toStr( childID ) );
+ std::cerr << std::string( "Received msg for unknown object: " ) + userName() + " child: " + toStr( childID ) << std::endl;
}
}
@@ -169,7 +168,8 @@
sendToRange( msg );
} break;
default:
- LogManager::getSingleton().fatal( std::string( "PROTO_UNKNOWN: " ) + toStr( (int)base.type() ) );
+ std::cerr << std::string( "PROTO_UNKNOWN: " ) + toStr( (int)base.type() ) << std::endl;
+ // std:LogManager::getSingleton().fatal( std::string( "PROTO_UNKNOWN: " ) + toStr( (int)base.type() ) );
break;
}
// std::cout << "User::handle_read_body: " << userID_ << std::endl;
@@ -177,8 +177,9 @@
asio::async_read( socket_, asio::buffer( readMsg_.data(), Message::HeaderLength ),
boost::bind( & UserSession::handleReadHeader, this, asio::placeholders::error ) );
} else {
- LogManager::getSingleton().fatal( std::string( "Cannot read body: " )
- + toStr( userID_ ) + " " + error.what() );
+ std::cerr << std::string( "Cannot read body: " ) + toStr( userID_ ) + " " + error.what() << std::endl;
+// LogManager::getSingleton().fatal( std::string( "Cannot read body: " )
+// + toStr( userID_ ) + " " + error.what() );
// room_.leave( this );
}
}
@@ -193,7 +194,8 @@
boost::bind( & UserSession::handleWrite, this, asio::placeholders::error ) );
}
} else {
- LogManager::getSingleton().fatal( std::string( "Cannot write to user: " ) + toStr( userID_ ) + error.what() );
+ std::cerr << std::string( "Cannot write to user: " ) + toStr( userID_ ) + error.what() << std::endl;
+ // LogManager::getSingleton().fatal( std::string( "Cannot write to user: " ) + toStr( userID_ ) + error.what() );
// room_.leave( this );
}
}
Modified: trunk/src/networkServerUser.h
===================================================================
--- trunk/src/networkServerUser.h 2007-09-24 20:40:42 UTC (rev 792)
+++ trunk/src/networkServerUser.h 2007-09-24 22:15:55 UTC (rev 793)
@@ -124,9 +124,9 @@
const std::string userName( ) const { return parent_->userName(); }
- void setPosition( const Ogre::Vector3 & pos ){ pos_ = pos; }
+ void setPosition( const FVector3 & pos ){ pos_ = pos; }
- Ogre::Vector3 position( ) const { return pos_; }
+ FVector3 position( ) const { return pos_; }
void sendToRange( MessageBodyBase & body );
@@ -164,7 +164,7 @@
ObjectStatus status_;
- Ogre::Vector3 pos_;
+ FVector3 pos_;
std::set < UserObject * > inRange_;
Uint32 mass_;
Modified: trunk/src/opengateclient.cpp
===================================================================
--- trunk/src/opengateclient.cpp 2007-09-24 20:40:42 UTC (rev 792)
+++ trunk/src/opengateclient.cpp 2007-09-24 22:15:55 UTC (rev 793)
@@ -144,7 +144,7 @@
asio::io_service io_service;
if ( withMetaServer ){
- OpenGate::MetaConnection meta( io_service );
+ OpenGate::MetaConnection meta( io_service, *log );
int user_id = meta.login( username, password );
if (( user_id > 0 ) && ( option_version == 1)) {
int response = meta.check_version( user_id );
Modified: trunk/src/opengateserver.cpp
===================================================================
--- trunk/src/opengateserver.cpp 2007-09-24 20:40:42 UTC (rev 792)
+++ trunk/src/opengateserver.cpp 2007-09-24 22:15:55 UTC (rev 793)
@@ -28,15 +28,12 @@
#include "common.h"
#include "networkServer.h"
-#include "LogManager.h"
+#include "LogManagerBase.h"
#include "metaserver.h"
using namespace OpenGate;
-#include "Console.h"
-void Console::print( const std::string & text ){}
-
-LogManager *logMgr = NULL;
+LogManagerBase *logMgr = NULL;
asio::io_service *io_servicePtr = NULL;
Server *serverPtr = NULL;
OpenGate::MetaConnection *metaPtr = NULL;
@@ -71,7 +68,7 @@
int main( int argc, char *argv[] ) {
- logMgr = new LogManager( );
+ logMgr = new LogManagerBase( );
logMgr->setLogFile( "OGserver.log" );
logMgr->setChatLogFile( "OGserverChat.log" );
logMgr->info( std::string("Starting up server ") + PACKAGE_STRING );
@@ -83,14 +80,14 @@
asio::io_service io_service;
io_servicePtr = &io_service;
- OpenGate::MetaConnection meta( io_service );
+ OpenGate::MetaConnection meta( io_service, *logMgr );
metaPtr = &meta;
int error = 0;
if ((error = meta.add_game_server()) < 0) {
logMgr->warn( std::string("Could not add game server " + toStr (error) ) );
}
tcp::endpoint endpoint( tcp::v4(), OG_PORT );
- Server server( io_service, endpoint );
+ Server server( io_service, endpoint, *logMgr );
serverPtr = &server;
io_service.run();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-09-24 20:40:38
|
Revision: 792
http://opengate.svn.sourceforge.net/opengate/?rev=792&view=rev
Author: egore
Date: 2007-09-24 13:40:42 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
2007-09-24 Christoph Brill <eg...@us...>
* src/common.cpp, src/common.h: add method to split strings with a
given delimiter
* src/metaserver.cpp, src/metaserver.h: add API for the metaserver
* src/opengateserver.cpp: register and unregister game server against
the metaserver
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/common.cpp
trunk/src/common.h
trunk/src/metaserver.cpp
trunk/src/metaserver.h
trunk/src/opengateserver.cpp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-09-24 20:03:30 UTC (rev 791)
+++ trunk/ChangeLog 2007-09-24 20:40:42 UTC (rev 792)
@@ -0,0 +1,6 @@
+2007-09-24 Christoph Brill <eg...@us...>
+ * src/common.cpp, src/common.h: add method to split strings with a
+ given delimiter
+ * src/metaserver.cpp, src/metaserver.h: add API for the metaserver
+ * src/opengateserver.cpp: register and unregister game server against
+ the metaserver
Modified: trunk/src/common.cpp
===================================================================
--- trunk/src/common.cpp 2007-09-24 20:03:30 UTC (rev 791)
+++ trunk/src/common.cpp 2007-09-24 20:40:42 UTC (rev 792)
@@ -99,3 +99,24 @@
dumpSceneNodes( ss, n, 0 );
return ss.str();
}
+
+int split(const std::string& input, const std::string& delimiter, std::list<std::string>& results) {
+ int pos = 0;
+ int offset = 0;
+ int lengthDelimiter = (int)delimiter.size();
+ int lengthInput = (int)input.size();
+
+ if ( ( lengthInput == 0 ) || ( lengthDelimiter == 0 ) ) {
+ return 0;
+ }
+
+ while (pos = input.find (delimiter, offset)) {
+ results.push_back(input.substr(offset, pos-offset));
+ if (pos == (int)std::string::npos) {
+ break;
+ }
+ offset = pos+1;
+ }
+
+ return results.size();
+}
Modified: trunk/src/common.h
===================================================================
--- trunk/src/common.h 2007-09-24 20:03:30 UTC (rev 791)
+++ trunk/src/common.h 2007-09-24 20:40:42 UTC (rev 792)
@@ -215,4 +215,6 @@
enum watchstate {undefined,halted,running} state;
};
+int split(const std::string& input, const std::string& delimiter, std::list<std::string>& results);
+
#endif // _OPENGATE_COMMON__H
Modified: trunk/src/metaserver.cpp
===================================================================
--- trunk/src/metaserver.cpp 2007-09-24 20:03:30 UTC (rev 791)
+++ trunk/src/metaserver.cpp 2007-09-24 20:40:42 UTC (rev 792)
@@ -48,9 +48,9 @@
socket_.connect( *endpoint_iterator++, asio::assign_error( error ) );
}
} catch ( asio::error & e) {
- log_->fatal( e.what() );
+ log_->fatal( std::string( "asio::error: " ) + e.what() );
} catch ( std::exception & e) {
- log_->fatal( std::string( "Exception: " ) + e.what() );
+ log_->fatal( std::string( "std::exception: " ) + e.what() );
} catch (...) {
log_->fatal( "Unkown exception occured while resolving the metaserver" );
}
@@ -88,7 +88,7 @@
if (returncode > 0) {
return returncode;
} else {
- log_->warn ( std::string ("unkown return code for login ") + toStr( returncode ) );
+ log_->warn ( std::string ("unkown return code for") + parameters + toStr( returncode ) );
return -4;
}
}
@@ -96,10 +96,10 @@
} catch ( asio::error & e) {
- log_->fatal( e.what() );
+ log_->fatal( std::string( "asio::error: " ) + e.what() );
return -5;
} catch ( std::exception & e) {
- log_->fatal( std::string( "Exception: " ) + e.what() );
+ log_->fatal( std::string( "std::exception: " ) + e.what() );
return -5;
} catch (...) {
log_->fatal( "Unkown exception occured while resolving the server" );
@@ -136,17 +136,17 @@
if (returncode > 0) {
return returncode;
} else {
- log_->warn ( std::string ("unkown return code for version check ") + toStr( returncode ) );
+ log_->warn ( std::string ("unkown return code for") + parameters + toStr( returncode ) );
return -4;
}
}
}
} catch ( asio::error & e) {
- log_->fatal( std::string( "check_version: ASIO: " ) + e.what() );
+ log_->fatal( std::string( "asio::error: " ) + e.what() );
return -5;
} catch ( std::exception & e) {
- log_->fatal( std::string( "check_version: Exception: " ) + e.what() );
+ log_->fatal( std::string( "std::exception: " ) + e.what() );
return -5;
} catch (...) {
log_->fatal( "check_version: Unkown exception occured while resolving the server" );
@@ -155,6 +155,192 @@
return 1;
}
+int MetaConnection::logout( int user_id ) {
+
+ try {
+
+ asio::streambuf response;
+ std::string parameters( "logout&user_id=" + toStr(user_id) + "&user_ip=" + "123.123.123.123"); // FIXME: determine IP or think of other way to handle this
+ int retval = request(parameters, response);
+ if (retval < 0) {
+ return retval;
+ }
+
+ // We got a usefull body. The body is an int, lets use it.
+ if (response.size() > 0) {
+ std::ostringstream stream;
+ stream << &response;
+ int returncode = toInt( stream.str() );
+ switch (returncode) {
+ case -101: log_->warn ( std::string ("no action given") ); return -3;
+ case -102: log_->warn ( std::string ("action given but unknown") ); return -3;
+ case -103: log_->warn ( std::string ("database is not available") ); return -3;
+ case -1: log_->warn ( std::string ("no user_id given") ); return -3;
+ case -2: log_->warn ( std::string ("no user_ip given") ); return -3;
+ case -3: log_->warn ( std::string ("user_id doesn't exist") ); return -3;
+ case -4: log_->warn ( std::string ("password incorrect") ); return -3;
+ case -5: log_->warn ( std::string ("user was already offline") ); return -3;
+ default:
+ if (returncode > 0) {
+ return returncode;
+ } else {
+ log_->warn ( std::string ("unkown return code for") + parameters + toStr( returncode ) );
+ return -4;
+ }
+ }
+ }
+
+
+ } catch ( asio::error & e) {
+ log_->fatal( std::string( "asio::error: " ) + e.what() );
+ return -5;
+ } catch ( std::exception & e) {
+ log_->fatal( std::string( "std::exception: " ) + e.what() );
+ return -5;
+ } catch (...) {
+ log_->fatal( "Unkown exception occured while resolving the server" );
+ return -5;
+ }
+ return 1;
+}
+
+int MetaConnection::add_game_server() {
+
+ try {
+
+ asio::streambuf response;
+ std::string parameters( "add_game_server" );
+ int retval = request(parameters, response);
+ if (retval < 0) {
+ return retval;
+ }
+
+ // We got a usefull body. The body is an int, lets use it.
+ if (response.size() > 0) {
+ std::ostringstream stream;
+ stream << &response;
+ int returncode = toInt( stream.str() );
+ switch (returncode) {
+ case -101: log_->warn ( std::string ("no action given") ); return -3;
+ case -102: log_->warn ( std::string ("action given but unknown") ); return -3;
+ case -103: log_->warn ( std::string ("database is not available") ); return -3;
+ case -12: log_->warn ( std::string ("no additional server possible") ); return -3;
+ case -13: log_->warn ( std::string ("ip is already a server") ); return -3;
+ default:
+ if (returncode > 0) {
+ return returncode;
+ } else {
+ log_->warn ( std::string ("unkown return code for") + parameters + toStr( returncode ) );
+ return -4;
+ }
+ }
+ }
+
+
+ } catch ( asio::error & e) {
+ log_->fatal( std::string( "asio::error: " ) + e.what() );
+ return -5;
+ } catch ( std::exception & e) {
+ log_->fatal( std::string( "std::exception: " ) + e.what() );
+ return -5;
+ } catch (...) {
+ log_->fatal( "Unkown exception occured while resolving the server" );
+ return -5;
+ }
+ return 1;
+}
+
+std::list<std::string> MetaConnection::list_game_server() {
+
+ std::list<std::string> mylist;
+ try {
+
+ asio::streambuf response;
+ std::string parameters( "list_game_server" );
+ int retval = request(parameters, response);
+ if (retval < 0) {
+ return mylist;
+ }
+
+ // We got a usefull body. The body is an int, lets use it.
+ if (response.size() > 0) {
+ std::ostringstream stream;
+ stream << &response;
+ int returncode = toInt( stream.str() );
+ switch (returncode) {
+ case -101: log_->warn ( std::string ("no action given") ); return mylist;
+ case -102: log_->warn ( std::string ("action given but unknown") ); return mylist;
+ case -103: log_->warn ( std::string ("database is not available") ); return mylist;
+ case -15: log_->warn ( std::string ("no game server available") ); return mylist;
+ default:
+
+ if (stream.str().length() > 5) {
+ split(stream.str(), " ", mylist);
+ } else {
+ log_->warn ( std::string ("unkown return code for ") + parameters + toStr( returncode ) );
+ return mylist;
+ }
+ }
+ }
+
+ } catch ( asio::error & e) {
+ log_->fatal( std::string( "asio::error: " ) + e.what() );
+ return mylist;
+ } catch ( std::exception & e) {
+ log_->fatal( std::string( "std::exception: " ) + e.what() );
+ return mylist;
+ } catch (...) {
+ log_->fatal( "Unkown exception occured while resolving the server" );
+ return mylist;
+ }
+ return mylist;
+}
+
+int MetaConnection::remove_game_server() {
+
+ try {
+
+ asio::streambuf response;
+ std::string parameters( "remove_game_server" );
+ int retval = request(parameters, response);
+ if (retval < 0) {
+ return retval;
+ }
+
+ // We got a usefull body. The body is an int, lets use it.
+ if (response.size() > 0) {
+ std::ostringstream stream;
+ stream << &response;
+ int returncode = toInt( stream.str() );
+ switch (returncode) {
+ case -101: log_->warn ( std::string ("no action given") ); return -3;
+ case -102: log_->warn ( std::string ("action given but unknown") ); return -3;
+ case -103: log_->warn ( std::string ("database is not available") ); return -3;
+ case -14: log_->warn ( std::string ("ip was not a server") ); return -3;
+ default:
+ if (returncode > 0) {
+ return returncode;
+ } else {
+ log_->warn ( std::string ("unkown return code for ") + parameters + toStr( returncode ) );
+ return -4;
+ }
+ }
+ }
+
+
+ } catch ( asio::error & e) {
+ log_->fatal( std::string( "asio::error: " ) + e.what() );
+ return -5;
+ } catch ( std::exception & e) {
+ log_->fatal( std::string( "std::exception: " ) + e.what() );
+ return -5;
+ } catch (...) {
+ log_->fatal( "Unkown exception occured while resolving the server" );
+ return -5;
+ }
+ return 1;
+}
+
int MetaConnection::request( const std::string & parameters, asio::streambuf & response ) {
// Form the request. We specify the "Connection: close" header so that the
// server will close the socket after transmitting the response. This will
Modified: trunk/src/metaserver.h
===================================================================
--- trunk/src/metaserver.h 2007-09-24 20:03:30 UTC (rev 791)
+++ trunk/src/metaserver.h 2007-09-24 20:40:42 UTC (rev 792)
@@ -35,7 +35,12 @@
int login( const std::string & userName, const std::string & passwd = "" );
int check_version( int user_id );
+ int logout( int user_id );
+ int add_game_server();
+ std::list<std::string> list_game_server();
+ int remove_game_server();
+
private:
LogManager *log_;
Modified: trunk/src/opengateserver.cpp
===================================================================
--- trunk/src/opengateserver.cpp 2007-09-24 20:03:30 UTC (rev 791)
+++ trunk/src/opengateserver.cpp 2007-09-24 20:40:42 UTC (rev 792)
@@ -29,6 +29,7 @@
#include "common.h"
#include "networkServer.h"
#include "LogManager.h"
+#include "metaserver.h"
using namespace OpenGate;
@@ -38,12 +39,18 @@
LogManager *logMgr = NULL;
asio::io_service *io_servicePtr = NULL;
Server *serverPtr = NULL;
+OpenGate::MetaConnection *metaPtr = NULL;
void server_shutdown() {
- serverPtr->shutdown();
+ if ( metaPtr ) {
+ logMgr->info("Remove server from server list!");
+ int error = 0;
+ if ((error = metaPtr->remove_game_server()) < 0) {
+ logMgr->warn( std::string("Could not remove game server " + toStr (error)) );
+ }
+ }
if ( serverPtr ) {
- //** no new operator so we need no delete. ;)
- // delete( serverPtr );
+ serverPtr->shutdown();
}
if ( io_servicePtr ) {
io_servicePtr->interrupt();
@@ -63,6 +70,7 @@
}
int main( int argc, char *argv[] ) {
+
logMgr = new LogManager( );
logMgr->setLogFile( "OGserver.log" );
logMgr->setChatLogFile( "OGserverChat.log" );
@@ -74,6 +82,13 @@
try {
asio::io_service io_service;
io_servicePtr = &io_service;
+
+ OpenGate::MetaConnection meta( io_service );
+ metaPtr = &meta;
+ int error = 0;
+ if ((error = meta.add_game_server()) < 0) {
+ logMgr->warn( std::string("Could not add game server " + toStr (error) ) );
+ }
tcp::endpoint endpoint( tcp::v4(), OG_PORT );
Server server( io_service, endpoint );
serverPtr = &server;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-09-24 20:03:27
|
Revision: 791
http://opengate.svn.sourceforge.net/opengate/?rev=791&view=rev
Author: ultrasick
Date: 2007-09-24 13:03:30 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
adding additional nebulae
will uploaded some more in one of these days. There are about 10 - 20 left. We got 127 sectors. Even if not every sector needs a unique skybox image we should collect quite something to make traveling diversified.
Added Paths:
-----------
trunk/data/skybox/objects/m17_-_omega_nebula.png
trunk/data/skybox/objects/m17_-_omega_nebula.xml
trunk/data/skybox/objects/m20_-_trifid_nebula.png
trunk/data/skybox/objects/m20_-_trifid_nebula.xml
trunk/data/skybox/objects/m27_-_dumb-bell_nebula.png
trunk/data/skybox/objects/m27_-_dumb-bell_nebula.xml
trunk/data/skybox/objects/m42_-_orion_nebula.png
trunk/data/skybox/objects/m42_-_orion_nebula.xml
Added: trunk/data/skybox/objects/m17_-_omega_nebula.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m17_-_omega_nebula.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m17_-_omega_nebula.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m17_-_omega_nebula.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m20_-_trifid_nebula.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m20_-_trifid_nebula.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m20_-_trifid_nebula.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m20_-_trifid_nebula.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m27_-_dumb-bell_nebula.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m27_-_dumb-bell_nebula.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m27_-_dumb-bell_nebula.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m27_-_dumb-bell_nebula.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m42_-_orion_nebula.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m42_-_orion_nebula.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m42_-_orion_nebula.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m42_-_orion_nebula.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spo...@us...> - 2007-09-24 19:32:16
|
Revision: 790
http://opengate.svn.sourceforge.net/opengate/?rev=790&view=rev
Author: spom_spom
Date: 2007-09-24 12:32:19 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
remove some old stuff
Removed Paths:
-------------
trunk/data/client/
trunk/data/gui/ActionMapping.layout
trunk/data/gui/ForceFeedback.layout
trunk/data/gui/WindowsLook.imageset
trunk/data/gui/WindowsLook.looknfeel
trunk/data/gui/WindowsLook.scheme
trunk/data/gui/WindowsLook.tga
trunk/data/gui/WindowsLookSkin.scheme
trunk/data/gui/WindowsLookWidgets.scheme
trunk/data/gui/tahoma-12.font
trunk/data/gui/tahoma.ttf
Deleted: trunk/data/gui/ActionMapping.layout
===================================================================
--- trunk/data/gui/ActionMapping.layout 2007-09-24 18:40:56 UTC (rev 789)
+++ trunk/data/gui/ActionMapping.layout 2007-09-24 19:32:19 UTC (rev 790)
@@ -1,77 +0,0 @@
-<?xml version="1.0" ?>
-<GUILayout>
-<Window Type="DefaultWindow" Name="Root" >
- <Property Name="Size" Value="w:1 h:1" />
- <Window Type="WindowsLook/FrameWindow" Name="Main" >
- <Property Name="Position" Value="x:0.0 y:0.0" />
- <Property Name="Size" Value="w:0.3 h:1" />
- <Property Name="Text" Value="Action Mapping Demo" />
- <Property Name="SizingEnabled" Value="false" />
- <Property Name="DragMovingEnabled" Value="False" />
- <Property Name="CloseButtonEnabled" Value="False" />
-
- <Window Type="WindowsLook/StaticText" Name="KeyboardLable" >
- <Property Name="Position" Value="x:0.02 y:0.06" />
- <Property Name="Size" Value="w:0.94 h:0.038" />
- <Property Name="Text" Value="Keyboard Actions" />
- </Window>
- <Window Type="WindowsLook/MultiColumnList" Name="Keyboard" >
- <Property Name="Position" Value="x:0.02 y:0.1" />
- <Property Name="Size" Value="w:0.94 h:0.25" />
- </Window>
-
- <Window Type="WindowsLook/StaticText" Name="MouseLable" >
- <Property Name="Position" Value="x:0.02 y:0.35" />
- <Property Name="Size" Value="w:0.94 h:0.04" />
- <Property Name="Text" Value="Mouse Actions" />
- </Window>
- <Window Type="WindowsLook/MultiColumnList" Name="Mouse" >
- <Property Name="Position" Value="x:0.02 y:0.39" />
- <Property Name="Size" Value="w:0.94 h:0.25" />
- </Window>
-
- <Window Type="WindowsLook/StaticText" Name="JoyStickLable" >
- <Property Name="Position" Value="x:0.02 y:0.645" />
- <Property Name="Size" Value="w:0.94 h:0.04" />
- <Property Name="Text" Value="JoyStick Actions" />
- </Window>
- <Window Type="WindowsLook/MultiColumnList" Name="Joystick" >
- <Property Name="Position" Value="x:0.02 y:0.69" />
- <Property Name="Size" Value="w:0.94 h:0.25" />
- </Window>
-
- <Window Type="WindowsLook/Button" Name="Test" >
- <Property Name="Position" Value="x:0.02 y:0.94" />
- <Property Name="Size" Value="w:0.3 h:0.042" />
- <Property Name="Text" Value="Test" />
- </Window>
- <Window Type="WindowsLook/Button" Name="Reset" >
- <Property Name="Position" Value="x:0.34 y:0.94" />
- <Property Name="Size" Value="w:0.3 h:0.042" />
- <Property Name="Text" Value="Reset" />
- </Window>
- <Window Type="WindowsLook/Button" Name="Quit" >
- <Property Name="Position" Value="x:0.66 y:0.94" />
- <Property Name="Size" Value="w:0.3 h:0.042" />
- <Property Name="Text" Value="Quit" />
- </Window>
- </Window>
-
- <Window Type="WindowsLook/FrameWindow" Name="ActionPrompt" >
- <Property Name="Position" Value="x:0.25 y:0.33" />
- <Property Name="Size" Value="w:0.5 h:0.33" />
- <Property Name="Text" Value="Action Configure Prompt" />
- <Property Name="SizingEnabled" Value="false" />
- <Property Name="CloseButtonEnabled" Value="False" />
- <Property Name="Visible" Value="False" />
- <Property Name="AlwaysOnTop" Value="True" />
-
- <Window Type="WindowsLook/StaticText" Name="ActionPromptLable" >
- <Property Name="Position" Value="x:0.02 y:0.18" />
- <Property Name="Size" Value="w:0.96 h:0.7" />
- <Property Name="Text" Value="Push any key" />
- <Property Name="HorzFormatting" Value="WordWrapCentred" />
- </Window>
- </Window>
-</Window>
-</GUILayout>
Deleted: trunk/data/gui/ForceFeedback.layout
===================================================================
--- trunk/data/gui/ForceFeedback.layout 2007-09-24 18:40:56 UTC (rev 789)
+++ trunk/data/gui/ForceFeedback.layout 2007-09-24 19:32:19 UTC (rev 790)
@@ -1,234 +0,0 @@
-<?xml version="1.0" ?>
-<GUILayout>
-<Window Type="DefaultWindow" Name="Root" >
- <Property Name="Size" Value="w:1 h:1" />
-
- <Window Type="WindowsLook/FrameWindow" Name="Main" >
- <Property Name="Position" Value="x:0.0 y:0.0" />
- <Property Name="Size" Value="w:0.5 h:0.3" />
- <Property Name="Text" Value="Force Feedback Demo" />
- <Property Name="SizingEnabled" Value="false" />
- <Property Name="DragMovingEnabled" Value="False" />
- <Property Name="CloseButtonEnabled" Value="False" />
-
- <Window Type="WindowsLook/Button" Name="Quit" >
- <Property Name="Position" Value="x:0.0 y:0.18" />
- <Property Name="Size" Value="w:0.15 h:0.15" />
- <Property Name="Text" Value="Quit" />
- </Window>
- <Window Type="WindowsLook/Button" Name="Create" >
- <Property Name="Position" Value="x:0.17 y:0.18" />
- <Property Name="Size" Value="w:0.15 h:0.15" />
- <Property Name="Text" Value="Create" />
- </Window>
- <Window Type="WindowsLook/StaticText" Name="SupportedEffects" >
- <Property Name="Position" Value="x:0.01 y:0.35" />
- <Property Name="Size" Value="w:0.49 h:0.15" />
- <Property Name="Text" Value="Supported Effects" />
- </Window>
- <Window Type="WindowsLook/Listbox" Name="SupportedEffectsList" >
- <Property Name="Position" Value="x:0.01 y:0.49" />
- <Property Name="Size" Value="w:0.49 h:0.45" />
- </Window>
-
- <Window Type="WindowsLook/Button" Name="Remove" >
- <Property Name="Position" Value="x:0.51 y:0.18" />
- <Property Name="Size" Value="w:0.15 h:0.15" />
- <Property Name="Text" Value="Remove" />
- </Window>
- <Window Type="WindowsLook/StaticText" Name="EffectsLabel" >
- <Property Name="Position" Value="x:0.51 y:0.35" />
- <Property Name="Size" Value="w:0.3 h:0.15" />
- <Property Name="Text" Value="Loaded Effects" />
- </Window>
- <Window Type="WindowsLook/Listbox" Name="EffectsList" >
- <Property Name="Position" Value="x:0.51 y:0.49" />
- <Property Name="Size" Value="w:0.3 h:0.45" />
- </Window>
-
- <Window Type="WindowsLook/StaticText" Name="Gain" >
- <Property Name="Position" Value="x:0.85 y:0.35" />
- <Property Name="Size" Value="w:0.13 h:0.15" />
- <Property Name="Text" Value="Gain" />
- </Window>
- <Window Type="WindowsLook/Spinner" Name="GainLevel" >
- <Property Name="Position" Value="x:0.85 y:0.51" />
- <Property Name="Size" Value="w:0.12 h:0.2" />
- <Property Name="CurrentValue" Value="1.0" />
- <Property Name="StepSize" Value="0.1" />
- <Property Name="MinimumValue" Value="0.0" />
- <Property Name="MaximumValue" Value="1.0" />
- <Property Name="TextInputMode" Value="FloatingPoint" />
- </Window>
- </Window>
- <Window Type="WindowsLook/FrameWindow" Name="General" >
- <Property Name="Position" Value="x:0.5 y:0.0" />
- <Property Name="Size" Value="w:0.25 h:0.3" />
- <Property Name="Text" Value="General Properties" />
- <Property Name="Visible" Value="false" />
- <Property Name="SizingEnabled" Value="false" />
- <Property Name="DragMovingEnabled" Value="False" />
- <Property Name="CloseButtonEnabled" Value="False" />
-
- <Window Type="WindowsLook/StaticText" Name="TriggerButtonLable" >
- <Property Name="Position" Value="x:0.01 y:0.18" />
- <Property Name="Size" Value="w:0.49 h:0.13" />
- <Property Name="Text" Value="T.B. N/I" />
- </Window>
- <Window Type="WindowsLook/Spinner" Name="TriggerButton" >
- <Property Name="Position" Value="x:0.01 y:0.31" />
- <Property Name="Size" Value="w:0.4 h:0.2" />
- <Property Name="CurrentValue" Value="-1" />
- <Property Name="StepSize" Value="1" />
- <Property Name="MinimumValue" Value="-1" />
- <Property Name="MaximumValue" Value="100" />
- </Window>
- <Window Type="WindowsLook/StaticText" Name="TriggerIntervalLable" >
- <Property Name="Position" Value="x:0.5 y:0.18" />
- <Property Name="Size" Value="w:0.49 h:0.13" />
- <Property Name="Text" Value="T.I. N/I" />
- </Window>
- <Window Type="WindowsLook/Spinner" Name="TriggerInterval" >
- <Property Name="Position" Value="x:0.5 y:0.31" />
- <Property Name="Size" Value="w:0.4 h:0.2" />
- <Property Name="CurrentValue" Value="500" />
- <Property Name="StepSize" Value="500" />
- <Property Name="MinimumValue" Value="0" />
- <Property Name="MaximumValue" Value="10000" />
- </Window>
-
- <Window Type="WindowsLook/StaticText" Name="ReplayLengthLable" >
- <Property Name="Position" Value="x:0.01 y:0.53" />
- <Property Name="Size" Value="w:0.49 h:0.13" />
- <Property Name="Text" Value="Length (sec)" />
- </Window>
- <Window Type="WindowsLook/Spinner" Name="ReplayLength" >
- <Property Name="Position" Value="x:0.01 y:0.66" />
- <Property Name="Size" Value="w:0.4 h:0.2" />
- <Property Name="CurrentValue" Value="0" />
- <Property Name="StepSize" Value="1" />
- <Property Name="MinimumValue" Value="0" />
- <Property Name="MaximumValue" Value="20" />
- </Window>
- <Window Type="WindowsLook/StaticText" Name="ReplayDelayLable" >
- <Property Name="Position" Value="x:0.5 y:0.53" />
- <Property Name="Size" Value="w:0.49 h:0.13" />
- <Property Name="Text" Value="Delay (sec)" />
- </Window>
- <Window Type="WindowsLook/Spinner" Name="ReplayDelay" >
- <Property Name="Position" Value="x:0.5 y:0.66" />
- <Property Name="Size" Value="w:0.4 h:0.2" />
- <Property Name="CurrentValue" Value="0" />
- <Property Name="StepSize" Value="1" />
- <Property Name="MinimumValue" Value="0" />
- <Property Name="MaximumValue" Value="20" />
- </Window>
-
- </Window>
- <Window Type="WindowsLook/FrameWindow" Name="Direction" >
- <Property Name="Position" Value="x:0.75 y:0.0" />
- <Property Name="Size" Value="w:0.25 h:0.3" />
- <Property Name="Text" Value="Direction N/I" />
- <Property Name="Visible" Value="false" />
- <Property Name="SizingEnabled" Value="false" />
- <Property Name="DragMovingEnabled" Value="False" />
- <Property Name="CloseButtonEnabled" Value="False" />
-
- <Window Type="WindowsLook/RadioButton" Name="North" >
- <Property Name="Position" Value="x:.47 y:0.14" />
- <Property Name="Size" Value="w:.2 h:0.2" />
- <Property Name="Selected" Value="true" />
- </Window>
- <Window Type="WindowsLook/RadioButton" Name="South" >
- <Property Name="Position" Value="x:.47 y:0.8" />
- <Property Name="Size" Value="w:.2 h:0.2" />
- </Window>
- <Window Type="WindowsLook/RadioButton" Name="West" >
- <Property Name="Position" Value="x:.17 y:0.5" />
- <Property Name="Size" Value="w:.2 h:0.2" />
- </Window>
- <Window Type="WindowsLook/RadioButton" Name="East" >
- <Property Name="Position" Value="x:.79 y:0.5" />
- <Property Name="Size" Value="w:.2 h:0.2" />
- </Window>
- <Window Type="WindowsLook/RadioButton" Name="NorthWest" >
- <Property Name="Position" Value="x:.26 y:0.27" />
- <Property Name="Size" Value="w:.2 h:0.2" />
- </Window>
- <Window Type="WindowsLook/RadioButton" Name="NorthEast" >
- <Property Name="Position" Value="x:.7 y:0.27" />
- <Property Name="Size" Value="w:.2 h:0.2" />
- </Window>
- <Window Type="WindowsLook/RadioButton" Name="SouthWest" >
- <Property Name="Position" Value="x:.26 y:0.72" />
- <Property Name="Size" Value="w:.2 h:0.2" />
- </Window>
- <Window Type="WindowsLook/RadioButton" Name="SouthEast" >
- <Property Name="Position" Value="x:.7 y:0.72" />
- <Property Name="Size" Value="w:.2 h:0.2" />
- </Window>
- </Window>
-
- <Window Type="WindowsLook/FrameWindow" Name="ConstantForm" >
- <Property Name="Position" Value="x:0.0 y:0.35" />
- <Property Name="Size" Value="w:0.5 h:0.6" />
- <Property Name="Text" Value="Constant Settings" />
- <Property Name="Visible" Value="false" />
- <Property Name="SizingEnabled" Value="false" />
- <Property Name="DragMovingEnabled" Value="False" />
- <Property Name="CloseButtonEnabled" Value="False" />
-
- <Window Type="WindowsLook/StaticText" Name="ConstantLevelLable" >
- <Property Name="Position" Value="x:0.1 y:0.2" />
- <Property Name="Size" Value="w:0.8 h:0.2" />
- <Property Name="Text" Value="Constant Force (besides envelope) has only one setting for a magnitude level (-10k to +10k)." />
- <Property Name="HorzFormatting" Value="WordWrapCentred" />
- </Window>
- <Window Type="WindowsLook/Spinner" Name="ConstantLevel" >
- <Property Name="Position" Value="x:0.1 y:0.45" />
- <Property Name="Size" Value="w:0.2 h:0.2" />
- <Property Name="CurrentValue" Value="5000" />
- <Property Name="StepSize" Value="500" />
- <Property Name="MinimumValue" Value="-10000" />
- <Property Name="MaximumValue" Value="10000" />
- </Window>
- </Window>
- <Window Type="WindowsLook/FrameWindow" Name="RampForm" >
- <Property Name="Position" Value="x:0.0 y:0.35" />
- <Property Name="Size" Value="w:0.5 h:0.6" />
- <Property Name="Text" Value="Ramp Settings" />
- <Property Name="Visible" Value="false" />
- <Property Name="SizingEnabled" Value="false" />
- <Property Name="DragMovingEnabled" Value="False" />
- <Property Name="CloseButtonEnabled" Value="False" />
- </Window>
- <Window Type="WindowsLook/FrameWindow" Name="PeriodicForm" >
- <Property Name="Position" Value="x:0.0 y:0.35" />
- <Property Name="Size" Value="w:0.5 h:0.6" />
- <Property Name="Text" Value="Periodic Settings" />
- <Property Name="Visible" Value="false" />
- <Property Name="SizingEnabled" Value="false" />
- <Property Name="DragMovingEnabled" Value="False" />
- <Property Name="CloseButtonEnabled" Value="False" />
- </Window>
- <Window Type="WindowsLook/FrameWindow" Name="ConditionalForm" >
- <Property Name="Position" Value="x:0.0 y:0.35" />
- <Property Name="Size" Value="w:0.5 h:0.6" />
- <Property Name="Text" Value="Conditional Settings" />
- <Property Name="Visible" Value="false" />
- <Property Name="SizingEnabled" Value="false" />
- <Property Name="DragMovingEnabled" Value="False" />
- <Property Name="CloseButtonEnabled" Value="False" />
- </Window>
-
- <Window Type="WindowsLook/FrameWindow" Name="EnvelopeForm" >
- <Property Name="Position" Value="x:0.7 y:0.35" />
- <Property Name="Size" Value="w:0.3 h:0.6" />
- <Property Name="Text" Value="Envelope Settings" />
- <Property Name="Visible" Value="false" />
- <Property Name="SizingEnabled" Value="false" />
- <Property Name="DragMovingEnabled" Value="False" />
- <Property Name="CloseButtonEnabled" Value="False" />
- </Window>
-</Window>
-</GUILayout>
Deleted: trunk/data/gui/WindowsLook.imageset
===================================================================
--- trunk/data/gui/WindowsLook.imageset 2007-09-24 18:40:56 UTC (rev 789)
+++ trunk/data/gui/WindowsLook.imageset 2007-09-24 19:32:19 UTC (rev 790)
@@ -1,152 +0,0 @@
-<?xml version="1.0" ?>
-<Imageset Name="WindowsLook" Imagefile="WindowsLook.tga" NativeHorzRes="800" NativeVertRes="600" AutoScaled="true">
- <Image Name="Background" XPos="9" YPos="9" Width="2" Height="2" />
- <Image Name="WindowFrameLeft" XPos="2" YPos="9" Width="4" Height="2" />
- <Image Name="WindowFrameRight" XPos="14" YPos="9" Width="4" Height="2" />
- <Image Name="WindowFrameTop" XPos="9" YPos="2" Width="2" Height="4" />
- <Image Name="WindowFrameBottom" XPos="9" YPos="14" Width="2" Height="4" />
- <Image Name="WindowFrameTopLeft" XPos="2" YPos="2" Width="4" Height="4" />
- <Image Name="WindowFrameTopRight" XPos="14" YPos="2" Width="4" Height="4" />
- <Image Name="WindowFrameBottomLeft" XPos="2" YPos="14" Width="4" Height="4" />
- <Image Name="WindowFrameBottomRight" XPos="14" YPos="14" Width="4" Height="4" />
- <Image Name="ButtonNormalLeft" XPos="20" YPos="9" Width="2" Height="2" />
- <Image Name="ButtonNormalRight" XPos="34" YPos="9" Width="2" Height="2" />
- <Image Name="ButtonNormalTop" XPos="27" YPos="2" Width="2" Height="2" />
- <Image Name="ButtonNormalBottom" XPos="27" YPos="16" Width="2" Height="2" />
- <Image Name="ButtonNormalTopLeft" XPos="20" YPos="2" Width="3" Height="3" />
- <Image Name="ButtonNormalTopRight" XPos="33" YPos="2" Width="3" Height="3" />
- <Image Name="ButtonNormalBottomLeft" XPos="20" YPos="15" Width="3" Height="3" />
- <Image Name="ButtonNormalBottomRight" XPos="33" YPos="15" Width="3" Height="3" />
- <Image Name="ButtonPushedLeft" XPos="38" YPos="9" Width="2" Height="2" />
- <Image Name="ButtonPushedRight" XPos="52" YPos="9" Width="2" Height="2" />
- <Image Name="ButtonPushedTop" XPos="45" YPos="2" Width="2" Height="2" />
- <Image Name="ButtonPushedBottom" XPos="45" YPos="16" Width="2" Height="2" />
- <Image Name="ButtonPushedTopLeft" XPos="38" YPos="2" Width="3" Height="3" />
- <Image Name="ButtonPushedTopRight" XPos="51" YPos="2" Width="3" Height="3" />
- <Image Name="ButtonPushedBottomLeft" XPos="38" YPos="15" Width="3" Height="3" />
- <Image Name="ButtonPushedBottomRight" XPos="51" YPos="15" Width="3" Height="3" />
- <Image Name="ButtonHoverLeft" XPos="56" YPos="9" Width="2" Height="2" />
- <Image Name="ButtonHoverRight" XPos="70" YPos="9" Width="2" Height="2" />
- <Image Name="ButtonHoverTop" XPos="63" YPos="2" Width="2" Height="2" />
- <Image Name="ButtonHoverBottom" XPos="63" YPos="16" Width="2" Height="2" />
- <Image Name="ButtonHoverTopLeft" XPos="56" YPos="2" Width="3" Height="3" />
- <Image Name="ButtonHoverTopRight" XPos="69" YPos="2" Width="3" Height="3" />
- <Image Name="ButtonHoverBottomLeft" XPos="56" YPos="15" Width="3" Height="3" />
- <Image Name="ButtonHoverBottomRight" XPos="69" YPos="15" Width="3" Height="3" />
- <Image Name="EditFrameLeft" XPos="74" YPos="9" Width="4" Height="2" />
- <Image Name="EditFrameRight" XPos="86" YPos="9" Width="4" Height="2" />
- <Image Name="EditFrameTop" XPos="81" YPos="2" Width="2" Height="4" />
- <Image Name="EditFrameBottom" XPos="81" YPos="14" Width="2" Height="4" />
- <Image Name="EditFrameTopLeft" XPos="74" YPos="2" Width="3" Height="3" />
- <Image Name="EditFrameTopRight" XPos="87" YPos="2" Width="3" Height="3" />
- <Image Name="EditFrameBottomLeft" XPos="74" YPos="15" Width="3" Height="3" />
- <Image Name="EditFrameBottomRight" XPos="87" YPos="15" Width="3" Height="3" />
- <Image Name="StaticFrameLeft" XPos="92" YPos="9" Width="2" Height="2" />
- <Image Name="StaticFrameRight" XPos="106" YPos="9" Width="2" Height="2" />
- <Image Name="StaticFrameTop" XPos="99" YPos="2" Width="2" Height="2" />
- <Image Name="StaticFrameBottom" XPos="99" YPos="16" Width="2" Height="2" />
- <Image Name="StaticFrameTopLeft" XPos="92" YPos="2" Width="3" Height="3" />
- <Image Name="StaticFrameTopRight" XPos="105" YPos="2" Width="3" Height="3" />
- <Image Name="StaticFrameBottomLeft" XPos="92" YPos="15" Width="3" Height="3" />
- <Image Name="StaticFrameBottomRight" XPos="105" YPos="15" Width="3" Height="3" />
- <Image Name="CloseButtonNormal" XPos="2" YPos="20" Width="13" Height="13" />
- <Image Name="CloseButtonHover" XPos="2" YPos="35" Width="13" Height="13" />
- <Image Name="CloseButtonPushed" XPos="2" YPos="50" Width="13" Height="13" />
- <Image Name="TitlebarTopLeft" XPos="87" YPos="103" Width="8" Height="4" />
- <Image Name="TitlebarTopRight" XPos="109" YPos="103" Width="8" Height="4" />
- <Image Name="TitlebarBottomLeft" XPos="87" YPos="123" Width="8" Height="2" />
- <Image Name="TitlebarBottomRight" XPos="109" YPos="123" Width="8" Height="2" />
- <Image Name="TitlebarLeft" XPos="87" YPos="110" Width="8" Height="10" />
- <Image Name="TitlebarRight" XPos="109" YPos="110" Width="8" Height="10" />
- <Image Name="TitlebarTop" XPos="98" YPos="103" Width="8" Height="4" />
- <Image Name="TitlebarBottom" XPos="98" YPos="123" Width="8" Height="2" />
- <Image Name="TitlebarFill" XPos="98" YPos="110" Width="8" Height="10" />
- <Image Name="CheckboxNormal" XPos="17" YPos="37" Width="10" Height="10" />
- <Image Name="CheckboxHover" XPos="17" YPos="49" Width="10" Height="10" />
- <Image Name="CheckboxMark" XPos="17" YPos="61" Width="10" Height="10" />
- <Image Name="RadioButtonNormal" XPos="29" YPos="37" Width="10" Height="10" />
- <Image Name="RadioButtonHover" XPos="29" YPos="49" Width="10" Height="10" />
- <Image Name="RadioButtonMark" XPos="29" YPos="61" Width="10" Height="10" />
- <Image Name="SliderThumbNormal" XPos="47" YPos="20" Width="7" Height="10" />
- <Image Name="SliderThumbHover" XPos="47" YPos="32" Width="7" Height="10" />
- <Image Name="SliderTrackLeft" XPos="56" YPos="20" Width="3" Height="4" />
- <Image Name="SlidertrackMiddle" XPos="63" YPos="20" Width="2" Height="4" />
- <Image Name="SliderTrackRight" XPos="69" YPos="20" Width="3" Height="4" />
- <Image Name="SliderTick" XPos="56" YPos="26" Width="1" Height="4" />
- <Image Name="HeaderMainBrush" XPos="53" YPos="45" Width="2" Height="2" />
- <Image Name="HeaderBottomEdge" XPos="53" YPos="50" Width="2" Height="4" />
- <Image Name="HeaderSplitter" XPos="47" YPos="44" Width="3" Height="15" />
- <Image Name="VertScrollbarGrip" XPos="41" YPos="68" Width="5" Height="8" />
- <Image Name="HorzScrollbarGrip" XPos="41" YPos="61" Width="8" Height="5" />
- <Image Name="LargeLeftArrow" XPos="2" YPos="65" Width="5" Height="9" />
- <Image Name="LargeRightArrow" XPos="9" YPos="65" Width="5" Height="9" />
- <Image Name="LargeUpArrow" XPos="2" YPos="76" Width="9" Height="5" />
- <Image Name="LargeDownArrow" XPos="2" YPos="83" Width="9" Height="5" />
- <Image Name="SmallLeftArrow" XPos="17" YPos="73" Width="5" Height="5" />
- <Image Name="SmallRightArrow" XPos="24" YPos="73" Width="5" Height="5" />
- <Image Name="SmallUpArrow" XPos="17" YPos="80" Width="5" Height="5" />
- <Image Name="SmallDownArrow" XPos="24" YPos="80" Width="5" Height="5" />
- <Image Name="EditBoxCarat" XPos="29" YPos="118" Width="2" Height="8" />
- <Image Name="MouseArrow" XPos="2" YPos="90" Width="10" Height="19" XOffset="0" YOffset="0" />
- <Image Name="MouseMoveCursor" XPos="14" YPos="90" Width="22" Height="22" XOffset="-10" YOffset="-10" />
- <Image Name="MouseNoSoCursor" XPos="38" YPos="89" Width="11" Height="19" XOffset="-4" YOffset="-9" />
- <Image Name="MouseEsWeCursor" XPos="2" YPos="116" Width="19" Height="8" XOffset="-9" YOffset="-4" />
- <Image Name="MouseNeSwCursor" XPos="51" YPos="90" Width="15" Height="15" XOffset="-7" YOffset="-6" />
- <Image Name="MouseNwSeCursor" XPos="68" YPos="90" Width="15" Height="15" XOffset="-6" YOffset="-7" />
- <Image Name="MouseTextBar" XPos="73" YPos="107" Width="11" Height="20" XOffset="-5" YOffset="-10" />
-
- <Image Name="TabControlButtonPaneFiller" XPos="81" YPos="34" Width="2" Height="2" />
- <Image Name="TabPaneLeft" XPos="92" YPos="9" Width="2" Height="2" />
- <Image Name="TabPaneRight" XPos="106" YPos="9" Width="2" Height="2" />
- <Image Name="TabPaneLower" XPos="99" YPos="16" Width="2" Height="2" />
- <Image Name="TabPaneLowerLeft" XPos="92" YPos="15" Width="3" Height="3" />
- <Image Name="TabPaneLowerRight" XPos="105" YPos="15" Width="3" Height="3" />
- <Image Name="TabPaneMiddle" XPos="9" YPos="9" Width="2" Height="2" />
- <Image Name="TabButtonLeftNormal" XPos="74" YPos="27" Width="2" Height="2" />
- <Image Name="TabButtonRightNormal" XPos="88" YPos="27" Width="2" Height="2" />
- <Image Name="TabButtonUpperNormal" XPos="81" YPos="20" Width="2" Height="2" />
- <Image Name="TabButtonLowerNormal" XPos="81" YPos="34" Width="2" Height="2" />
- <Image Name="TabButtonUpperLeftNormal" XPos="74" YPos="20" Width="3" Height="3" />
- <Image Name="TabButtonUpperRightNormal" XPos="87" YPos="20" Width="3" Height="3" />
- <Image Name="TabButtonLowerLeftNormal" XPos="74" YPos="33" Width="3" Height="3" />
- <Image Name="TabButtonLowerRightNormal" XPos="87" YPos="33" Width="3" Height="3" />
- <Image Name="TabButtonMiddleNormal" XPos="9" YPos="9" Width="2" Height="2" />
-
- <Image Name="TabButtonLeftSelected" XPos="92" YPos="27" Width="2" Height="2" />
- <Image Name="TabButtonRightSelected" XPos="106" YPos="27" Width="2" Height="2" />
- <Image Name="TabButtonUpperSelected" XPos="99" YPos="20" Width="2" Height="2" />
- <Image Name="TabButtonUpperLeftSelected" XPos="92" YPos="20" Width="3" Height="3" />
- <Image Name="TabButtonUpperRightSelected" XPos="105" YPos="20" Width="3" Height="3" />
- <Image Name="TabButtonMiddleSelected" XPos="9" YPos="9" Width="2" Height="2" />
-
- <Image Name="TooltipTopLeft" XPos="74" YPos="38" Width="3" Height="3" />
- <Image Name="TooltipTopRight" XPos="87" YPos="38" Width="4" Height="3" />
- <Image Name="TooltipBottomLeft" XPos="74" YPos="51" Width="3" Height="4" />
- <Image Name="TooltipBottomRight" XPos="87" YPos="51" Width="4" Height="4" />
- <Image Name="TooltipLeftEdge" XPos="74" YPos="45" Width="3" Height="2" />
- <Image Name="TooltipRightEdge" XPos="87" YPos="45" Width="4" Height="2" />
- <Image Name="TooltipTopEdge" XPos="81" YPos="38" Width="2" Height="3" />
- <Image Name="TooltipBottomEdge" XPos="81" YPos="51" Width="2" Height="4" />
- <Image Name="TooltipMiddle" XPos="81" YPos="45" Width="2" Height="2" />
-
- <Image Name="MenuTopLeft" XPos="61" YPos="57" Width="2" Height="2" />
- <Image Name="MenuTopRight" XPos="70" YPos="57" Width="2" Height="2" />
- <Image Name="MenuBottomLeft" XPos="61" YPos="66" Width="2" Height="2" />
- <Image Name="MenuBottomRight" XPos="70" YPos="66" Width="2" Height="2" />
- <Image Name="MenuLeft" XPos="61" YPos="62" Width="2" Height="1" />
- <Image Name="MenuRight" XPos="70" YPos="62" Width="2" Height="1" />
- <Image Name="MenuTop" XPos="66" YPos="57" Width="1" Height="2" />
- <Image Name="MenuBottom" XPos="66" YPos="66" Width="1" Height="2" />
-
- <Image Name="PopupMenuFrameTopLeft" XPos="74" YPos="57" Width="3" Height="3" />
- <Image Name="PopupMenuFrameTopRight" XPos="87" YPos="57" Width="3" Height="3" />
- <Image Name="PopupMenuFrameBottomLeft" XPos="74" YPos="70" Width="3" Height="3" />
- <Image Name="PopupMenuFrameBottomRight" XPos="87" YPos="70" Width="3" Height="3" />
- <Image Name="PopupMenuFrameLeft" XPos="74" YPos="64" Width="3" Height="2" />
- <Image Name="PopupMenuFrameRight" XPos="87" YPos="64" Width="3" Height="2" />
- <Image Name="PopupMenuFrameTop" XPos="81" YPos="57" Width="2" Height="3" />
- <Image Name="PopupMenuFrameBottom" XPos="81" YPos="70" Width="2" Height="3" />
- <Image Name="PopupMenuArrowRight" XPos="61" YPos="75" Width="5" Height="9" />
- <Image Name="PopupMenuArrowLeft" XPos="68" YPos="75" Width="5" Height="9" />
-
-</Imageset>
Deleted: trunk/data/gui/WindowsLook.looknfeel
===================================================================
--- trunk/data/gui/WindowsLook.looknfeel 2007-09-24 18:40:56 UTC (rev 789)
+++ trunk/data/gui/WindowsLook.looknfeel 2007-09-24 19:32:19 UTC (rev 790)
@@ -1,3707 +0,0 @@
-<?xml version="1.0" ?>
-<Falagard>
- <!--
- ***************************************************
- WindowsLook/Button
- ***************************************************
- -->
- <WidgetLook name="WindowsLook/Button">
- <Property name="NormalTextColour" value="FF000000" />
- <Property name="HoverTextColour" value="FF000000" />
- <Property name="PushedTextColour" value="FF000000" />
- <Property name="DisabledTextColour" value="FF888888" />
- <ImagerySection name="label">
- <TextComponent>
- <Area>
- <Dim type="LeftEdge">
- <AbsoluteDim value="0" />
- </Dim>
- <Dim type="TopEdge">
- <AbsoluteDim value="0" />
- </Dim>
- <Dim type="RightEdge">
- <UnifiedDim scale="1" type="RightEdge" />
- </Dim>
- <Dim type="BottomEdge">
- <UnifiedDim scale="1" type="BottomEdge" />
- </Dim>
- </Area>
- <VertFormat type="CentreAligned" />
- <HorzFormat type="WordWrapCentreAligned" />
- </TextComponent>
- </ImagerySection>
- <ImagerySection name="normal">
- <FrameComponent>
- <Area>
- <Dim type="LeftEdge">
- <AbsoluteDim value="0" />
- </Dim>
- <Dim type="TopEdge">
- <AbsoluteDim value="0" />
- </Dim>
- <Dim type="RightEdge">
- <UnifiedDim scale="1" type="RightEdge" />
- </Dim>
- <Dim type="BottomEdge">
- <UnifiedDim scale="1" type="BottomEdge" />
- </Dim>
- </Area>
- <Image type="TopLeftCorner" imageset="WindowsLook" image="ButtonNormalTopLeft" />
- <Image type="TopRightCorner" imageset="WindowsLook" image="ButtonNormalTopRight" />
- <Image type="BottomLeftCorner" imageset="WindowsLook" image="ButtonNormalBottomLeft" />
- <Image type="BottomRightCorner" imageset="WindowsLook" image="ButtonNormalBottomRight" />
- <Image type="LeftEdge" imageset="WindowsLook" image="ButtonNormalLeft" />
- <Image type="TopEdge" imageset="WindowsLook" image="ButtonNormalTop" />
- <Image type="RightEdge" imageset="WindowsLook" image="ButtonNormalRight" />
- <Image type="BottomEdge" imageset="WindowsLook" image="ButtonNormalBottom" />
- </FrameComponent>
- <ImageryComponent>
- <Area>
- <Dim type="LeftEdge">
- <ImageDim imageset="WindowsLook" image="ButtonNormalLeft" dimension="Width" />
- </Dim>
- <Dim type="TopEdge">
- <ImageDim imageset="WindowsLook" image="ButtonNormalTop" dimension="Height" />
- </Dim>
- <Dim type="RightEdge">
- <UnifiedDim scale="1" type="RightEdge">
- <DimOperator op="Subtract">
- <ImageDim imageset="WindowsLook" image="ButtonNormalRight" dimension="Width" />
- </DimOperator>
- </UnifiedDim>
- </Dim>
- <Dim type="BottomEdge">
- <UnifiedDim scale="1" type="BottomEdge">
- <DimOperator op="Subtract">
- <ImageDim imageset="WindowsLook" image="ButtonNormalBottom" dimension="Height" />
- </DimOperator>
- </UnifiedDim>
- </Dim>
- </Area>
- <Image imageset="WindowsLook" image="Background" />
- <Colours topLeft="FFAFAFAF" topRight="FFFFFFFF" bottomLeft="FFFFFFFF" bottomRight="FFAFAFAF" />
- <VertFormat type="Stretched" />
- <HorzFormat type="Stretched" />
- </ImageryComponent>
- </ImagerySection>
- <ImagerySection name="hover">
- <FrameComponent>
- <Area>
- <Dim type="LeftEdge">
- <AbsoluteDim value="0" />
- </Dim>
- <Dim type="TopEdge">
- <AbsoluteDim value="0" />
- </Dim>
- <Dim type="RightEdge">
- <UnifiedDim scale="1" type="RightEdge" />
- </Dim>
- <Dim type="BottomEdge">
- <UnifiedDim scale="1" type="BottomEdge" />
- </Dim>
- </Area>
- <Image type="TopLeftCorner" imageset="WindowsLook" image="ButtonHoverTopLeft" />
- <Image type="TopRightCorner" imageset="WindowsLook" image="ButtonHoverTopRight" />
- <Image type="BottomLeftCorner" imageset="WindowsLook" image="ButtonHoverBottomLeft" />
- <Image type="BottomRightCorner" imageset="WindowsLook" image="ButtonHoverBottomRight" />
- <Image type="LeftEdge" imageset="WindowsLook" image="ButtonHoverLeft" />
- <Image type="TopEdge" imageset="WindowsLook" image="ButtonHoverTop" />
- <Image type="RightEdge" imageset="WindowsLook" image="ButtonHoverRight" />
- <Image type="BottomEdge" imageset="WindowsLook" image="ButtonHoverBottom" />
- </FrameComponent>
- <ImageryComponent>
- <Area>
- <Dim type="LeftEdge">
- <ImageDim imageset="WindowsLook" image="ButtonHoverLeft" dimension="Width" />
- </Dim>
- <Dim type="TopEdge">
- <ImageDim imageset="WindowsLook" image="ButtonHoverTop" dimension="Height" />
- </Dim>
- <Dim type="RightEdge">
- <UnifiedDim scale="1" type="RightEdge">
- <DimOperator op="Subtract">
- <ImageDim imageset="WindowsLook" image="ButtonHoverRight" dimension="Width" />
- </DimOperator>
- </UnifiedDim>
- </Dim>
- <Dim type="BottomEdge">
- <UnifiedDim scale="1" type="BottomEdge">
- <DimOperator op="Subtract">
- <ImageDim imageset="WindowsLook" image="ButtonHoverBottom" dimension="Height" />
- </DimOperator>
- </UnifiedDim>
- </Dim>
- </Area>
- <Image imageset="WindowsLook" image="Background" />
- <Colours topLeft="FFCFD9CF" topRight="FFF2FFF2" bottomLeft="FFF2FFF2" bottomRight="FFCFD9CF" />
- <VertFormat type="Stretched" />
- <HorzFormat type="Stretched" />
- </ImageryComponent>
- </ImagerySection>
- <ImagerySection name="pushed">
- <FrameComponent>
- <Area>
- <Dim type="LeftEdge">
- <AbsoluteDim value="0" />
- </Dim>
- <Dim type="TopEdge">
- <AbsoluteDim value="0" />
- </Dim>
- <Dim type="RightEdge">
- <UnifiedDim scale="1" type="RightEdge" />
- </Dim>
- <Dim type="BottomEdge">
- <UnifiedDim scale="1" type="BottomEdge" />
- </Dim>
- </Area>
- <Image type="TopLeftCorner" imageset="WindowsLook" image="ButtonPushedTopLeft" />
- <Image type="TopRightCorner" imageset="WindowsLook" image="ButtonPushedTopRight" />
- <Image type="BottomLeftCorner" imageset="WindowsLook" image="ButtonPushedBottomLeft" />
- <Image type="BottomRightCorner" imageset="WindowsLook" image="ButtonPushedBottomRight" />
- <Image type="LeftEdge" imageset="WindowsLook" image="ButtonPushedLeft" />
- <Image type="TopEdge" imageset="WindowsLook" image="ButtonPushedTop" />
- <Image type="RightEdge" imageset="WindowsLook" image="ButtonPushedRight" />
- <Image type="BottomEdge" imageset="WindowsLook" image="ButtonPushedBottom" />
- </FrameComponent>
- <ImageryComponent>
- <Area>
- <Dim type="LeftEdge">
- <ImageDim imageset="WindowsLook" image="ButtonPushedLeft" dimension="Width" />
- </Dim>
- <Dim type="TopEdge">
- <ImageDim imageset="WindowsLook" image="ButtonPushedTop" dimension="Height" />
- </Dim>
- <Dim type="RightEdge">
- <UnifiedDim scale="1" type="RightEdge">
- <DimOperator op="Subtract">
- <ImageDim imageset="WindowsLook" image="ButtonPushedRight" dimension="Width" />
- </DimOperator>
- </UnifiedDim>
- </Dim>
- <Dim type="BottomEdge">
- <UnifiedDim scale="1" type="BottomEdge">
- <DimOperator op="Subtract">
- <ImageDim imageset="WindowsLook" image="ButtonPushedBottom" dimension="Height" />
- </DimOperator>
- </UnifiedDim>
- </Dim>
- </Area>
- <Image imageset="WindowsLook" image="Background" />
- <Colours topLeft="FFAFAFAF" topRight="FFFFFFFF" bottomLeft="FFFFFFFF" bottomRight="FFAFAFAF" />
- <VertFormat type="Stretched" />
- <HorzFormat type="Stretched" />
- </ImageryComponent>
- </ImagerySection>
- <ImagerySection name="disabled">
- <FrameComponent>
- <Area>
- <Dim type="LeftEdge">
- <AbsoluteDim value="0" />
- </Dim>
- <Dim type="TopEdge">
- <AbsoluteDim value="0" />
- </Dim>
- <Dim type="RightEdge">
- <UnifiedDim scale="1" type="RightEdge" />
- </Dim>
- <Dim type="BottomEdge">
- <UnifiedDim scale="1" type="BottomEdge" />
- </Dim>
- </Area>
- <Image type="TopLeftCorner" imageset="WindowsLook" image="ButtonNormalTopLeft" />
- <Image type="TopRightCorner" imageset="WindowsLook" image="ButtonNormalTopRight" />
- <Image type="BottomLeftCorner" imageset="WindowsLook" image="ButtonNormalBottomLeft" />
- <Image type="BottomRightCorner" imageset="WindowsLook" image="ButtonNormalBottomRight" />
- <Image type="LeftEdge" imageset="WindowsLook" image="ButtonNormalLeft" />
- <Image type="TopEdge" imageset="WindowsLook" image="ButtonNormalTop" />
- <Image type="RightEdge" imageset="WindowsLook" image="ButtonNormalRight" />
- <Image type="BottomEdge" imageset="WindowsLook" image="ButtonNormalBottom" />
- </FrameComponent>
- <ImageryComponent>
- <Area>
- <Dim type="LeftEdge">
- <ImageDim imageset="WindowsLook" image="ButtonNormalLeft" dimension="Width" />
- </Dim>
- <Dim type="TopEdge">
- <ImageDim imageset="WindowsLook" image="ButtonNormalTop" dimension="Height" />
- </Dim>
- <Dim type="RightEdge">
- <UnifiedDim scale="1" type="RightEdge">
- <DimOperator op="Subtract">
- <ImageDim imageset="WindowsLook" image="ButtonNormalRight" dimension="Width" />
- </DimOperator>
- </UnifiedDim>
- </Dim>
- <Dim type="BottomEdge">
- <UnifiedDim scale="1" type="BottomEdge">
- <DimOperator op="Subtract">
- <ImageDim imageset="WindowsLook" image="ButtonNormalBottom" dimension="Height" />
- </DimOperator>
- </UnifiedDim>
- </Dim>
- </Area>
- <Image imageset="WindowsLook" image="Background" />
- <VertFormat type="Stretched" />
- <HorzFormat type="Stretched" />
- </ImageryComponent>
- </ImagerySection>
- <StateImagery name="Normal">
- <Layer>
- <Section section="normal" />
- <Section section="label">
- <ColourProperty name="NormalTextColour" />
- </Section>
- </Layer>
- </StateImagery>
- <StateImagery name="Hover">
- <Layer>
- <Section section="hover" />
- <Section section="label">
- <ColourProperty name="HoverTextColour" />
- </Section>
- </Layer>
- </StateImagery>
- <StateImagery name="Pushed">
- <Layer>
- <Section section="pushed" />
- <Section section="label">
- <ColourProperty name="PushedTextColour" />
- </Section>
- </Layer>
- </StateImagery>
- <StateImagery name="Disabled">
- <Layer>
- <Section section="disabled">
- <Colours topLeft="FFDFDFDF" topRight="FFDFDFDF" bottomLeft="FFDFDFDF" bottomRight="FFDFDFDF" />
- </Section>
- <Section section="label">
- <ColourProperty name="DisabledTextColour" />
- </Section>
- </Layer>
- </StateImagery>
- </WidgetLook>
-
-
- <!--
- ***************************************************
- WindowsLook/Checkbox
- ***************************************************
- -->
- <WidgetLook name="WindowsLook/Checkbox">
- <Property name="NormalTextColour" value="FF000000" />
- <Property name="HoverTextColour" value="FF000000" />
- <Property name="PushedTextColour" value="FF000000" />
- <Property name="DisabledTextColour" value="FF888888" />
- <ImagerySection name="label">
- <TextComponent>
- <Area>
- <Dim type="LeftEdge" >
- <ImageDim imageset="WindowsLook" image="CheckboxNormal" dimension="Width">
- <DimOperator op="Add">
- <AbsoluteDim value="4" />
- </DimOperator>
- </ImageDim>
- </Dim>
- <Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="RightEdge" ><UnifiedDim scale="1" type="Width" /></Dim>
- <Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim>
- </Area>
- <VertFormat type="CentreAligned" />
- <HorzFormat type="LeftAligned" />
- </TextComponent>
- </ImagerySection>
- <ImagerySection name="normal">
- <ImageryComponent>
- <Area>
- <Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="Width" ><UnifiedDim scale="1" type="Width" /></Dim>
- <Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim>
- </Area>
- <Image imageset="WindowsLook" image="CheckboxNormal" />
- <VertFormat type="CentreAligned" />
- <HorzFormat type="LeftAligned" />
- </ImageryComponent>
- </ImagerySection>
- <ImagerySection name="hover">
- <ImageryComponent>
- <Area>
- <Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="Width" ><UnifiedDim scale="1" type="Width" /></Dim>
- <Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim>
- </Area>
- <Image imageset="WindowsLook" image="CheckboxHover" />
- <VertFormat type="CentreAligned" />
- <HorzFormat type="LeftAligned" />
- </ImageryComponent>
- </ImagerySection>
- <ImagerySection name="select_mark">
- <ImageryComponent>
- <Area>
- <Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="Width" ><UnifiedDim scale="1" type="Width" /></Dim>
- <Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim>
- </Area>
- <Image imageset="WindowsLook" image="CheckboxMark" />
- <VertFormat type="CentreAligned" />
- <HorzFormat type="LeftAligned" />
- </ImageryComponent>
- </ImagerySection>
- <StateImagery name="Normal">
- <Layer>
- <Section section="normal" />
- <Section section="label">
- <ColourProperty name="NormalTextColour" />
- </Section>
- </Layer>
- </StateImagery>
- <StateImagery name="Hover">
- <Layer>
- <Section section="hover" />
- <Section section="label">
- <ColourProperty name="HoverTextColour" />
- </Section>
- </Layer>
- </StateImagery>
- <StateImagery name="SelectedNormal">
- <Layer>
- <Section section="normal" />
- <Section section="select_mark" />
- <Section section="label">
- <ColourProperty name="NormalTextColour" />
- </Section>
- </Layer>
- </StateImagery>
- <StateImagery name="SelectedHover">
- <Layer>
- <Section section="hover" />
- <Section section="select_mark" />
- <Section section="label">
- <ColourProperty name="HoverTextColour" />
- </Section>
- </Layer>
- </StateImagery>
- </WidgetLook>
-
-
- <!--
- ***************************************************
- WindowsLook/CloseButton
- ***************************************************
- -->
- <WidgetLook name="WindowsLook/CloseButton">
- <ImagerySection name="normal">
- <ImageryComponent>
- <Area>
- <Dim type="LeftEdge">
- <AbsoluteDim value="0" />
- </Dim>
- <Dim type="TopEdge">
- <AbsoluteDim value="0" />
- </Dim>
- <Dim type="RightEdge">
- <UnifiedDim scale="1" type="RightEdge" />
- </Dim>
- <Dim type="BottomEdge">
- <UnifiedDim scale="1" type="BottomEdge" />
- </Dim>
- </Area>
- <Image imageset="WindowsLook" image="CloseButtonNormal" />
- <VertFormat type="Stretched" />
- <HorzFormat type="Stretched" />
- </ImageryComponent>
- </ImagerySection>
- <ImagerySection name="hover">
- <ImageryComponent>
- <Area>
- <Dim type="LeftEdge">
- <AbsoluteDim value="0" />
- </Dim>
- <Dim type="TopEdge">
- <AbsoluteDim value="0" />
- </Dim>
- <Dim type="RightEdge">
- <UnifiedDim scale="1" type="RightEdge" />
- </Dim>
- <Dim type="BottomEdge">
- <UnifiedDim scale="1" type="BottomEdge" />
- </Dim>
- </Area>
- <Image imageset="WindowsLook" image="CloseButtonHover" />
- <VertFormat type="Stretched" />
- <HorzFormat type="Stretched" />
- </ImageryComponent>
- </ImagerySection>
- <ImagerySection name="pushed">
- <ImageryComponent>
- <Area>
- <Dim type="LeftEdge">
- <AbsoluteDim value="0" />
- </Dim>
- <Dim type="TopEdge">
- <AbsoluteDim value="0" />
- </Dim>
- <Dim type="RightEdge">
- <UnifiedDim scale="1" type="RightEdge" />
- </Dim>
- <Dim type="BottomEdge">
- <UnifiedDim scale="1" type="BottomEdge" />
- </Dim>
- </Area>
- <Image imageset="WindowsLook" image="CloseButtonPushed" />
- <VertFormat type="Stretched" />
- <HorzFormat type="Stretched" />
- </ImageryComponent>
- </ImagerySection>
- <StateImagery name="Normal">
- <Layer>
- <Section section="normal" />
- </Layer>
- </StateImagery>
- <StateImagery name="Hover">
- <Layer>
- <Section section="hover" />
- </Layer>
- </StateImagery>
- <StateImagery name="Pushed">
- <Layer>
- <Section section="pushed" />
- </Layer>
- </StateImagery>
- <StateImagery name="Disabled">
- <Layer>
- <Section section="normal">
- <Colours topLeft="FFDFDFDF" topRight="FFDFDFDF" bottomLeft="FFDFDFDF" bottomRight="FFDFDFDF" />
- </Section>
- </Layer>
- </StateImagery>
- </WidgetLook>
-
-
- <!--
- ***************************************************
- WindowsLook/ComboDropList
- ***************************************************
- -->
- <WidgetLook name="WindowsLook/ComboDropList">
- <NamedArea name="ItemRenderingArea">
- <Area>
- <Dim type="LeftEdge" ><ImageDim imageset="WindowsLook" image="StaticFrameLeft" dimension="Width" /></Dim>
- <Dim type="TopEdge" ><ImageDim imageset="WindowsLook" image="StaticFrameTop" dimension="Height" /></Dim>
- <Dim type="RightEdge" >
- <UnifiedDim scale="1" type="RightEdge">
- <DimOperator op="Subtract">
- <ImageDim imageset="WindowsLook" image="StaticFrameRight" dimension="Width" />
- </DimOperator>
- </UnifiedDim>
- </Dim>
- <Dim type="BottomEdge" >
- <UnifiedDim scale="1" type="BottomEdge">
- <DimOperator op="Subtract">
- <ImageDim imageset="WindowsLook" image="StaticFrameBottom" dimension="Height" />
- </DimOperator>
- </UnifiedDim>
- </Dim>
- </Area>
- </NamedArea>
- <NamedArea name="ItemRenderingAreaHScroll">
- <Area>
- <Dim type="LeftEdge" ><ImageDim imageset="WindowsLook" image="StaticFrameLeft" dimension="Width" /></Dim>
- <Dim type="TopEdge" ><ImageDim imageset="WindowsLook" image="StaticFrameTop" dimension="Height" /></Dim>
- <Dim type="RightEdge" >
- <UnifiedDim scale="1" type="RightEdge">
- <DimOperator op="Subtract">
- <ImageDim imageset="WindowsLook" image="StaticFrameRight" dimension="Width" />
- </DimOperator>
- </UnifiedDim>
- </Dim>
- <Dim type="BottomEdge" >
- <UnifiedDim scale="1" offset="-16" type="BottomEdge" />
- </Dim>
- </Area>
- </NamedArea>
- <NamedArea name="ItemRenderingAreaVScroll">
- <Area>
- <Dim type="LeftEdge" ><ImageDim imageset="WindowsLook" image="StaticFrameLeft" dimension="Width" /></Dim>
- <Dim type="TopEdge" ><ImageDim imageset="WindowsLook" image="StaticFrameTop" dimension="Height" /></Dim>
- <Dim type="RightEdge" >
- <UnifiedDim scale="1" offset="-16" type="RightEdge" />
- </Dim>
- <Dim type="BottomEdge" >
- <UnifiedDim scale="1" type="BottomEdge">
- <DimOperator op="Subtract">
- <ImageDim imageset="WindowsLook" image="StaticFrameBottom" dimension="Height" />
- </DimOperator>
- </UnifiedDim>
- </Dim>
- </Area>
- </NamedArea>
- <NamedArea name="ItemRenderingAreaHVScroll">
- <Area>
- <Dim type="LeftEdge" ><ImageDim imageset="WindowsLook" image="StaticFrameLeft" dimension="Width" /></Dim>
- <Dim type="TopEdge" ><ImageDim imageset="WindowsLook" image="StaticFrameTop" dimension="Height" /></Dim>
- <Dim type="RightEdge" >
- <UnifiedDim scale="1" offset="-16" type="RightEdge" />
- </Dim>
- <Dim type="BottomEdge" >
- <UnifiedDim scale="1" offset="-16" type="BottomEdge" />
- </Dim>
- </Area>
- </NamedArea>
- <Child type="WindowsLook/HorizontalScrollbar" nameSuffix="__auto_hscrollbar__">
- <Area>
- <Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="Width" ><UnifiedDim scale="1" offset="-16" type="Width" /></Dim>
- <Dim type="Height" ><AbsoluteDim value="16" /></Dim>
- </Area>
- <VertAlignment type="BottomAligned" />
- </Child>
- <Child type="WindowsLook/VerticalScrollbar" nameSuffix="__auto_vscrollbar__">
- <Area>
- <Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="Width" ><AbsoluteDim value="16" /></Dim>
- <Dim type="Height" ><UnifiedDim scale="1" offset="-16" type="Height" /></Dim>
- </Area>
- <HorzAlignment type="RightAligned" />
- </Child>
- <ImagerySection name="main">
- <FrameComponent>
- <Area>
- <Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="Width" ><UnifiedDim scale="1" type="Width" /></Dim>
- <Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim>
- </Area>
- <Image type="TopLeftCorner" imageset="WindowsLook" image="StaticFrameTopLeft" />
- <Image type="TopRightCorner" imageset="WindowsLook" image="StaticFrameTopRight" />
- <Image type="BottomLeftCorner" imageset="WindowsLook" image="StaticFrameBottomLeft" />
- <Image type="BottomRightCorner" imageset="WindowsLook" image="StaticFrameBottomRight" />
- <Image type="LeftEdge" imageset="WindowsLook" image="StaticFrameLeft" />
- <Image type="RightEdge" imageset="WindowsLook" image="StaticFrameRight" />
- <Image type="TopEdge" imageset="WindowsLook" image="StaticFrameTop" />
- <Image type="BottomEdge" imageset="WindowsLook" image="StaticFrameBottom" />
- <Image type="Background" imageset="WindowsLook" image="Background" />
- </FrameComponent>
- </ImagerySection>
- <StateImagery name="Enabled">
- <Layer>
- <Section section="main" />
- </Layer>
- </StateImagery>
- <StateImagery name="Disabled">
- <Layer>
- <Section section="main" />
- </Layer>
- </StateImagery>
- </WidgetLook>
-
-
- <!--
- ***************************************************
- WindowsLook/Combobox
- ***************************************************
- -->
- <WidgetLook name="WindowsLook/Combobox">
- <Child type="WindowsLook/Editbox" nameSuffix="__auto_editbox__">
- <Area>
- <Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="RightEdge" >
- <UnifiedDim scale="1" type="RightEdge">
- <DimOperator op="Subtract">
- <ImageDim imageset="WindowsLook" image="EditFrameTop" dimension="Height">
- <DimOperator op="Add">
- <ImageDim imageset="WindowsLook" image="EditFrameBottom" dimension="Height">
- <DimOperator op="Add">
- <FontDim type="LineSpacing">
- <DimOperator op="Multiply">
- <AbsoluteDim value="1.5" />
- </DimOperator>
- </FontDim>
- </DimOperator>
- </ImageDim>
- </DimOperator>
- </ImageDim>
- </DimOperator>
- </UnifiedDim>
- </Dim>
- <Dim type="Height" >
- <ImageDim imageset="WindowsLook" image="EditFrameTop" dimension="Height">
- <DimOperator op="Add">
- <ImageDim imageset="WindowsLook" image="EditFrameBottom" dimension="Height">
- <DimOperator op="Add">
- <FontDim type="LineSpacing">
- <DimOperator op="Multiply">
- <AbsoluteDim value="1.5" />
- </DimOperator>
- </FontDim>
- </DimOperator>
- </ImageDim>
- </DimOperator>
- </ImageDim>
- </Dim>
- </Area>
- </Child>
- <Child type="WindowsLook/ComboDropList" nameSuffix="__auto_droplist__">
- <Area>
- <Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="TopEdge" ><WidgetDim widget="__auto_editbox__" dimension="BottomEdge" /></Dim>
- <Dim type="Width" ><UnifiedDim scale="1" type="Width" /></Dim>
- <Dim type="BottomEdge" ><UnifiedDim scale="1" type="BottomEdge" /></Dim>
- </Area>
- </Child>
- <Child type="WindowsLook/IconButton" nameSuffix="__auto_button__">
- <Area>
- <Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="Width" ><WidgetDim widget="__auto_editbox__" dimension="Height" /></Dim>
- <Dim type="Height" ><WidgetDim widget="__auto_editbox__" dimension="Height" /></Dim>
- </Area>
- <HorzAlignment type="RightAligned" />
- <Property name="IconImage" value="set:WindowsLook image:LargeDownArrow" />
- </Child>
- <StateImagery name="Enabled" />
- <StateImagery name="Disabled" />
- </WidgetLook>
-
-
- <!--
- ***************************************************
- WindowsLook/Editbox
- ***************************************************
- -->
- <WidgetLook name="WindowsLook/Editbox">
- <PropertyDefinition name="ReadOnlyBGColour" initialValue="FFDFDFDF" />
- <Property name="MouseCursorImage" value="set:WindowsLook image:MouseTextBar" />
- <Property name="NormalTextColour" value="FF000000" />
- <Property name="SelectedTextColour" value="FFFFFFFF" />
- <Property name="ActiveSelectionColour" value="FF607FFF" />
- <Property name="InactiveSelectionColour" value="FF808080" />
- <NamedArea name="TextArea">
- <Area>
- <Dim type="LeftEdge" ><AbsoluteDim value="5" /></Dim>
- <Dim type="TopEdge" ><AbsoluteDim value="5" /></Dim>
- <Dim type="RightEdge" ><UnifiedDim scale="1.0" offset="-5" type="RightEdge" /></Dim>
- <Dim type="BottomEdge" ><UnifiedDim scale="1.0" offset="-5" type="BottomEdge" /></Dim>
- </Area>
- </NamedArea>
- <ImagerySection name="container_normal">
- <FrameComponent>
- <Area>
- <Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="Width" ><UnifiedDim scale="1" type="Width" /></Dim>
- <Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim>
- </Area>
- <Image type="TopLeftCorner" imageset="WindowsLook" image="EditFrameTopLeft" />
- <Image type="TopRightCorner" imageset="WindowsLook" image="EditFrameTopRight" />
- <Image type="BottomLeftCorner" imageset="WindowsLook" image="EditFrameBottomLeft" />
- <Image type="BottomRightCorner" imageset="WindowsLook" image="EditFrameBottomRight" />
- <Image type="LeftEdge" imageset="WindowsLook" image="EditFrameLeft" />
- <Image type="TopEdge" imageset="WindowsLook" image="EditFrameTop" />
- <Image type="RightEdge" imageset="WindowsLook" image="EditFrameRight" />
- <Image type="BottomEdge" imageset="WindowsLook" image="EditFrameBottom" />
- <Image type="Background" imageset="WindowsLook" image="Background" />
- </FrameComponent>
- </ImagerySection>
- <ImagerySection name="selection">
- <ImageryComponent>
- <Area>
- <Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="RightEdge" ><UnifiedDim scale="1.0" type="RightEdge" /></Dim>
- <Dim type="BottomEdge" ><UnifiedDim scale="1.0" type="BottomEdge" /></Dim>
- </Area>
- <Image imageset="WindowsLook" image="Background" />
- <VertFormat type="Stretched" />
- <HorzFormat type="Stretched" />
- </ImageryComponent>
- </ImagerySection>
- <ImagerySection name="Carat">
- <ImageryComponent>
- <Area>
- <Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
- <Dim type="Width" ><ImageDim imageset="WindowsLook" image="EditBoxCarat" dimension="Width" /></Dim>
- <Dim type="BottomEdge" ><UnifiedDim scale="1.0" type="BottomEdge" /></Dim>
- </Area>
- <Image imageset="WindowsLook" image="EditBoxCarat" />
- <VertFormat type="Stretched" />
- <HorzFormat type="Stretched" />
- </ImageryComponent>
- </ImagerySection>
- <StateImagery name="Enabled">
- <Layer>
- <Section section="container_normal" />
- </Layer>
- </StateImagery>
- <StateImagery name="ReadOnly">
- <Layer>
- <Section section="container_normal">
- <ColourProperty name="ReadOnlyBGColour" />
- </Section>
- </Layer>
- </StateImagery>
- <StateImagery name="Disabled">
- <Layer>
- <Section section="container_normal">
- <ColourProperty name="ReadOnlyBGColour" />
- </Section>
- </Layer>
- </StateImagery>
- <StateImagery name="ActiveSelection">
- <Layer>
- <Section section="selection">
- <ColourProperty name="ActiveSelectionColour" />
- </Section>
- </Layer>
- </StateImagery>
- <StateImagery name="InactiveSelection">
- <Layer>
- <Section section="selection">
- <ColourProperty name="InactiveSelectionColour" />
- </Section>
- </Layer>
- </StateImagery>
- </WidgetLook>
-
-
- <!--
- ***************************************************
- WindowsLook/FrameWindow
- ***************************************************
- -->
- <WidgetLook name="WindowsLook/FrameWindow">
- <Property name="NSSizingCursorImage" value="set:WindowsLook image:MouseNoSoCursor" />
- <Property name="EWSizingCursorImage" value="set:WindowsLook image:MouseEsWeCursor" />
- <Property name="NWSESizingCursorImage" value="set:WindowsLook image:MouseNwSeCursor" />
- <Property name="NESWSizingCursorImage" value="set:WindowsLook image:MouseNeSwCursor" />
- <NamedArea name="ClientWithTitleWithFrame">
- <Area>
- <Dim type="LeftEdge">
- <ImageDim imageset="WindowsLook" image="WindowFrameLeft" dimension="Width" />
- </Dim>
- <Dim type="TopEdge">
- <WidgetDim widget="__auto_titlebar__" dimension="BottomEdge" />
- </Dim>
- <Dim type="RightEdge">
- <UnifiedDim scale="1" type="RightEdge">
- <DimOperator op="Subtract">
- <ImageDim imageset="WindowsLook" image="WindowFrameRight" dimension="Width" />
- </DimOperator>
- </UnifiedDim>
- </Dim>
- <Dim type="BottomEdge">
- <UnifiedDim scale="1" type="BottomEdge">
- <DimOperator op="Subtract">
- <ImageDim imageset="WindowsLook" image="WindowFrameBottom" dimension="Height" />
- </DimOperator>
- </UnifiedDim>
- </Dim>
- </Area>
- </NamedArea>
- <NamedArea name="ClientWithTitleNoFrame">
- <Area>
- <Dim type="LeftEdge">
- <AbsoluteDim value="0" />
- </Dim>
- <Dim type="TopEdge">
- <WidgetDim widget="__auto_titlebar__" dimension="BottomEdge" />
- </Dim>
- <Dim type="RightEdge">
- <UnifiedDim scale="1" type="RightEdge" />
- </Dim>
- <Dim type="BottomEdge">
- <UnifiedDim scale="1" type="BottomEdge" />
- </Dim>
- </Area>
- </NamedArea>
- <NamedArea name="ClientNoTitleWithFrame">
- <Area>
- <Dim type="LeftEdge">
- <ImageDim imageset="WindowsLook" image="WindowFrameLeft" dimension="Width" />
- </Dim>
- <Dim type="TopEdge">
- <ImageDim imageset="WindowsLook" image="WindowFrameTop" dimension="Height" />
- </Dim>
- <Dim type="RightEdge">
- <UnifiedDim scale="1" type="RightEdge">
- <DimOperator op="Subtract">
- <ImageDim imageset="WindowsLook" image="WindowFrameRight" dimension="Width" />
- </DimOperator>
- </UnifiedDim>
- </Dim>
- <Dim type="BottomEdge">
- <UnifiedDim scale="1" type="BottomEdge">
- <DimOperator op="Subtract">
- <ImageDim imageset="WindowsLook" image="WindowFrameBottom" dimension="Height" />
- </DimOperator>
- </UnifiedDim>
- </Dim>
- </Area>
- </NamedArea>
- <NamedArea name="ClientNoTitleNoFrame">
- <Area>
- <Dim type="LeftEdge">
- <AbsoluteDim value="0" />
- </Dim>
- <Dim type="TopEdge">
- <AbsoluteDim value="0" />
- </Dim>
- <Dim type="RightEdge">
- <UnifiedDim scale="1" type="RightEdge" />
- </Dim>
- <Dim type="BottomEdge">
- <UnifiedDim scale="1" type="BottomEdge" />
- </Dim>
- </Area>
- </NamedArea>
- <Child type="WindowsLook/Titlebar" nameSuffix="__auto_titlebar__">
- <Area>
- <Dim type="LeftEdge">
- <AbsoluteDim value="0" />
- </Dim>
- <Dim type="TopEdge">
- <AbsoluteDim value="0" />
- </Dim>
- <Dim type="RightEdge">
- <UnifiedDim scale="1" type="RightEdge" />
- </Dim>
- <Dim type="Height">
- <FontDim widget="__auto_titlebar__" type="LineSpacing">
- <DimOperator op="Multiply">
- <AbsoluteDim value="1.5" />
- </DimOperator>
- </FontDim>
- </Dim>
- </Area>
- <Property name="AlwaysOnTop" value="False" />
- </Child>
- <Child type="WindowsLook/CloseButton" nameSuffix="__auto_closebutton__">
- <Area>
- <Dim type="LeftEdge">
- <UnifiedDim scale="1" type="LeftEdge">
- <DimOperator op="Subtract">
- <AbsoluteDim value="0.5">
- <DimOperator op="Multiply">
- <ImageDim imageset="WindowsLook" image="CloseButtonNormal" dimension="Width">
- <DimOperator op="Add">
- <WidgetDim widget="__auto_titlebar__" dimension="Height" />
- </DimOperator>
- </ImageDim>
- </DimOperator>
- </AbsoluteDim>
- </DimOperator>
- </UnifiedDim>
- </Dim>
- <Dim type="TopEdge">
- <WidgetDim widget="__auto_titlebar__" dimension="Height">
- <DimOperator op="Subtract">
- <AbsoluteDim value="0.5">
- <DimOperator op="Multiply">
- <WidgetDim widget="__auto_titlebar__" dimension="Height">
- <DimOperator op="Add">
- <ImageDim imageset="WindowsLook" image="CloseButtonNormal" dimension="Height" />
- </DimOperator>
- </WidgetDim>
- </DimOperator>
- </AbsoluteDim>
- </DimOperator>
- </WidgetDim>
- </Dim>
- <Dim type="Width">
- <ImageDim imageset="WindowsLook" image="CloseButtonNormal" dimension="Width" />
- </Dim>
- <Dim type="Height">
- <ImageDim imageset="WindowsLook" image="CloseButtonNormal" dimension="Height" />
- </Dim>
- </Area>
- <Property name="AlwaysOnTop" value="True" />
- </Child>
- <ImagerySection name="withtitle_frame">
- <FrameComponent>
- <Area>
- <Dim type="LeftEdge">
- <AbsoluteDim value="0" />
- </Dim>
- <Dim type="TopEdge">
- <WidgetDim widget="__auto_titlebar__" dimension="Height" />
- </Dim>
- <Dim type="RightEdge">
- <UnifiedDim scale="1" type="R...
[truncated message content] |
|
From: <spo...@us...> - 2007-09-24 18:40:56
|
Revision: 789
http://opengate.svn.sourceforge.net/opengate/?rev=789&view=rev
Author: spom_spom
Date: 2007-09-24 11:40:56 -0700 (Mon, 24 Sep 2007)
Log Message:
-----------
moved/removed some stuff in the sense of the new order
Modified Paths:
--------------
trunk/data/materials/simpleHUD.material
trunk/ogre.cfg
trunk/resources.cfg
Added Paths:
-----------
trunk/data/gui/fonts/read_me.html
trunk/data/gui/fonts/simpleHUD.fontdef
trunk/data/gui/overlays/
trunk/data/gui/overlays/simpleHUD.overlay
trunk/data/misc/arrow.mesh
trunk/data/misc/explosion.particle
trunk/data/textures/Bullet.png
Removed Paths:
-------------
trunk/data/Bullet.png
trunk/data/arrow.mesh
trunk/data/explosion.particle
trunk/data/fonts.zip
trunk/data/mousePointer.overlay
trunk/data/simpleHUD.fontdef
trunk/data/simpleHUD.overlay
Deleted: trunk/data/Bullet.png
===================================================================
(Binary files differ)
Deleted: trunk/data/arrow.mesh
===================================================================
(Binary files differ)
Deleted: trunk/data/explosion.particle
===================================================================
--- trunk/data/explosion.particle 2007-09-23 14:43:47 UTC (rev 788)
+++ trunk/data/explosion.particle 2007-09-24 18:40:56 UTC (rev 789)
@@ -1,84 +0,0 @@
-OpenGate/Explosion
-{
- material OpenGate/Explosion/Flare
- particle_width 20
- particle_height 20
- cull_each false
- quota 1000
- billboard_type point
- sorted true
- iteration_interval 0.02
- nonvisible_update_timeout 0.1
-
- // Area emitter
- emitter Ellipsoid
- {
- angle 360
- colour_range_start 1 1.0 0
- colour_range_end 1 1.0 0.0
- emission_rate 100000
- duration 0.3
- time_to_live_min 0.3
- time_to_live_max 2
- direction 1 0 0
- velocity 500.1
- width 0.0
- height 0.0
- depth 0.0
- }
-
-// Fader
- affector ColourFader
- {
- alpha -1.0
- green -0.8
- }
-
- affector Scaler
- {
- rate -6.5
- }
-}
-
-OpenGate/ExplosionStart
-{
- material OpenGate/Explosion/Base
- particle_width 10
- particle_height 10
- cull_each false
- quota 500
- billboard_type point
- sorted true
- iteration_interval 0.02
- nonvisible_update_timeout 0.1
-
- // Area emitter
- emitter Ellipsoid
- {
- angle 360
- colour_range_start 1 1.0 0
- colour_range_end 1 1.0 0.0
- emission_rate 5000
- duration 0.3
- time_to_live_min 0.5
- time_to_live_max 1.0
- direction 1 0 0
- velocity 100.0
- width 0.0
- height 0.0
- depth 0.0
- }
-
-// Fader
- affector ColourFader
- {
- alpha -100.0
- green -1.8
- }
-
- affector Scaler
- {
- rate -9
- }
-}
-
Deleted: trunk/data/fonts.zip
===================================================================
(Binary files differ)
Added: trunk/data/gui/fonts/read_me.html
===================================================================
--- trunk/data/gui/fonts/read_me.html (rev 0)
+++ trunk/data/gui/fonts/read_me.html 2007-09-24 18:40:56 UTC (rev 789)
@@ -0,0 +1,2 @@
+<html><head><title>Larabie Fonts "read me" file, license and FAQ</title><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="keywords" content="typodermic,typo dermic,fonts,Larabie,Larabie Fonts,fontd,fotn,fnots,fons,fots,fnts,font,truetype,typefaces,typeface,logo,ttf,opentype,larbie,laribie,larby,larabee,lairby,larrabie,larraby,laraby,typography,Type1,postscript,macintosh,windows,design,lettering,type"><font face="Georgia"><h3>LARABIE FONTS \x93README.TXT\x94</h3><p>All Larabie Fonts in this file are free to use for personal and/or commercial purposes. No payment is necessary to use these fonts for personal or commercial use. For Software Products who want to include Larabie Fonts see the License Agreement below. You can add this font to a website but do not combine fonts into a single archive or alter them in any way.</p><p>All Larabie Fonts are free for commercial use but a sample of your product would be gratefully appreciated so I can see how the font looks in use. Contact <a href="http://www.larabiefonts.com/donation.html">www.larabiefonts.com/donation.html</a> for mailing information.</p><p>Some Larabie Fonts have enhanced and expanded families available for sale at <a href="http://www.typodermic.com">www.typodermic.com</a>.</p><p>If you'd like to make a voluntary donation to Larabie Fonts for the use of the free fonts in any amount please go to <a href="http://www.larabiefonts.com/donation.html">www.larabiefonts.com/donation.html</a></p><p>I accept CDs, magazines, t-shirts, a sample of your merchandise or anything featuring Larabie Fonts. Please remember to list your item as a \x91gift\x92 on the customs form or I will have to pay import duties and taxes on the item. Mailing information is provided at the link above.</p><p>Font installation help is available at <a href="http://www.larabiefonts.com/help.html">www.larabiefonts.com/help.html</a></p><h3>LARABIE FONTS FREQUENTLY ASKED QUESTIONS</h3><ul><li>Q: How do use these fonts in my favourite software?<li>A: In Windows, you take the fonts out of the ZIP archive and place them in your fonts folder which can be found in your Control Panel. The next time you run your software, the font will be available. For example: If you install a new font, the next time you run Microsoft Word, that font will be available in the menu under Format / Font. For anything more complicated, or Mac installation, visit <a href="http://www.larabiefonts.com/help.html">www.larabiefonts.com/help.html</a></ul><ul><li>Q: How can I use this font in <a href="http://www.aol.com/aim/">AOL Instant Messenger</a>, <a href="http://messenger.msn.com/">MSN Messenger</a>, <a href="http://www.microsoft.com/office/outlook/">Outlook</a>, <a href="http://www.microsoft.com/office/outlook/">Outlook Express</a>, <a href="http://www.eudora.com/">Euodora</a> or any other email software?<li>A: At the time of this writing (Feb 2004) you can\x92t. After installing one of my fonts, you may be able to select it in the above applications but the person at the other end won\x92t see that same thing unless they have the font installed. If you really want to use my fonts in these applications, make sure the people at the other end have the same fonts installed.</ul><ul><li>Q: How can I use these fonts on a web page?<li>A: If you\x92re creating a web page using Flash, it\x92s easy. Consult your Flash manual. If you\x92re using <a href="http://www.adobe.com/products/acrobat/">Acrobat</a>, make sure the font embedding settings are turned on. Consult your Acrobat manual. For anything else there are limitations: If you want to use one of my fonts as your main, text font you\x92re pretty much out of luck unless you explore a font embedding tool such as <a href="http://www.microsoft.com/typography/web/embedding/weft/">WEFT</a> but I don\x92t recommend it. To use my fonts as headings or titles, use image creation software such as <a href="http://www.gimp.org/">The Gimp</a>, <a href="http://www.adobe.com/products/photoshop/">Photoshop</a>, <a href="http://www.jasc.com/">Paint Shop Pro</a>, <a href="http://www.google.com/search?q=pixia">Pixia</a> etc. Save the images as GIF files and place them on your web page. There\x92s a lot more to it than can be explained here but there are countless books available on web page design.</ul><ul><li>Q: How can I make these fonts bigger?<li>A: All my fonts are infinitely scalable; the limitations are in your software. A common problem is scaling fonts in Microsoft Word. If you choose Format / Font you can type in any number you like under \x93size\x94.</ul><ul><li>Q: Are these fonts really free?<li>A: Yes they are. Some fonts such as <a href="http://www.typodermic.com/fonts/19.html">Neuropol</a> have expanded font families available for sale at <a href="http://www.typodermic.com">www.typodermic.com</a> but the version you downloaded at Larabie Fonts is free.</ul><ul><li>Q: Your licence agreement states that the fonts can\x92t be altered. Does that mean I can\x92t mess around with your fonts in Photoshop/Illustrator/Publisher etc?<li>A: Those license restrictions refer to altering the actual fonts themselves, not what you make with them. As long as you don\x92t alter the font files in font creation software such as FontLab or Fontographer you\x92re free to create anything you like with them.</ul><ul><li>Q: Can I use your fonts in a logo?<li>A: Yes. But check with a lawyer if you\x92re not sure. It\x92s okay with me if you use it but do so at your own risk.</ul><ul><li>Q: Can I send you a sample of the nifty thing I created with your fonts?<li>A: Of course. Check <a href="http://www.larabiefonts.com/donation.html">www.larabiefonts.com/donation.html</a> for my current email or mailing address.</ul><ul><li>Q: Can you make a custom font for me?<li>A: Possibly. Check <a href="http://typodermic.com/custom.html">typodermic.com/custom.html</a> for details. Keep in mind that making fonts is my full-time job so no freebies.</ul><ul><li>Q: I want to sell software that includes you font files.<li>A: Contact me first at <a href="http://www.larabiefonts.com/email.html">www.larabiefonts.com/email.html</a>.</ul><ul><li>Q: I want to sell rubber stamp alphabets, alphabet punches or stencil alphabets using your font designs.<li>A: Contact me first at <a href="http://www.larabiefonts.com/email.html">www.larabiefonts.com/email.html</a>.</ul><ul><li>Q: My software won\x92t let me embed one of your fonts.<li>A: You may have an old version of one of my fonts. Uninstall it and install a current version on Larabie Fonts.</ul><ul><li>Q: Can you help me find a font?<li>A: I really don\x92t have the time but if you send a donation, I can give it a try. If not. post your question on my font forum: <a href="http://www.larabiefonts.com/info.html">www.larabiefonts.com/info.html</a>.</ul><h3>LARABIE FONTS END-USER LICENSE AGREEMENT FOR SOFTWARE PRODUCTS</h3><h4>SOFTWARE PRODUCT LICENSE</h4><p>The SOFTWARE PRODUCT is protected by copyright laws and International copyright treaties, as well as other intellectual property laws and treaties. The SOFTWARE PRODUCT is licensed, not sold.</p><h5>1. GRANT OF LICENSE. This document grants you the following rights:</h5><p>- Installation and Use. You may install and use an unlimited number of copies of the SOFTWARE PRODUCT. You may copy and distribute unlimited copies of the SOFTWARE PRODUCT as you receive them, in any medium, provided that you publish on each copy an appropriate copyright notice. Keep intact all the notices that refer to this License and give any other recipients of the fonts a copy of this License along with the fonts.</p><h5>2. DESCRIPTION OF OTHER RIGHTS AND LIMITATIONS.</h5><p>- You may modify your copy or copies of the SOFTWARE PRODUCT or any portion of it, provided that you also meet all of these rules:</p><p>a) Do not alter in any way alphanumeric characters (A-Z, a-z, 1-9) contained in the font. An exception is converting between formats, here is allowed the nominal distortion that occurs during conversion from second order to third order quadratic curves (TrueType to Postscript) and vice versa.</p><p>b) Extra characters may be added; here it is allowed to use curves (shapes) from alphanumeric characters in fonts under same license.</p><p>c) It is allowed to modify and remove analpahbetics (punctuation, special characters, ligatures and symbols).</p><p>d) The original font name must be retained but can be augmented. (ie. a Font named Blue Highway can be renamed Blue Highway Cyrillic or Blue Highway ANSI, etc.)</p><p>e) Character mapping may be altered.</p><p>f) If the kerning information is altered or discarded it must be stated in the user notes or documentation.</p><p>g) All modifications must be released under this license.</p></p>LIMITED WARRANTY NO WARRANTIES. Larabie Fonts expressly disclaims any warranty for the SOFTWARE PRODUCT. The SOFTWARE PRODUCT and any related documentation is provided "as is" without warranty of any kind, either express or implied, including, without limitation, the implied warranties or merchantability, fitness for a particular purpose, or non-infringement. The entire risk arising out of use or performance of the SOFTWARE PRODUCT remains with you.</p><p>NO LIABILITY FOR CONSEQUENTIAL DAMAGES. In no event shall Larabie Fonts be liable for any damages whatsoever (including, without limitation, damages for loss of business profits, business interruption, loss of business information, or any other pecuniary loss) arising out of the use of or inability to use this product, even if Larabie Fonts has been advised of the possibility of such damages.</p><h5>3. MISCELLANEOUS</h5><p>Should you have any questions concerning this document, or if you desire to contact Larabie Fonts for any reason, please email <a href="http://www.larabiefonts.com/email.html">www.larabiefonts.com/email.html</a>.</p></font></BODY></HTML>
+
Copied: trunk/data/gui/fonts/simpleHUD.fontdef (from rev 788, trunk/data/simpleHUD.fontdef)
===================================================================
--- trunk/data/gui/fonts/simpleHUD.fontdef (rev 0)
+++ trunk/data/gui/fonts/simpleHUD.fontdef 2007-09-24 18:40:56 UTC (rev 789)
@@ -0,0 +1,21 @@
+Console
+{
+ type truetype
+ source BlueHighway.ttf
+ size 32
+ resolution 55
+ antialias_colour false
+ code_points 33-255
+}
+
+
+BlueHighway
+{
+ type truetype
+ source BlueHighway.ttf
+ size 32
+ resolution 55
+ antialias_colour false
+ code_points 33-255
+}
+
Copied: trunk/data/gui/overlays/simpleHUD.overlay (from rev 788, trunk/data/simpleHUD.overlay)
===================================================================
--- trunk/data/gui/overlays/simpleHUD.overlay (rev 0)
+++ trunk/data/gui/overlays/simpleHUD.overlay 2007-09-24 18:40:56 UTC (rev 789)
@@ -0,0 +1,295 @@
+Radar
+{
+ zorder 501
+ container Panel(Radar/Map)
+ {
+ left 0.4
+ top 0.84
+ width 0.2
+ height 0.15
+ material OpenGate/Radar/Background
+ }
+// container Panel(Radar/Dot)
+// {
+// material Radar/Dot
+// }
+}
+
+SimpleHUD
+{
+ zorder 500
+// container Panel(SimpleHUD/Console)
+// {
+// left 0.01
+// top 0.01
+// width 0.98
+// height 0.5
+//// material OpenGate/Console/Background
+//
+// element TextArea(SimpleHUD/Console/TextArea)
+// {
+// left 0.01
+// top 0.01
+// width 0.98
+// height 0.5
+// font_name Console
+// char_height 0.02
+// colour_top 1 1 1
+// colour_bottom 1 1 1
+// }
+// }
+//
+// container Panel(SimpleHUD/ConsoleShort)
+// {
+// left 0.01
+// top 0.01
+// width 0.98
+// height 0.075
+//// material OpenGate/Console/Background
+//
+// element TextArea(SimpleHUD/ConsoleShort/TextArea)
+// {
+// left 0.01
+// top 0.01
+// width 0.98
+// height 0.075
+// font_name Console
+// char_height 0.02
+// colour_top 1.0 1.0 1.0
+// colour_bottom 1.0 1.0 1.0
+// }
+// }
+//
+// container Panel(SimpleHUD/ChatIn)
+// {
+// left 0.01
+// top 0.52
+// width 0.98
+// height 0.025
+// material OpenGate/Console/Background
+//
+// element TextArea(SimpleHUD/ChatIn/TextArea)
+// {
+// left 0.01
+// top 0.005
+// width 0.9
+// height 0.025
+// font_name Console
+// char_height 0.02
+// colour_top 1.0 1.0 1.0
+// colour_bottom 1.0 1.0 1.0
+// }
+// }
+//
+// container Panel(SimpleHUD/CenterPointer)
+// {
+// metrics_mode pixels
+// top 0
+// left 0
+// width 48
+// height 48
+// material SimpleHUD/CenterPointer
+// }
+//
+ container Panel(SimpleHUD/FlightCursor)
+ {
+ metrics_mode pixels
+ top 0
+ left 0
+ width 32
+ height 32
+// material SimpleHUD/FlightCursor
+ }
+//
+// container Panel(SimpleHUD/TargetPointer)
+// {
+// metrics_mode pixels
+// top 0
+// left 0
+// width 32
+// height 32
+// material SimpleHUD/TargetPointer
+// }
+//
+// container Panel(SimpleHUD/DuelistPilotPointer)
+// {
+// metrics_mode pixels
+// top 0
+// left 0
+// width 32
+// height 32
+// material SimpleHUD/DuelistPilotPointer
+// }
+//
+// container Panel(SimpleHUD/DuelistTargetPointer)
+// {
+// metrics_mode pixels
+// top 0
+// left 0
+// width 32
+// height 32
+// material SimpleHUD/DuelistTargetPointer
+// }
+
+ container Panel(SimpleHUD/MainPanel)
+ {
+ left 0
+ top 0
+ width 1.0
+ height 1.0
+
+ element TextArea(SimpleHUD/MainPanel/StatsTextArea)
+ {
+ left 0.8
+ top 0.01
+ width 0.2
+ height 0.03
+ caption FPS:
+ font_name BlueHighway
+ char_height 0.02
+ colour_top 1 1 0.7
+ colour_bottom 1 1 0.7
+ }
+//
+// element TextArea(SimpleHUD/MainPanel/TextVelocity)
+// {
+// left 0.25
+// top 0.3
+// width 0.1
+// height 0.03
+// caption Vel:
+// font_name BlueHighway
+// char_height 0.02
+// colour_top 0.5 0.7 0.5
+// colour_bottom 0.3 0.5 0.3
+// }
+// element TextArea(SimpleHUD/MainPanel/TextVelocityMax)
+// {
+// left 0.31
+// top 0.3
+// width 0.1
+// height 0.03
+// caption /
+// font_name BlueHighway
+// char_height 0.02
+// colour_top 0.5 0.7 0.5
+// colour_bottom 0.3 0.5 0.3
+// }
+// element TextArea(SimpleHUD/MainPanel/TextThr)
+// {
+// left 0.25
+// top 0.33
+// width 0.1
+// height 0.03
+// caption Thr:
+// font_name BlueHighway
+// char_height 0.02
+// colour_top 0.5 0.7 0.5
+// colour_bottom 0.3 0.5 0.3
+// }
+// element TextArea(SimpleHUD/MainPanel/TextAcc)
+// {
+// left 0.25
+// top 0.36
+// width 0.03
+// height 0.1
+// caption Current Acc:
+// font_name BlueHighway
+// char_height 0.022
+// colour_top 0.5 0.7 0.5
+// colour_bottom 0.3 0.5 0.3
+// }
+// element TextArea(SimpleHUD/MainPanel/TextShield)
+// {
+// left 0.25
+// top 0.39
+// width 0.1
+// height 0.03
+// font_name BlueHighway
+// char_height 0.02
+// colour_top 0.5 0.7 0.5
+// colour_bottom 0.3 0.5 0.3
+// }
+// element TextArea(SimpleHUD/MainPanel/TextArmor)
+// {
+// left 0.25
+// top 0.42
+// width 0.1
+// height 0.03
+// font_name BlueHighway
+// char_height 0.02
+// colour_top 0.5 0.7 0.5
+// colour_bottom 0.3 0.5 0.3
+// }
+// element TextArea(SimpleHUD/MainPanel/TextPosition)
+// {
+// left 0.25
+// top 0.45
+// width 0.1
+// height 0.1
+// caption Current Pos:
+// font_name BlueHighway
+// char_height 0.02
+// colour_top 0.5 0.7 0.5
+// colour_bottom 0.3 0.5 0.3
+// }
+//
+ element TextArea(SimpleHUD/MainPanel/TextTargetName)
+ {
+ left 0.015
+ top 0.80
+ width 0.1
+ height 0.02
+ font_name BlueHighway
+ char_height 0.02
+ colour_top 0.5 0.7 0.5
+ colour_bottom 0.3 0.5 0.3
+ }
+ element TextArea(SimpleHUD/MainPanel/TextTargetDistance)
+ {
+ left 0.015
+ top 0.82
+ width 0.1
+ height 0.02
+ font_name BlueHighway
+ char_height 0.02
+ colour_top 0.5 0.7 0.5
+ colour_bottom 0.3 0.5 0.3
+ }
+ element TextArea(SimpleHUD/MainPanel/TextTargetVelocity)
+ {
+ left 0.17
+ top 0.84
+ width 0.1
+ height 0.02
+ font_name BlueHighway
+ char_height 0.02
+ colour_top 0.5 0.7 0.5
+ colour_bottom 0.3 0.5 0.3
+ }
+
+ element TextArea(SimpleHUD/MainPanel/TextTargetShield)
+ {
+ left 0.17
+ top 0.86
+ width 0.1
+ height 0.02
+ font_name BlueHighway
+ char_height 0.02
+ colour_top 0.5 0.7 0.5
+ colour_bottom 0.3 0.5 0.3
+ }
+ element TextArea(SimpleHUD/MainPanel/TextTargetArmor)
+ {
+ left 0.17
+ top 0.88
+ width 0.1
+ height 0.02
+ font_name BlueHighway
+ char_height 0.02
+ colour_top 0.5 0.7 0.5
+ colour_bottom 0.3 0.5 0.3
+ }
+ }
+}
+
Modified: trunk/data/materials/simpleHUD.material
===================================================================
--- trunk/data/materials/simpleHUD.material 2007-09-23 14:43:47 UTC (rev 788)
+++ trunk/data/materials/simpleHUD.material 2007-09-24 18:40:56 UTC (rev 789)
@@ -9,7 +9,7 @@
texture_unit
{
- texture GUI/docked/base/station_backgrounds/solrain.png
+ texture gui/docked/base/station_backgrounds/solrain.png
}
}
}
Copied: trunk/data/misc/arrow.mesh (from rev 788, trunk/data/arrow.mesh)
===================================================================
(Binary files differ)
Copied: trunk/data/misc/explosion.particle (from rev 788, trunk/data/explosion.particle)
===================================================================
--- trunk/data/misc/explosion.particle (rev 0)
+++ trunk/data/misc/explosion.particle 2007-09-24 18:40:56 UTC (rev 789)
@@ -0,0 +1,84 @@
+OpenGate/Explosion
+{
+ material OpenGate/Explosion/Flare
+ particle_width 20
+ particle_height 20
+ cull_each false
+ quota 1000
+ billboard_type point
+ sorted true
+ iteration_interval 0.02
+ nonvisible_update_timeout 0.1
+
+ // Area emitter
+ emitter Ellipsoid
+ {
+ angle 360
+ colour_range_start 1 1.0 0
+ colour_range_end 1 1.0 0.0
+ emission_rate 100000
+ duration 0.3
+ time_to_live_min 0.3
+ time_to_live_max 2
+ direction 1 0 0
+ velocity 500.1
+ width 0.0
+ height 0.0
+ depth 0.0
+ }
+
+// Fader
+ affector ColourFader
+ {
+ alpha -1.0
+ green -0.8
+ }
+
+ affector Scaler
+ {
+ rate -6.5
+ }
+}
+
+OpenGate/ExplosionStart
+{
+ material OpenGate/Explosion/Base
+ particle_width 10
+ particle_height 10
+ cull_each false
+ quota 500
+ billboard_type point
+ sorted true
+ iteration_interval 0.02
+ nonvisible_update_timeout 0.1
+
+ // Area emitter
+ emitter Ellipsoid
+ {
+ angle 360
+ colour_range_start 1 1.0 0
+ colour_range_end 1 1.0 0.0
+ emission_rate 5000
+ duration 0.3
+ time_to_live_min 0.5
+ time_to_live_max 1.0
+ direction 1 0 0
+ velocity 100.0
+ width 0.0
+ height 0.0
+ depth 0.0
+ }
+
+// Fader
+ affector ColourFader
+ {
+ alpha -100.0
+ green -1.8
+ }
+
+ affector Scaler
+ {
+ rate -9
+ }
+}
+
Deleted: trunk/data/mousePointer.overlay
===================================================================
--- trunk/data/mousePointer.overlay 2007-09-23 14:43:47 UTC (rev 788)
+++ trunk/data/mousePointer.overlay 2007-09-24 18:40:56 UTC (rev 789)
@@ -1,13 +0,0 @@
-//OpenGate/MousePointer
-//{
-// zorder 502
-// container Panel(OpenGate/MousePointer/Pointer)
-// {
-// metrics_mode pixels
-// top 0
-// left 0
-// width 32
-// height 32
-// material OpenGate/MousePointer
-// }
-//}
\ No newline at end of file
Deleted: trunk/data/simpleHUD.fontdef
===================================================================
--- trunk/data/simpleHUD.fontdef 2007-09-23 14:43:47 UTC (rev 788)
+++ trunk/data/simpleHUD.fontdef 2007-09-24 18:40:56 UTC (rev 789)
@@ -1,21 +0,0 @@
-Console
-{
- type truetype
- source bluehigh.ttf
- size 32
- resolution 55
- antialias_colour false
- code_points 33-255
-}
-
-
-BlueHighway
-{
- type truetype
- source bluehigh.ttf
- size 32
- resolution 55
- antialias_colour false
- code_points 33-255
-}
-
Deleted: trunk/data/simpleHUD.overlay
===================================================================
--- trunk/data/simpleHUD.overlay 2007-09-23 14:43:47 UTC (rev 788)
+++ trunk/data/simpleHUD.overlay 2007-09-24 18:40:56 UTC (rev 789)
@@ -1,295 +0,0 @@
-Radar
-{
- zorder 501
- container Panel(Radar/Map)
- {
- left 0.4
- top 0.84
- width 0.2
- height 0.15
- material OpenGate/Radar/Background
- }
-// container Panel(Radar/Dot)
-// {
-// material Radar/Dot
-// }
-}
-
-SimpleHUD
-{
- zorder 500
-// container Panel(SimpleHUD/Console)
-// {
-// left 0.01
-// top 0.01
-// width 0.98
-// height 0.5
-//// material OpenGate/Console/Background
-//
-// element TextArea(SimpleHUD/Console/TextArea)
-// {
-// left 0.01
-// top 0.01
-// width 0.98
-// height 0.5
-// font_name Console
-// char_height 0.02
-// colour_top 1 1 1
-// colour_bottom 1 1 1
-// }
-// }
-//
-// container Panel(SimpleHUD/ConsoleShort)
-// {
-// left 0.01
-// top 0.01
-// width 0.98
-// height 0.075
-//// material OpenGate/Console/Background
-//
-// element TextArea(SimpleHUD/ConsoleShort/TextArea)
-// {
-// left 0.01
-// top 0.01
-// width 0.98
-// height 0.075
-// font_name Console
-// char_height 0.02
-// colour_top 1.0 1.0 1.0
-// colour_bottom 1.0 1.0 1.0
-// }
-// }
-//
-// container Panel(SimpleHUD/ChatIn)
-// {
-// left 0.01
-// top 0.52
-// width 0.98
-// height 0.025
-// material OpenGate/Console/Background
-//
-// element TextArea(SimpleHUD/ChatIn/TextArea)
-// {
-// left 0.01
-// top 0.005
-// width 0.9
-// height 0.025
-// font_name Console
-// char_height 0.02
-// colour_top 1.0 1.0 1.0
-// colour_bottom 1.0 1.0 1.0
-// }
-// }
-//
-// container Panel(SimpleHUD/CenterPointer)
-// {
-// metrics_mode pixels
-// top 0
-// left 0
-// width 48
-// height 48
-// material SimpleHUD/CenterPointer
-// }
-//
- container Panel(SimpleHUD/FlightCursor)
- {
- metrics_mode pixels
- top 0
- left 0
- width 32
- height 32
-// material SimpleHUD/FlightCursor
- }
-//
-// container Panel(SimpleHUD/TargetPointer)
-// {
-// metrics_mode pixels
-// top 0
-// left 0
-// width 32
-// height 32
-// material SimpleHUD/TargetPointer
-// }
-//
-// container Panel(SimpleHUD/DuelistPilotPointer)
-// {
-// metrics_mode pixels
-// top 0
-// left 0
-// width 32
-// height 32
-// material SimpleHUD/DuelistPilotPointer
-// }
-//
-// container Panel(SimpleHUD/DuelistTargetPointer)
-// {
-// metrics_mode pixels
-// top 0
-// left 0
-// width 32
-// height 32
-// material SimpleHUD/DuelistTargetPointer
-// }
-
- container Panel(SimpleHUD/MainPanel)
- {
- left 0
- top 0
- width 1.0
- height 1.0
-
- element TextArea(SimpleHUD/MainPanel/StatsTextArea)
- {
- left 0.8
- top 0.01
- width 0.2
- height 0.03
- caption FPS:
- font_name BlueHighway
- char_height 0.02
- colour_top 1 1 0.7
- colour_bottom 1 1 0.7
- }
-//
-// element TextArea(SimpleHUD/MainPanel/TextVelocity)
-// {
-// left 0.25
-// top 0.3
-// width 0.1
-// height 0.03
-// caption Vel:
-// font_name BlueHighway
-// char_height 0.02
-// colour_top 0.5 0.7 0.5
-// colour_bottom 0.3 0.5 0.3
-// }
-// element TextArea(SimpleHUD/MainPanel/TextVelocityMax)
-// {
-// left 0.31
-// top 0.3
-// width 0.1
-// height 0.03
-// caption /
-// font_name BlueHighway
-// char_height 0.02
-// colour_top 0.5 0.7 0.5
-// colour_bottom 0.3 0.5 0.3
-// }
-// element TextArea(SimpleHUD/MainPanel/TextThr)
-// {
-// left 0.25
-// top 0.33
-// width 0.1
-// height 0.03
-// caption Thr:
-// font_name BlueHighway
-// char_height 0.02
-// colour_top 0.5 0.7 0.5
-// colour_bottom 0.3 0.5 0.3
-// }
-// element TextArea(SimpleHUD/MainPanel/TextAcc)
-// {
-// left 0.25
-// top 0.36
-// width 0.03
-// height 0.1
-// caption Current Acc:
-// font_name BlueHighway
-// char_height 0.022
-// colour_top 0.5 0.7 0.5
-// colour_bottom 0.3 0.5 0.3
-// }
-// element TextArea(SimpleHUD/MainPanel/TextShield)
-// {
-// left 0.25
-// top 0.39
-// width 0.1
-// height 0.03
-// font_name BlueHighway
-// char_height 0.02
-// colour_top 0.5 0.7 0.5
-// colour_bottom 0.3 0.5 0.3
-// }
-// element TextArea(SimpleHUD/MainPanel/TextArmor)
-// {
-// left 0.25
-// top 0.42
-// width 0.1
-// height 0.03
-// font_name BlueHighway
-// char_height 0.02
-// colour_top 0.5 0.7 0.5
-// colour_bottom 0.3 0.5 0.3
-// }
-// element TextArea(SimpleHUD/MainPanel/TextPosition)
-// {
-// left 0.25
-// top 0.45
-// width 0.1
-// height 0.1
-// caption Current Pos:
-// font_name BlueHighway
-// char_height 0.02
-// colour_top 0.5 0.7 0.5
-// colour_bottom 0.3 0.5 0.3
-// }
-//
- element TextArea(SimpleHUD/MainPanel/TextTargetName)
- {
- left 0.015
- top 0.80
- width 0.1
- height 0.02
- font_name BlueHighway
- char_height 0.02
- colour_top 0.5 0.7 0.5
- colour_bottom 0.3 0.5 0.3
- }
- element TextArea(SimpleHUD/MainPanel/TextTargetDistance)
- {
- left 0.015
- top 0.82
- width 0.1
- height 0.02
- font_name BlueHighway
- char_height 0.02
- colour_top 0.5 0.7 0.5
- colour_bottom 0.3 0.5 0.3
- }
- element TextArea(SimpleHUD/MainPanel/TextTargetVelocity)
- {
- left 0.17
- top 0.84
- width 0.1
- height 0.02
- font_name BlueHighway
- char_height 0.02
- colour_top 0.5 0.7 0.5
- colour_bottom 0.3 0.5 0.3
- }
-
- element TextArea(SimpleHUD/MainPanel/TextTargetShield)
- {
- left 0.17
- top 0.86
- width 0.1
- height 0.02
- font_name BlueHighway
- char_height 0.02
- colour_top 0.5 0.7 0.5
- colour_bottom 0.3 0.5 0.3
- }
- element TextArea(SimpleHUD/MainPanel/TextTargetArmor)
- {
- left 0.17
- top 0.88
- width 0.1
- height 0.02
- font_name BlueHighway
- char_height 0.02
- colour_top 0.5 0.7 0.5
- colour_bottom 0.3 0.5 0.3
- }
- }
-}
-
Copied: trunk/data/textures/Bullet.png (from rev 788, trunk/data/Bullet.png)
===================================================================
(Binary files differ)
Modified: trunk/ogre.cfg
===================================================================
--- trunk/ogre.cfg 2007-09-23 14:43:47 UTC (rev 788)
+++ trunk/ogre.cfg 2007-09-24 18:40:56 UTC (rev 789)
@@ -4,4 +4,4 @@
FSAA=0
Full Screen=No
RTT Preferred Mode=FBO
-Video Mode=640 x 480
+Video Mode=1024 x 768
Modified: trunk/resources.cfg
===================================================================
--- trunk/resources.cfg 2007-09-23 14:43:47 UTC (rev 788)
+++ trunk/resources.cfg 2007-09-24 18:40:56 UTC (rev 789)
@@ -22,16 +22,16 @@
FileSystem=./data/materials
FileSystem=./data/textures
FileSystem=./data/asteroids
+FileSystem=./data/misc
FileSystem=./data/gui
FileSystem=./data/gui/fonts
FileSystem=./data/gui/layouts
FileSystem=./data/gui/imagesets
-FileSystem=./data/gui/schemes
+FileSystem=./data/gui/schemes
FileSystem=./data/gui/looknfeel
+FileSystem=./data/gui/overlays
Zip=./data/skybox/simpleSkybox.zip
-Zip=./data/fonts.zip
FileSystem=./data/MediaFromOgre
FileSystem=./data/MediaFromOgre/AdvancedMaterials
-#FileSystem=./data/local/astro
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-09-23 14:43:44
|
Revision: 788
http://opengate.svn.sourceforge.net/opengate/?rev=788&view=rev
Author: ultrasick
Date: 2007-09-23 07:43:47 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
renaming (part 2 of 2)
Removed Paths:
-------------
trunk/data/skybox/random_sky_box_pictures/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-09-23 14:41:13
|
Revision: 787
http://opengate.svn.sourceforge.net/opengate/?rev=787&view=rev
Author: ultrasick
Date: 2007-09-23 07:41:16 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
renaming (part 1 of 2)
Added Paths:
-----------
trunk/data/skybox/objects/
trunk/data/skybox/objects/eso_510-g13.png
trunk/data/skybox/objects/eso_510-g13.xml
trunk/data/skybox/objects/m10.png
trunk/data/skybox/objects/m10.xml
trunk/data/skybox/objects/m101.png
trunk/data/skybox/objects/m101.xml
trunk/data/skybox/objects/m104.png
trunk/data/skybox/objects/m104.xml
trunk/data/skybox/objects/m108.png
trunk/data/skybox/objects/m108.xml
trunk/data/skybox/objects/m109.png
trunk/data/skybox/objects/m109.xml
trunk/data/skybox/objects/m13.png
trunk/data/skybox/objects/m13.xml
trunk/data/skybox/objects/m14.png
trunk/data/skybox/objects/m14.xml
trunk/data/skybox/objects/m15.png
trunk/data/skybox/objects/m15.xml
trunk/data/skybox/objects/m16_-_eagle_nebula.png
trunk/data/skybox/objects/m16_-_eagle_nebula.xml
trunk/data/skybox/objects/m16_-_eagle_nebula_b.png
trunk/data/skybox/objects/m16_-_eagle_nebula_b.xml
trunk/data/skybox/objects/m19.png
trunk/data/skybox/objects/m19.xml
trunk/data/skybox/objects/m1_-_crab_nebula.png
trunk/data/skybox/objects/m1_-_crab_nebula.xml
trunk/data/skybox/objects/m1_-_crab_nebula_b.png
trunk/data/skybox/objects/m1_-_crab_nebula_b.xml
trunk/data/skybox/objects/m2.png
trunk/data/skybox/objects/m2.xml
trunk/data/skybox/objects/m3.png
trunk/data/skybox/objects/m3.xml
trunk/data/skybox/objects/m31_-_andromeda.png
trunk/data/skybox/objects/m31_-_andromeda.xml
trunk/data/skybox/objects/m31_-_andromeda_b.png
trunk/data/skybox/objects/m31_-_andromeda_b.xml
trunk/data/skybox/objects/m33.png
trunk/data/skybox/objects/m33.xml
trunk/data/skybox/objects/m33_b.png
trunk/data/skybox/objects/m33_b.xml
trunk/data/skybox/objects/m5.png
trunk/data/skybox/objects/m5.xml
trunk/data/skybox/objects/m53.png
trunk/data/skybox/objects/m53.xml
trunk/data/skybox/objects/m55.png
trunk/data/skybox/objects/m55.xml
trunk/data/skybox/objects/m64.png
trunk/data/skybox/objects/m64.xml
trunk/data/skybox/objects/m65.png
trunk/data/skybox/objects/m65.xml
trunk/data/skybox/objects/m66.png
trunk/data/skybox/objects/m66.xml
trunk/data/skybox/objects/m81.png
trunk/data/skybox/objects/m81.xml
trunk/data/skybox/objects/m81_b.png
trunk/data/skybox/objects/m81_b.xml
trunk/data/skybox/objects/m82.png
trunk/data/skybox/objects/m82.xml
trunk/data/skybox/objects/m82_b.png
trunk/data/skybox/objects/m82_b.xml
trunk/data/skybox/objects/m83.png
trunk/data/skybox/objects/m83.xml
trunk/data/skybox/objects/m88.png
trunk/data/skybox/objects/m88.xml
trunk/data/skybox/objects/m8_-_lagoon_nebula.png
trunk/data/skybox/objects/m8_-_lagoon_nebula.xml
trunk/data/skybox/objects/m90.png
trunk/data/skybox/objects/m90.xml
trunk/data/skybox/objects/m91.png
trunk/data/skybox/objects/m91.xml
trunk/data/skybox/objects/m92.png
trunk/data/skybox/objects/m92.xml
trunk/data/skybox/objects/m96.png
trunk/data/skybox/objects/m96.xml
trunk/data/skybox/objects/ngc_1300.png
trunk/data/skybox/objects/ngc_1300.xml
trunk/data/skybox/objects/ngc_2146.png
trunk/data/skybox/objects/ngc_2146.xml
trunk/data/skybox/objects/ngc_2207.png
trunk/data/skybox/objects/ngc_2207.xml
trunk/data/skybox/objects/ngc_3314.png
trunk/data/skybox/objects/ngc_3314.xml
trunk/data/skybox/objects/ngc_4314.png
trunk/data/skybox/objects/ngc_4314.xml
trunk/data/skybox/objects/ngc_4414.png
trunk/data/skybox/objects/ngc_4414.xml
trunk/data/skybox/objects/ngc_4565.png
trunk/data/skybox/objects/ngc_4565.xml
trunk/data/skybox/objects/ngc_4650.png
trunk/data/skybox/objects/ngc_4650.xml
trunk/data/skybox/objects/ngc_4676.png
trunk/data/skybox/objects/ngc_4676.xml
trunk/data/skybox/objects/ngc_5033.png
trunk/data/skybox/objects/ngc_5033.xml
trunk/data/skybox/objects/ngc_604.png
trunk/data/skybox/objects/ngc_604.xml
trunk/data/skybox/objects/ngc_6822.png
trunk/data/skybox/objects/ngc_6822.xml
trunk/data/skybox/objects/ngc_7479.png
trunk/data/skybox/objects/ngc_7479.xml
trunk/data/skybox/objects/ugc_10214.png
trunk/data/skybox/objects/ugc_10214.xml
Added: trunk/data/skybox/objects/eso_510-g13.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/eso_510-g13.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/eso_510-g13.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/eso_510-g13.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m10.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m10.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m10.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m10.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m101.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m101.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m101.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m101.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m104.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m104.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m104.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m104.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m108.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m108.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m108.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m108.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m109.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m109.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m109.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m109.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m13.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m13.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m13.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m13.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m14.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m14.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m14.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m14.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m15.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m15.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m15.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m15.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m16_-_eagle_nebula.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m16_-_eagle_nebula.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m16_-_eagle_nebula.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m16_-_eagle_nebula.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m16_-_eagle_nebula_b.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m16_-_eagle_nebula_b.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m16_-_eagle_nebula_b.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m16_-_eagle_nebula_b.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m19.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m19.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m19.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m19.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m1_-_crab_nebula.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m1_-_crab_nebula.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m1_-_crab_nebula.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m1_-_crab_nebula.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m1_-_crab_nebula_b.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m1_-_crab_nebula_b.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m1_-_crab_nebula_b.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m1_-_crab_nebula_b.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m2.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m2.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m2.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m3.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m3.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m3.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m31_-_andromeda.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m31_-_andromeda.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m31_-_andromeda.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m31_-_andromeda.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m31_-_andromeda_b.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m31_-_andromeda_b.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m31_-_andromeda_b.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m31_-_andromeda_b.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m33.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m33.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m33.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m33.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m33_b.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m33_b.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m33_b.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m33_b.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m5.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m5.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m5.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m5.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m53.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m53.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m53.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m53.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m55.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m55.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m55.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m55.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m64.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m64.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m64.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m64.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m65.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m65.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m65.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m65.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m66.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m66.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m66.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m66.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m81.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m81.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m81.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m81.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m81_b.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m81_b.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m81_b.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m81_b.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m82.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m82.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m82.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m82.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m82_b.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m82_b.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m82_b.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m82_b.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m83.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m83.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m83.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m83.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m88.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m88.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m88.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m88.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m8_-_lagoon_nebula.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m8_-_lagoon_nebula.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m8_-_lagoon_nebula.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m8_-_lagoon_nebula.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m90.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m90.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m90.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m90.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m91.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m91.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m91.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m91.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m92.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m92.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m92.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m92.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/m96.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m96.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/m96.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/m96.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/ngc_1300.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_1300.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/ngc_1300.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_1300.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/ngc_2146.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_2146.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/ngc_2146.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_2146.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/ngc_2207.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_2207.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/ngc_2207.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_2207.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/ngc_3314.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_3314.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/ngc_3314.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_3314.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/ngc_4314.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_4314.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/ngc_4314.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_4314.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/ngc_4414.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_4414.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/ngc_4414.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_4414.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/ngc_4565.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_4565.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/ngc_4565.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_4565.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/ngc_4650.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_4650.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/ngc_4650.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_4650.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/ngc_4676.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_4676.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/ngc_4676.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_4676.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/ngc_5033.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_5033.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/ngc_5033.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_5033.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/ngc_604.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_604.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/ngc_604.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_604.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/ngc_6822.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_6822.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/ngc_6822.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_6822.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/ngc_7479.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_7479.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/ngc_7479.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ngc_7479.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
Added: trunk/data/skybox/objects/ugc_10214.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ugc_10214.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/skybox/objects/ugc_10214.xml
===================================================================
(Binary files differ)
Property changes on: trunk/data/skybox/objects/ugc_10214.xml
___________________________________________________________________
Name: svn:mime-type
+ application/xml
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ult...@us...> - 2007-09-23 14:33:40
|
Revision: 786
http://opengate.svn.sourceforge.net/opengate/?rev=786&view=rev
Author: ultrasick
Date: 2007-09-23 07:33:44 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
correcting "sky box" -> "skybox" in description texts
Modified Paths:
--------------
trunk/data/skybox/random_sky_box_pictures/m16_-_eagle_nebula_b.xml
trunk/data/skybox/random_sky_box_pictures/m1_-_crab_nebula_b.xml
trunk/data/skybox/random_sky_box_pictures/m31_-_andromeda_b.xml
trunk/data/skybox/random_sky_box_pictures/m33_b.xml
trunk/data/skybox/random_sky_box_pictures/m81_b.xml
trunk/data/skybox/random_sky_box_pictures/m82_b.xml
trunk/data/skybox/random_sky_box_pictures/ngc_604.xml
Modified: trunk/data/skybox/random_sky_box_pictures/m16_-_eagle_nebula_b.xml
===================================================================
(Binary files differ)
Modified: trunk/data/skybox/random_sky_box_pictures/m1_-_crab_nebula_b.xml
===================================================================
(Binary files differ)
Modified: trunk/data/skybox/random_sky_box_pictures/m31_-_andromeda_b.xml
===================================================================
(Binary files differ)
Modified: trunk/data/skybox/random_sky_box_pictures/m33_b.xml
===================================================================
(Binary files differ)
Modified: trunk/data/skybox/random_sky_box_pictures/m81_b.xml
===================================================================
(Binary files differ)
Modified: trunk/data/skybox/random_sky_box_pictures/m82_b.xml
===================================================================
(Binary files differ)
Modified: trunk/data/skybox/random_sky_box_pictures/ngc_604.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-09-23 14:26:55
|
Revision: 785
http://opengate.svn.sourceforge.net/opengate/?rev=785&view=rev
Author: ultrasick
Date: 2007-09-23 07:26:58 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
correcting category: "random sector objects" -> "sector objects" because they will be at a given position and won't appear randomly
I hope I don't interfere with your work, christoph
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: <eg...@us...> - 2007-09-23 13:27:10
|
Revision: 784
http://opengate.svn.sourceforge.net/opengate/?rev=784&view=rev
Author: egore
Date: 2007-09-23 06:27:13 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
remove empty directory
remove items from todo list
Modified Paths:
--------------
trunk/TODO.cbrill
Removed Paths:
-------------
trunk/data/misc/asteroids/
Modified: trunk/TODO.cbrill
===================================================================
--- trunk/TODO.cbrill 2007-09-23 13:25:57 UTC (rev 783)
+++ trunk/TODO.cbrill 2007-09-23 13:27:13 UTC (rev 784)
@@ -9,9 +9,6 @@
* remove data/MediaFromOgre
* remove data/menus/ogre_menu.zip
* remove data/ogre_menu.zip
- * move misc/skybox.zip -> data/skybox
- * move simpleSkybox.zip -> data/skybox
- * move povry -> data/skybox
* replace WAVs by ogg (where useful, size improvement should me measurable)
* remove testopenalmanager once the client is done
* fix "make dist" with ogreopcode external stuff
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-09-23 13:25:53
|
Revision: 783
http://opengate.svn.sourceforge.net/opengate/?rev=783&view=rev
Author: egore
Date: 2007-09-23 06:25:57 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
move skybox stuff around
Added Paths:
-----------
trunk/data/skybox/random_sky_box_pictures/
trunk/data/skybox/skybox.material
trunk/data/skybox/skybox.zip
Removed Paths:
-------------
trunk/data/misc/random_sky_box_pictures/
trunk/data/misc/skybox.material
trunk/data/misc/skybox.zip
Deleted: trunk/data/misc/skybox.material
===================================================================
--- trunk/data/misc/skybox.material 2007-09-23 13:24:39 UTC (rev 782)
+++ trunk/data/misc/skybox.material 2007-09-23 13:25:57 UTC (rev 783)
@@ -1,17 +0,0 @@
-material Examples/SpaceSkyBox
-{
- technique
- {
- pass
- {
- lighting off
- depth_write off
-
- texture_unit
- {
- cubic_texture stevecube.jpg separateUV
- tex_address_mode clamp
- }
- }
- }
-}
Deleted: trunk/data/misc/skybox.zip
===================================================================
(Binary files differ)
Copied: trunk/data/skybox/random_sky_box_pictures (from rev 779, trunk/data/misc/random_sky_box_pictures)
Copied: trunk/data/skybox/skybox.material (from rev 779, trunk/data/misc/skybox.material)
===================================================================
--- trunk/data/skybox/skybox.material (rev 0)
+++ trunk/data/skybox/skybox.material 2007-09-23 13:25:57 UTC (rev 783)
@@ -0,0 +1,17 @@
+material Examples/SpaceSkyBox
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ depth_write off
+
+ texture_unit
+ {
+ cubic_texture stevecube.jpg separateUV
+ tex_address_mode clamp
+ }
+ }
+ }
+}
Copied: trunk/data/skybox/skybox.zip (from rev 779, trunk/data/misc/skybox.zip)
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-09-23 13:24:37
|
Revision: 782
http://opengate.svn.sourceforge.net/opengate/?rev=782&view=rev
Author: egore
Date: 2007-09-23 06:24:39 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
move skybox stuff around
Modified Paths:
--------------
trunk/resources.cfg
Added Paths:
-----------
trunk/data/skybox/buildSkyBox.sh
trunk/data/skybox/simpleSkybox.zip
trunk/data/skybox/skybox1.pov
trunk/data/skybox/skybox2.pov
Removed Paths:
-------------
trunk/data/povray/
trunk/data/simpleSkybox.zip
Deleted: trunk/data/simpleSkybox.zip
===================================================================
(Binary files differ)
Copied: trunk/data/skybox/buildSkyBox.sh (from rev 779, trunk/data/povray/buildSkyBox.sh)
===================================================================
--- trunk/data/skybox/buildSkyBox.sh (rev 0)
+++ trunk/data/skybox/buildSkyBox.sh 2007-09-23 13:24:39 UTC (rev 782)
@@ -0,0 +1,28 @@
+ALLPOVFILES='skybox1.pov skybox2.pov'
+
+#RESOLUTION=4096
+#RESOLUTION=2048
+#RESOLUTION=1024
+RESOLUTION=512
+for POVFILE in $ALLPOVFILES; do
+ OUT=${POVFILE%.pov}
+ OUTNAME=$OUT
+
+ for i in 0 1 2 3 4 5; do
+
+ case $i in
+ 0) EXTENSION="_fr";; # front
+ 1) EXTENSION="_rt";; # right
+ 2) EXTENSION="_bk";; # back
+ 3) EXTENSION="_lf";; # left
+ 4) EXTENSION="_up";; # up
+ 5) EXTENSION="_dn";; # down
+ esac
+
+ povray -I $POVFILE -H$RESOLUTION -W$RESOLUTION +FT -D32 -O$OUTNAME$EXTENSION.tga -K$i
+ convert -quality 100 $OUTNAME$EXTENSION.tga $OUTNAME$EXTENSION.png
+ rm $OUTNAME$EXTENSION.tga
+ done
+done
+zip sykbox_$RESOLUTION.zip *.png
+rm *.png
Copied: trunk/data/skybox/simpleSkybox.zip (from rev 779, trunk/data/simpleSkybox.zip)
===================================================================
(Binary files differ)
Copied: trunk/data/skybox/skybox1.pov (from rev 779, trunk/data/povray/skybox1.pov)
===================================================================
--- trunk/data/skybox/skybox1.pov (rev 0)
+++ trunk/data/skybox/skybox1.pov 2007-09-23 13:24:39 UTC (rev 782)
@@ -0,0 +1,58 @@
+// found here: http://www.ogre3d.org/wiki/index.php/POVRay_Skyboxes
+
+#include "colors.inc"
+
+camera {
+ location <0,0,0>
+ angle 90
+ right <1,0,0> up <0,1,0>
+// turn the cam based on the current frame=clock : [0-5]
+ #switch (clock)
+ #range (0,3)
+// first 4 frames : turn from left to right
+
+rotate (90*clock)*y
+ #break
+ #case (4)
+ // look at the sky
+ rotate -90*x
+ #break
+ #case (5)
+ // look at the ground
+ rotate 90*x
+ #break
+ #end // End of conditional part
+}
+
+background { color rgb <0,0,0> }
+// light_source { <100, 100, -200> color White }
+
+sphere { < 0, 0, 0>, 2
+ pigment { rgbt 1 } // surface of sphere is transparent
+
+ interior {
+ media {
+ emission 0.02
+ intervals 1
+ samples 25
+ method 3
+ density {
+ spherical
+ ramp_wave
+ translate 1.0*y
+ // replace 1.0 = t by time for animation
+ warp { turbulence 1.5 }
+ translate -1.0*y
+ // replace -1.0 = -t by time for animation
+ color_map {
+ [0.0 color rgb <0, 0, 0>]
+ [0.1 color rgb <1, 0, 0>]
+ [0.5 color rgb <1, 1, 0>]
+ [1.0 color rgb <1, 1, 0>]
+ }
+ }
+ }
+ }
+ scale 25
+ hollow
+}
Copied: trunk/data/skybox/skybox2.pov (from rev 779, trunk/data/povray/skybox2.pov)
===================================================================
--- trunk/data/skybox/skybox2.pov (rev 0)
+++ trunk/data/skybox/skybox2.pov 2007-09-23 13:24:39 UTC (rev 782)
@@ -0,0 +1,89 @@
+// found here: http://www.ogre3d.org/wiki/index.php/POVRay_Skyboxes
+
+#include "colors.inc"
+
+camera {
+ location <0,0,0>
+ angle 90
+ right <1,0,0> up <0,1,0>
+ // turn the cam based on the current frame=clock : [0-5]
+ #switch (clock)
+ #range (0,3)
+ // first 4 frames : turn from left to right
+ rotate (90*clock)*y
+ #break
+ #case (4)
+ // look at the sky
+ rotate -90*x
+ #break
+ #case (5)
+ // look at the ground
+ rotate 90*x
+ #break
+ #end // End of conditional part
+}
+
+background { color rgb <0,0,0> }
+
+// light_source { <100, 100, -200> color White }
+/*
+/usr/share/povray-3.5/include/stars.inc
+
+ sky_sphere {
+ pigment {
+ granite
+ color_map {
+ [ 0.000 0.270 color rgb < 0, 0, 0> color rgb < 0, 0, 0> ]
+ [ 0.270 0.280 color rgb <.5,.5,.4> color rgb <.8,.8,.4> ]
+ [ 0.280 0.470 color rgb < 0, 0, 0> color rgb < 0, 0, 0> ]
+ [ 0.470 0.480 color rgb <.4,.4,.5> color rgb <.4,.4,.8> ]
+ [ 0.480 0.680 color rgb < 0, 0, 0> color rgb < 0, 0, 0> ]
+ [ 0.680 0.690 color rgb <.5,.4,.4> color rgb <.8,.4,.4> ]
+ [ 0.690 0.880 color rgb < 0, 0, 0> color rgb < 0, 0, 0> ]
+ [ 0.880 0.890 color rgb <.5,.5,.5> color rgb < 1, 1, 1> ]
+ [ 0.890 1.000 color rgb < 0, 0, 0> color rgb < 0, 0, 0> ]
+ }
+ turbulence 1
+ sine_wave
+ scale .5
+ }
+
+ }
+ */
+
+sphere { < 0, 0, 0>, 2
+ pigment { rgbt 1 } // surface of sphere is transparent
+ interior {
+ media {
+ emission 0.02
+ intervals 1
+ samples 25
+ method 3
+ density {
+ spherical
+ ramp_wave
+ translate 1.0*y // replace 1.0 = t by time for animation
+ warp { turbulence 2.5 }
+ translate -1.0*y // replace -1.0 = -t by time for animation
+ color_map {
+ [0.0 color rgb <0, 0, 0> * 0.5]
+ [0.1 color rgb <0, 1, 0> * 0.5]
+ [0.5 color rgb <1, 1, 0> * 0.5]
+ [1.0 color rgb <1, 0, 0> * 0.5]
+ }
+ }
+ density {
+ spherical
+ ramp_wave
+ color_map {
+ [0.0 color rgb 1]
+ [0.2 color rgb 1]
+ [0.3 color rgb 0]
+ [1.0 color rgb 0]
+ }
+ }
+ }
+ }
+ scale 25
+ hollow
+}
Modified: trunk/resources.cfg
===================================================================
--- trunk/resources.cfg 2007-09-23 13:20:00 UTC (rev 781)
+++ trunk/resources.cfg 2007-09-23 13:24:39 UTC (rev 782)
@@ -29,7 +29,7 @@
FileSystem=./data/gui/schemes
FileSystem=./data/gui/looknfeel
-Zip=./data/simpleSkybox.zip
+Zip=./data/skybox/simpleSkybox.zip
Zip=./data/fonts.zip
FileSystem=./data/MediaFromOgre
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-09-23 13:19:57
|
Revision: 781
http://opengate.svn.sourceforge.net/opengate/?rev=781&view=rev
Author: egore
Date: 2007-09-23 06:20:00 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
duplicated from data/fonts
Removed Paths:
-------------
trunk/data/client/data1.x/GUI/BlueHighway-10.font
trunk/data/client/data1.x/GUI/BlueHighway-12.font
trunk/data/client/data1.x/GUI/BlueHighway.ttf
Deleted: trunk/data/client/data1.x/GUI/BlueHighway-10.font
===================================================================
--- trunk/data/client/data1.x/GUI/BlueHighway-10.font 2007-09-23 13:16:50 UTC (rev 780)
+++ trunk/data/client/data1.x/GUI/BlueHighway-10.font 2007-09-23 13:20:00 UTC (rev 781)
@@ -1,2 +0,0 @@
-<?xml version="1.0" ?>
-<Font Name="BlueHighway-10" Filename="BlueHighway.ttf" Type="FreeType" Size="10" NativeHorzRes="800" NativeVertRes="600" AutoScaled="false" />
Deleted: trunk/data/client/data1.x/GUI/BlueHighway-12.font
===================================================================
--- trunk/data/client/data1.x/GUI/BlueHighway-12.font 2007-09-23 13:16:50 UTC (rev 780)
+++ trunk/data/client/data1.x/GUI/BlueHighway-12.font 2007-09-23 13:20:00 UTC (rev 781)
@@ -1,2 +0,0 @@
-<?xml version="1.0" ?>
-<Font Name="BlueHighway-12" Filename="BlueHighway.ttf" Type="FreeType" Size="12" NativeHorzRes="800" NativeVertRes="600" AutoScaled="false" />
Deleted: trunk/data/client/data1.x/GUI/BlueHighway.ttf
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-09-23 13:16:46
|
Revision: 780
http://opengate.svn.sourceforge.net/opengate/?rev=780&view=rev
Author: egore
Date: 2007-09-23 06:16:50 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
move templates around
Added Paths:
-----------
trunk/templates/misc/
trunk/templates/misc/arrow.wings
Removed Paths:
-------------
trunk/data/wings/
Copied: trunk/templates/misc/arrow.wings (from rev 779, trunk/data/wings/arrow.wings)
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-09-23 13:14:38
|
Revision: 779
http://opengate.svn.sourceforge.net/opengate/?rev=779&view=rev
Author: egore
Date: 2007-09-23 06:14:41 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
fix resources
Modified Paths:
--------------
trunk/resources.cfg
Modified: trunk/resources.cfg
===================================================================
--- trunk/resources.cfg 2007-09-23 13:13:44 UTC (rev 778)
+++ trunk/resources.cfg 2007-09-23 13:14:41 UTC (rev 779)
@@ -11,7 +11,7 @@
FileSystem=./data/engines
FileSystem=./data/radars
FileSystem=./data/shields
-FileSystem=./data/ECMs
+FileSystem=./data/ecms
FileSystem=./data/power_plants
FileSystem=./data/guns
FileSystem=./data/ships/octavius/apteryx
@@ -19,9 +19,6 @@
FileSystem=./data/ships/tauseti/lady_kickstart
FileSystem=./data/ships/squadrok/squid
FileSystem=./data/stations
-FileSystem=./data/misc/asteroids
-
-FileSystem=./data
FileSystem=./data/materials
FileSystem=./data/textures
FileSystem=./data/asteroids
@@ -31,10 +28,10 @@
FileSystem=./data/gui/imagesets
FileSystem=./data/gui/schemes
FileSystem=./data/gui/looknfeel
-#FileSystem=./data/gui/schemes/opengate
+
Zip=./data/simpleSkybox.zip
Zip=./data/fonts.zip
-#
+
FileSystem=./data/MediaFromOgre
FileSystem=./data/MediaFromOgre/AdvancedMaterials
#FileSystem=./data/local/astro
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-09-23 13:13:40
|
Revision: 778
http://opengate.svn.sourceforge.net/opengate/?rev=778&view=rev
Author: egore
Date: 2007-09-23 06:13:44 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
merge asteroids directories
Added Paths:
-----------
trunk/data/asteroids/ice_oval.material
trunk/data/asteroids/ice_oval.png
trunk/data/asteroids/ice_oval_10.mesh
trunk/data/asteroids/ice_oval_6.mesh
trunk/data/asteroids/ice_oval_7.mesh
trunk/data/asteroids/ice_oval_8.mesh
trunk/data/asteroids/ice_oval_9.mesh
trunk/data/asteroids/normal_oval.material
trunk/data/asteroids/normal_oval.png
trunk/data/asteroids/normal_oval_1.mesh
trunk/data/asteroids/normal_oval_2.mesh
trunk/data/asteroids/normal_oval_3.mesh
trunk/data/asteroids/normal_oval_4.mesh
trunk/data/asteroids/normal_oval_5.mesh
Removed Paths:
-------------
trunk/data/misc/asteroids/ice_oval.material
trunk/data/misc/asteroids/ice_oval.png
trunk/data/misc/asteroids/ice_oval_10.mesh
trunk/data/misc/asteroids/ice_oval_6.mesh
trunk/data/misc/asteroids/ice_oval_7.mesh
trunk/data/misc/asteroids/ice_oval_8.mesh
trunk/data/misc/asteroids/ice_oval_9.mesh
trunk/data/misc/asteroids/normal_oval.material
trunk/data/misc/asteroids/normal_oval.png
trunk/data/misc/asteroids/normal_oval_1.mesh
trunk/data/misc/asteroids/normal_oval_2.mesh
trunk/data/misc/asteroids/normal_oval_3.mesh
trunk/data/misc/asteroids/normal_oval_4.mesh
trunk/data/misc/asteroids/normal_oval_5.mesh
Copied: trunk/data/asteroids/ice_oval.material (from rev 766, trunk/data/misc/asteroids/ice_oval.material)
===================================================================
--- trunk/data/asteroids/ice_oval.material (rev 0)
+++ trunk/data/asteroids/ice_oval.material 2007-09-23 13:13:44 UTC (rev 778)
@@ -0,0 +1,25 @@
+material asteroid/TEXFACE/ice_oval.png
+{
+ receive_shadows on
+ technique
+ {
+ pass
+ {
+ ambient 0.500000 0.500000 0.500000 1.000000
+ diffuse 0.800000 0.800000 0.800000 1.000000
+ emissive 0.000000 0.000000 0.000000 1.000000
+ texture_unit
+ {
+ texture ice_oval.png
+ colour_op modulate
+ }
+ }
+ pass
+ {
+ ambient 0.0 0.0 0.0
+ diffuse 0.0 0.0 0.0
+ specular 0.500000 0.500000 0.500000 1.000000 12.500000
+ scene_blend add
+ }
+ }
+}
Copied: trunk/data/asteroids/ice_oval.png (from rev 766, trunk/data/misc/asteroids/ice_oval.png)
===================================================================
(Binary files differ)
Copied: trunk/data/asteroids/ice_oval_10.mesh (from rev 766, trunk/data/misc/asteroids/ice_oval_10.mesh)
===================================================================
(Binary files differ)
Copied: trunk/data/asteroids/ice_oval_6.mesh (from rev 766, trunk/data/misc/asteroids/ice_oval_6.mesh)
===================================================================
(Binary files differ)
Copied: trunk/data/asteroids/ice_oval_7.mesh (from rev 766, trunk/data/misc/asteroids/ice_oval_7.mesh)
===================================================================
(Binary files differ)
Copied: trunk/data/asteroids/ice_oval_8.mesh (from rev 766, trunk/data/misc/asteroids/ice_oval_8.mesh)
===================================================================
(Binary files differ)
Copied: trunk/data/asteroids/ice_oval_9.mesh (from rev 766, trunk/data/misc/asteroids/ice_oval_9.mesh)
===================================================================
(Binary files differ)
Copied: trunk/data/asteroids/normal_oval.material (from rev 766, trunk/data/misc/asteroids/normal_oval.material)
===================================================================
--- trunk/data/asteroids/normal_oval.material (rev 0)
+++ trunk/data/asteroids/normal_oval.material 2007-09-23 13:13:44 UTC (rev 778)
@@ -0,0 +1,25 @@
+material asteroid/TEXFACE/normal_oval.png
+{
+ receive_shadows on
+ technique
+ {
+ pass
+ {
+ ambient 0.500000 0.500000 0.500000 1.000000
+ diffuse 0.800000 0.800000 0.800000 1.000000
+ emissive 0.000000 0.000000 0.000000 1.000000
+ texture_unit
+ {
+ texture normal_oval.png
+ colour_op modulate
+ }
+ }
+ pass
+ {
+ ambient 0.0 0.0 0.0
+ diffuse 0.0 0.0 0.0
+ specular 0.500000 0.500000 0.500000 1.000000 12.500000
+ scene_blend add
+ }
+ }
+}
Copied: trunk/data/asteroids/normal_oval.png (from rev 766, trunk/data/misc/asteroids/normal_oval.png)
===================================================================
(Binary files differ)
Copied: trunk/data/asteroids/normal_oval_1.mesh (from rev 766, trunk/data/misc/asteroids/normal_oval_1.mesh)
===================================================================
(Binary files differ)
Copied: trunk/data/asteroids/normal_oval_2.mesh (from rev 766, trunk/data/misc/asteroids/normal_oval_2.mesh)
===================================================================
(Binary files differ)
Copied: trunk/data/asteroids/normal_oval_3.mesh (from rev 766, trunk/data/misc/asteroids/normal_oval_3.mesh)
===================================================================
(Binary files differ)
Copied: trunk/data/asteroids/normal_oval_4.mesh (from rev 766, trunk/data/misc/asteroids/normal_oval_4.mesh)
===================================================================
(Binary files differ)
Copied: trunk/data/asteroids/normal_oval_5.mesh (from rev 766, trunk/data/misc/asteroids/normal_oval_5.mesh)
===================================================================
(Binary files differ)
Deleted: trunk/data/misc/asteroids/ice_oval.material
===================================================================
--- trunk/data/misc/asteroids/ice_oval.material 2007-09-23 13:09:20 UTC (rev 777)
+++ trunk/data/misc/asteroids/ice_oval.material 2007-09-23 13:13:44 UTC (rev 778)
@@ -1,25 +0,0 @@
-material asteroid/TEXFACE/ice_oval.png
-{
- receive_shadows on
- technique
- {
- pass
- {
- ambient 0.500000 0.500000 0.500000 1.000000
- diffuse 0.800000 0.800000 0.800000 1.000000
- emissive 0.000000 0.000000 0.000000 1.000000
- texture_unit
- {
- texture ice_oval.png
- colour_op modulate
- }
- }
- pass
- {
- ambient 0.0 0.0 0.0
- diffuse 0.0 0.0 0.0
- specular 0.500000 0.500000 0.500000 1.000000 12.500000
- scene_blend add
- }
- }
-}
Deleted: trunk/data/misc/asteroids/ice_oval.png
===================================================================
(Binary files differ)
Deleted: trunk/data/misc/asteroids/ice_oval_10.mesh
===================================================================
(Binary files differ)
Deleted: trunk/data/misc/asteroids/ice_oval_6.mesh
===================================================================
(Binary files differ)
Deleted: trunk/data/misc/asteroids/ice_oval_7.mesh
===================================================================
(Binary files differ)
Deleted: trunk/data/misc/asteroids/ice_oval_8.mesh
===================================================================
(Binary files differ)
Deleted: trunk/data/misc/asteroids/ice_oval_9.mesh
===================================================================
(Binary files differ)
Deleted: trunk/data/misc/asteroids/normal_oval.material
===================================================================
--- trunk/data/misc/asteroids/normal_oval.material 2007-09-23 13:09:20 UTC (rev 777)
+++ trunk/data/misc/asteroids/normal_oval.material 2007-09-23 13:13:44 UTC (rev 778)
@@ -1,25 +0,0 @@
-material asteroid/TEXFACE/normal_oval.png
-{
- receive_shadows on
- technique
- {
- pass
- {
- ambient 0.500000 0.500000 0.500000 1.000000
- diffuse 0.800000 0.800000 0.800000 1.000000
- emissive 0.000000 0.000000 0.000000 1.000000
- texture_unit
- {
- texture normal_oval.png
- colour_op modulate
- }
- }
- pass
- {
- ambient 0.0 0.0 0.0
- diffuse 0.0 0.0 0.0
- specular 0.500000 0.500000 0.500000 1.000000 12.500000
- scene_blend add
- }
- }
-}
Deleted: trunk/data/misc/asteroids/normal_oval.png
===================================================================
(Binary files differ)
Deleted: trunk/data/misc/asteroids/normal_oval_1.mesh
===================================================================
(Binary files differ)
Deleted: trunk/data/misc/asteroids/normal_oval_2.mesh
===================================================================
(Binary files differ)
Deleted: trunk/data/misc/asteroids/normal_oval_3.mesh
===================================================================
(Binary files differ)
Deleted: trunk/data/misc/asteroids/normal_oval_4.mesh
===================================================================
(Binary files differ)
Deleted: trunk/data/misc/asteroids/normal_oval_5.mesh
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-09-23 13:09:17
|
Revision: 777
http://opengate.svn.sourceforge.net/opengate/?rev=777&view=rev
Author: egore
Date: 2007-09-23 06:09:20 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
lowercase
Added Paths:
-----------
trunk/data/ecms/
Removed Paths:
-------------
trunk/data/ECMs/
Copied: trunk/data/ecms (from rev 766, trunk/data/ECMs)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eg...@us...> - 2007-09-23 13:05:22
|
Revision: 776
http://opengate.svn.sourceforge.net/opengate/?rev=776&view=rev
Author: egore
Date: 2007-09-23 06:05:20 -0700 (Sun, 23 Sep 2007)
Log Message:
-----------
lowercase ECMs to ecms
Added Paths:
-----------
trunk/templates/data/ecms/
Removed Paths:
-------------
trunk/templates/data/ECMs/
Copied: trunk/templates/data/ecms (from rev 764, trunk/templates/data/ECMs)
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.
