Changeset 98 for code/branches

Timestamp:

Oct 24, 2007, 8:09:52 PM (16 years ago)

Author:

anonymous

Message:

 

Location:

code/branches/network

Files:

• CMakeCache.txt (deleted)
• Orxonox.kdevelop (modified) (8 diffs)
• Orxonox.kdevelop.filelist (modified) (1 diff)
• Orxonox.kdevses (modified) (1 diff)
• src/orxonox.cc (modified) (1 diff)

code/branches/network/Orxonox.kdevelop

@@ -2 +2 @@
 <kdevelop>
   <general>
-    <author></author>
-    <email></email>
+    <author/>
+    <email/>
     <version>$VERSION$</version>
     <projectmanagement>KDevCustomProject</projectmanagement>
@@ -14 +14 @@
     </secondaryLanguages>
     <projectname>Orxonox</projectname>
-    <description></description>
-    <defaultencoding></defaultencoding>
+    <description/>
+    <defaultencoding/>
   </general>
   <kdevcustomproject>
@@ -23 +23 @@
       <directoryradio>custom</directoryradio>
       <customdirectory>/home/scheusso/orxonox/network</customdirectory>
-      <programargs></programargs>
+      <programargs/>
       <terminal>false</terminal>
       <autocompile>true</autocompile>
       <envvars/>
-      <globaldebugarguments></globaldebugarguments>
+      <globaldebugarguments/>
       <globalcwd>/home/scheusso/orxonox/network/bin/</globalcwd>
       <useglobalprogram>false</useglobalprogram>
@@ -41 +41 @@
       <numberofjobs>1</numberofjobs>
       <dontact>false</dontact>
-      <makebin></makebin>
+      <makebin/>
       <selectedenvironment>default</selectedenvironment>
       <environments>
@@ -47 +47 @@
       </environments>
       <prio>0</prio>
-      <defaulttarget></defaulttarget>
+      <defaulttarget/>
       <makeoptions>-I ./net/</makeoptions>
     </make>
@@ -69 +69 @@
     <other>
       <prio>0</prio>
-      <otherbin></otherbin>
-      <defaulttarget></defaulttarget>
-      <otheroptions></otheroptions>
+      <otherbin/>
+      <defaulttarget/>
+      <otheroptions/>
       <selectedenvironment>default</selectedenvironment>
       <environments>
@@ -136 +136 @@
       <version>3</version>
       <includestyle>3</includestyle>
-      <root>/usr/pack/qt-3.3.6-mo/i686-debian-linux3.1</root>
+      <root>/usr/qt/3</root>
       <designerintegration>EmbeddedKDevDesigner</designerintegration>
-      <qmake>/usr/pack/qt-3.3.6-mo/i686-debian-linux3.1/bin/qmake</qmake>
-      <designer>/usr/pack/qt-3.3.6-mo/i686-debian-linux3.1/bin/designer</designer>
+      <qmake>/usr/qt/3/bin/qmake</qmake>
+      <designer>/usr/qt/3/bin/designer</designer>
       <designerpluginpaths/>
     </qt>
     <creategettersetter>
-      <prefixGet></prefixGet>
+      <prefixGet/>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
@@ -172 +172 @@
   <kdevdebugger>
     <general>
-      <gdbpath></gdbpath>
-      <dbgshell></dbgshell>
-      <configGdbScript></configGdbScript>
-      <runShellScript></runShellScript>
-      <runGdbScript></runGdbScript>
+      <gdbpath/>
+      <dbgshell/>
+      <configGdbScript/>
+      <runShellScript/>
+      <runGdbScript/>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>

code/branches/network/Orxonox.kdevelop.filelist

@@ -9 +9 @@
 Makefile
 src
