Changeset 3401 in orxonox.OLD

Timestamp:

Feb 11, 2005, 12:10:00 PM (19 years ago)

Author:

dave

Message:

branches/dave/src:Ok, diesmal ist die Rotation besser gelungen, schoener programmiert und vor allem nur im player.cc und player.h

Location:

orxonox/branches/dave

Files:

• Makefile.in (modified) (4 diffs)
• src/Makefile.in (modified) (3 diffs)
• src/camera.cc (modified) (1 diff)
• src/console/Makefile.in (modified) (2 diffs)
• src/environment.cc (modified) (1 diff)
• src/gui/Makefile.in (modified) (2 diffs)
• src/importer/Makefile.in (modified) (2 diffs)
• src/player.cc (modified) (7 diffs)
• src/player.h (modified) (1 diff)
• src/world.cc (modified) (1 diff)

orxonox/branches/dave/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
 # @configure_input@
 
@@ -318 +318 @@
         tags=; \
         here=`pwd`; \
-        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+        if (etags --etags-include --version) >/dev/null 2>&1; then \
           include_option=--etags-include; \
-          empty_fix=.; \
         else \
           include_option=--include; \
-          empty_fix=; \
         fi; \
         list='$(SUBDIRS)'; for subdir in $$list; do \
           if test "$$subdir" = .; then :; else \
-            test ! -f $$subdir/TAGS || \
+            test -f $$subdir/TAGS && \
               tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
           fi; \
@@ -337 +335 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique; \
-        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
@@ -450 +446 @@
           uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
         *.shar.gz*) \
-          GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+          GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
         *.zip*) \
           unzip $(distdir).zip ;;\

orxonox/branches/dave/src/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
 # @configure_input@
 
@@ -543 +543 @@
         tags=; \
         here=`pwd`; \
-        if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+        if (etags --etags-include --version) >/dev/null 2>&1; then \
           include_option=--etags-include; \
-          empty_fix=.; \
         else \
           include_option=--include; \
-          empty_fix=; \
         fi; \
         list='$(SUBDIRS)'; for subdir in $$list; do \
           if test "$$subdir" = .; then :; else \
-            test ! -f $$subdir/TAGS || \
+            test -f $$subdir/TAGS && \
               tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
           fi; \
@@ -562 +560 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique; \
-        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

orxonox/branches/dave/src/camera.cc

@@ -171 +171 @@
         {
           //FIXME: camera should be made via relative coordinates
-          Vector* cameraOffset = new Vector (-10, 5, 0);
+          Vector* cameraOffset = new Vector (-15,8, 0);
           this->setRelCoor (cameraOffset);
         } 

orxonox/branches/dave/src/console/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
 # @configure_input@
 
@@ -289 +289 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique; \
-        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

orxonox/branches/dave/src/environment.cc

@@ -59 +59 @@
   
   glMatrixMode(GL_MODELVIEW);
+  glRotatef(90.0f,0.0f,1.0f,0.0f);
+  glScalef(.5f,.5f,.5f);
+ 
   this->model->draw();
 }

orxonox/branches/dave/src/gui/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
 # @configure_input@
 
@@ -321 +321 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique; \
-        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

orxonox/branches/dave/src/importer/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
+# Makefile.in generated by automake 1.8.3 from Makefile.am.
 # @configure_input@
 
