Changeset 2811 in orxonox.OLD for orxonox

Timestamp:

Nov 11, 2004, 2:45:54 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the ObjectImporter to trunk: merged with
svn merge branches/importer/src/ trunk/src/ -r 2794:HEAD

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (5 diffs)
• array.cc (copied) (copied from orxonox/branches/importer/src/array.cc)
• array.h (copied) (copied from orxonox/branches/importer/src/array.h)
• material.cc (copied) (copied from orxonox/branches/importer/src/material.cc)
• material.h (copied) (copied from orxonox/branches/importer/src/material.h)
• object.cc (copied) (copied from orxonox/branches/importer/src/object.cc)
• object.h (copied) (copied from orxonox/branches/importer/src/object.h)
• player.cc (modified) (3 diffs)
• player.h (modified) (2 diffs)
• world.cc (modified) (2 diffs)

orxonox/trunk/src/Makefile.am

@@ -6 +6 @@
 
 bin_PROGRAMS=orxonox
-orxonox_SOURCES=orxonox.cc world.cc player.cc data_tank.cc world_entity.cc vector.cc camera.cc collision.cc command_node.cc ini_parser.cc keynames.cc track.cc base_entity.cc game_loader.cc campaign.cc story_entity.cc
+orxonox_SOURCES=orxonox.cc world.cc player.cc data_tank.cc world_entity.cc vector.cc camera.cc collision.cc command_node.cc ini_parser.cc keynames.cc track.cc base_entity.cc game_loader.cc campaign.cc story_entity.cc object.cc array.cc material.cc
 
-noinst_HEADERS=ability.h data_tank.h npc.h stdincl.h ai.h environment.h orxonox.h synchronisable.h base_entity.h error.h player.h track.h camera.h ini_parser.h power_up.h vector.h collision.h keynames.h proto_class.h world.h command_node.h list.h shoot_laser.h world_entity.h coordinates.h message_structures.h shoot_rocket.h
+noinst_HEADERS=ability.h data_tank.h npc.h stdincl.h ai.h environment.h orxonox.h synchronisable.h base_entity.h error.h player.h track.h camera.h ini_parser.h power_up.h vector.h collision.h keynames.h proto_class.h world.h command_node.h list.h shoot_laser.h world_entity.h coordinates.h message_structures.h shoot_rocket.h object.h array.h material.h
 
 

orxonox/trunk/src/Makefile.in

@@ -57 +57 @@
         command_node.$(OBJEXT) ini_parser.$(OBJEXT) keynames.$(OBJEXT) \
         track.$(OBJEXT) base_entity.$(OBJEXT) game_loader.$(OBJEXT) \
-        campaign.$(OBJEXT) story_entity.$(OBJEXT)
+        campaign.$(OBJEXT) story_entity.$(OBJEXT) object.$(OBJEXT) \
+        array.$(OBJEXT) material.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
 orxonox_LDADD = $(LDADD)
@@ -63 +64 @@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/base_entity.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/camera.Po ./$(DEPDIR)/campaign.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/collision.Po \
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/base_entity.Po ./$(DEPDIR)/camera.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/campaign.Po ./$(DEPDIR)/collision.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/command_node.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/data_tank.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/game_loader.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/ini_parser.Po ./$(DEPDIR)/keynames.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/object.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox.Po ./$(DEPDIR)/player.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po ./$(DEPDIR)/track.Po \
@@ -163 +165 @@
 AM_CXXFLAGS = "-I/usr/X11R6/include"
 AM_LDFLAGS = "-L/usr/Mesa-6.0.1/lib  -L/usr/X11R6/lib -lXt -lX11" $(MWINDOWS)
-orxonox_SOURCES = orxonox.cc world.cc player.cc data_tank.cc world_entity.cc vector.cc camera.cc collision.cc command_node.cc ini_parser.cc keynames.cc track.cc base_entity.cc game_loader.cc campaign.cc story_entity.cc
-noinst_HEADERS = ability.h data_tank.h npc.h stdincl.h ai.h environment.h orxonox.h synchronisable.h base_entity.h error.h player.h track.h camera.h ini_parser.h power_up.h vector.h collision.h keynames.h proto_class.h world.h command_node.h list.h shoot_laser.h world_entity.h coordinates.h message_structures.h shoot_rocket.h
+orxonox_SOURCES = orxonox.cc world.cc player.cc data_tank.cc world_entity.cc vector.cc camera.cc collision.cc command_node.cc ini_parser.cc keynames.cc track.cc base_entity.cc game_loader.cc campaign.cc story_entity.cc object.cc array.cc material.cc
+noinst_HEADERS = ability.h data_tank.h npc.h stdincl.h ai.h environment.h orxonox.h synchronisable.h base_entity.h error.h player.h track.h camera.h ini_parser.h power_up.h vector.h collision.h keynames.h proto_class.h world.h command_node.h list.h shoot_laser.h world_entity.h coordinates.h message_structures.h shoot_rocket.h object.h array.h material.h
 all: all-am
 
@@ -231 +233 @@
         -rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base_entity.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/camera.Po@am__quote@
@@ -240 +243 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ini_parser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keynames.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Po@am__quote@

orxonox/trunk/src/player.cc

@@ -25 +25 @@
 Player::Player(bool isFree) : WorldEntity(isFree)
 {
+
+  obj = new Object ("reaphigh.obj");
+  /*
   objectList = glGenLists(1);
   glNewList (objectList, GL_COMPILE);
@@ -48 +51 @@
   
   glEndList ();
-
+  */
 }
 
@@ -104 +107 @@
   glMultMatrixf ((float*)matrix);
   
-  glCallList (objectList);
+  glMatrixMode (GL_MODELVIEW);
+  glRotatef (-90, 0,1,0);
+  obj->draw();
+  //  glCallList (objectList);
 
   

orxonox/trunk/src/player.h

@@ -8 +8 @@
 
 #include "world_entity.h"
+#include "object.h"
 
 //! Basic controllable WorldEntity
@@ -37 +38 @@
   float acceleration;
   GLuint objectList;
+  Object* obj;
   
   void move (float time);

orxonox/trunk/src/world.cc

@@ -177 +177 @@
   glBegin(GL_LINES);
   float height [500][100];
+  float size = 2.0;
     for ( int i = 0; i<=200; i+=1)
       {
         for (int j = 0; j<=50;j+=1)
           {
-            height[i][j] = rand()/200321400;
+            height[i][j] = rand()/200321400 + (j-25)*(j-25)/30;
             
           }
@@ -189 +190 @@
         for (int j = 0; j<=50;j+=1)
           {       
-            glVertex3f(5*i,        5*j-125,      height[i][j] -20);
-            glVertex3f(5*i+5.0,    5*j-125,      height[i+1][j]-20);
-            //      glVertex3f(5*i+5.0,    5*j+5.0-125,  height[i+1][j+1]-20);
-            glVertex3f(5*i,        5*j-125,      height[i][j] -20);
-            glVertex3f(5*i,        5*j+5.0-125,  height[i][j+1]-20);
+            glVertex3f(size*i,        size*j-25*size,      height[i][j] -20);
+            glVertex3f(size*i+size,    size*j-25*size,      height[i+1][j]-20);
+            //      glVertex3f(size*i+5.0,    size*j+5.0-12size,  height[i+1][j+1]-20);
+            glVertex3f(size*i,        size*j-25*size,      height[i][j] -20);
+            glVertex3f(size*i,        size*j+size -25*size,  height[i][j+1]-20);
           }
       }