-src/Makefile
+zig2.1.0
+zig2.1.0/minigame
+zig2.1.0/minigame/conalleg.cpp
+zig2.1.0/minigame/conalleg.h
+zig2.1.0/minigame/gameclient.cpp
+zig2.1.0/minigame/gameclient.h
+zig2.1.0/minigame/gameserver.cpp
+zig2.1.0/minigame/gameserver.h
+zig2.1.0/minigame/main.cpp
+zig2.1.0/minigame/main.h
+zig2.1.0/minigame/Makefile
+zig2.1.0/ziglib
+zig2.1.0/ziglib/include
+zig2.1.0/ziglib/include/nl.h
+zig2.1.0/ziglib/include/zig
+zig2.1.0/ziglib/include/zig/address.h
+zig2.1.0/ziglib/include/zig/buffer.h
+zig2.1.0/ziglib/include/zig/bzip2.h
+zig2.1.0/ziglib/include/zig/client.h
+zig2.1.0/ziglib/include/zig/console.h
+zig2.1.0/ziglib/include/zig/leetnet.h
+zig2.1.0/ziglib/include/zig/log.h
+zig2.1.0/ziglib/include/zig/msocket.h
+zig2.1.0/ziglib/include/zig/pfilesys.h
+zig2.1.0/ziglib/include/zig/server.h
+zig2.1.0/ziglib/include/zig/serverinfo.h
+zig2.1.0/ziglib/include/zig/station.h
+zig2.1.0/ziglib/include/zig/typereg.h
+zig2.1.0/ziglib/include/zig/utils.h
+zig2.1.0/ziglib/include/zig/zigclient.h
+zig2.1.0/ziglib/include/zig/zigdefs.h
+zig2.1.0/ziglib/include/zig/zig.h
+zig2.1.0/ziglib/include/zig/zigserver.h
+zig2.1.0/ziglib/src
+zig2.1.0/ziglib/src/address.cpp
+zig2.1.0/ziglib/src/buffer.cpp
+zig2.1.0/ziglib/src/bzip2.cpp
+zig2.1.0/ziglib/src/client.cpp
+zig2.1.0/ziglib/src/console.cpp
+zig2.1.0/ziglib/src/log.cpp
+zig2.1.0/ziglib/src/Makefile
+zig2.1.0/ziglib/src/msocket.cpp
+zig2.1.0/ziglib/src/pfilesys.cpp
+zig2.1.0/ziglib/src/server.cpp
+zig2.1.0/ziglib/src/serverinfo.cpp
+zig2.1.0/ziglib/src/station.cpp
+zig2.1.0/ziglib/src/typereg.cpp
+zig2.1.0/ziglib/src/utils.cpp
+zig2.1.0/ziglib/src/zigclient.cpp
+zig2.1.0/ziglib/src/zig.cpp
+zig2.1.0/ziglib/src/zigserver.cpp

code/branches/network/Orxonox.kdevses

@@ -2 +2 @@
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="2" >
-  <Doc0 NumberOfViews="1" URL="file:///home/scheusso/orxonox/network/src/orxonox.cc" >
-   <View0 Encoding="" line="27" Type="Source" />
+ <DocsAndViews NumberOfDocuments="1" >
+  <Doc0 NumberOfViews="1" URL="file:///pub/eth/orxonox/network/src/orxonox.cc" >
+   <View0 Encoding="" line="0" Type="Source" />
   </Doc0>
-  <Doc1 NumberOfViews="1" URL="file:///home/scheusso/orxonox/network/src/tnl/tnlVector.h" >
-   <View0 Encoding="" line="316" Type="Source" />
-  </Doc1>
  </DocsAndViews>
  <pluginList>

code/branches/network/src/orxonox.cc

@@ -26 +26 @@
  */
 
-#include "tnl.h" 
-#include "tnlEventConnection.h" 
-#include "tnlNetInterface.h" 
-#include "tnlRPC.h" 
-#include <stdio.h> 
-bool gQuit = false; // a flag used when the client wants to quit. using namespace TNL; // make sure we can simply use the TNL classes. 
+// TODO: Change this to orxonox.h and include all necessary functions there
+#include "ExampleApplication.h"
 
-class SimpleEventConnection : public EventConnection
+// TODO: Put creation of SceneNode and implementation of FrameListener into an extern file
+SceneNode *lightNode;
+
+class FrameListener : public ExampleFrameListener
 {
-    typedef EventConnection Parent;
+  public:
+    FrameListener(RenderWindow* win, Camera* cam, SceneManager *sceneMgr)
+  : ExampleFrameListener(win, cam, false, false)
+    {
+    }
 
-public:
-    // Let the network system know this is a valid network connection.
-    TNL_DECLARE_NETCONNECTION(SimpleEventConnection);
+    bool frameStarted(const FrameEvent &evt)
+    {
+        // add tutorial code here:
+        // ...
+      lightNode->translate(Vector3(0, -10 * evt.timeSinceLastFrame, 0));
 
-    // declare the client to server message
-    TNL_DECLARE_RPC(rpcMessageClientToServer, (const char *theMessageString));
-
-    // declare the server to client message
-    TNL_DECLARE_RPC(rpcMessageServerToClient, (const char *theMessageString));
+      return ExampleFrameListener::frameStarted(evt);
+    }
+  private:
 };
 