@@ -303 +303 @@
           $(AWK) '    { files[$$0] = 1; } \
                END { for (i in files) print i; }'`; \
-        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-          test -n "$$unique" || unique=$$empty_fix; \
-          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-            $$tags $$unique; \
-        fi
+        test -z "$(ETAGS_ARGS)$$tags$$unique" \
+          || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+             $$tags $$unique
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \

orxonox/branches/dave/src/player.cc

@@ -27 +27 @@
 {
 
-  this->model = new Model("../data/models/reaplow.obj");
+  this->model = new Model("../data/models/reaplow.obj",.4f);
   /*
   objectList = glGenLists(1);
@@ -66 +66 @@
   bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
   bFire = false;
-  acceleration = 10.0;
+  acceleration = 20.0;
   setCollision(new CollisionCluster(1.0, Vector(0,0,0)));
 }
@@ -103 +103 @@
   glLoadIdentity();
   float matrix[4][4];
-  
+  //glRotatef(90.0f,1.0f,0.0f,0.0f); 
   /* translate */
   glTranslatef (this->getAbsCoor ().x, 
@@ -111 +111 @@
   this->getAbsDir ().matrix (matrix);
   glMultMatrixf((float*)matrix);
-  
+  glRotatef(angle,1.0f,0.0f,0.0f);
   glMatrixMode(GL_MODELVIEW);
   this->model->draw();
@@ -132 +132 @@
 void Player::move (float time)
 {
+ 
   Vector accel(0.0, 0.0, 0.0);
+  
   /* FIXME: calculating the direction and orthDirection every timeSlice is redundant! save it somewhere */
   //Placement *pos = getPlacement();
@@ -138 +140 @@
   /* calculate the direction in which the craft is heading  */
   Vector direction (1.0, 0.0, 0.0);
+    
+  
+  
   //direction = this->absDirection.apply (direction);
   Vector orthDirection (0.0, 0.0, 1.0);
+  
   //orthDirection = orthDirection.cross (direction);
 
-  if( bUp) { accel = accel+(direction*acceleration); }
-  if( bDown) { accel = accel-(direction*acceleration); }
-  if( bLeft ) { accel = accel - (orthDirection*acceleration); }
-  if( bRight ) { accel = accel + (orthDirection*acceleration); }
+  if( bUp) { accel = accel+(direction*acceleration);accelSlipDirection=accel; }
+  if( bDown) { accel = accel-(direction*acceleration);accelSlipDirection=accel; }
+  if( bLeft ) { accel = accel-(orthDirection*acceleration);rotate(time);accelSlip=accel; }
+  if( bRight ) { accel = accel+(orthDirection*acceleration);rotate(time);accelSlip=accel;}
   if( bAscend ) { /* not yet implemented but just: (0,0,1)*acceleration */}
   if( bDescend) {/* FIXME */} /* \todo up and down player movement */
+  if((int)angle!=0&&!bLeft&&!bRight){backRotate(time);accelSlip=accelSlip-slip(time,accelSlip);}
+  if(!bUp&&!bDown){accelSlipDirection=accelSlipDirection-slip(time,accelSlipDirection);}
 
   //Location* l = getLocation();
@@ -159 +167 @@
   //l->dist = l->dist + travelSpeed * time;
   
-  Vector* shift = new Vector (this->travelSpeed * time, 0, 0);
-  this->shiftCoor (shift);
+  //Vector* shift = new Vector (this->travelSpeed * time, 0, 0);
+  Vector shift(this->travelSpeed*time,0,0);
+  
+  this->shiftCoor (&shift);
   
   /* this updates the player position on the track - user interaction */
   //l->pos = l->pos + accel*time;
+  
   Vector move = accel * time;
   this->shiftCoor (&move);
-}
+  
+}
+void Player::rotate(float time){
+    if(bLeft&&angle>-40.0f){
+        angle=angle-time*200.0f;
+                
+    }
+    if(bRight&&angle<40.0f){
+        angle=angle+time*200.0f;
+                
+    }
+}
+
+void Player::backRotate(float time){
+    if(angle<0){
+    angle=angle+3.0f*(exp(angle*.0015f*time));
+    
+    
+    }
+    if(angle>0){
+    angle=angle-3.0f*(exp(-angle*.0015f*time));
+    
+    
+    }
+
+}
+//When the sidewords movement is finished, the ship will still slip untill it stands still
+Vector Player::slip(float time,Vector accel){
+        Vector move= accel*time;
+        this->shiftCoor(&move);
+        return accel*time*3.0f;
+    
+}
+
+
+
+
+

orxonox/branches/dave/src/player.h

@@ -32 +32 @@
   virtual void leftWorld();
   
+  
  private:
   bool bUp, bDown, bLeft, bRight, bAscend, bDescend;
   bool bFire;
+  
   Vector velocity;
+  Vector accelSlip;
+  Vector accelSlipDirection;
   float travelSpeed;
   float acceleration;
+  float angle;
   GLuint objectList;
   
   void move(float time);
-  
+  void rotate(float time);
+  void backRotate(float time);
+  Vector slip (float time,Vector accel);
 };
 

orxonox/branches/dave/src/world.cc

@@ -377 +377 @@
   int sizeZ = 80;
   float length = 1000;
-  float width = 200;
+  float width = 300;
   float widthX = float (length /sizeX);
   float widthZ = float (width /sizeZ);