Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2811 in orxonox.OLD for orxonox/trunk


Ignore:
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:
5 edited
6 copied

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/Makefile.am

    r2636 r2811  
    66
    77bin_PROGRAMS=orxonox
    8 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
     8orxonox_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
    99
    10 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
     10noinst_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
    1111
    1212

  • orxonox/trunk/src/Makefile.in

    r2711 r2811  
    5757        command_node.$(OBJEXT) ini_parser.$(OBJEXT) keynames.$(OBJEXT) \
    5858        track.$(OBJEXT) base_entity.$(OBJEXT) game_loader.$(OBJEXT) \
    59         campaign.$(OBJEXT) story_entity.$(OBJEXT)
     59        campaign.$(OBJEXT) story_entity.$(OBJEXT) object.$(OBJEXT) \
     60        array.$(OBJEXT) material.$(OBJEXT)
    6061orxonox_OBJECTS = $(am_orxonox_OBJECTS)
    6162orxonox_LDADD = $(LDADD)
    … …  
    6364depcomp = $(SHELL) $(top_srcdir)/depcomp
    6465am__depfiles_maybe = depfiles
    65 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/base_entity.Po \
    66 @AMDEP_TRUE@    ./$(DEPDIR)/camera.Po ./$(DEPDIR)/campaign.Po \
    67 @AMDEP_TRUE@    ./$(DEPDIR)/collision.Po \
     66@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po \
     67@AMDEP_TRUE@    ./$(DEPDIR)/base_entity.Po ./$(DEPDIR)/camera.Po \
     68@AMDEP_TRUE@    ./$(DEPDIR)/campaign.Po ./$(DEPDIR)/collision.Po \
    6869@AMDEP_TRUE@    ./$(DEPDIR)/command_node.Po \
    6970@AMDEP_TRUE@    ./$(DEPDIR)/data_tank.Po \
    7071@AMDEP_TRUE@    ./$(DEPDIR)/game_loader.Po \
    7172@AMDEP_TRUE@    ./$(DEPDIR)/ini_parser.Po ./$(DEPDIR)/keynames.Po \
     73@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/object.Po \
    7274@AMDEP_TRUE@    ./$(DEPDIR)/orxonox.Po ./$(DEPDIR)/player.Po \
    7375@AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po ./$(DEPDIR)/track.Po \
    … …  
    163165AM_CXXFLAGS = "-I/usr/X11R6/include"
    164166AM_LDFLAGS = "-L/usr/Mesa-6.0.1/lib  -L/usr/X11R6/lib -lXt -lX11" $(MWINDOWS)
    165 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
    166 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
     167orxonox_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
     168noinst_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
    167169all: all-am
    168170
    … …  
    231233        -rm -f *.tab.c
    232234
     235@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@
    233236@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base_entity.Po@am__quote@
    234237@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/camera.Po@am__quote@
    … …  
    240243@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ini_parser.Po@am__quote@
    241244@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keynames.Po@am__quote@
     245@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
     246@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object.Po@am__quote@
    242247@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox.Po@am__quote@
    243248@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Po@am__quote@

  • orxonox/trunk/src/player.cc

    r2730 r2811  
    2525Player::Player(bool isFree) : WorldEntity(isFree)
    2626{
     27
     28  obj = new Object ("reaphigh.obj");
     29  /*
    2730  objectList = glGenLists(1);
    2831  glNewList (objectList, GL_COMPILE);
    … …  
    4851 
    4952  glEndList ();
    50 
     53  */
    5154}
    5255
    … …  
    104107  glMultMatrixf ((float*)matrix);
    105108 
    106   glCallList (objectList);
     109  glMatrixMode (GL_MODELVIEW);
     110  glRotatef (-90, 0,1,0);
     111  obj->draw();
     112  //  glCallList (objectList);
    107113
    108114 

  • orxonox/trunk/src/player.h

    r2730 r2811  
    88
    99#include "world_entity.h"
     10#include "object.h"
    1011
    1112//! Basic controllable WorldEntity
    … …  
    3738  float acceleration;
    3839  GLuint objectList;
     40  Object* obj;
    3941 
    4042  void move (float time);

  • orxonox/trunk/src/world.cc

    r2792 r2811  
    177177  glBegin(GL_LINES);
    178178  float height [500][100];
     179  float size = 2.0;
    179180    for ( int i = 0; i<=200; i+=1)
    180181      {
    181182        for (int j = 0; j<=50;j+=1)
    182183          {
    183             height[i][j] = rand()/200321400;
     184            height[i][j] = rand()/200321400 + (j-25)*(j-25)/30;
    184185           
    185186          }
    … …  
    189190        for (int j = 0; j<=50;j+=1)
    190191          {       
    191             glVertex3f(5*i,        5*j-125,      height[i][j] -20);
    192             glVertex3f(5*i+5.0,    5*j-125,      height[i+1][j]-20);
    193             //      glVertex3f(5*i+5.0,    5*j+5.0-125,  height[i+1][j+1]-20);
    194             glVertex3f(5*i,        5*j-125,      height[i][j] -20);
    195             glVertex3f(5*i,        5*j+5.0-125,  height[i][j+1]-20);
     192            glVertex3f(size*i,        size*j-25*size,      height[i][j] -20);
     193            glVertex3f(size*i+size,    size*j-25*size,      height[i+1][j]-20);
     194            //      glVertex3f(size*i+5.0,    size*j+5.0-12size,  height[i+1][j+1]-20);
     195            glVertex3f(size*i,        size*j-25*size,      height[i][j] -20);
     196            glVertex3f(size*i,        size*j+size -25*size,  height[i][j+1]-20);
    196197          }
    197198      }
Note: See TracChangeset for help on using the changeset viewer.