-TNL_IMPLEMENT_NETCONNECTION(SimpleEventConnection, NetClassGroupGame, true);
-
-TNL_IMPLEMENT_RPC(SimpleEventConnection, rpcMessageClientToServer, (const char *messageString), NetClassGroupGameMask, RPCGuaranteedOrdered, RPCDirClientToServer, 0)
+// TODO: Make Doxygen tags work and create scene AFTER loading in an extern file
+//! This is the application class of Orxonox
+/**
+  Application class. The starting point of Orxonox.
+  Loading of ressources should start in here.
+  ...
+*/
+class Orxonox : public ExampleApplication
 {
-    // display the message the client sent
-    printf("Got message from client: %s\n", messageString);
-    // send a hello world back to the client.
-    rpcMessageServerToClient("Hello, World!");
-}
-
-TNL_IMPLEMENT_RPC(SimpleEventConnection, rpcMessageServerToClient, (const char *messageString), NetClassGroupGameMask, RPCGuaranteedOrdered, RPCDirServerToClient, 0)
-{
-    // display the message the server sent
-    printf("Got a message from server: %s\n", messageString);
-
-    // once the client has heard back from the server, it should quit.
-    gQuit = true;
-}
-
-int main(int argc, const char **argv)
-{
-    if(argc != 3)
+  protected:
+  public:
+    Orxonox()
     {
-        printf("usage: simpletnltest <-server|-client> <connectAddress>");
-        return 1;
-    }
-    bool isClient = !strcmp(argv[1], "-client");
-
-    // convert the command-line address into TNL address form
-    Address cmdAddress(argv[2]);
-
-    RefPtr<NetInterface> theNetInterface;
-    if(isClient)
-    {
-        Address bindAddress(IPProtocol, Address::Any, 0);
-
-        // create a new NetInterface bound to any interface, any port (0)
-        theNetInterface = new NetInterface(bindAddress);
-        
-        // create a new SimpleEventConnection and tell it to connect to the
-        // server at cmdAddress.
-        SimpleEventConnection *newConnection = new SimpleEventConnection;
-        newConnection->connect(theNetInterface, cmdAddress);
-
-        // post an RPC, to be executed when the connection is established
-        newConnection->rpcMessageClientToServer("Hello??");
-    }
-    else
-    {
-        // create a server net interface, bound to the cmdAddress
-        theNetInterface = new NetInterface(cmdAddress);
-
-        // notify the NetInterface that it can allow connections
-        theNetInterface->setAllowsConnections(true);
     }
 
-    // now just loop, processing incoming packets and sending outgoing packets
-    // until the global quit flag is set.
-    while(!gQuit)
+    ~Orxonox()
     {
-         theNetInterface->checkIncomingPackets();
-         theNetInterface->processConnections();
-         Platform::sleep(1);
     }
-    return 0;
+  protected:
+    void createCamera(void)
+    {
+        // create camera
+      mCamera = mSceneMgr->createCamera("PlayerCam");
+      mCamera->setNearClipDistance(5);
+      mCamera->setPosition(Vector3(0,10,500));
+      mCamera->lookAt(Vector3(0,0,0));
+    }
+
+    void createScene(void)
+    {
+        // add tutorial code here:
+        // ...
+      mSceneMgr->setAmbientLight( ColourValue( 0.3, 0.3, 0.3 ) );
+      //Entity* head = mSceneMgr->createEntity("head", "ogrehead.mesh");
+
+      //Entity* head2 = mSceneMgr->createEntity("head2", "ogrehead.mesh");
+
+      SceneNode *node = mSceneMgr->getRootSceneNode()->createChildSceneNode( "OgreHeadNode", Vector3( 0, 0, 0 ) );
+      //node->attachObject( head );
+
+      SceneNode *node2 = mSceneMgr->getRootSceneNode()->createChildSceneNode( "OgreHeadNode2", Vector3( 50, 0, 0 ) );
+      //node2->attachObject( head2 );
+
+
+      //mSceneMgr->setSkyBox(true, "Examples/SpaceSkyBox");
+
+      Light *light = mSceneMgr->createLight("Light1");
+      light->setType(Light::LT_POINT);
+      light->setPosition(Vector3(0, 100, 0));
+      light->setDiffuseColour(0.5, 0.5, 0.0);
+      light->setSpecularColour(0.5, 0.5, 0.0);
+
+      BillboardSet *bbs = mSceneMgr->createBillboardSet("bb", 1);
+      bbs->createBillboard(Vector3::ZERO, ColourValue(1.0, 0.0, 0.0));
+      //bbs->setMaterialName("Examples/Flare");
+
+      lightNode = mSceneMgr->getRootSceneNode()->createChildSceneNode("LightNode", Vector3(0, 100, 0));
+      lightNode->attachObject(bbs);
+      lightNode->attachObject(light);
+      light->setPosition(0.0, 0.0, 0.0);
+    }
+
+    void createFrameListener(void)
+    {
+        // create frame listener
+      mFrameListener = new ExampleFrameListener(mWindow, mCamera, mSceneMgr);
+      mRoot->addFrameListener(mFrameListener);
+    }
+};
+
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#define WIN32_LEAN_AND_MEAN
+#include "windows.h"
+
+INT WINAPI WinMain( HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT )
+#else
+
+int main(int argc, char **argv)
+#endif
+{
+  // Create application object
+  Orxonox orxonox;
+
+  try {
+    orxonox.go();
+  } catch( Exception& e ) {
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+    MessageBox( NULL, e.getFullDescription().c_str(), "An exception has occurred!", MB_OK | MB_ICONERROR | MB_TASKMODAL);
+#else
+    fprintf(stderr, "An exception has occurred: %s\n",
+            e.getFullDescription().c_str());
+#endif
+  }
+
+  return 0;
 }