Changeset 2105 in orxonox.OLD for orxonox

Timestamp:

Jul 11, 2004, 3:14:52 PM (20 years ago)

Author:

chris

Message:

orxonox/branches/chris: Port to SDL complete. Everything compiles and the generated executable runs without crashing. Keyboard and mouse handling works. Drawing is messed up, possibly because of my incompetent Rotation class. Hence all you see at them moment is a pitch black screen. I added the makefile I used to compile it since bensch hasn't yet included SDL into the configure script.

Location:

orxonox/branches/chris/src

Files:

• Makefile (added)
• command_node.cc (modified) (9 diffs)
• command_node.h (modified) (1 diff)
• keynames.cc (modified) (2 diffs)
• orxonox.cc (modified) (7 diffs)
• orxonox.conf (added)
• orxonox.h (modified) (1 diff)
• player.cc (modified) (1 diff)

orxonox/branches/chris/src/command_node.cc

@@ -22 +22 @@
 #include <stdio.h>
 #include <strings.h>
+#include <stdlib.h>
 
 using namespace std;
@@ -52 +53 @@
         FILE* stream;
         
+        printf("Loading key bindings from %s\n", filename);
+        
         if( filename == NULL) filename = DEFAULT_KEYBIND_FILE;
         
@@ -73 +76 @@
         char namebuf[256];
         char valuebuf[256];
+        memset (namebuf, 0, 256);
+        memset (valuebuf, 0, 256);
         int* index;
 
@@ -81 +86 @@
                 {
                         case 0:
+                                printf("Key binding %d(%s) set to %s\n", index[1], SDLK_to_keyname( index[1]), valuebuf);
                                 strcpy (aliases->keys[index[1]], valuebuf);
                                 break;
                         case 1:
+                                printf("Button binding %d(%s) set to %s\n", index[1], SDLB_to_buttonname( index[1]), valuebuf);
                                 strcpy (aliases->buttons[index[1]], valuebuf);
                                 break;
@@ -89 +96 @@
                                 break;
                 }
+                memset (namebuf, 0, 256);
+                memset (valuebuf, 0, 256);
         }
 }
@@ -105 +114 @@
 {
         coord[0] = -1;
-        if( (coord[1] = keyname_to_SDLK (name)) != -1) coord[0] = 0;
-        if( (coord[1] = buttonname_to_SDLB (name)) != -1) coord[0] = 1;
+        coord[1] = -1;
+        int c;
+        if( (c = keyname_to_SDLK (name)) != -1)
+        {
+                coord[1] = c;
+                coord[0] = 0;
+        }
+        if( (c = buttonname_to_SDLB (name)) != -1)
+        {
+                coord[1] = c;
+                coord[0] = 1;
+        }
         return coord;
 }
@@ -112 +131 @@
 void CommandNode::process ()
 {
+perror("CommandNode|process()");
         if( bLocalInput) process_local ();
         else process_network ();
@@ -123 +143 @@
         while( SDL_PollEvent (&event))
         {
+                memset (cmd.cmd, 0, CMD_LENGHT); 
                 switch( event.type)
                 {
@@ -173 +194 @@
 void CommandNode::relay (Command* cmd)
 {
+perror("CommandNode|relay()");
         List<WorldEntity>* plist = bound;
         
+        Orxonox *orx = Orxonox::getInstance();
+        if( orx->system_command (cmd)) return;
+                
         if( bLocalInput) send_over_network (cmd);
         

orxonox/branches/chris/src/command_node.h

@@ -42 +42 @@
         KeyBindings* aliases;
         List<WorldEntity>* bound;       //!< List of WorldEntites that recieve commands from this CommandNode
-        int coord[2];
+        Sint32 coord[2];
         
         void relay (Command* cmd);

orxonox/branches/chris/src/keynames.cc

@@ -48 +48 @@
         if( !strcmp (name, "RETURN")) return SDLK_RETURN;
         if( !strcmp (name, "ESCAPE")) return SDLK_ESCAPE;
+        if( !strcmp (name, "SPACE")) return SDLK_SPACE;
         if( !strcmp (name, "EXCLAIM")) return SDLK_EXCLAIM;
         if( !strcmp (name, "QUOTEDBL")) return SDLK_QUOTEDBL;
@@ -184 +185 @@
         if( key == SDLK_CLEAR) return "CLEAR";
         if( key == SDLK_RETURN) return "RETURN";
+        if( key == SDLK_SPACE) return "SPACE";
         if( key == SDLK_ESCAPE) return "ESCAPE";
         if( key == SDLK_EXCLAIM) return "EXCLAIM";

orxonox/branches/chris/src/orxonox.cc

@@ -72 +72 @@
         strcat (configfilename, "/.orxonox.conf");*/
         
-        strcpy (configfilename, "./orxonox.conf");
+        strcpy (configfilename, "orxonox.conf");
 }
 
@@ -119 +119 @@
   int width = 640;
   int height = 480;
-  Uint32 flags = SDL_OPENGL | SDL_GL_DOUBLEBUFFER;
+  Uint32 flags = SDL_HWSURFACE | SDL_OPENGL | SDL_GL_DOUBLEBUFFER;
   
   if( (screen = SDL_SetVideoMode (width, height, bpp, flags)) == NULL)
@@ -187 +187 @@
 {
         bQuitOrxonox = true;
-  //cout << "finished garbage colletion, quitting..." << endl;
 }
 void Orxonox::mainLoop()
 {
         lastframe = SDL_GetTicks();
-
+        bQuitOrxonox = false;
   // This is where everything is run
+printf("Orxonox|Entering main loop\n");
   while( !bQuitOrxonox)
   {
@@ -207 +207 @@
     display();
   }
+printf("Orxonox|Exiting the main loop\n");
 }
 
@@ -244 +245 @@
 }
 
+bool Orxonox::system_command (Command* cmd)
+{
+        if( !strcmp( cmd->cmd, "quit") && !cmd->bUp)
+        {
+                bQuitOrxonox = true;
+                return true;
+        }
+}
+
 void Orxonox::display ()
 {
@@ -254 +264 @@
                 // draw HUD
                 // flip buffers
-        SDL_Flip( screen);
+        SDL_GL_SwapBuffers();
 }
 
@@ -274 +284 @@
 int main (int argc, char** argv) 
 {  
+        printf(">>> Starting Orxonox <<<\n");
   Orxonox *orx = Orxonox::getInstance();
   

orxonox/branches/chris/src/orxonox.h

@@ -53 +53 @@
 
   void event_handler (SDL_Event* event);
+  bool system_command (Command* cmd);
 
   int init (int argc, char** argv);

orxonox/branches/chris/src/player.cc

@@ -61 +61 @@
 void Player::command (Command* cmd)
 {
-        if( strcmp( cmd->cmd, "up")) bUp = !cmd->bUp;
-        else if( strcmp( cmd->cmd, "down")) bDown = !cmd->bUp;
-        else if( strcmp( cmd->cmd, "left")) bLeft = !cmd->bUp;
-        else if( strcmp( cmd->cmd, "right")) bRight = !cmd->bUp;
-        else if( strcmp( cmd->cmd, "fire")) bFire = !cmd->bUp;
+        if( !strcmp( cmd->cmd, "up")) bUp = !cmd->bUp;
+        else if( !strcmp( cmd->cmd, "down")) bDown = !cmd->bUp;
+        else if( !strcmp( cmd->cmd, "left")) bLeft = !cmd->bUp;
+        else if( !strcmp( cmd->cmd, "right")) bRight = !cmd->bUp;
+        else if( !strcmp( cmd->cmd, "fire")) bFire = !cmd->bUp;
 }
 
 void Player::draw ()
 {
+        glMatrixMode(GL_MODELVIEW);
+        float matrix[16];
+  get_placement()->w.glmatrix (matrix);
+  glLoadMatrixf (matrix);
+
+        glTranslatef(get_placement()->r.x,get_placement()->r.y,get_placement()->r.z);
+        
+        glBegin(GL_TRIANGLES);
+        glColor3f(1,0,0);
+        glVertex3f(0,0,0);
+        glColor3f(0,1,0);
+        glVertex3f(-1,-0.5,0);
+        glColor3f(0,0,1);
+        glVertex3f(-1,+0.5,0);
+        glEnd();
 }