From: <eg...@us...> - 2007-05-11 23:41:21
|
Revision: 459 http://svn.sourceforge.net/opengate/?rev=459&view=rev Author: egore Date: 2007-05-11 16:41:21 -0700 (Fri, 11 May 2007) Log Message: ----------- Simple documentation about the upcoming network model Added Paths: ----------- trunk/doc/network_model.odt trunk/doc/network_model.pdf Added: trunk/doc/network_model.odt =================================================================== (Binary files differ) Property changes on: trunk/doc/network_model.odt ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/doc/network_model.pdf =================================================================== (Binary files differ) Property changes on: trunk/doc/network_model.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eg...@us...> - 2007-09-22 18:14:49
|
Revision: 760 http://opengate.svn.sourceforge.net/opengate/?rev=760&view=rev Author: egore Date: 2007-09-22 11:14:53 -0700 (Sat, 22 Sep 2007) Log Message: ----------- Start merge Added Paths: ----------- trunk/AUTHORS trunk/COPYING trunk/ChangeLog trunk/INSTALL trunk/Makefile.am trunk/NEWS trunk/Opengate.anjuta trunk/README trunk/TODO.cbrill trunk/TODO.gluck trunk/ToDo trunk/autogen.sh trunk/compile trunk/configure.ac trunk/depcomp trunk/doc/Doxyfile trunk/externals/ trunk/install-sh trunk/missing trunk/ogre.cfg trunk/plugins.cfg trunk/resources.cfg trunk/runClient.sh trunk/runServer.sh trunk/win32/ Removed Paths: ------------- branches/ogsector/AUTHORS branches/ogsector/COPYING branches/ogsector/ChangeLog branches/ogsector/INSTALL branches/ogsector/Makefile.am branches/ogsector/NEWS branches/ogsector/Opengate.anjuta branches/ogsector/README branches/ogsector/TODO.cbrill branches/ogsector/TODO.gluck branches/ogsector/ToDo branches/ogsector/autogen.sh branches/ogsector/compile branches/ogsector/configure.ac branches/ogsector/depcomp branches/ogsector/doc/ branches/ogsector/externals/ branches/ogsector/install-sh branches/ogsector/missing branches/ogsector/ogre.cfg branches/ogsector/plugins.cfg branches/ogsector/resources.cfg branches/ogsector/runClient.sh branches/ogsector/runServer.sh branches/ogsector/win32/ Deleted: branches/ogsector/AUTHORS =================================================================== --- branches/ogsector/AUTHORS 2007-09-21 16:36:48 UTC (rev 759) +++ branches/ogsector/AUTHORS 2007-09-22 18:14:53 UTC (rev 760) @@ -1,3 +0,0 @@ -Carsten <spo...@us...> -Christoph Brill <eg...@us...> -Gary Luck <ult...@us...> Deleted: branches/ogsector/COPYING =================================================================== --- branches/ogsector/COPYING 2007-09-21 16:36:48 UTC (rev 759) +++ branches/ogsector/COPYING 2007-09-22 18:14:53 UTC (rev 760) @@ -1 +0,0 @@ -link /usr/share/automake-1.10/COPYING \ No newline at end of file Deleted: branches/ogsector/ChangeLog =================================================================== Deleted: branches/ogsector/INSTALL =================================================================== --- branches/ogsector/INSTALL 2007-09-21 16:36:48 UTC (rev 759) +++ branches/ogsector/INSTALL 2007-09-22 18:14:53 UTC (rev 760) @@ -1 +0,0 @@ -link /usr/share/automake-1.10/INSTALL \ No newline at end of file Deleted: branches/ogsector/Makefile.am =================================================================== --- branches/ogsector/Makefile.am 2007-09-21 16:36:48 UTC (rev 759) +++ branches/ogsector/Makefile.am 2007-09-22 18:14:53 UTC (rev 760) @@ -1,9 +0,0 @@ -SUBDIRS = src - -distclean: maintainer-clean - rm -rf *~ - rm -rf autom4te.cache - rm -rf configure - rm -rf Makefile.in - rm -rf Ogre.log - rm -rf opcode.log Deleted: branches/ogsector/NEWS =================================================================== Deleted: branches/ogsector/Opengate.anjuta =================================================================== --- branches/ogsector/Opengate.anjuta 2007-09-21 16:36:48 UTC (rev 759) +++ branches/ogsector/Opengate.anjuta 2007-09-22 18:14:53 UTC (rev 760) @@ -1,44 +0,0 @@ -<?xml version="1.0"?> -<anjuta> - <plugin name="GBF Project Manager" - url="http://anjuta.org/plugins/" - mandatory="yes"> - <require group="Anjuta Plugin" - attribute="Interfaces" - value="IAnjutaProjectManager"/> - <require group="Project" - attribute="Supported-Project-Types" - value="automake"/> - </plugin> - <plugin name="Symbol Browser" - url="http://anjuta.org/plugins/" - mandatory="yes"> - <require group="Anjuta Plugin" - attribute="Location" - value="anjuta-symbol-browser:SymbolBrowserPlugin"/> - </plugin> - <plugin name="Make Build System" - url="http://anjuta.org/plugins/" - mandatory="yes"> - <require group="Anjuta Plugin" - attribute="Interfaces" - value="IAnjutaBuildable"/> - <require group="Build" - attribute="Supported-Build-Types" - value="make"/> - </plugin> - <plugin name="Task Manager" - url="http://anjuta.org/plugins/" - mandatory="no"> - <require group="Anjuta Plugin" - attribute="Interfaces" - value="IAnjutaTodo"/> - </plugin> - <plugin name="Debug Manager" - url="http://anjuta.org/plugins/" - mandatory="no"> - <require group="Anjuta Plugin" - attribute="Interfaces" - value="IAnjutaDebuggerManager"/> - </plugin> -</anjuta> Deleted: branches/ogsector/README =================================================================== --- branches/ogsector/README 2007-09-21 16:36:48 UTC (rev 759) +++ branches/ogsector/README 2007-09-22 18:14:53 UTC (rev 760) @@ -1,52 +0,0 @@ --- 0.0.2 -- -Not yet testet with other players -need test Nr.2 ;) - -- changed netprotocol to TCP (my router hangs with udp, I dont know why), port: 1234 -- add simple interpolation and extrapolation for smooth movement at higher pings or packetloss -(spawned ships still jiggle a bit) -- clear register/deregister of spawns and playerships -- add network protocol for: registering ships, ship status changed, ship hit by ammo - --- 0.0.1 -- -do not fly online -At test Nr.1 my router died 2 times. -Lost packets lead to crazy behaviour of the vessels. - ------------------------------------------------------------------------ -For installation: - -you will need: -Ogre-1.2 ->=freealut-1.0.1 - -Build externals (libgrapple, OIS, OgreOpode) - -cd ./externals -sh genExternals.sh all -cd .. - -For building ogsector simple run: -./bootstrap -./configure -make -j3 - -For running the ogsectorclient you have to custumise: - -plugins.cfg -ogre.cfg -runClient.sh - -then -./runClient.sh - -# start a server (optional) -./runServer.sh - -If you want to test the openALsoundManager you have to take care that your LD_LIBRARY_PATH knows the external libs - -src/testopenalmanager - -Enjoy this first technical proof of concept. - -Spom Deleted: branches/ogsector/TODO.cbrill =================================================================== --- branches/ogsector/TODO.cbrill 2007-09-21 16:36:48 UTC (rev 759) +++ branches/ogsector/TODO.cbrill 2007-09-22 18:14:53 UTC (rev 760) @@ -1,6 +0,0 @@ -before first release: -* use metaserver for servers to manage sectors -* remove ogre dependency from server -* remove ois dependency from server -* remove testopenalmanager once the client is done -* fix "make dist" with ogreopcode external stuff Deleted: branches/ogsector/TODO.gluck =================================================================== --- branches/ogsector/TODO.gluck 2007-09-21 16:36:48 UTC (rev 759) +++ branches/ogsector/TODO.gluck 2007-09-22 18:14:53 UTC (rev 760) @@ -1,8 +0,0 @@ -before first release: -* xml dateien f\xFCr die galaxien erzeugen -* nebulars aufnehmen -* metaserver f\xFCr die sektorverwaltung vorbereiten -* 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 Deleted: branches/ogsector/ToDo =================================================================== --- branches/ogsector/ToDo 2007-09-21 16:36:48 UTC (rev 759) +++ branches/ogsector/ToDo 2007-09-22 18:14:53 UTC (rev 760) @@ -1,201 +0,0 @@ -Das Fluggef\xFChl mit Joy oder Maus brauch noch finetuning aber prinzipiell kommt es schon vertraut vor. -Ein leerer und leichter Apty ist schon m\xE4chtig wendig. Mal schaun wie es mit einer 500er Titan TOW wird. - -Done: - -- Class: Sector - - enth\xE4llt alle Informationen des Sector (noMovable, movable und avatar) - - add/new/remove/update aller Objecte erfolgt \xFCber den Sector - - setor content by xml-file - -- Class: SectorClient (Verwaltung) - - HauptKlasse enth\xE4llt Sector und SectorCientFrameListener - -- Class: SectorObject - - movable Klasse, bekommt, prozentuale Drehbewegung und Schub und berechnet damit selbst das movement im Sector. Das Objekt hat graphische Eigenschaften damit es direkt dargestellt werden kann. - Das Objekt kann von aussen (Sektor) leicht gesteuert werden, (per Netcode, Ai oder Player). - Gibt man dem Framlistener eine camera mit Position des PlayerShip->mainNode hat man first persons view aus dem Schiff. - - jaw, pitch, roll - - Thrust, break, afterburner - - Thrusterpartikel support - -- InputManager supports key/mouse/joy - -- camera toggle - -- Testsector mit diversen Objekten - - 2 simple skyboxes without Stars (OpenGate/SimpleSkyBox1, OpenGate/SimpleSkyBox1) - -- Simplest HUD - - Position, - - Speed/MaxSpeed - - Acceleration - - Mousecursor - - Bullseye/VCT-1 (Duelist) - - JG-like Radar - -- Simplest global chat - - -Questions: - - depends yaw/pitch/roll-factor on curr. speed/thrust (testing and implement) - - breaking fixed negtiv percentate thrust or fixed acc. (testing and implement) - -ToDo: - -- global/code - - cleaning / refaktoring - - integrate in currect OpenGate framework -# - add licence header - - mark third persons thingies (mousecursor, skybox) -#ALT-TAB - free mousepointer from widget contents - - fullscreen switch (probably not supported by ogre) - - show Whos online -- chat -# - console for input -# - input/output highlight -# - multiple out-lines -# - log to file - - channeling - -- netcode - - communication: client->server->client - - cheatprotection - -- testsector -# - show all shipmodels - - show all objects - - skybox with higher resolution - - stars -# - planet - -- xml-read -# - read playership data -# - read nonmovable objects -# - read equipment and commodities - - global config - -- openal -# - simplest testing - - soundmanger - -- input - - keymap - - mousemap - - joymap - - colihat -> inputmanager - - force feedback support -# - 1/r sensitivity -# - deathzone "nicyfy" - -- radar targeting -# - cam -# - toggle through - - toggle Astro/Stations/Friends/Enemies/All - - nearest Enemy/Friend - - last Enemy/Friend - - proper radar rotation instead of 0.5 scaling - -- HUD -# - targetarrow -# - target infos -# - duellist -# - bullseye/VCR (??) -# - flydirection arrow -# - colorindex for break/AB/FF -# - shield/ammo - - selected rockets - -- GUI -# - market dialog - - ship config dialog - - global config dialog - - mision dialog - - private trade dialog - -- moving - - - flyindicator particle - -- fire! -# - partikel for ammo -# - object destroyed - - mesh for laser - -- collision detection -# - objects -# - fired partikel - -- station - - landing rings on the big ogrehead-mouth - -- ai -# - simple follow - - calculate fireing solution - - rockets - - pathfinding - - genetic learning - -For the talented: - - particle for thrust - - textures for laser, ammo - - animated textures for explosions - - animated textures shield hit indikator - - animated textures ammo hit indikator - - skyboxes with more content - - proper background sound - - sounds: ammo (fired/hit), explosion (sound in space!! "funny"), thruster - -BUGS: -# - (linux)changing mousefocus by < Alt-TAB > lost key-repeat -# OIS disables autorepeat, fire `xset r on` to enable - - - UTF support (\xFC\xF6\xE4) - since Ogre1.4 Overlay only support Ogre::UTFString, which throws exception by using umlaut - - -IDEAS: - - personal scanmission - - Spieler kann sich mit geeignetem Scanner eine eigene Datenbank von Astro erstellen die ingame abgerufen werden kann, f\xFCr jeden neuen Eintrag gibt es exp(nach Mission/Seltenheit/Gefahrenbereich) - - das erleichtert das Leben (kein Papierkram) und sorgt f\xFCr spielerentropie - - -Leuchtfeuer, manuel und als sectorobject - - Tauseti (technical/scientifical) - -------------------------------- - 1. Lady Kickstart - 2. Fuse guzzler (Sicherungsfresser) - ... - X. Catcher - - Quantar (water) - --------------- - 1. Ebbe - 2. leises Pl\xE4tschern - 3. Str\xF6mung - 4. Wellenschlag - 5. Love wave - 6. Rayleigh waves - 7. Monsterwelle - 8. Brecher - 9. Seegang - 10. Brandung - 11. Flut - 12. Tsunami - 13. See - - Octavius (fire) - --------------- - 1. Funke - 2. Irrlicht - 3. Brand - 4. Leuchtfeuer - 5. Fl\xE4chenbrand - 6. Feuerball - 7. Hitze - 8. Flamme - 9. Sonne - 10. Plasma - 11. Asche - - -Guns: Dazzler \ No newline at end of file Deleted: branches/ogsector/autogen.sh =================================================================== --- branches/ogsector/autogen.sh 2007-09-21 16:36:48 UTC (rev 759) +++ branches/ogsector/autogen.sh 2007-09-22 18:14:53 UTC (rev 760) @@ -1,159 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -DIE=0 - -if [ -n "$GNOME2_DIR" ]; then - ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS" - LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH" - PATH="$GNOME2_DIR/bin:$PATH" - export PATH - export LD_LIBRARY_PATH -fi - -(test -f $srcdir/configure.ac) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level package directory" - exit 1 -} - -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`autoconf' installed." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -(grep "^IT_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && { - (intltoolize --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`intltool' installed." - echo "You can get it from:" - echo " ftp://ftp.gnome.org/pub/GNOME/" - DIE=1 - } -} - -(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.ac >/dev/null) && { - (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`xml-i18n-toolize' installed." - echo "You can get it from:" - echo " ftp://ftp.gnome.org/pub/GNOME/" - DIE=1 - } -} - -(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && { - (libtool --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`libtool' installed." - echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" - DIE=1 - } -} - -(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.ac >/dev/null) && { - (grep "sed.*POTFILES" $srcdir/configure.ac) > /dev/null || \ - (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`glib' installed." - echo "You can get it from: ftp://ftp.gtk.org/pub/gtk" - DIE=1 - } -} - -(automake --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`automake' installed." - echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" - DIE=1 - NO_AUTOMAKE=yes -} - - -# if no automake, don't bother testing for aclocal -test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: Missing \`aclocal'. The version of \`automake'" - echo "installed doesn't appear recent enough." - echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -if test "$DIE" -eq 1; then - exit 1 -fi - -if test -z "$*"; then - echo "**Warning**: I am going to run \`configure' with no arguments." - echo "If you wish to pass any to it, please specify them on the" - echo \`$0\'" command line." - echo -fi - -case $CC in -xlc ) - am_opt=--include-deps;; -esac - -for coin in `find $srcdir -path $srcdir/CVS -prune -o -name configure.ac -print` -do - dr=`dirname $coin` - if test -f $dr/NO-AUTO-GEN; then - echo skipping $dr -- flagged as no auto-gen - else - echo processing $dr - ( cd $dr - - aclocalinclude="$ACLOCAL_FLAGS" - - if grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null; then - echo "Creating $dr/aclocal.m4 ..." - test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 - echo "Running glib-gettextize... Ignore non-fatal messages." - echo "no" | glib-gettextize --force --copy - echo "Making $dr/aclocal.m4 writable ..." - test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 - fi - if grep "^IT_PROG_INTLTOOL" configure.ac >/dev/null; then - echo "Running intltoolize..." - intltoolize --copy --force --automake - fi - if grep "^AM_PROG_XML_I18N_TOOLS" configure.ac >/dev/null; then - echo "Running xml-i18n-toolize..." - xml-i18n-toolize --copy --force --automake - fi - if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then - if test -z "$NO_LIBTOOLIZE" ; then - echo "Running libtoolize..." - libtoolize --force --copy - fi - fi - echo "Running aclocal $aclocalinclude ..." - aclocal $aclocalinclude - if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then - echo "Running autoheader..." - autoheader - fi - echo "Running automake --gnu $am_opt ..." - automake --add-missing --gnu $am_opt - echo "Running autoconf ..." - autoconf - ) - fi -done - -conf_flags="--enable-maintainer-mode" - -if test x$NOCONFIGURE = x; then - echo Running $srcdir/configure $conf_flags "$@" ... - $srcdir/configure $conf_flags "$@" \ - && echo Now type \`make\' to compile. || exit 1 -else - echo Skipping configure process. -fi Deleted: branches/ogsector/compile =================================================================== --- branches/ogsector/compile 2007-09-21 16:36:48 UTC (rev 759) +++ branches/ogsector/compile 2007-09-22 18:14:53 UTC (rev 760) @@ -1 +0,0 @@ -link /usr/share/automake-1.10/compile \ No newline at end of file Deleted: branches/ogsector/configure.ac =================================================================== --- branches/ogsector/configure.ac 2007-09-21 16:36:48 UTC (rev 759) +++ branches/ogsector/configure.ac 2007-09-22 18:14:53 UTC (rev 760) @@ -1,88 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -dnl Created by Anjuta application wizard. - -AC_PREREQ(2.59) -AC_INIT([opengate], [0.0.1], [http://sourceforge.net/projects/opengate/]) - -AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION, [dist-bzip2]) -AM_CONFIG_HEADER(config.h) -AM_MAINTAINER_MODE -AM_INIT_AUTOMAKE(ogsector, 0.0.1) - -AC_ISC_POSIX -AC_LANG_CPLUSPLUS -AC_PROG_CXX -AM_PROG_CC_STDC -AC_HEADER_STDC -AM_PROG_CC_C_O - -# TODO: remove this part -OGSECTOR_PATH=$PWD -AC_PREFIX_DEFAULT($OGSECTOR_PATH) -OGSECTOR_EXTERNALS_PATH=$OGSECTOR_PATH/externals -AC_SUBST(OGSECTOR_EXTERNALS_PATH) -AC_SUBST(PKG_CONFIG_PATH, "$OGSECTOR_EXTERNALS_PATH/lib/pkgconfig:$PKG_CONFIG_PATH") -# TODO: end remove - -AM_PROG_LIBTOOL - -PKG_CHECK_MODULES(OGRE, [OGRE >= 1.4.0]) -AC_SUBST(OGRE_CFLAGS) -AC_SUBST(OGRE_LIBS) - -PKG_CHECK_MODULES(CEGUI, [CEGUI >= 0.5.0]) -AC_SUBST(CEGUI_CFLAGS) -AC_SUBST(CEGUI_LIBS) - -PKG_CHECK_MODULES(CEGUIOGRE, [CEGUI-OGRE >= 1.4.0]) -AC_SUBST(CEGUIOGRE_CFLAGS) -AC_SUBST(CEGUIOGRE_LIBS) - -PKG_CHECK_MODULES(OIS, [OIS >= 1.0.0]) -AC_SUBST(OIS_CFLAGS) -AC_SUBST(OIS_LIBS) - -PKG_CHECK_MODULES(freealut, [freealut >= 1.0.1]) -AC_SUBST(freealut_CFLAGS) -AC_SUBST(freealut_LIBS) - -PKG_CHECK_MODULES(vorbis, [vorbis >= 1.1.2]) -AC_SUBST(vorbis_CFLAGS) -AC_SUBST(vorbis_LIBS) - -PKG_CHECK_MODULES(vorbisfile, [vorbisfile >= 1.1.2]) -AC_SUBST(vorbisfile_CFLAGS) -AC_SUBST(vorbisfile_LIBS) - -AC_CHECK_LIB([boost_regex], - [main], - , - [AC_MSG_ERROR([*** boost_regex library not found!])] -) - -AC_CHECK_LIB([boost_thread], - [main], - , - [AC_MSG_ERROR([*** boost_thread library not found!])] -) - -# TODO: fix this part -AC_CHECK_HEADER([asio.hpp],, -[ - echo "Can't find asio headers. Please install the asio development packages." - echo "You can get them from http://sourceforge.net/projects/asio/" - 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"]) -# TODO: end fix - -AC_OUTPUT([ -Makefile -src/Makefile -]) - -AC_MSG_RESULT([Configuration successful! Now type 'make'.]) Deleted: branches/ogsector/depcomp =================================================================== --- branches/ogsector/depcomp 2007-09-21 16:36:48 UTC (rev 759) +++ branches/ogsector/depcomp 2007-09-22 18:14:53 UTC (rev 760) @@ -1 +0,0 @@ -link /usr/share/automake-1.10/depcomp \ No newline at end of file Deleted: branches/ogsector/install-sh =================================================================== --- branches/ogsector/install-sh 2007-09-21 16:36:48 UTC (rev 759) +++ branches/ogsector/install-sh 2007-09-22 18:14:53 UTC (rev 760) @@ -1 +0,0 @@ -link /usr/share/automake-1.10/install-sh \ No newline at end of file Deleted: branches/ogsector/missing =================================================================== --- branches/ogsector/missing 2007-09-21 16:36:48 UTC (rev 759) +++ branches/ogsector/missing 2007-09-22 18:14:53 UTC (rev 760) @@ -1 +0,0 @@ -link /usr/share/automake-1.10/missing \ No newline at end of file Deleted: branches/ogsector/ogre.cfg =================================================================== --- branches/ogsector/ogre.cfg 2007-09-21 16:36:48 UTC (rev 759) +++ branches/ogsector/ogre.cfg 2007-09-22 18:14:53 UTC (rev 760) @@ -1,7 +0,0 @@ -Render System=OpenGL Rendering Subsystem - -[OpenGL Rendering Subsystem] -FSAA=6 -Full Screen=No -RTT Preferred Mode=FBO -Video Mode=1280 x 1024 Deleted: branches/ogsector/plugins.cfg =================================================================== --- branches/ogsector/plugins.cfg 2007-09-21 16:36:48 UTC (rev 759) +++ branches/ogsector/plugins.cfg 2007-09-22 18:14:53 UTC (rev 760) @@ -1,12 +0,0 @@ -# Defines plugins to load - -# Define plugin folder -PluginFolder=/usr/lib/OGRE - -# Define D3D rendering implementation plugin -Plugin=RenderSystem_GL.so -Plugin=Plugin_ParticleFX.so -Plugin=Plugin_BSPSceneManager.so -Plugin=Plugin_OctreeSceneManager.so -Plugin=Plugin_CgProgramManager.so - Deleted: branches/ogsector/resources.cfg =================================================================== --- branches/ogsector/resources.cfg 2007-09-21 16:36:48 UTC (rev 759) +++ branches/ogsector/resources.cfg 2007-09-22 18:14:53 UTC (rev 760) @@ -1,40 +0,0 @@ -# Resource locations to be added to the 'boostrap' path -# This also contains the minimum you need to use the Ogre example framework -[Bootstrap] -FileSystem=../../trunk/data/startup - -# Resource locations to be added to the default path -[General] -FileSystem=../../trunk/data/ -FileSystem=../../trunk/data/commodities -FileSystem=../../trunk/data/capacitors -FileSystem=../../trunk/data/engines -FileSystem=../../trunk/data/radars -FileSystem=../../trunk/data/shields -FileSystem=../../trunk/data/ECMs -FileSystem=../../trunk/data/power_plants -FileSystem=../../trunk/data/guns -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/stations -FileSystem=../../trunk/data/misc/asteroids - -FileSystem=./data -FileSystem=./data/materials -FileSystem=./data/textures -FileSystem=./data/asteroids -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/schemes/opengate -Zip=./data/simpleSkybox.zip -Zip=./data/fonts.zip -# -FileSystem=./data/MediaFromOgre -FileSystem=./data/MediaFromOgre/AdvancedMaterials -#FileSystem=./data/local/astro Deleted: branches/ogsector/runClient.sh =================================================================== --- branches/ogsector/runClient.sh 2007-09-21 16:36:48 UTC (rev 759) +++ branches/ogsector/runClient.sh 2007-09-22 18:14:53 UTC (rev 760) @@ -1,13 +0,0 @@ -#!/bin/bash - -USERNAME='player' - -HOSTNAME='localhost' - -[ $# -gt 0 ] && USERNAME=$1 - -[ $# -gt 1 ] && HOSTNAME=$2 - -export LD_LIBRARY_PATH=./externals/lib:$LD_LIBRARY_PATH - -./src/opengateclient --no-config $* Deleted: branches/ogsector/runServer.sh =================================================================== --- branches/ogsector/runServer.sh 2007-09-21 16:36:48 UTC (rev 759) +++ branches/ogsector/runServer.sh 2007-09-22 18:14:53 UTC (rev 760) @@ -1,4 +0,0 @@ -#!/bin/bash -export LD_LIBRARY_PATH=./externals/lib:$LD_LIBRARY_PATH - -./src/opengateserver Copied: trunk/AUTHORS (from rev 759, branches/ogsector/AUTHORS) =================================================================== --- trunk/AUTHORS (rev 0) +++ trunk/AUTHORS 2007-09-22 18:14:53 UTC (rev 760) @@ -0,0 +1,3 @@ +Carsten <spo...@us...> +Christoph Brill <eg...@us...> +Gary Luck <ult...@us...> Copied: trunk/COPYING (from rev 759, branches/ogsector/COPYING) =================================================================== --- trunk/COPYING (rev 0) +++ trunk/COPYING 2007-09-22 18:14:53 UTC (rev 760) @@ -0,0 +1 @@ +link /usr/share/automake-1.10/COPYING \ No newline at end of file Copied: trunk/ChangeLog (from rev 759, branches/ogsector/ChangeLog) =================================================================== Copied: trunk/INSTALL (from rev 759, branches/ogsector/INSTALL) =================================================================== --- trunk/INSTALL (rev 0) +++ trunk/INSTALL 2007-09-22 18:14:53 UTC (rev 760) @@ -0,0 +1 @@ +link /usr/share/automake-1.10/INSTALL \ No newline at end of file Copied: trunk/Makefile.am (from rev 759, branches/ogsector/Makefile.am) =================================================================== --- trunk/Makefile.am (rev 0) +++ trunk/Makefile.am 2007-09-22 18:14:53 UTC (rev 760) @@ -0,0 +1,9 @@ +SUBDIRS = src + +distclean: maintainer-clean + rm -rf *~ + rm -rf autom4te.cache + rm -rf configure + rm -rf Makefile.in + rm -rf Ogre.log + rm -rf opcode.log Copied: trunk/NEWS (from rev 759, branches/ogsector/NEWS) =================================================================== Copied: trunk/Opengate.anjuta (from rev 759, branches/ogsector/Opengate.anjuta) =================================================================== --- trunk/Opengate.anjuta (rev 0) +++ trunk/Opengate.anjuta 2007-09-22 18:14:53 UTC (rev 760) @@ -0,0 +1,44 @@ +<?xml version="1.0"?> +<anjuta> + <plugin name="GBF Project Manager" + url="http://anjuta.org/plugins/" + mandatory="yes"> + <require group="Anjuta Plugin" + attribute="Interfaces" + value="IAnjutaProjectManager"/> + <require group="Project" + attribute="Supported-Project-Types" + value="automake"/> + </plugin> + <plugin name="Symbol Browser" + url="http://anjuta.org/plugins/" + mandatory="yes"> + <require group="Anjuta Plugin" + attribute="Location" + value="anjuta-symbol-browser:SymbolBrowserPlugin"/> + </plugin> + <plugin name="Make Build System" + url="http://anjuta.org/plugins/" + mandatory="yes"> + <require group="Anjuta Plugin" + attribute="Interfaces" + value="IAnjutaBuildable"/> + <require group="Build" + attribute="Supported-Build-Types" + value="make"/> + </plugin> + <plugin name="Task Manager" + url="http://anjuta.org/plugins/" + mandatory="no"> + <require group="Anjuta Plugin" + attribute="Interfaces" + value="IAnjutaTodo"/> + </plugin> + <plugin name="Debug Manager" + url="http://anjuta.org/plugins/" + mandatory="no"> + <require group="Anjuta Plugin" + attribute="Interfaces" + value="IAnjutaDebuggerManager"/> + </plugin> +</anjuta> Copied: trunk/README (from rev 759, branches/ogsector/README) =================================================================== --- trunk/README (rev 0) +++ trunk/README 2007-09-22 18:14:53 UTC (rev 760) @@ -0,0 +1,52 @@ +-- 0.0.2 -- +Not yet testet with other players +need test Nr.2 ;) + +- changed netprotocol to TCP (my router hangs with udp, I dont know why), port: 1234 +- add simple interpolation and extrapolation for smooth movement at higher pings or packetloss +(spawned ships still jiggle a bit) +- clear register/deregister of spawns and playerships +- add network protocol for: registering ships, ship status changed, ship hit by ammo + +-- 0.0.1 -- +do not fly online +At test Nr.1 my router died 2 times. +Lost packets lead to crazy behaviour of the vessels. + +----------------------------------------------------------------------- +For installation: + +you will need: +Ogre-1.2 +>=freealut-1.0.1 + +Build externals (libgrapple, OIS, OgreOpode) + +cd ./externals +sh genExternals.sh all +cd .. + +For building ogsector simple run: +./bootstrap +./configure +make -j3 + +For running the ogsectorclient you have to custumise: + +plugins.cfg +ogre.cfg +runClient.sh + +then +./runClient.sh + +# start a server (optional) +./runServer.sh + +If you want to test the openALsoundManager you have to take care that your LD_LIBRARY_PATH knows the external libs + +src/testopenalmanager + +Enjoy this first technical proof of concept. + +Spom Copied: trunk/TODO.cbrill (from rev 759, branches/ogsector/TODO.cbrill) =================================================================== --- trunk/TODO.cbrill (rev 0) +++ trunk/TODO.cbrill 2007-09-22 18:14:53 UTC (rev 760) @@ -0,0 +1,6 @@ +before first release: +* use metaserver for servers to manage sectors +* remove ogre dependency from server +* remove ois dependency from server +* remove testopenalmanager once the client is done +* fix "make dist" with ogreopcode external stuff Copied: trunk/TODO.gluck (from rev 759, branches/ogsector/TODO.gluck) =================================================================== --- trunk/TODO.gluck (rev 0) +++ trunk/TODO.gluck 2007-09-22 18:14:53 UTC (rev 760) @@ -0,0 +1,8 @@ +before first release: +* xml dateien f\xFCr die galaxien erzeugen +* nebulars aufnehmen +* metaserver f\xFCr die sektorverwaltung vorbereiten +* 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 Copied: trunk/ToDo (from rev 759, branches/ogsector/ToDo) =================================================================== --- trunk/ToDo (rev 0) +++ trunk/ToDo 2007-09-22 18:14:53 UTC (rev 760) @@ -0,0 +1,201 @@ +Das Fluggef\xFChl mit Joy oder Maus brauch noch finetuning aber prinzipiell kommt es schon vertraut vor. +Ein leerer und leichter Apty ist schon m\xE4chtig wendig. Mal schaun wie es mit einer 500er Titan TOW wird. + +Done: + +- Class: Sector + - enth\xE4llt alle Informationen des Sector (noMovable, movable und avatar) + - add/new/remove/update aller Objecte erfolgt \xFCber den Sector + - setor content by xml-file + +- Class: SectorClient (Verwaltung) + - HauptKlasse enth\xE4llt Sector und SectorCientFrameListener + +- Class: SectorObject + - movable Klasse, bekommt, prozentuale Drehbewegung und Schub und berechnet damit selbst das movement im Sector. Das Objekt hat graphische Eigenschaften damit es direkt dargestellt werden kann. + Das Objekt kann von aussen (Sektor) leicht gesteuert werden, (per Netcode, Ai oder Player). + Gibt man dem Framlistener eine camera mit Position des PlayerShip->mainNode hat man first persons view aus dem Schiff. + - jaw, pitch, roll + - Thrust, break, afterburner + - Thrusterpartikel support + +- InputManager supports key/mouse/joy + +- camera toggle + +- Testsector mit diversen Objekten + - 2 simple skyboxes without Stars (OpenGate/SimpleSkyBox1, OpenGate/SimpleSkyBox1) + +- Simplest HUD + - Position, + - Speed/MaxSpeed + - Acceleration + - Mousecursor + - Bullseye/VCT-1 (Duelist) + - JG-like Radar + +- Simplest global chat + + +Questions: + - depends yaw/pitch/roll-factor on curr. speed/thrust (testing and implement) + - breaking fixed negtiv percentate thrust or fixed acc. (testing and implement) + +ToDo: + +- global/code + - cleaning / refaktoring + - integrate in currect OpenGate framework +# - add licence header + - mark third persons thingies (mousecursor, skybox) +#ALT-TAB - free mousepointer from widget contents + - fullscreen switch (probably not supported by ogre) + - show Whos online +- chat +# - console for input +# - input/output highlight +# - multiple out-lines +# - log to file + - channeling + +- netcode + - communication: client->server->client + - cheatprotection + +- testsector +# - show all shipmodels + - show all objects + - skybox with higher resolution + - stars +# - planet + +- xml-read +# - read playership data +# - read nonmovable objects +# - read equipment and commodities + - global config + +- openal +# - simplest testing + - soundmanger + +- input + - keymap + - mousemap + - joymap + - colihat -> inputmanager + - force feedback support +# - 1/r sensitivity +# - deathzone "nicyfy" + +- radar targeting +# - cam +# - toggle through + - toggle Astro/Stations/Friends/Enemies/All + - nearest Enemy/Friend + - last Enemy/Friend + - proper radar rotation instead of 0.5 scaling + +- HUD +# - targetarrow +# - target infos +# - duellist +# - bullseye/VCR (??) +# - flydirection arrow +# - colorindex for break/AB/FF +# - shield/ammo + - selected rockets + +- GUI +# - market dialog + - ship config dialog + - global config dialog + - mision dialog + - private trade dialog + +- moving + + - flyindicator particle + +- fire! +# - partikel for ammo +# - object destroyed + - mesh for laser + +- collision detection +# - objects +# - fired partikel + +- station + - landing rings on the big ogrehead-mouth + +- ai +# - simple follow + - calculate fireing solution + - rockets + - pathfinding + - genetic learning + +For the talented: + - particle for thrust + - textures for laser, ammo + - animated textures for explosions + - animated textures shield hit indikator + - animated textures ammo hit indikator + - skyboxes with more content + - proper background sound + - sounds: ammo (fired/hit), explosion (sound in space!! "funny"), thruster + +BUGS: +# - (linux)changing mousefocus by < Alt-TAB > lost key-repeat +# OIS disables autorepeat, fire `xset r on` to enable + + - UTF support (\xFC\xF6\xE4) + since Ogre1.4 Overlay only support Ogre::UTFString, which throws exception by using umlaut + + +IDEAS: + - personal scanmission + - Spieler kann sich mit geeignetem Scanner eine eigene Datenbank von Astro erstellen die ingame abgerufen werden kann, f\xFCr jeden neuen Eintrag gibt es exp(nach Mission/Seltenheit/Gefahrenbereich) + - das erleichtert das Leben (kein Papierkram) und sorgt f\xFCr spielerentropie + + -Leuchtfeuer, manuel und als sectorobject + + Tauseti (technical/scientifical) + -------------------------------- + 1. Lady Kickstart + 2. Fuse guzzler (Sicherungsfresser) + ... + X. Catcher + + Quantar (water) + --------------- + 1. Ebbe + 2. leises Pl\xE4tschern + 3. Str\xF6mung + 4. Wellenschlag + 5. Love wave + 6. Rayleigh waves + 7. Monsterwelle + 8. Brecher + 9. Seegang + 10. Brandung + 11. Flut + 12. Tsunami + 13. See + + Octavius (fire) + --------------- + 1. Funke + 2. Irrlicht + 3. Brand + 4. Leuchtfeuer + 5. Fl\xE4chenbrand + 6. Feuerball + 7. Hitze + 8. Flamme + 9. Sonne + 10. Plasma + 11. Asche + + -Guns: Dazzler \ No newline at end of file Copied: trunk/autogen.sh (from rev 759, branches/ogsector/autogen.sh) =================================================================== --- trunk/autogen.sh (rev 0) +++ trunk/autogen.sh 2007-09-22 18:14:53 UTC (rev 760) @@ -0,0 +1,159 @@ +#!/bin/sh +# Run this to generate all the initial makefiles, etc. + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +DIE=0 + +if [ -n "$GNOME2_DIR" ]; then + ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS" + LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH" + PATH="$GNOME2_DIR/bin:$PATH" + export PATH + export LD_LIBRARY_PATH +fi + +(test -f $srcdir/configure.ac) || { + echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" + echo " top-level package directory" + exit 1 +} + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`autoconf' installed." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(grep "^IT_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && { + (intltoolize --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`intltool' installed." + echo "You can get it from:" + echo " ftp://ftp.gnome.org/pub/GNOME/" + DIE=1 + } +} + +(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.ac >/dev/null) && { + (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`xml-i18n-toolize' installed." + echo "You can get it from:" + echo " ftp://ftp.gnome.org/pub/GNOME/" + DIE=1 + } +} + +(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && { + (libtool --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`libtool' installed." + echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" + DIE=1 + } +} + +(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.ac >/dev/null) && { + (grep "sed.*POTFILES" $srcdir/configure.ac) > /dev/null || \ + (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`glib' installed." + echo "You can get it from: ftp://ftp.gtk.org/pub/gtk" + DIE=1 + } +} + +(automake --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: You must have \`automake' installed." + echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/" + DIE=1 + NO_AUTOMAKE=yes +} + + +# if no automake, don't bother testing for aclocal +test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "**Error**: Missing \`aclocal'. The version of \`automake'" + echo "installed doesn't appear recent enough." + echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +if test -z "$*"; then + echo "**Warning**: I am going to run \`configure' with no arguments." + echo "If you wish to pass any to it, please specify them on the" + echo \`$0\'" command line." + echo +fi + +case $CC in +xlc ) + am_opt=--include-deps;; +esac + +for coin in `find $srcdir -path $srcdir/CVS -prune -o -name configure.ac -print` +do + dr=`dirname $coin` + if test -f $dr/NO-AUTO-GEN; then + echo skipping $dr -- flagged as no auto-gen + else + echo processing $dr + ( cd $dr + + aclocalinclude="$ACLOCAL_FLAGS" + + if grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null; then + echo "Creating $dr/aclocal.m4 ..." + test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 + echo "Running glib-gettextize... Ignore non-fatal messages." + echo "no" | glib-gettextize --force --copy + echo "Making $dr/aclocal.m4 writable ..." + test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 + fi + if grep "^IT_PROG_INTLTOOL" configure.ac >/dev/null; then + echo "Running intltoolize..." + intltoolize --copy --force --automake + fi + if grep "^AM_PROG_XML_I18N_TOOLS" configure.ac >/dev/null; then + echo "Running xml-i18n-toolize..." + xml-i18n-toolize --copy --force --automake + fi + if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then + if test -z "$NO_LIBTOOLIZE" ; then + echo "Running libtoolize..." + libtoolize --force --copy + fi + fi + echo "Running aclocal $aclocalinclude ..." + aclocal $aclocalinclude + if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then + echo "Running autoheader..." + autoheader + fi + echo "Running automake --gnu $am_opt ..." + automake --add-missing --gnu $am_opt + echo "Running autoconf ..." + autoconf + ) + fi +done + +conf_flags="--enable-maintainer-mode" + +if test x$NOCONFIGURE = x; then + echo Running $srcdir/configure $conf_flags "$@" ... + $srcdir/configure $conf_flags "$@" \ + && echo Now type \`make\' to compile. || exit 1 +else + echo Skipping configure process. +fi Copied: trunk/compile (from rev 759, branches/ogsector/compile) =================================================================== --- trunk/compile (rev 0) +++ trunk/compile 2007-09-22 18:14:53 UTC (rev 760) @@ -0,0 +1 @@ +link /usr/share/automake-1.10/compile \ No newline at end of file Copied: trunk/configure.ac (from rev 759, branches/ogsector/configure.ac) =================================================================== --- trunk/configure.ac (rev 0) +++ trunk/configure.ac 2007-09-22 18:14:53 UTC (rev 760) @@ -0,0 +1,88 @@ +dnl Process this file with autoconf to produce a configure script. +dnl Created by Anjuta application wizard. + +AC_PREREQ(2.59) +AC_INIT([opengate], [0.0.1], [http://sourceforge.net/projects/opengate/]) + +AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION, [dist-bzip2]) +AM_CONFIG_HEADER(config.h) +AM_MAINTAINER_MODE +AM_INIT_AUTOMAKE(ogsector, 0.0.1) + +AC_ISC_POSIX +AC_LANG_CPLUSPLUS +AC_PROG_CXX +AM_PROG_CC_STDC +AC_HEADER_STDC +AM_PROG_CC_C_O + +# TODO: remove this part +OGSECTOR_PATH=$PWD +AC_PREFIX_DEFAULT($OGSECTOR_PATH) +OGSECTOR_EXTERNALS_PATH=$OGSECTOR_PATH/externals +AC_SUBST(OGSECTOR_EXTERNALS_PATH) +AC_SUBST(PKG_CONFIG_PATH, "$OGSECTOR_EXTERNALS_PATH/lib/pkgconfig:$PKG_CONFIG_PATH") +# TODO: end remove + +AM_PROG_LIBTOOL + +PKG_CHECK_MODULES(OGRE, [OGRE >= 1.4.0]) +AC_SUBST(OGRE_CFLAGS) +AC_SUBST(OGRE_LIBS) + +PKG_CHECK_MODULES(CEGUI, [CEGUI >= 0.5.0]) +AC_SUBST(CEGUI_CFLAGS) +AC_SUBST(CEGUI_LIBS) + +PKG_CHECK_MODULES(CEGUIOGRE, [CEGUI-OGRE >= 1.4.0]) +AC_SUBST(CEGUIOGRE_CFLAGS) +AC_SUBST(CEGUIOGRE_LIBS) + +PKG_CHECK_MODULES(OIS, [OIS >= 1.0.0]) +AC_SUBST(OIS_CFLAGS) +AC_SUBST(OIS_LIBS) + +PKG_CHECK_MODULES(freealut, [freealut >= 1.0.1]) +AC_SUBST(freealut_CFLAGS) +AC_SUBST(freealut_LIBS) + +PKG_CHECK_MODULES(vorbis, [vorbis >= 1.1.2]) +AC_SUBST(vorbis_CFLAGS) +AC_SUBST(vorbis_LIBS) + +PKG_CHECK_MODULES(vorbisfile, [vorbisfile >= 1.1.2]) +AC_SUBST(vorbisfile_CFLAGS) +AC_SUBST(vorbisfile_LIBS) + +AC_CHECK_LIB([boost_regex], + [main], + , + [AC_MSG_ERROR([*** boost_regex library not found!])] +) + +AC_CHECK_LIB([boost_thread], + [main], + , + [AC_MSG_ERROR([*** boost_thread library not found!])] +) + +# TODO: fix this part +AC_CHECK_HEADER([asio.hpp],, +[ + echo "Can't find asio headers. Please install the asio development packages." + echo "You can get them from http://sourceforge.net/projects/asio/" + 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"]) +# TODO: end fix + +AC_OUTPUT([ +Makefile +src/Makefile +]) + +AC_MSG_RESULT([Configuration successful! Now type 'make'.]) Copied: trunk/depcomp (from rev 759, branches/ogsector/depcomp) =================================================================== --- trunk/depcomp (rev 0) +++ trunk/depcomp 2007-09-22 18:14:53 UTC (rev 760) @@ -0,0 +1 @@ +link /usr/share/automake-1.10/depcomp \ No newline at end of file Copied: trunk/doc/Doxyfile (from rev 759, branches/ogsector/doc/Doxyfile) =================================================================== --- trunk/doc/Doxyfile (rev 0) +++ trunk/doc/Doxyfile 2007-09-22 18:14:53 UTC (rev 760) @@ -0,0 +1,277 @@ +# Doxyfile 1.5.2 + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- +DOXYFILE_ENCODING = UTF-8 +PROJECT_NAME = opengate +PROJECT_NUMBER = 0.0.1 +OUTPUT_DIRECTORY = ./ +CREATE_SUBDIRS = NO +OUTPUT_LANGUAGE = English +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = YES +ABBREVIATE_BRIEF = "The $name class" \ + "The $name widget" \ + "The $name file" \ + is \ + provides \ + specifies \ + contains \ + represents \ + a \ + an \ + the +ALWAYS_DETAILED_SEC = NO +INLINE_INHERITED_MEMB = NO +FULL_PATH_NAMES = YES +STRIP_FROM_PATH = +STRIP_FROM_INC_PATH = +SHORT_NAMES = NO +JAVADOC_AUTOBRIEF = NO +MULTILINE_CPP_IS_BRIEF = NO +DETAILS_AT_TOP = NO +INHERIT_DOCS = YES +SEPARATE_MEMBER_PAGES = NO +TAB_SIZE = 8 +ALIASES = +OPTIMIZE_OUTPUT_FOR_C = NO +OPTIMIZE_OUTPUT_JAVA = NO +BUILTIN_STL_SUPPORT = NO +CPP_CLI_SUPPORT = NO +DISTRIBUTE_GROUP_DOC = NO +SUBGROUPING = YES +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- +EXTRACT_ALL = YES +EXTRACT_PRIVATE = YES +EXTRACT_STATIC = YES +EXTRACT_LOCAL_CLASSES = YES +EXTRACT_LOCAL_METHODS = YES +HIDE_UNDOC_MEMBERS = YES +HIDE_UNDOC_CLASSES = YES +HIDE_FRIEND_COMPOUNDS = NO +HIDE_IN_BODY_DOCS = NO +INTERNAL_DOCS = NO +CASE_SENSE_NAMES = YES +HIDE_SCOPE_NAMES = NO +SHOW_INCLUDE_FILES = YES +INLINE_INFO = YES +SORT_MEMBER_DOCS = YES +SORT_BRIEF_DOCS = NO +SORT_BY_SCOPE_NAME = NO +GENERATE_TODOLIST = YES +GENERATE_TESTLIST = YES +GENERATE_BUGLIST = YES +GENERATE_DEPRECATEDLIST= YES +ENABLED_SECTIONS = +MAX_INITIALIZER_LINES = 30 +SHOW_USED_FILES = YES +SHOW_DIRECTORIES = NO +FILE_VERSION_FILTER = +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- +QUIET = NO +WARNINGS = YES +WARN_IF_UNDOCUMENTED = YES +WARN_IF_DOC_ERROR = YES +WARN_NO_PARAMDOC = NO +WARN_FORMAT = "$file:$line: $text" +WARN_LOGFILE = +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- +INPUT = ../src/ +INPUT_ENCODING = UTF-8 +FILE_PATTERNS = *.c \ + *.cc \ + *.cxx \ + *.cpp \ + *.c++ \ + *.d \ + *.java \ + *.ii \ + *.ixx \ + *.ipp \ + *.i++ \ + *.inl \ + *.h \ + *.hh \ + *.hxx \ + *.hpp \ + *.h++ \ + *.idl \ + *.odl \ + *.cs \ + *.php \ + *.php3 \ + *.inc \ + *.m \ + *.mm \ + *.dox \ + *.py \ + *.C \ + *.CC \ + *.C++ \ + *.II \ + *.I++ \ + *.H \ + *.HH \ + *.H++ \ + *.CS \ + *.PHP \ + *.PHP3 \ + *.M \ + *.MM \ + *.PY +RECURSIVE = YES +EXCLUDE = +EXCLUDE_SYMLINKS = NO +EXCLUDE_PATTERNS = +EXCLUDE_SYMBOLS = +EXAMPLE_PATH = +EXAMPLE_PATTERNS = * +EXAMPLE_RECURSIVE = NO +IMAGE_PATH = +INPUT_FILTER = +FILTER_PATTERNS = +FILTER_SOURCE_FILES = NO +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- +SOURCE_BROWSER = NO +INLINE_SOURCES = NO +STRIP_CODE_COMMENTS = YES +REFERENCED_BY_RELATION = NO +REFERENCES_RELATION = NO +REFERENCES_LINK_SOURCE = YES +USE_HTAGS = NO +VERBATIM_HEADERS = NO +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- +ALPHABETICAL_INDEX = NO +COLS_IN_ALPHA_INDEX = 5 +IGNORE_PREFIX = +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- +GENERATE_HTML = YES +HTML_OUTPUT = html +HTML_FILE_EXTENSION = .html +HTML_HEADER = +HTML_FOOTER = +HTML_STYLESHEET = +HTML_ALIGN_MEMBERS = YES +GENERATE_HTMLHELP = NO +CHM_FILE = +HHC_LOCATION = +GENERATE_CHI = NO +BINARY_TOC = NO +TOC_EXPAND = NO +DISABLE_INDEX = NO +ENUM_VALUES_PER_LINE = 4 +GENERATE_TREEVIEW = NO +TREEVIEW_WIDTH = 250 +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- +GENERATE_LATEX = NO +LATEX_OUTPUT = latex +LATEX_CMD_NAME = latex +MAKEINDEX_CMD_NAME = makeindex +COMPACT_LATEX = NO +PAPER_TYPE = a4wide +EXTRA_PACKAGES = +LATEX_HEADER = +PDF_HYPERLINKS = NO +USE_PDFLATEX = NO +LATEX_BATCHMODE = NO +LATEX_HIDE_INDICES = NO +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- +GENERATE_RTF = NO +RTF_OUTPUT = rtf +COMPACT_RTF = NO +RTF_HYPERLINKS = NO +RTF_STYLESHEET_FILE = +RTF_EXTENSIONS_FILE = +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- +GENERATE_MAN = NO +MAN_OUTPUT = man +MAN_EXTENSION = .3 +MAN_LINKS = NO +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- +GENERATE_XML = NO +XML_OUTPUT = xml +XML_SCHEMA = +XML_DTD = +XML_PROGRAMLISTING = YES +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- +GENERATE_AUTOGEN_DEF = NO +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- +GENERATE_PERLMOD = NO +PERLMOD_LATEX = NO +PERLMOD_PRETTY = YES +PERLMOD_MAKEVAR_PREFIX = +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- +ENABLE_PREPROCESSING = YES +MACRO_EXPANSION = NO +EXPAND_ONLY_PREDEF = NO +SEARCH_INCLUDES = YES +INCLUDE_PATH = +INCLUDE_FILE_PATTERNS = +PREDEFINED = +EXPAND_AS_DEFINED = +SKIP_FUNCTION_MACROS = YES +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- +TAGFILES = +GENERATE_TAGFILE = +ALLEXTERNALS = NO +EXTERNAL_GROUPS = YES +PERL_PATH = /usr/bin/perl +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- +CLASS_DIAGRAMS = YES +MSCGEN_PATH = +HIDE_UNDOC_RELATIONS = YES +HAVE_DOT = YES +CLASS_GRAPH = YES +COLLABORATION_GRAPH = YES +GROUP_GRAPHS = YES +UML_LOOK = NO +TEMPLATE_RELATIONS = NO +INCLUDE_GRAPH = YES +INCLUDED_BY_GRAPH = YES +CALL_GRAPH = NO +CALLER_GRAPH = NO +GRAPHICAL_HIERARCHY = YES +DIRECTORY_GRAPH = YES +DOT_IMAGE_FORMAT = png +DOT_PATH = +DOTFILE_DIRS = +DOT_GRAPH_MAX_NODES = 50 +DOT_TRANSPARENT = NO +DOT_MULTI_TARGETS = NO +GENERATE_LEGEND = YES +DOT_CLEANUP = YES +#--------------------------------------------------------------------------- +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO Copied: trunk/externals (from rev 759, branches/ogsector/externals) Copied: trunk/install-sh (from rev 759, branches/ogsector/install-sh) =================================================================== --- trunk/install-sh (rev 0) +++ trunk/install-sh 2007-09-22 18:14:53 UTC (rev 760) @@ -0,0 +1 @@ +link /usr/share/automake-1.10/install-sh \ No newline at end of file Copied: trunk/missing (from rev 759, branches/ogsector/missing) =================================================================== --- trunk/missing (rev 0) +++ trunk/missing 2007-09-22 18:14:53 UTC (rev 760) @@ -0,0 +1 @@ +link /usr/share/automake-1.10/missing \ No newline at end of file Copied: trunk/ogre.cfg (from rev 759, branches/ogsector/ogre.cfg) =================================================================== --- trunk/ogre.cfg (rev 0) +++ trunk/ogre.cfg 2007-09-22 18:14:53 UTC (rev 760) @@ -0,0 +1,7 @@ +Render System=OpenGL Rendering Subsystem + +[OpenGL Rendering Subsystem] +FSAA=6 +Full Screen=No +RTT Preferred Mode=FBO +Video Mode=1280 x 1024 Copied: trunk/plugins.cfg (from rev 759, branches/ogsector/plugins.cfg) =================================================================== --- trunk/plugins.cfg (rev 0) +++ trunk/plugins.cfg 2007-09-22 18:14:53 UTC (rev 760) @@ -0,0 +1,12 @@ +# Defines plugins to load + +# Define plugin folder +PluginFolder=/usr/lib/OGRE + +# Define D3D rendering implementation plugin +Plugin=RenderSystem_GL.so +Plugin=Plugin_ParticleFX.so +Plugin=Plugin_BSPSceneManager.so +Plugin=Plugin_OctreeSceneManager.so +Plugin=Plugin_CgProgramManager.so + Copied: trunk/resources.cfg (from rev 759, branches/ogsector/resources.cfg) =================================================================== --- trunk/resources.cfg (rev 0) +++ trunk/resources.cfg 2007-09-22 18:14:53 UTC (rev 760) @@ -0,0 +1,40 @@ +# Resource locations to be added to the 'boostrap' path +# This also contains the minimum you need to use the Ogre example framework +[Bootstrap] +FileSystem=../../trunk/data/startup + +# Resource locations to be added to the default path +[General] +FileSystem=../../trunk/data/ +FileSystem=../../trunk/data/commodities +FileSystem=../../trunk/data/capacitors +FileSystem=../../trunk/data/engines +FileSystem=../../trunk/data/radars +FileSystem=../../trunk/data/shields +FileSystem=../../trunk/data/ECMs +FileSystem=../../trunk/data/power_plants +FileSystem=../../trunk/data/guns +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/stations +FileSystem=../../trunk/data/misc/asteroids + +FileSystem=./data +FileSystem=./data/materials +FileSystem=./data/textures +FileSystem=./data/asteroids +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/schemes/opengate +Zip=./data/simpleSkybox.zip +Zip=./data/fonts.zip +# +FileSystem=./data/MediaFromOgre +FileSystem=./data/MediaFromOgre/AdvancedMaterials +#FileSystem=./data/local/astro Copied: trunk/runClient.sh (from rev 759, branches/ogsector/runClient.sh) =================================================================== --- trunk/runClient.sh (rev 0) +++ trunk/runClient.sh 2007-09-22 18:14:53 UTC (rev 760) @@ -0,0 +1,13 @@ +#!/bin/bash + +USERNAME='player' + +HOSTNAME='localhost' + +[ $# -gt 0 ] && USERNAME=$1 + +[ $# -gt 1 ] && HOSTNAME=$2 + +export LD_LIBRARY_PATH=./externals/lib:$LD_LIBRARY_PATH + +./src/opengateclient --no-config $* Copied: trunk/runServer.sh (from rev 759, branches/ogsector/runServer.sh) =================================================================== --- trunk/runServer.sh (rev 0) +++ trunk/runServer.sh 2007-09-22 18:14:53 UTC (rev 760) @@ -0,0 +1,4 @@ +#!/bin/bash +export LD_LIBRARY_PATH=./externals/lib:$LD_LIBRARY_PATH + +./src/opengateserver Copied: trunk/win32 (from rev 759, branches/ogsector/win32) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |