Changeset 2100 in orxonox.OLD for orxonox

Timestamp:

Jul 10, 2004, 1:15:22 PM (20 years ago)

Author:

chris

Message:

orxonox/branches/chris: First part of the "Getittocompile"-Project

Location:

orxonox/branches/chris/src

Files:

• camera.cc (modified) (3 diffs)
• camera.h (modified) (2 diffs)
• collision.cc (modified) (1 diff)
• command_node.cc (modified) (1 diff)
• command_node.h (modified) (1 diff)
• keynames.cc (modified) (4 diffs)
• orxonox.h (modified) (2 diffs)
• stdincl.h (modified) (1 diff)
• vector.h (modified) (2 diffs)
• world.h (modified) (2 diffs)
• world_entity.cc (modified) (1 diff)
• world_entity.h (modified) (2 diffs)

orxonox/branches/chris/src/camera.cc

@@ -16 +16 @@
 */
 
-
 #include "camera.h"
+#include "world.h"
+#include "world_entity.h"
 
 using namespace std;
@@ -93 +94 @@
   glLoadMatrixf (matrix);
         // translation
-  glTranslatef (actual_place.v.x, actual_place.v.y, actual_place.v.z);
+  glTranslatef (actual_place.r.x, actual_place.r.y, actual_place.r.z);
   
   glMatrixMode (GL_MODELVIEW);
@@ -130 +131 @@
         if( entity != NULL)
         {
-                if( entity->bFree) printf("Cannot bind camera to free entity");
+                if( entity->isFree ()) printf("Cannot bind camera to free entity");
                 else bound = entity;
         } 

orxonox/branches/chris/src/camera.h

@@ -6 +6 @@
 #ifndef CAMERA_H
 #define CAMERA_H
+
+#include "stdincl.h"
+
+class WorldEntity;
 
 //! Camera
@@ -26 +30 @@
   ~Camera ();
 
-        void time_slice (float deltaT);
-        apply ();
-        bind (WorldEntity* entity);
-        jump (Placement* plc);
+        void time_slice (Uint32 deltaT);
+        void apply ();
+        void bind (WorldEntity* entity);
+        void jump (Placement* plc);
 
 };

orxonox/branches/chris/src/collision.cc

@@ -18 +18 @@
 
 #include "collision.h"
-
 
 using namespace std;

orxonox/branches/chris/src/command_node.cc

@@ -18 +18 @@
 #include "keynames.h"
 #include "ini_parser.h"
+#include "world_entity.h"
 
 #include <stdio.h>

orxonox/branches/chris/src/command_node.h

@@ -10 +10 @@
 
 #include "stdincl.h"
+
+class WorldEntity;
 
 #define N_STD_KEYS SDLK_LAST

orxonox/branches/chris/src/keynames.cc

@@ -13 +13 @@
    co-programmer: ...
 */
+#include <SDL/SDL.h>
 
 #include "keynames.h"
@@ -25 +26 @@
         if( !strcmp (name, "BUTTON_MIDDLE")) return SDL_BUTTON_MIDDLE;
         if( !strcmp (name, "BUTTON_RIGHT")) return SDL_BUTTON_RIGHT;
-        if( !strcmp (name, "BUTTON_WHEELUP")) return SDL_BUTTON_WHEELUP;
-        if( !strcmp (name, "BUTTON_WHEELDOWN")) return SDL_BUTTON_WHEELDOWN;
+//      if( !strcmp (name, "BUTTON_WHEELUP")) return SDL_BUTTON_WHEELUP;
+//      if( !strcmp (name, "BUTTON_WHEELDOWN")) return SDL_BUTTON_WHEELDOWN;
         return -1;
 }
@@ -32 +33 @@
 char* SDLB_to_buttonname( int button)
 {
-        if( button == SDL_BUTTON_LEFT)) return "BUTTON_LEFT";
-        if( button == BUTTON_MIDDLE)) return "BUTTON_MIDDLE";
-        if( button == BUTTON_RIGHT)) return "BUTTON_RIGHT";
-        if( button == BUTTON_WHEELUP)) return "BUTTON_WHEELUP";
-        if( button == BUTTON_WHEELDOWN)) return "BUTTON_WHEELDOWN";
-        return -1;
+        if( button == SDL_BUTTON_LEFT) return "BUTTON_LEFT";
+        if( button == SDL_BUTTON_MIDDLE) return "BUTTON_MIDDLE";
+        if( button == SDL_BUTTON_RIGHT) return "BUTTON_RIGHT";
+//      if( button == SDL_BUTTON_WHEELUP) return "BUTTON_WHEELUP";
+//      if( button == SDL_BUTTON_WHEELDOWN) return "BUTTON_WHEELDOWN";
+        return "UNKNOWN";
 }
 
@@ -311 +312 @@
         if( key == SDLK_POWER) return "POWER";
         if( key == SDLK_EURO) return "EURO";
-        return "UNKNOWN"
+        return "UNKNOWN";
 }

orxonox/branches/chris/src/orxonox.h

@@ -5 +5 @@
 #include <SDL/SDL.h>
 
+#include "stdincl.h"
+
+class CommandNode;
+class WorldEntity;
+class DataTank;
 class World;
+class Camera;
 
 class Orxonox {
@@ -41 +47 @@
   int init_resources ();
   int init_world ();
-
-  static void event_handler (SDL_Event* event);
   
  public:
   static Orxonox* getInstance ();
   static void quitGame();
+
+  static void event_handler (SDL_Event* event);
 
   int init (int argc, char** argv);

orxonox/branches/chris/src/stdincl.h

@@ -9 +9 @@
 #endif
 #include <SDL/SDL.h>
+#include <GL/GL.h>
 
+#include "vector.h"
+#include "coordinates.h"
 #include "list.h"
 #include "message_structures.h"
 #include "orxonox.h"
-#include "world_entity.h"
 
 #endif

orxonox/branches/chris/src/vector.h

@@ -12 +12 @@
 #define PI 3.14159265359f
 
-CommandNode::
 class Vector {
 
@@ -55 +54 @@
   Rotation operator* (const Rotation& r);
   
-  glmatrix (float* buffer);
+  void glmatrix (float* buffer);
 };
 

orxonox/branches/chris/src/world.h

@@ -2 +2 @@
 #ifndef WORLD_H
 #define WORLD_H
+
+class Track;
 
 class World {
@@ -9 +11 @@
   ~World ();
 
-        template<class T> T* spawn<T>(Location* loc, WorldEntity* owner);       // template to be able to spawn any derivation of WorldEntity
-        template<class T> T* spawn<T>(Placement* plc, WorldEntity* owner = NULL)
+        template<class T> 
+          T* spawn<T>(Location* loc, WorldEntity* owner);       // template to be able to spawn any derivation of WorldEntity
+        template<class T> 
+          T* spawn<T>(Placement* plc, WorldEntity* owner);
 
         void time_slice (Uint32 deltaT);

orxonox/branches/chris/src/world_entity.cc

@@ -53 +53 @@
 {
         return &place;
+}
+
+bool WorldEntity::isFree ()
+{
+  return bFree;
 }
 

orxonox/branches/chris/src/world_entity.h

@@ -3 +3 @@
 #define WORLD_ENTITY_H
 
-#include "stdincl.h"
-//#include "data_tank.h"
-
-class Vector;
-class Ability;
+class CollisionCluster;
 
 class WorldEntity
@@ -20 +16 @@
         Placement* get_placement ();
         void set_collision (CollisionCluster* newhull);
-                
+        
+        bool isFree ();
+        
   //void addAbility(Ability* ability);
   //void removeAbility(Ability* ability);