Changeset 3365 in orxonox.OLD

Timestamp:

Jan 7, 2005, 1:14:33 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/parenting back to the.
merged with command:
svn merge branches/parenting trunk -r 3247:HEAD
resolved all conflicts in favor of parenting.

Location:

orxonox/trunk

Files:

• configure (modified) (9 diffs)
• doc/orxodox.src (modified) (3 diffs)
• src/Makefile.am (modified) (3 diffs)
• src/Makefile.in (modified) (8 diffs)
• src/base_object.cc (copied) (copied from orxonox/branches/parenting/src/base_object.cc)
• src/base_object.h (copied) (copied from orxonox/branches/parenting/src/base_object.h)
• src/camera.cc (modified) (10 diffs)
• src/camera.h (modified) (4 diffs)
• src/curve.cc (modified) (10 diffs)
• src/curve.h (modified) (5 diffs)
• src/data_tank.cc (modified) (1 diff)
• src/data_tank.h (modified) (1 diff)
• src/debug.h (modified) (1 diff)
• src/environment.cc (modified) (2 diffs)
• src/glmenu_imagescreen.cc (copied) (copied from orxonox/branches/parenting/src/glmenu_imagescreen.cc)
• src/glmenu_imagescreen.h (copied) (copied from orxonox/branches/parenting/src/glmenu_imagescreen.h)
• src/helper_parent.cc (copied) (copied from orxonox/branches/parenting/src/helper_parent.cc)
• src/helper_parent.h (copied) (copied from orxonox/branches/parenting/src/helper_parent.h)
• src/importer/Makefile.am (modified) (1 diff)
• src/importer/Makefile.in (modified) (4 diffs)
• src/importer/framework.cc (modified) (3 diffs)
• src/importer/framework.h (modified) (2 diffs)
• src/importer/material.cc (modified) (8 diffs)
• src/importer/material.h (modified) (5 diffs)
• src/importer/model.cc (copied) (copied from orxonox/branches/parenting/src/importer/model.cc)
• src/importer/model.h (copied) (copied from orxonox/branches/parenting/src/importer/model.h)
• src/importer/object.cc (deleted)
• src/importer/object.h (deleted)
• src/importer/texture.cc (copied) (copied from orxonox/branches/parenting/src/importer/texture.cc)
• src/importer/texture.h (copied) (copied from orxonox/branches/parenting/src/importer/texture.h)
• src/list.h (modified) (3 diffs)
• src/matrix.cc (copied) (copied from orxonox/branches/parenting/src/matrix.cc)
• src/matrix.h (copied) (copied from orxonox/branches/parenting/src/matrix.h)
• src/null_parent.cc (copied) (copied from orxonox/branches/parenting/src/null_parent.cc)
• src/null_parent.h (copied) (copied from orxonox/branches/parenting/src/null_parent.h)
• src/orxonox.cc (modified) (5 diffs)
• src/orxonox.h (modified) (1 diff)
• src/p_node.cc (modified) (3 diffs)
• src/p_node.h (modified) (3 diffs)
• src/player.cc (modified) (8 diffs)
• src/player.h (modified) (3 diffs)
• src/proto_class.cc (modified) (1 diff)
• src/proto_class.h (modified) (1 diff)
• src/stdincl.h (modified) (3 diffs)
• src/story_entity.h (modified) (1 diff)
• src/track.cc (modified) (3 diffs)
• src/track.h (modified) (2 diffs)
• src/track_manager.cc (copied) (copied from orxonox/branches/parenting/src/track_manager.cc)
• src/track_manager.h (copied) (copied from orxonox/branches/parenting/src/track_manager.h)
• src/vector.cc (modified) (1 diff)
• src/vector.h (modified) (1 diff)
• src/world.cc (modified) (36 diffs)
• src/world.h (modified) (7 diffs)
• src/world_entity.cc (modified) (8 diffs)
• src/world_entity.h (modified) (3 diffs)

orxonox/trunk/configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for orxonox 2.0.1-pre-alpha.
+# Generated by GNU Autoconf 2.59 for orxonox 0.2.1-pre-alpha.
 #
 # Report bugs to <orxonox-dev at mail.datacore.ch>.
@@ -270 +270 @@
 PACKAGE_NAME='orxonox'
 PACKAGE_TARNAME='orxonox'
-PACKAGE_VERSION='2.0.1-pre-alpha'
-PACKAGE_STRING='orxonox 2.0.1-pre-alpha'
+PACKAGE_VERSION='0.2.1-pre-alpha'
+PACKAGE_STRING='orxonox 0.2.1-pre-alpha'
 PACKAGE_BUGREPORT='orxonox-dev at mail.datacore.ch'
 
@@ -789 +789 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures orxonox 2.0.1-pre-alpha to adapt to many kinds of systems.
+\`configure' configures orxonox 0.2.1-pre-alpha to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -856 +856 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of orxonox 2.0.1-pre-alpha:";;
+     short | recursive ) echo "Configuration of orxonox 0.2.1-pre-alpha:";;
    esac
   cat <<\_ACEOF
@@ -984 +984 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-orxonox configure 2.0.1-pre-alpha
+orxonox configure 0.2.1-pre-alpha
 generated by GNU Autoconf 2.59
 
@@ -998 +998 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by orxonox $as_me 2.0.1-pre-alpha, which was
+It was created by orxonox $as_me 0.2.1-pre-alpha, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
@@ -1719 +1719 @@
 # Define the identity of the package.
  PACKAGE='orxonox'
- VERSION='2.0.1-pre-alpha'
+ VERSION='0.2.1-pre-alpha'
 
 
@@ -7946 +7946 @@
 cat >&5 <<_CSEOF
 
-This file was extended by orxonox $as_me 2.0.1-pre-alpha, which was
+This file was extended by orxonox $as_me 0.2.1-pre-alpha, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
@@ -8009 +8009 @@
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-orxonox config.status 2.0.1-pre-alpha
+orxonox config.status 0.2.1-pre-alpha
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

orxonox/trunk/doc/orxodox.src

@@ -7 +7 @@
 PROJECT_NAME           = Orxonox
 PROJECT_NUMBER         = 1
-OUTPUT_DIRECTORY       = doc/doxygen/
+OUTPUT_DIRECTORY       = doxygen/
 CREATE_SUBDIRS         = YES
 OUTPUT_LANGUAGE        = English
@@ -34 +34 @@
 #---------------------------------------------------------------------------
 EXTRACT_ALL            = NO
-EXTRACT_PRIVATE        = NO
-EXTRACT_STATIC         = NO
+EXTRACT_PRIVATE        = YES
+EXTRACT_STATIC         = YES
 EXTRACT_LOCAL_CLASSES  = YES
 EXTRACT_LOCAL_METHODS  = NO
@@ -69 +69 @@
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = src/
+INPUT                  = .
 FILE_PATTERNS          = 
-RECURSIVE              = YES
+RECURSIVE              = NO
 EXCLUDE                = 
 EXCLUDE_SYMLINKS       = NO

orxonox/trunk/src/Makefile.am

@@ -24 +24 @@
                  story_entity.cc \
                  environment.cc \
-                 importer/object.cc \
+                 importer/model.cc \
                  importer/array.cc \
                  importer/material.cc \
+                 importer/texture.cc \
                  list.cc \
-                 p_node.cc
+                 p_node.cc \
+                 null_parent.cc \
+                 base_object.cc \
+                 helper_parent.cc \
+                 track_manager.cc \
+                 matrix.cc \
+                 curve.cc \
+                 glmenu_imagescreen.cc
+
 
 noinst_HEADERS = ability.h \
@@ -54 +63 @@
                  shoot_laser.h \
                  world_entity.h \
-                 coordinates.h \
                  message_structures.h \
                  shoot_rocket.h \
@@ -62 +70 @@
                  game_loader.h \
                  campaign.h \
-                 p_node.h
+                 p_node.h \
+                 null_parent.h \
+                 base_object.h \
+                 helper_parent.h \
+                 track_manager.h \
+                 matrix.h \
+                 curve.h \
+                 glmenu_imagescreen.h
+
 
 ## orxonox.conf will be used from home-dir instead.

orxonox/trunk/src/Makefile.in

@@ -59 +59 @@
         track.$(OBJEXT) base_entity.$(OBJEXT) game_loader.$(OBJEXT) \
         campaign.$(OBJEXT) story_entity.$(OBJEXT) \
-        environment.$(OBJEXT) object.$(OBJEXT) array.$(OBJEXT) \
-        material.$(OBJEXT) list.$(OBJEXT) p_node.$(OBJEXT)
+        environment.$(OBJEXT) model.$(OBJEXT) array.$(OBJEXT) \
+        material.$(OBJEXT) texture.$(OBJEXT) list.$(OBJEXT) \
+        p_node.$(OBJEXT) null_parent.$(OBJEXT) base_object.$(OBJEXT) \
+        helper_parent.$(OBJEXT) track_manager.$(OBJEXT) \
+        matrix.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
 orxonox_LDADD = $(LDADD)
@@ -67 +70 @@
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/base_entity.Po ./$(DEPDIR)/camera.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/base_entity.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/base_object.Po ./$(DEPDIR)/camera.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/campaign.Po ./$(DEPDIR)/collision.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/command_node.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/command_node.Po ./$(DEPDIR)/curve.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/data_tank.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/environment.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/game_loader.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/glmenu_imagescreen.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/helper_parent.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/ini_parser.Po ./$(DEPDIR)/keynames.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/list.Po ./$(DEPDIR)/material.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/object.Po ./$(DEPDIR)/orxonox.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/matrix.Po ./$(DEPDIR)/model.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/orxonox.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/p_node.Po ./$(DEPDIR)/player.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po ./$(DEPDIR)/track.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po ./$(DEPDIR)/texture.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/track.Po ./$(DEPDIR)/track_manager.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/vector.Po ./$(DEPDIR)/world.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/world_entity.Po
@@ -214 +222 @@
                  story_entity.cc \
                  environment.cc \
-                 importer/object.cc \
+                 importer/model.cc \
                  importer/array.cc \
                  importer/material.cc \
+                 importer/texture.cc \
                  list.cc \
-                 p_node.cc
+                 p_node.cc \
+                 null_parent.cc \
+                 base_object.cc \
+                 helper_parent.cc \
+                 track_manager.cc \
+                 matrix.cc \
+                 curve.cc \
+                 glmenu_imagescreen.cc
 
 noinst_HEADERS = ability.h \
@@ -244 +260 @@
                  shoot_laser.h \
                  world_entity.h \
-                 coordinates.h \
                  message_structures.h \
                  shoot_rocket.h \
@@ -252 +267 @@
                  game_loader.h \
                  campaign.h \
-                 p_node.h
+                 p_node.h \
+                 null_parent.h \
+                 base_object.h \
+                 helper_parent.h \
+                 track_manager.h \
+                 matrix.h \
+                 curve.h \
+                 glmenu_imagescreen.h
 
 EXTRA_DIST = orxonox.conf
@@ -332 +354 @@
 @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)/base_object.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/camera.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/campaign.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/command_node.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curve.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data_tank.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/environment.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/game_loader.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glmenu_imagescreen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helper_parent.Po@am__quote@
 @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)/list.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)/matrix.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/null_parent.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/p_node.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/story_entity.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/track.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/track_manager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/world.Po@am__quote@
@@ -369 +399 @@
 @am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
-object.o: importer/object.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT object.o -MD -MP -MF "$(DEPDIR)/object.Tpo" -c -o object.o `test -f 'importer/object.cc' || echo '$(srcdir)/'`importer/object.cc; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/object.Tpo" "$(DEPDIR)/object.Po"; else rm -f "$(DEPDIR)/object.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='importer/object.cc' object='object.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/object.Po' tmpdepfile='$(DEPDIR)/object.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o object.o `test -f 'importer/object.cc' || echo '$(srcdir)/'`importer/object.cc
-
-object.obj: importer/object.cc
-@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT object.obj -MD -MP -MF "$(DEPDIR)/object.Tpo" -c -o object.obj `if test -f 'importer/object.cc'; then $(CYGPATH_W) 'importer/object.cc'; else $(CYGPATH_W) '$(srcdir)/importer/object.cc'; fi`; \
-@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/object.Tpo" "$(DEPDIR)/object.Po"; else rm -f "$(DEPDIR)/object.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='importer/object.cc' object='object.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/object.Po' tmpdepfile='$(DEPDIR)/object.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o object.obj `if test -f 'importer/object.cc'; then $(CYGPATH_W) 'importer/object.cc'; else $(CYGPATH_W) '$(srcdir)/importer/object.cc'; fi`
+model.o: importer/model.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT model.o -MD -MP -MF "$(DEPDIR)/model.Tpo" -c -o model.o `test -f 'importer/model.cc' || echo '$(srcdir)/'`importer/model.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/model.Tpo" "$(DEPDIR)/model.Po"; else rm -f "$(DEPDIR)/model.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='importer/model.cc' object='model.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/model.Po' tmpdepfile='$(DEPDIR)/model.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o model.o `test -f 'importer/model.cc' || echo '$(srcdir)/'`importer/model.cc
+
+model.obj: importer/model.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT model.obj -MD -MP -MF "$(DEPDIR)/model.Tpo" -c -o model.obj `if test -f 'importer/model.cc'; then $(CYGPATH_W) 'importer/model.cc'; else $(CYGPATH_W) '$(srcdir)/importer/model.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/model.Tpo" "$(DEPDIR)/model.Po"; else rm -f "$(DEPDIR)/model.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='importer/model.cc' object='model.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/model.Po' tmpdepfile='$(DEPDIR)/model.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o model.obj `if test -f 'importer/model.cc'; then $(CYGPATH_W) 'importer/model.cc'; else $(CYGPATH_W) '$(srcdir)/importer/model.cc'; fi`
 
 array.o: importer/array.cc
@@ -416 +446 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o material.obj `if test -f 'importer/material.cc'; then $(CYGPATH_W) 'importer/material.cc'; else $(CYGPATH_W) '$(srcdir)/importer/material.cc'; fi`
+
+texture.o: importer/texture.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT texture.o -MD -MP -MF "$(DEPDIR)/texture.Tpo" -c -o texture.o `test -f 'importer/texture.cc' || echo '$(srcdir)/'`importer/texture.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/texture.Tpo" "$(DEPDIR)/texture.Po"; else rm -f "$(DEPDIR)/texture.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='importer/texture.cc' object='texture.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/texture.Po' tmpdepfile='$(DEPDIR)/texture.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o texture.o `test -f 'importer/texture.cc' || echo '$(srcdir)/'`importer/texture.cc
+
+texture.obj: importer/texture.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT texture.obj -MD -MP -MF "$(DEPDIR)/texture.Tpo" -c -o texture.obj `if test -f 'importer/texture.cc'; then $(CYGPATH_W) 'importer/texture.cc'; else $(CYGPATH_W) '$(srcdir)/importer/texture.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/texture.Tpo" "$(DEPDIR)/texture.Po"; else rm -f "$(DEPDIR)/texture.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='importer/texture.cc' object='texture.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/texture.Po' tmpdepfile='$(DEPDIR)/texture.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o texture.obj `if test -f 'importer/texture.cc'; then $(CYGPATH_W) 'importer/texture.cc'; else $(CYGPATH_W) '$(srcdir)/importer/texture.cc'; fi`
 uninstall-info-am:
 

orxonox/trunk/src/camera.cc

@@ -42 +42 @@
   this->t = 0.0;
 
-  this->actualPlace.r.x = 0.0;
-  this->actualPlace.r.y = 10.0;
-  this->actualPlace.r.z = -5.0;
+
+  this->setDrawable (false);
 }
 
@@ -67 +66 @@
   //printf("time is: t=%f\n", t );
   updateDesiredPlace();
-  jump(NULL);
+  //jump(NULL);
 }
 
@@ -83 +82 @@
     case ELLIPTICAL:
       {
+        /*
         //r = actual_place.r 
         Orxonox *orx = Orxonox::getInstance();
@@ -95 +95 @@
               {
                 Vector *start = new Vector(0.0, 1.0, 0.0);
-                //r = /*actual_place.r*/ *start - plFocus.r;
                 r = *(new Vector(0.0, 5.0, 0.0));
 
@@ -120 +119 @@
             //printf("vector r = %f, %f, %f\n",r.x, r.y, r.z );
             rAbs = r.len();
-            if(t < 30.0) /* FIXME!!*/
+            if(t < 30)
               {
                 ka = rAbs / deltaTime*deltaTime;
               }
-            /* this is the new length of the vector */
-            //float len = ka * powf((deltaTime - t), 2);
-            
-            /* calc the rotation */
-            /*
-            Vector axis(0.0, 0.0, 1.0);
-            if(t < 30.0)
-              a0 = PI/4 - atanf(fabs(r.x) / fabs(r.y));
-            printf("a0 = %f\n", a0);
-            float angle = a0/deltaTime * (deltaTime - t);
-            printf("angle is: %f\n", angle);
-            Quaternion q(angle, axis);
-            */
-            //r = q.apply(r);
-            //r = r * (len/r.len());
-            
-            //res->quatSlerp(from, to, t/deltaTime, res);
+
             res->quatSlerp(to, from, t/deltaTime, res);
 
             Vector ursp(0.0, 0.0, 0.0);
-            desiredPlace.r = /*plFocus.r -*/ ursp - res->apply(r); 
+            desiredPlace.r =  ursp - res->apply(r); 
 
             printf("desired place is: %f, %f, %f\n", desiredPlace.r.x, desiredPlace.r.y, desiredPlace.r.z);
             //plLastBPlace = *bound->get_placement();
+            
           } 
+      */
       }
       break;
     case SMOTH_FOLLOW:
       {
+        /*
         Placement *plBound = bound->getPlacement();
         Location lcBound;
@@ -160 +146 @@
             Vector vDirection(0.0, 0.0, 1.0);
             vDirection = plBound->w.apply(vDirection);
-            desiredPlace.r = (vDirection * ((lcBound.dist-10.0)/* / l*/)) + Vector(0,0,5.0);
+            desiredPlace.r = (vDirection * ((lcBound.dist-10.0))) + Vector(0,0,5.0);
           }
+        */
         break;
       }
@@ -167 +154 @@
     case STICKY:
       {
+        /*
         if(bound != null)
           {
@@ -175 +163 @@
             desiredPlace.r = plBound->r - vDirection*10 + eclipticOffset;
           }
+        */
         break;
       }
       /* the camera is handled like an entity and rolls on the track */
     case NORMAL:
-      Location lookat;  
       if( bound != NULL && world != NULL )
         {
-          bound->getLookat (&lookat);
-          world->calcCameraPos (&lookat, &desiredPlace);
+          //FIXME: camera should be made via relative coordinates
+          Vector* cameraOffset = new Vector (-10, 5, 0);
+          this->setRelCoor (cameraOffset);
         } 
       else
         {
+          /*
           desiredPlace.r = Vector (0,0,0);
           desiredPlace.w = Quaternion (); 
+          */
         }
       break;
@@ -237 +228 @@
   // rotation
   float matrix[4][4];
-  actualPlace.w.conjugate().matrix (matrix);
+  //this->absDirection.conjugate().matrix (matrix);
   /* orientation and */
-  glMultMatrixf ((float*)matrix);
+  //glMultMatrixf ((float*)matrix);
+
   /*  translation */
-  glTranslatef (-actualPlace.r.x, -actualPlace.r.y,- actualPlace.r.z);
-//Placement *plBound = bound->get_placement();
+  //glTranslatef (this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z );
+
 
   // ===== second camera control calculation option
-  /*
-   gluLookAt(actual_place.r.x, actual_place.r.y, actual_place.r.z, 
-              plBound->r.x, plBound->r.y, plBound->r.z,
-              0.0, 0.0, 1.0);
-  */
+  
+  gluLookAt(this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z, 
+            this->parent->getAbsCoor ().x, this->parent->getAbsCoor ().y, this->parent->getAbsCoor ().z,
+            0.0, 1.0, 0.0);
+  
 
   glMatrixMode (GL_MODELVIEW);
@@ -255 +247 @@
 }
 
-/**
-  \brief set the camera position
-  \param plc: The Placement to set the camera to 
-        
-        This will set the actual and desired placement of the camera to plc
-*/
-void Camera::jump (Placement* plc = NULL)
-{
-  if( plc == NULL)
-    {
-      actualPlace = desiredPlace;
-      //printf("Camera|jump: camer@ %f, %f, %f\n\n", actual_place.r.x, actual_place.r.y, actual_place.r.z);
-    }
-  else
-    {
-      desiredPlace = *plc;
-      actualPlace = *plc;
-    }
-}
+
 
 /**

orxonox/trunk/src/camera.h

@@ -8 +8 @@
 
 #include "stdincl.h"
+#include "world_entity.h"
 
-class WorldEntity;
+
 class World;
 
@@ -23 +24 @@
 enum CAMERA_MODE {NORMAL, SMOTH_FOLLOW, STICKY, ELLIPTICAL};
 
-class Camera {
+class Camera : public WorldEntity {
  private:
   WorldEntity* bound;           //!< the WorldEntity the Camera is bound to
-  Placement actualPlace;                //!< the Camera's current position
-  Placement desiredPlace;        //!< where the Camera should be according to calculations
   World* world;
   
@@ -37 +36 @@
   
   /* elliptical camera mode variables */
-  Placement plLastBPlace;
   float cameraOffset;
   float cameraOffsetZ;
@@ -63 +61 @@
   void apply ();
   void bind (WorldEntity* entity);
-  void jump (Placement* plc);
   void destroy();
 

orxonox/trunk/src/curve.cc

@@ -11 +11 @@
    ### File Specific:
    main-programmer: Benjamin Grauer
-   co-programmer: ...
+   co-programmer: Patrick Boenzli
+
+   ADD: Patrick Boenzli           B-Spline 
+
 
    TODO: 
      local-Time implementation
-     closed Bezier Curve
      NURBS
      
@@ -21 +23 @@
 
 #include "curve.h"
-
-
+#include "matrix.h"
+#include "debug.h"
+
+#include <math.h>
+#include <stdio.h>
 
 /**
@@ -37 +42 @@
   currentNode->next = 0; // not sure if this really points to NULL!!
   currentNode->number = (++nodeCount);
+  this->rebuild();
   return;
 }
 
+/**
+   \brief Finds a Node by its Number, and returns its Position
+   \param nodeToFind the n'th node in the List of nodes
+   \returns A Vector to the Position of the Node.
+*/
+Vector Curve::getNode(unsigned int nodeToFind)
+{
+  if (nodeToFind > this->nodeCount)
+    return Vector(0,0,0);
+  PathNode* tmpNode = this->firstNode;
+  for (int i = 1; i < nodeToFind; i++)
+    tmpNode = tmpNode->next;
+  return tmpNode->position;
+}
+
+///////////////////////////////////
+/// Bezier Curve //////////////////
+///////////////////////////////////
 
 /**
@@ -45 +69 @@
 */
 BezierCurve::BezierCurve (void)
+{
+  this->derivation = 0;
+  dirCurve = new BezierCurve(1);
+  this->init();
+}
+
+/**
+   \brief Creates a new BezierCurve-Derivation-Curve
+*/
+BezierCurve::BezierCurve (int derivation)
+{
+  this->derivation = derivation;
+  dirCurve=NULL;
+  this->init();
+}
+
+/**
+   \brief Deletes a BezierCurve.
+
+   It does this by freeing all the space taken over from the nodes
+*/
+BezierCurve::~BezierCurve(void)
+{
+  PathNode* tmpNode;
+  currentNode = firstNode;
+  while (tmpNode != 0)
+    {
+      tmpNode = currentNode;
+      currentNode = currentNode->next;
+      delete tmpNode;
+    }
+  if (dirCurve)
+    delete dirCurve;
+}
+
+/**
+   \brief Initializes a BezierCurve
+*/
+void BezierCurve::init(void)
 {
   nodeCount = 0;
@@ -58 +121 @@
 
 /**
-   \brief Deletes a BezierCurve.
+   \brief Rebuilds a Curve
+*/
+void BezierCurve::rebuild(void)
+{
+  PathNode* tmpNode = firstNode;
+
+  // rebuilding the Curve itself
+  float k=0;
+  float n = nodeCount -1;
+  float binCoef = 1;
+  while(tmpNode)
+    {
+      tmpNode->factor = binCoef;
+      if (tmpNode =tmpNode->next)
+        {
+          binCoef *=(n-k)/(k+1);
+          ++k;
+        }
+    }
+
+  // rebuilding the Derivation curve
+  if(this->derivation == 0)
+    {
+      tmpNode = firstNode;
+      delete dirCurve;
+      dirCurve = new BezierCurve(1);
+      while(tmpNode->next)
+        {
+          Vector tmpVector = (tmpNode->next->position)- (tmpNode->position);
+          tmpVector.x*=(float)nodeCount;
+          tmpVector.y*=(float)nodeCount;
+          tmpVector.z*=(float)nodeCount;
+          tmpVector.normalize();
+          this->dirCurve->addNode(tmpVector);
+          tmpNode = tmpNode->next;
+        }
+    }
+}
+
+/**
+   \brief calculates the Position on the curve
+   \param t The position on the Curve (0<=t<=1)
+   \return the Position on the Path
+*/
+Vector BezierCurve::calcPos(float t) 
+{
+  Vector ret = Vector(0.0,0.0,0.0);
+  if (this->nodeCount >= 3)
+    {
+      PathNode* tmpNode = this->firstNode;
+      double factor = pow(1.0-t,nodeCount-1);
+      while(tmpNode)
+        {
+          ret.x += tmpNode->factor * factor * tmpNode->position.x;
+          ret.y += tmpNode->factor * factor * tmpNode->position.y;
+          ret.z += tmpNode->factor * factor * tmpNode->position.z;
+          factor *= t/(1.0-t); // same as pow but much faster.
+          
+          tmpNode = tmpNode->next;
+        }
+    }
+  else if (nodeCount == 2)
+    {
+      ret = this->firstNode->position *(1.0-t);
+      ret = ret + this->firstNode->next->position * t;
+    }
+  else if (nodeCount == 1)
+    ret = this->firstNode->position;
+  return ret;
+}
+
+/**
+   \brief Calulates the direction of the Curve at time t.
+   \param The time at which to evaluate the curve.
+   \returns The vvaluated Vector.
+*/
+Vector BezierCurve::calcDir (float t)
+{
+  return dirCurve->calcPos(t);
+}
+
+/**
+   \brief Calculates the Quaternion needed for our rotations
+   \param t The time at which to evaluate the cuve.
+   \returns The evaluated Quaternion.
+*/
+Quaternion BezierCurve::calcQuat (float t)
+{
+  return Quaternion (calcDir(t), Vector(0,0,1));
+}
+
+
+/**
+  \brief returns the Position of the point calculated on the Curve
+  \return a Vector to the calculated position
+*/
+Vector BezierCurve::getPos(void) const
+{
+  return curvePoint;
+}
+
+
+
+///////////////////////////////////
+//// Uniform Point curve  /////////
+///////////////////////////////////
+/**
+   \brief Creates a new UPointCurve
+*/
+UPointCurve::UPointCurve (void)
+{
+  this->derivation = 0;
+  this->init();
+}
+
+/**
+   \brief Creates a new UPointCurve-Derivation-Curve of deriavation'th degree
+*/
+UPointCurve::UPointCurve (int derivation)
+{
+  this->derivation = derivation;
+  dirCurve=NULL;
+  this->init();
+}
+
+/**
+   \brief Deletes a UPointCurve.
 
    It does this by freeing all the space taken over from the nodes
 */
-BezierCurve::~BezierCurve (void)
+UPointCurve::~UPointCurve(void)
 {
   PathNode* tmpNode;
@@ -72 +261 @@
       delete tmpNode;
     }
+  if (dirCurve)
+    delete dirCurve;
+}
+
+/**
+   \brief Initializes a UPointCurve
+*/
+void UPointCurve::init(void)
+{
+  nodeCount = 0;
+  firstNode = new PathNode;
+  currentNode = firstNode;
+
+  firstNode->position = Vector (.0, .0, .0);
+  firstNode->number = 0;
+  firstNode->next = 0; // not sure if this really points to NULL!!
+
+  return;
+}
+
+/**
+   \brief Rebuilds a UPointCurve
+   
+   \todo very bad algorithm
+*/
+void UPointCurve::rebuild(void)
+{
+  // rebuilding the Curve itself
+  PathNode* tmpNode = this->firstNode;
+  int i=0;
+  Matrix xTmpMat = Matrix(this->nodeCount, this->nodeCount);
+  Matrix yTmpMat = Matrix(this->nodeCount, this->nodeCount);
+  Matrix zTmpMat = Matrix(this->nodeCount, this->nodeCount);
+  Matrix xValMat = Matrix(this->nodeCount, 3);
+  Matrix yValMat = Matrix(this->nodeCount, 3);
+  Matrix zValMat = Matrix(this->nodeCount, 3);
+  while(tmpNode)
+    {
+      Vector fac = Vector(1,1,1);
+      for (int j = 0; j < this->nodeCount; j++)
+        {
+          xTmpMat(i,j) = fac.x; fac.x *= (float)i/(float)this->nodeCount;//tmpNode->position.x;
+          yTmpMat(i,j) = fac.y; fac.y *= (float)i/(float)this->nodeCount;//tmpNode->position.y;
+          zTmpMat(i,j) = fac.z; fac.z *= (float)i/(float)this->nodeCount;//tmpNode->position.z;
+        }
+      xValMat(i,0) = tmpNode->position.x;
+      yValMat(i,0) = tmpNode->position.y;
+      zValMat(i,0) = tmpNode->position.z;
+      ++i;
+      tmpNode = tmpNode->next;
+    }
+  tmpNode = this->firstNode;
+  xValMat = xTmpMat.Inv() *= xValMat;
+  yValMat = yTmpMat.Inv() *= yValMat;
+  zValMat = zTmpMat.Inv() *= zValMat;
+  i = 0;
+  while(tmpNode)
+    {
+      tmpNode->vFactor.x = xValMat(i,0);
+      tmpNode->vFactor.y = yValMat(i,0);
+      tmpNode->vFactor.z = zValMat(i,0);
+
+      i++;
+      tmpNode = tmpNode->next;
+    }
 }
 
@@ -79 +333 @@
    \return the Position on the Path
 */
-Vector BezierCurve::calcPos(float t) 
-{
-  if (nodeCount <=4)
-    {
-      //      if (verbose >= 1)
-      //      printf ("Please define at least 4 nodes, until now you have only defined %i.\n", nodeCount);
-      return Vector(0,0,0);
-    }
+Vector UPointCurve::calcPos(float t) 
+{
   PathNode* tmpNode = firstNode;
-    
   Vector ret = Vector(0.0,0.0,0.0);
-  double factor;
-  int k=0;
-  while(tmpNode!=0)
-    {
-      k++;
-      factor = ncr (nodeCount, k);
-      
-      for (int j=0; j<nodeCount-k; j++)
-        factor*=(1-t);
-      for (int j=0; j<k; j++)
-        factor*=t;
-      ret.x += factor * tmpNode->position.x;
-      ret.y += factor * tmpNode->position.y;
-      ret.z += factor * tmpNode->position.z;
-      
+  float factor = 1.0;
+  while(tmpNode)
+    {
+      ret.x += tmpNode->vFactor.x * factor;
+      ret.y += tmpNode->vFactor.y * factor;
+      ret.z += tmpNode->vFactor.z * factor;
+      factor *= t;
+
       tmpNode = tmpNode->next;
-
     }
   return ret;
@@ -116 +355 @@
    \returns The vvaluated Vector.
 */
-Vector BezierCurve::calcDir (float t)
+Vector UPointCurve::calcDir (float t)
 {
   PathNode* tmpNode = firstNode;
-  BezierCurve* tmpCurve = new BezierCurve();
-  Vector ret;
-  Vector tmpVector;
-
-  while (tmpNode->next != 0)
-    {
-      tmpVector = (tmpNode->next->position)- (tmpNode->position);
-      tmpVector.x*=(float)nodeCount;
-      tmpVector.y*=(float)nodeCount;
-      tmpVector.z*=(float)nodeCount;
-
-      tmpCurve->addNode(tmpVector);
+  Vector ret = Vector(0.0,0.0,0.0);
+  float factor = 1.0/t;
+  int k=0;
+  while(tmpNode)
+    {
+      ret.x += tmpNode->vFactor.x * factor *k;
+      ret.y += tmpNode->vFactor.y * factor *k;
+      ret.z += tmpNode->vFactor.z * factor *k;
+      factor *= t;
+      k++;
       tmpNode = tmpNode->next;
     }
-  ret = tmpCurve->calcPos(t);
   ret.normalize();
-
   return ret;
 }
@@ -144 +379 @@
    \returns The evaluated Quaternion.
 */
-Quaternion BezierCurve::calcQuat (float t)
+Quaternion UPointCurve::calcQuat (float t)
 {
   return Quaternion (calcDir(t), Vector(0,0,1));
@@ -154 +389 @@
   \return a Vector to the calculated position
 */
-Vector BezierCurve::getPos() const
+Vector UPointCurve::getPos(void) const
 {
   return curvePoint;
 }
-
-/**
-   \brief ncr-calculator, did not find an other method
-   \todo a c++ variante to do this
-*/
-int ncr(int n, int i)
-{
-  int ret = 1;
-  for (int k=1; k<=n; k++)
-    ret*=k;
-  for (int k=1; k<=i; k++)
-    ret/=k;
-  for (int k=1; k<=n-i; k++)
-    ret/=k;
-
-  return ret;
-}
-

orxonox/trunk/src/curve.h

@@ +1 @@
+
 /*! 
     \file curve.h
@@ -11 +12 @@
 #include "vector.h"
 
+//! An Enumerator that defines what sort of Curves are availible
+enum CurveType {BEZIERCURVE, UPOINTCURVE};
 
-//! An abstract class to handle curves.
+
+//! An abstract class to handle curves. Needed for the Tracking system in orxonox.
 class Curve
 {
@@ -19 +23 @@
   Vector curvePoint;     //!< The point on the Cureve at a local Time.
   float localTime;       //!< If the time of one point is asked more than once the programm will not calculate it again.
+  Curve* dirCurve;       //!< The derivation-curve of this Curve.
+  int derivation;        //!< Which derivation of a Curve is this.
 
   //! Handles the curve-points (dynamic List)
@@ -24 +30 @@
   {
     int number;          //!< The N-th node of this curve.
+    float factor;        //!< Curve specific multiplier factor.
+    Vector vFactor;      //!< A Vector-factor for multipliing.
     Vector position;     //!< Vector Pointung to this curve-point.
     PathNode* next;      //!< Pointer to the next Node.
@@ -31 +39 @@
   PathNode* currentNode; //!< The node we are working with (the Last node).
 
+ private:
+  virtual void rebuild(void) = 0;
  public:
-  void addNode (const Vector& newNode);
+  void addNode(const Vector& newNode);
+  Vector getNode(unsigned int nodeToFind);
+  inline int getNodeCount(void) { return this->nodeCount;}
 
+  virtual Vector calcPos(float t) = 0;
+  virtual Vector calcDir(float t) = 0;
+  virtual Quaternion calcQuat(float t) = 0;
+ 
 };
 
-//! Bezier Curve
+//!    Class to handle bezier curves in 3-dimesnsional space
 /**
-   Class to handle bezier curves in 3-dimesnsional space
-   
-   needed for  the Tracking system in OrxOnoX.
+   This Curve is good, for Fast Interaction. If you want to change it during the game, go on.
+   !!be aware!! BezierCurves only flow through their first and last Node. Their Tangents at those Points a directed to the second and second-last Point.
 */
 class BezierCurve : public Curve
 {
  private:
-  // all from Curve-Class
+  void rebuild(void);
  public:
-  BezierCurve (void);
-  ~BezierCurve (void);
-  Vector calcPos (float t);
-  Vector calcDir (float t);
-  Quaternion calcQuat (float t);
+  BezierCurve(void);
+  BezierCurve(int derivation);
+  ~BezierCurve(void);
+  void init(void);
+
+  Vector calcPos(float t);
+  Vector calcDir(float t);
+  Quaternion calcQuat(float t);
   
   
-  Vector getPos () const;
+  Vector getPos(void) const;
 };
 
-int ncr(int n, int i);
+
+//! B-Spline
+/**
+   class to handle b-spline in 3d space
+*/
+class BSplieCurve : public Curve
+{
 
 
+};
+
+//! Uniform Point Curve-class
+/**
+   A UPoint Curve is a A Curve, that flows through all the nodes given it.
+   The Algorithm to buid the curve is rather slow, but Painting and tracing along the curve has high speed, so do not change this curve during the Game.
+
+   This Curve is very erattic, so i do not recommend to use it.
+*/
+class UPointCurve : public Curve
+{
+ private:
+  void rebuild(void);
+ public:
+  UPointCurve(void);
+  UPointCurve(int derivation);
+  ~UPointCurve(void);
+  void init(void);
+
+  Vector calcPos(float t);
+  Vector calcDir(float t);
+  Quaternion calcQuat(float t);
+  
+  Vector getPos(void) const;
+};
+
 #endif /* _CURVE_H */

orxonox/trunk/src/data_tank.cc

@@ -19 +19 @@
 using namespace std;
 
+long DataTank::timeStamp = 0;
+
 DataTank::DataTank () {}
 DataTank::~DataTank () {}

orxonox/trunk/src/data_tank.h

@@ -10 +10 @@
   ~DataTank ();
 
+  static long timeStamp;
+
 };
 

orxonox/trunk/src/debug.h

@@ -8 +8 @@
 
 #ifdef  DEBUG
+extern int verbose;
 #define PRINTF(x) \
            PRINTF ## x

orxonox/trunk/src/environment.cc

@@ -21 +21 @@
 #include "world_entity.h"
 #include "vector.h"
+#include "importer/model.h"
 
 using namespace std;
 
 
-//Sorry Bensch
-#define LEVEL_LENGTH 500
 
 Environment::Environment () : WorldEntity()
 {
-
-  /*
-  //Sorry Bensch: x,y = 10
-  for (int x = 0; x < 50; x++)
-    {
-      for (int y = 0; y < 50; y++)
-        {
-          mountainTest[x][y] =0;
-                                                 
-        }
-    }
-  //Sorry Bensch: x,y = 9
-  for (int x = 1; x < LEVEL_LENGTH; x++)
-    {
-      for (int y = 1; y < LEVEL_LENGTH; y++)
-        {
-          //mountainTest[x][y] = (float)random() / 900000000;
-          mountainTest[x][y] = (float)(random() % 4);                                       
-        }
-    }
-  */
+  this->model = new Model("reaplow.obj");
 }
 
 
 
-Environment::~Environment () {}
+Environment::~Environment () 
+{
+  delete this->model;
+}
 
 void Environment::tick (float time) {}
@@ -71 +53 @@
   float matrix[4][4];
   
-  glTranslatef(getPlacement()->r.x,getPlacement()->r.y,getPlacement()->r.z);
-  getPlacement()->w.matrix (matrix);
-  glMultMatrixf ((float*)matrix);
-
-  glBegin(GL_TRIANGLES);
-  glColor3f(1,0,1);
-  glVertex3f(0,0,0.5);
-  glVertex3f(-0.5,0,-1);
-  glVertex3f(0.5,0,-1);
+  glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
+  //rotate
+  this->getAbsDir ().matrix (matrix);
+  glMultMatrixf((float*)matrix);
   
-  glVertex3f(0,0,0.5);
-  glVertex3f(0,0.5,-1);
-  glVertex3f(0,-0.5,-1);
-  glEnd();
-    
-  glBegin(GL_QUADS);
-  glColor3f(1,0,1);
-  glVertex3f(0.5,0.5,-1);
-  glVertex3f(0.5,-0.5,-1);
-  glVertex3f(-0.5,-0.5,-1);
-  glVertex3f(-0.5,0.5,-1);
-  glEnd();
+  glMatrixMode(GL_MODELVIEW);
+  this->model->draw();
 }
 
-/*
-void Environment::paint()
-{
-  
-  glPushMatrix();
-  //glScalef(0.5, 0.5, 1.0);
-  //glTranslatef(xCor, yCor, zCor);
-  glTranslatef( -16.0, -2.0, 0.0);
-  
-  glColor3f(0.0, 1.0, 0.0);
-  
-  glBegin(GL_LINES);
-  for (int x = 0; x < LEVEL_LENGTH; x += 1)
-    {
-      for (int y = 0; y < 190; y += 1)
-        {
-          glVertex3f((float)(2*x), (float)(2*y), mountainTest[x][y]);
-          glVertex3f((float)(2*x), (float)(2*(y+1)), mountainTest[x][y+1]);
-        }
-    }
-  glEnd();
-  
-  
-  glBegin(GL_LINES);
-  for (int y = 0; y < LEVEL_LENGTH; y += 1)
-    {
-      for (int x = 0; x < 90; x += 1)
-        {
-          glVertex3f((float)(2*x), (float)(2*y), mountainTest[x][y]);
-          glVertex3f((float)(2*(x+1)), (float)(2*y), mountainTest[x+1][y]);
-        }
-    }
-  glEnd();
-  
-  glPopMatrix();
-  
-}
-
-void Environment::drawEnvironment() 
-{
-
-}
-
-*/

orxonox/trunk/src/importer/Makefile.am

@@ -8 +8 @@
 importer_SOURCES= framework.cc \
                   windowHandler.cc \
-                  object.cc \
+                  model.cc \
                   array.cc \
                   material.cc \
+                  texture.cc \
                   vector.cc 
 
 noinst_HEADERS= framework.h \
                 windowHandler.h \
-                object.h \
+                model.h \
                 array.h \
-                material.h 
+                material.h \
+                texture.h
 
 

orxonox/trunk/src/importer/Makefile.in

@@ -54 +54 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_importer_OBJECTS = framework.$(OBJEXT) windowHandler.$(OBJEXT) \
-        object.$(OBJEXT) array.$(OBJEXT) material.$(OBJEXT) \
-        vector.$(OBJEXT)
+        model.$(OBJEXT) array.$(OBJEXT) material.$(OBJEXT) \
+        texture.$(OBJEXT) vector.$(OBJEXT)
 importer_OBJECTS = $(am_importer_OBJECTS)
 importer_LDADD = $(LDADD)
@@ -62 +62 @@
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/array.Po ./$(DEPDIR)/framework.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/object.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/vector.Po ./$(DEPDIR)/windowHandler.Po
+@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/model.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/texture.Po ./$(DEPDIR)/vector.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/windowHandler.Po
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -176 +177 @@
 importer_SOURCES = framework.cc \
                   windowHandler.cc \
-                  object.cc \
+                  model.cc \
                   array.cc \
                   material.cc \
+                  texture.cc \
                   vector.cc 
 
 noinst_HEADERS = framework.h \
                 windowHandler.h \
-                object.h \
+                model.h \
                 array.h \
-                material.h 
+                material.h \
+                texture.h
 
 all: all-am
@@ -256 +259 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/framework.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)/model.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windowHandler.Po@am__quote@

orxonox/trunk/src/importer/framework.cc

@@ -52 +52 @@
 int main(int argc, char *argv[])
 {
-  int verbose = 3;
+  verbose = 2;
 
   PRINTF(2)("This is The big verbose-Test %i, %s\n", 1, "cool");
@@ -71 +71 @@
   PRINTF(2)("screensize: %i, %i\n", wHandler.screen->w, wHandler.screen->h);
   if (argc>=3)
-    obj = new Object (argv[1], atof(argv[2]));
+    obj = new Model (argv[1], atof(argv[2]));
   else if (argc>=2)
-    obj = new Object(argv[1]);
+    obj = new Model(argv[1]);
   else 
-    obj = new Object();
+    obj = new Model();
   
   M = Vector(wHandler.screen->w/2, wHandler.screen->h/2, 0); 
@@ -215 +215 @@
           case SDLK_c:
             if (!obj)
-              obj = new Object(argv[1]);
+              obj = new Model(argv[1]);
             break;
           }

orxonox/trunk/src/importer/framework.h

@@ -3 +3 @@
  
 #include "windowHandler.h" // Include the Whandler Basecode
-#include "object.h"
+#include "model.h"
 #include "vector.h"
 
@@ -33 +33 @@
 
 WindowHandler wHandler;  // Create an instance of the whandler basecode class
-Object* obj;
+Model* obj;
 
 

orxonox/trunk/src/importer/material.cc

@@ -13 +13 @@
    co-programmer: ...
 
-   TGA-code: borrowed from nehe-Tutorials
-
 */
 
 #include "material.h"
 
-// headers only for PathList
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <fstream>
-
 using namespace std;
 
-/**
-   \brief creates a ned PathList.
-   
-   It is a good idea to use this as an initial List,
-   because if you give on a name the Path will not be checked for its existence.
-*/
-PathList::PathList()
-{
-  this->pathName = NULL;
-  this->next = NULL;
-}
-
-/**
-   \brief Creates a new PathList with a Name.
-   \param pName the Name of The Path.
-
-   This function just adds the Path without checking if it exists.
-*/
-PathList::PathList(char* pName)
-{
-  this->pathName = new char [strlen(pName)+1];
-  strcpy (this->pathName, pName);
-  this->next = NULL;
-}
-
-/**
-   \brief destroys a PathList
-
-   It does this by deleting the Name and then delete its preceding PathList.
-*/
-PathList::~PathList()
-{
-  if (this->pathName)
-    delete []this->pathName;
-  if (this->next)
-    delete this->next;
-}
-
-/**
-   \brief Adds a new Pathlist Element.
-   \param pName
-   
-   Adding a Path automatically checks if the Path exists,
-   and if it does not it will not add it to the List.
-*/
-void PathList::addPath (char* pName)
-{
-  if (pName[0] == '\0')
-    {
-      PRINTF(3)("not Adding empty Path to the List.\n");
-      return;
-    }
-  char* tmpPName = new char[strlen(pName)];
-  strncpy(tmpPName, pName, strlen(pName)-1);
-  tmpPName[strlen(pName)-1] = '\0';
-  if (access (tmpPName, F_OK) == 0)
-    {
-      struct stat status;
-      stat(tmpPName, &status);
-      if (status.st_mode & S_IFDIR)
-        {
-          PRINTF(2)("Adding Path %s to the PathList.\n", pName);
-          PathList* tmpPathList = this;
-          while (tmpPathList->next)
-            tmpPathList = tmpPathList->next;
-          tmpPathList->next = new PathList(pName);
-        }
-      else
-        PRINTF(2)("You tried to add non-folder %s to a PathList.\n", tmpPName);
-    }
-  else
-      PRINTF(2)("You tried to add non-existing folder %s to a PathList.\n", tmpPName);
-  delete []tmpPName;
-}
 
 /**
@@ -133 +50 @@
   if (this->name)
     delete []this->name;
-  if (this->diffuseTextureSet)
-    glDeleteTextures (1, &this->diffuseTexture);
+  if (this->diffuseTexture)
+    this->diffuseTexture;
   if (this->nextMat)
     delete this->nextMat;
@@ -172 +89 @@
   this->setTransparency(0.0);
 
-  if (!this->pathList)
-    this->pathList = new PathList("");
-
+
+  this->diffuseTexture = NULL;
+  this->ambientTexture = NULL;
+  this->specularTexture = NULL;
 
   this->diffuseTextureSet = false;
@@ -182 +100 @@
   
 }
-
-PathList *Material::pathList = NULL;
 
 /**
@@ -233 +149 @@
 
   if (this->diffuseTextureSet)
-    glBindTexture(GL_TEXTURE_2D, this->diffuseTexture);
+    glBindTexture(GL_TEXTURE_2D, this->diffuseTexture->getTexture());
   else
     glBindTexture(GL_TEXTURE_2D, 0);
@@ -394 +310 @@
 void Material::addTexturePath(char* pathName)
 {
-  this->pathList->addPath (pathName);
-}
-
-/**
-   \brief Searches for a Texture inside one of the defined Paths
-   \param texName The name of the texture o search for.
-   \returns pathName+texName if texName was found in the pathList. NULL if the Texture is not found.
-*/
-char* Material::searchTextureInPaths(char* texName) const
-{
-  char* tmpName = NULL;
-  PathList* pList = pathList;
-  while (pList)
-    {
-      if (pList->pathName)
-        {
-          tmpName = new char [strlen(pList->pathName)+strlen(texName)+1];
-          strcpy(tmpName, pList->pathName);
-        }
-      else
-        {
-          tmpName = new char [strlen(texName)+1];
-          tmpName[0]='\0';
-        }
-      strcat(tmpName, texName);
-      if (access (tmpName, F_OK) == 0)
-        return tmpName;
-      
-      if (tmpName)
-        delete []tmpName;
-      tmpName = NULL;
-      pList = pList->next;
-    }
-  return NULL;
-}
-
+  PathList::getInstance()->addPath(pathName);
+}
 
 // MAPPING //
@@ -440 +322 @@
 {
   PRINTF(3)("setting Diffuse Map %s\n", dMap);
-
-  //  diffuseTextureSet = loadBMP(dMap, &diffuseTexture);
-  this->diffuseTextureSet = this->loadImage(dMap, &this->diffuseTexture);
+  diffuseTexture = new Texture();
+  this->diffuseTextureSet = diffuseTexture->loadImage(dMap);
 
 }
@@ -477 +358 @@
 
 }
-
-/**
-   \brief Loads a Texture to the openGL-environment.
-   \param pImage The Image to load to openGL
-   \param texture The Texture to apply it to.
-*/
-bool Material::loadTexToGL (Image* pImage, GLuint* texture)
-{
-  PRINTF(2)("Loading texture to OpenGL-Environment.\n");
-  glGenTextures(1, texture);
-  glBindTexture(GL_TEXTURE_2D, *texture);
-  /* not Working, and not needed. 
-  glTexImage2D( GL_TEXTURE_2D, 0, 3, width,
-                height, 0, GL_BGR,
-                GL_UNSIGNED_BYTE, map->pixels );
-  */ 
-  gluBuild2DMipmaps(GL_TEXTURE_2D, 3, pImage->width, pImage->height, GL_RGB, GL_UNSIGNED_BYTE, pImage->data);
-  
-  glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_NEAREST);
-  glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR_MIPMAP_LINEAR); 
-}
-
-
-#ifdef HAVE_SDL_SDL_IMAGE_H
-bool Material::loadImage(char* imageName, GLuint* texture)
-{
-  char* imgNameWithPath = searchTextureInPaths(imageName);
-  if (imgNameWithPath)
-    {
-      SDL_Surface* map;
-      Image* pImage = new Image;
-      map=IMG_Load(imgNameWithPath);
-      if(!map)
-        {
-          PRINTF(1)("IMG_Load: %s\n", IMG_GetError());
-          return false;
-        }
-      pImage->height = map->h;
-      pImage->width  = map->w;
-      pImage->data   = (GLubyte*)map->pixels;
-      if( !IMG_isPNG(SDL_RWFromFile(imgNameWithPath, "rb")) && !IMG_isJPG(SDL_RWFromFile(imgNameWithPath, "rb")))
-        for (int i=0;i<map->h * map->w *3;i+=3)
-          { 
-            GLuint temp = pImage->data[i];
-            pImage->data[i] = pImage->data[i+2];
-            pImage->data[i+2] = temp;
-          }
-      this->loadTexToGL (pImage, texture);
-    }
-  else
-    {
-      PRINTF(1)("Image not Found: %s\n", imgNameWithPath);
-      return false;
-    }
-}
-
-
-#else /* HAVE_SDL_SDL_IMAGE_H */
-/**
-   \brief Makes the Programm ready to Read-in a texture-File
-   1. Checks what type of Image should be imported
-   2. ToDO: Checks where to find the Image
-*/
-bool Material::loadImage(char* imageName, GLuint* texture)
-{
-  char* imgNameWithPath = searchTextureInPaths(imageName);
-  if (imgNameWithPath)
-    {
-      if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".bmp", 4))
-        {
-          PRINTF(3)("Requested bmp-image. Trying to Import.\n");
-          return this->loadBMP(imgNameWithPath, texture);
-        }
-      
-      else if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".jpg", 4) || !strncmp(imgNameWithPath+strlen(imgNameWithPath)-5, ".jpg", 5))
-        {
-          PRINTF(3)("Requested jpeg-image. Trying to Import\n");
-          return this->loadJPG(imgNameWithPath, texture);
-        }
-      else if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".tga", 4))
-        {
-          PRINTF(3)("Requested tga-image. Trying to Import\n");
-          return this->loadTGA(imgNameWithPath, texture);
-        }
-      else if (!strncmp(imgNameWithPath+strlen(imgNameWithPath)-4, ".png", 4))
-        {
-          PRINTF(3)("Requested png-image. Trying to Import\n");
-          return this->loadPNG(imgNameWithPath, texture);
-        }
-      else
-        {
-          PRINTF(1)("Requested Image was not recognized in its type. (Maybe a type-Cast-error.)\n FileName: %s", imgNameWithPath);
-          return false;
-        }
-    }
-  else
-    {
-      PRINTF(1)("Image not Found: %s\n", imgNameWithPath);
-      return false;
-    }
-}
-
-/**
-   \brief reads in a Windows BMP-file, and imports it to openGL.
-   \param bmpName The name of the Image to load.
-   \param texture A pointer to the Texture which should be read to.
-*/
-bool Material::loadBMP (char* bmpName, GLuint* texture)
-{
-  Image* pImage = new Image;
-  FILE *file;
-  unsigned long size;                 // size of the image in bytes.
-  unsigned long i;                    // standard counter.
-  unsigned short int planes;          // number of planes in image (must be 1) 
-  unsigned short int bpp;             // number of bits per pixel (must be 24)
-  GLuint temp;                          // temporary color storage for bgr-rgb conversion.
-
-  // make sure the file is there.
-  if ((file = fopen(bmpName, "rb"))==NULL)
-    {
-      PRINTF(1)("File Not Found : %s\n",bmpName);
-      return false;
-    }
-  // seek through the bmp header, up to the width/height:
-  fseek(file, 18, SEEK_CUR);
-  
-  // read the width
-  if ((i = fread(&pImage->width, 4, 1, file)) != 1) 
-    {
-      PRINTF(1)("Error reading width from %s.\n", bmpName);
-      return false;
-    }
-  // read the height 
-  if ((i = fread(&pImage->height, 4, 1, file)) != 1) 
-    {
-      PRINTF(1)("Error reading height from %s.\n", bmpName);
-      return false;
-    }
-  
-  // calculate the size (assuming 24 bits or 3 bytes per pixel).
-  size = pImage->width * pImage->height * 3;
-  
-  // read the planes
-  if ((fread(&planes, 2, 1, file)) != 1) 
-    {
-      PRINTF(1)("Error reading planes from %s.\n", bmpName);
-      return false;
-    }
-  if (planes != 1) 
-    {
-      PRINTF(1)("Planes from %s is not 1: %u\n", bmpName, planes);
-      return false;
-    }
-  
-  // read the bpp
-  if ((i = fread(&bpp, 2, 1, file)) != 1) 
-    {
-      PRINTF(1)("Error reading bpp from %s.\n", bmpName);
-      return false;
-    }
-  if (bpp != 24) 
-    {
-      PRINTF(1)("Bpp from %s is not 24: %u\n", bmpName, bpp);
-      return false;
-    }
-  
-  // seek past the rest of the bitmap header.
-  fseek(file, 24, SEEK_CUR);
-  
-  // read the data. 
-  pImage->data = (GLubyte *) malloc(size);
-  if (pImage->data == NULL) 
-    {
-      PRINTF(1)("Error allocating memory for color-corrected image data");
-      return false;     
-    }
-  
-  if ((i = fread(pImage->data, size, 1, file)) != 1) 
-    {
-      PRINTF(1)("Error reading image data from %s.\n", bmpName);
-      return false;
-    }
-  fclose(file);
-
-  // reverse all of the colors. (bgr -> rgb)
-  for (i=0;i<size;i+=3) 
-    { 
-      temp = pImage->data[i];
-      pImage->data[i] = pImage->data[i+2];
-      pImage->data[i+2] = temp;
-    }
-  this->loadTexToGL (pImage, texture);
-  
-
-  if (pImage)
-    {
-      if (pImage->data)
-        {
-          free(pImage->data);
-        }
-      
-      free(pImage);
-    }
-  return true;
-
-}
-
-/**
-   \brief reads in a jpg-file
-   \param jpgName the Name of the Image to load
-   \param texture a reference to the Texture to write the image to
-*/
-bool Material::loadJPG (char* jpgName, GLuint* texture)
-{
-#ifdef HAVE_JPEGLIB_H
-  struct jpeg_decompress_struct cinfo;
-  Image *pImage = NULL;
-  FILE *pFile;
-  
-  // Open a file pointer to the jpeg file and check if it was found and opened 
-  if((pFile = fopen(jpgName, "rb")) == NULL) 
-    {
-      // Display an error message saying the file was not found, then return NULL
-      PRINTF(1)("Unable to load JPG File %s.\n", jpgName);
-      return false;
-    }
-  
-  // Create an error handler
-  jpeg_error_mgr jerr;
-  
-  // Have our compression info object point to the error handler address
-  cinfo.err = jpeg_std_error(&jerr);
-  
-  // Initialize the decompression object
-  jpeg_create_decompress(&cinfo);
-  
-  // Specify the data source (Our file pointer) 
-  jpeg_stdio_src(&cinfo, pFile);
-  
-  // Allocate the structure that will hold our eventual jpeg data (must free it!)
-  pImage = (Image*)malloc(sizeof(Image));
-  
-  // DECOFING
-  // Read in the header of the jpeg file
-  jpeg_read_header(&cinfo, TRUE);
-  
-  // Start to decompress the jpeg file with our compression info
-  jpeg_start_decompress(&cinfo);
-  
-  // Get the image dimensions and row span to read in the pixel data
-  pImage->rowSpan = cinfo.image_width * cinfo.num_components;
-  pImage->width   = cinfo.image_width;
-  pImage->height   = cinfo.image_height;
-  
-  // Allocate memory for the pixel buffer
-  pImage->data = new unsigned char[pImage->rowSpan * pImage->height];
-  
-  // Here we use the library's state variable cinfo.output_scanline as the
-  // loop counter, so that we don't have to keep track ourselves.
-  
-  // Create an array of row pointers
-  unsigned char** rowPtr = new unsigned char*[pImage->height];
-  for (int i = 0; i < pImage->height; i++)
-    rowPtr[i] = &(pImage->data[i*pImage->rowSpan]);
-  
-  // Now comes the juice of our work, here we extract all the pixel data
-  int rowsRead = 0;
-  while (cinfo.output_scanline < cinfo.output_height) 
-    {
-      // Read in the current row of pixels and increase the rowsRead count
-      rowsRead += jpeg_read_scanlines(&cinfo, &rowPtr[rowsRead], cinfo.output_height - rowsRead);
-    }
-  
-  // Delete the temporary row pointers
-  delete [] rowPtr;
-  
-  // Finish decompressing the data
-  jpeg_finish_decompress(&cinfo);//  decodeJPG(&cinfo, pImage);
-  
-  // This releases all the stored memory for reading and decoding the jpeg
-  jpeg_destroy_decompress(&cinfo);
-  
-  // Close the file pointer that opened the file
-  fclose(pFile);
-  
-
-  if(pImage == NULL)
-    exit(0);
-  
-  this->loadTexToGL (pImage, texture);
-  if (pImage)
-    {
-      if (pImage->data)
-        {
-          free(pImage->data);
-        }
-      
-      free(pImage);
-    }
-  return true;
-#else /* HAVE_JPEGLIB_H */
-  PRINTF(1)("sorry, but you did not compile with jpeg-support.\nEither install SDL_image or jpeglib, and recompile to see the image\n");
-  return false;
-#endif /* HAVE_JPEGLIB_H */
-
-}
-
-/**
-   \brief reads in a tga-file
-   \param tgaName the Name of the Image to load
-   \param texture a reference to the Texture to write the image to
-*/
-bool Material::loadTGA(const char * tgaName, GLuint* texture)
-{
-  typedef struct
-  {
-    GLubyte Header[12];
-  } TGAHeader;
-  TGAHeader tgaHeader;                  
-  
-  GLubyte uTGAcompare[12] = {0,0,2, 0,0,0,0,0,0,0,0,0}; // Uncompressed TGA Header 
-  GLubyte cTGAcompare[12] = {0,0,10,0,0,0,0,0,0,0,0,0}; // Compressed TGA Header 
-  FILE * fTGA;
-  fTGA = fopen(tgaName, "rb");
-
-  if(fTGA == NULL)
-    {
-      PRINTF(1)("Error could not open texture file: %s\n", tgaName);
-      return false;
-    }
-  
-  if(fread(&tgaHeader, sizeof(TGAHeader), 1, fTGA) == 0)
-    {
-      PRINTF(1)("Error could not read file header of %s\n", tgaName);
-      if(fTGA != NULL)
-        {
-          fclose(fTGA);
-        }
-      return false;
-    }
-  
-  if(memcmp(uTGAcompare, &tgaHeader, sizeof(TGAHeader)) == 0)
-    {
-      loadUncompressedTGA(tgaName, fTGA, texture);
-      if (fTGA)
-        fclose (fTGA);
-    }
-  else if(memcmp(cTGAcompare, &tgaHeader, sizeof(TGAHeader)) == 0)
-    {
-      loadCompressedTGA(tgaName, fTGA, texture);
-        if (fTGA)
-          fclose (fTGA);
-    }
-  else
-    {
-      PRINTF(1)("Error TGA file be type 2 or type 10\n");
-      if (fTGA)
-        fclose(fTGA);
-      return false;
-    }
-  return true;
-}
-
-/**
-   \brief reads in an uncompressed tga-file
-   \param filename the Name of the Image to load
-   \param fTGA a Pointer to a File, that should be read
-   \param texture a reference to the Texture to write the image to
-*/
-bool Material::loadUncompressedTGA(const char * filename, FILE * fTGA, GLuint* texture)
-{
-  GLubyte header[6];      // First 6 Useful Bytes From The Header 
-  GLuint  bytesPerPixel;  // Holds Number Of Bytes Per Pixel Used In The TGA File 
-  GLuint  imageSize;      // Used To Store The Image Size When Setting Aside Ram 
-  GLuint  temp;           // Temporary Variable
-  GLuint  type;
-  GLuint  Height;         // Height of Image 
-  GLuint  Width;          // Width of Image 
-  GLuint  Bpp;            // Bits Per Pixel 
-
-  Image* pImage = new Image;
-  GLuint cswap;
-  if(fread(header, sizeof(header), 1, fTGA) == 0)
-    {
-      PRINTF(1)("Error could not read info header\n");
-      return false;
-    }
-  
-  Width = pImage->width  = header[1] * 256 + header[0];
-  Height =  pImage->height = header[3] * 256 + header[2];
-  Bpp = pImage->bpp = header[4];
-  // Make sure all information is valid
-  if((pImage->width <= 0) || (pImage->height <= 0) || ((pImage->bpp != 24) && (pImage->bpp !=32)))
-    {
-      PRINTF(1)("Error invalid texture information\n");
-      return false;
-    }
-  
-  if(pImage->bpp == 24) 
-    {
-      pImage->type = GL_RGB;
-    }
-  else
-    {
-      pImage->type = GL_RGBA;
-    }
-  
-  bytesPerPixel = (Bpp / 8);
-  imageSize = (bytesPerPixel * Width * Height);
-  pImage->data = (GLubyte*) malloc(imageSize);
-  
-  if(pImage->data == NULL)
-    {
-      PRINTF(1)("Error could not allocate memory for image\n");
-      return false;
-    }
-  
-  if(fread(pImage->data, 1, imageSize, fTGA) != imageSize)
-    {
-      PRINTF(1)("Error could not read image data\n");
-      if(pImage->data != NULL)
-        {
-          free(pImage->data);
-        }
-      return false;
-    }
-  
-  for(cswap = 0; cswap < (int)imageSize; cswap += bytesPerPixel)
-    {
-      pImage->data[cswap] ^= pImage->data[cswap+2] ^=
-        pImage->data[cswap] ^= pImage->data[cswap+2];
-    }
-  
-  this->loadTexToGL (pImage, texture);
-
-  return true;
-}
-
-/**
-   \brief reads in a compressed tga-file
-   \param filename the Name of the Image to load
-   \param fTGA a Pointer to a File, that should be read
-   \param texture a reference to the Texture to write the image to
-*/
-bool Material::loadCompressedTGA(const char * filename, FILE * fTGA, GLuint* texture)
-{
-  GLubyte header[6];      // First 6 Useful Bytes From The Header 
-  GLuint  bytesPerPixel;  // Holds Number Of Bytes Per Pixel Used In The TGA File 
-  GLuint  imageSize;      // Used To Store The Image Size When Setting Aside Ram 
-  GLuint  temp;           // Temporary Variable
-  GLuint  type;
-  GLuint  Height;         // Height of Image 
-  GLuint  Width;          // Width of Image 
-  GLuint  Bpp;            // Bits Per Pixel 
-
-  Image* pImage = new Image;
-
-  
-  if(fread(header, sizeof(header), 1, fTGA) == 0)
-    {
-      PRINTF(1)("Error could not read info header\n");
-      return false;
-    }
-  
-  Width = pImage->width  = header[1] * 256 + header[0];
-  Height = pImage->height = header[3] * 256 + header[2];
-  Bpp = pImage->bpp     = header[4];
-
-  GLuint pixelcount     = Height * Width;
-  GLuint currentpixel   = 0;
-  GLuint currentbyte    = 0;
-  GLubyte * colorbuffer = (GLubyte *)malloc(bytesPerPixel);
-
-  //Make sure all pImage info is ok 
-  if((pImage->width <= 0) || (pImage->height <= 0) || ((pImage->bpp != 24) && (pImage->bpp !=32)))
-    {
-      PRINTF(1)("Error Invalid pImage information\n");
-      return false;
-    }
-  
-  bytesPerPixel = (Bpp / 8);
-  imageSize             = (bytesPerPixel * Width * Height);
-  pImage->data  = (GLubyte*) malloc(imageSize);
-  
-  if(pImage->data == NULL)
-    {
-      PRINTF(1)("Error could not allocate memory for image\n");
-      return false;
-    }
-  
-  do
-    {
-      GLubyte chunkheader = 0;
-      
-      if(fread(&chunkheader, sizeof(GLubyte), 1, fTGA) == 0)
-        {
-          PRINTF(1)("Error could not read RLE header\n");
-          if(pImage->data != NULL)
-            {
-              free(pImage->data);
-            }
-          return false;
-        }
-      // If the ehader is < 128, it means the that is the number of RAW color packets minus 1 
-      if(chunkheader < 128)
-        {
-          short counter;
-          chunkheader++;
-          // Read RAW color values
-          for(counter = 0; counter < chunkheader; counter++)
-            { 
-              // Try to read 1 pixel 
-              if(fread(colorbuffer, 1, bytesPerPixel, fTGA) != bytesPerPixel)
-                {
-                  PRINTF(1)("Error could not read image data\n");
-                  if(colorbuffer != NULL)
-                    {
-                      free(colorbuffer);
-                    }
-                  
-                  if(pImage->data != NULL)
-                    {
-                      free(pImage->data);
-                    }
-                  
-                  return false; 
-                }
-              // write to memory 
-              // Flip R and B vcolor values around in the process 
-              pImage->data[currentbyte    ] = colorbuffer[2];                               
-              pImage->data[currentbyte + 1] = colorbuffer[1];
-              pImage->data[currentbyte + 2] = colorbuffer[0];
-              
-              if(bytesPerPixel == 4) // if its a 32 bpp image 
-                {
-                  pImage->data[currentbyte + 3] = colorbuffer[3];// copy the 4th byte 
-                }
-              
-              currentbyte += bytesPerPixel;
-              currentpixel++;
-
-              // Make sure we haven't read too many pixels 
-              if(currentpixel > pixelcount)     
-                {
-                  PRINTF(1)("Error too many pixels read\n");
-                  if(colorbuffer != NULL)
-                    {
-                      free(colorbuffer);
-                    }
-                  
-                  if(pImage->data != NULL)
-                    {
-                      free(pImage->data);
-                    }
-                  
-                  return false;
-                }
-            }
-        }
-      // chunkheader > 128 RLE data, next color  reapeated chunkheader - 127 times
-      else
-        {
-          short counter;
-          chunkheader -= 127;   // Subteact 127 to get rid of the ID bit 
-          if(fread(colorbuffer, 1, bytesPerPixel, fTGA) != bytesPerPixel) // Attempt to read following color values 
-            {
-              PRINTF(1)("Error could not read from file");
-              if(colorbuffer != NULL)
-                {
-                  free(colorbuffer);
-                }
-              
-              if(pImage->data != NULL)
-                {
-                  free(pImage->data);
-                }
-              
-              return false;
-            }
-          
-          for(counter = 0; counter < chunkheader; counter++) //copy the color into the image data as many times as dictated
-            {                                                   
-              // switch R and B bytes areound while copying
-              pImage->data[currentbyte    ] = colorbuffer[2];
-              pImage->data[currentbyte + 1] = colorbuffer[1];
-              pImage->data[currentbyte + 2] = colorbuffer[0];
-              
-              if(bytesPerPixel == 4)
-                {
-                  pImage->data[currentbyte + 3] = colorbuffer[3];
-                }
-              
-              currentbyte += bytesPerPixel;
-              currentpixel++;
-              
-              if(currentpixel > pixelcount)
-                {
-                  PRINTF(1)("Error too many pixels read\n");
-                  if(colorbuffer != NULL)
-                    {
-                      free(colorbuffer);
-                    }
-                  
-                  if(pImage->data != NULL)
-                    {
-                      free(pImage->data);
-                    }
-                  
-                  return false;
-                }
-            }
-        }
-    }
-  
-  while(currentpixel < pixelcount);     // Loop while there are still pixels left
-
-  this->loadTexToGL (pImage, texture);
-
-  return true;
-}
-
-
-/*
-static int ST_is_power_of_two(unsigned int number)
-{
-  return (number & (number - 1)) == 0;
-}
-*/
-
-/**
-   \brief reads in a png-file
-   \param pngName the Name of the Image to load
-   \param texture a reference to the Texture to write the image to
-*/
-bool Material::loadPNG(const char* pngName, GLuint* texture)
-{
-#ifdef HAVE_PNG_H
-  Image* pImage = new Image;
-
-  FILE *PNG_file = fopen(pngName, "rb");
-  if (PNG_file == NULL)
-    {
-      return 0;
-    }
-  
-  GLubyte PNG_header[8];
-  
-  fread(PNG_header, 1, 8, PNG_file);
-  if (png_sig_cmp(PNG_header, 0, 8) != 0)
-    {
-      PRINTF(2)("Not Recognized as a pngFile\n");
-      fclose (PNG_file);
-      return 0;
-    }
-  
-  png_structp PNG_reader = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-  if (PNG_reader == NULL)
-    {
-      fclose(PNG_file);
-      return 0;
-    }
-  
-  png_infop PNG_info = png_create_info_struct(PNG_reader);
-  if (PNG_info == NULL)
-    {
-      png_destroy_read_struct(&PNG_reader, NULL, NULL);
-      fclose(PNG_file);
-      return 0;
-    }
-  
-  png_infop PNG_end_info = png_create_info_struct(PNG_reader);
-  if (PNG_end_info == NULL)
-    {
-      png_destroy_read_struct(&PNG_reader, &PNG_info, NULL);
-      fclose(PNG_file);
-      return 0;
-    }
-  
-  if (setjmp(png_jmpbuf(PNG_reader)))
-    {
-      png_destroy_read_struct(&PNG_reader, &PNG_info, &PNG_end_info);
-      fclose(PNG_file);
-      return (0);
-    }
-  
-  png_init_io(PNG_reader, PNG_file);
-  png_set_sig_bytes(PNG_reader, 8);
-  
-  png_read_info(PNG_reader, PNG_info);
-  
-  pImage->width = png_get_image_width(PNG_reader, PNG_info);
-  pImage->height = png_get_image_height(PNG_reader, PNG_info);
-  
-  png_uint_32 bit_depth, color_type;
-  bit_depth = png_get_bit_depth(PNG_reader, PNG_info);
-  color_type = png_get_color_type(PNG_reader, PNG_info);
-  
-  if (color_type == PNG_COLOR_TYPE_PALETTE)
-    {
-      png_set_palette_to_rgb(PNG_reader);
-    }
-  
-  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
-    {
-      png_set_gray_1_2_4_to_8(PNG_reader);
-    }
-  
-  if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-    {
-      png_set_gray_to_rgb(PNG_reader);
-    }
-  
-  if (png_get_valid(PNG_reader, PNG_info, PNG_INFO_tRNS))
-    {
-      png_set_tRNS_to_alpha(PNG_reader);
-    }
-  else
-    {
-      png_set_filler(PNG_reader, 0xff, PNG_FILLER_AFTER);
-    }
-  
-  if (bit_depth == 16)
-    {
-      png_set_strip_16(PNG_reader);
-    }
-  
-  png_read_update_info(PNG_reader, PNG_info);
-  
-  pImage->data = (png_byte*)malloc(4 * pImage->width * pImage->height);
-  png_byte** PNG_rows = (png_byte**)malloc(pImage->height * sizeof(png_byte*));
-  
-  unsigned int row;
-  for (row = 0; row < pImage->height; ++row)
-    {
-      PNG_rows[pImage->height - 1 - row] = pImage->data + (row * 4 * pImage->width);
-    }
-  
-  png_read_image(PNG_reader, PNG_rows);
-  
-  free(PNG_rows);
-  
-  png_destroy_read_struct(&PNG_reader, &PNG_info, &PNG_end_info);
-  fclose(PNG_file);
-  
-  /*  if (!ST_is_power_of_two(pImage->width) || !ST_is_power_of_two(pImage->height))
-    {
-      free(pImage->data);
-      return 0;
-    }
-  */
-  this->loadTexToGL (pImage, texture);  
-  
-  free(pImage->data);
-  
-  return true;
-#else /* HAVE_PNG_H */
-  PRINTF(1)("sorry, but you did not compile with png-support.\nEither install SDL_image or libpng, and recompile to see the image\n");
-  return false;
-#endif /* HAVE_PNG_H */
-
-}
-
-#endif /* HAVE_SDL_SDL_IMAGE_H */

orxonox/trunk/src/importer/material.h

@@ -14 +14 @@
 
 #include "../stdincl.h"
+#include "texture.h"
 
 #if HAVE_CONFIG_H 
@@ -19 +20 @@
 #endif /* HAVE_CONFIG_H */
 
-#ifdef HAVE_SDL_SDL_IMAGE_H
-#include <SDL/SDL_image.h>
-#else
-// IMAGE LIBS //
-#ifdef HAVE_JPEGLIB_H
-extern "C"{         // This has to be done, because not a c++ lib
-#include <jpeglib.h>
-}
-#endif /* HAVE_JPEGLIB_H */
-#ifdef HAVE_PNG_H
-#include <png.h>
-#endif /* HAVE_PNG_H */
-#endif /* HAVE_SDL_SDL_IMAGE_H */
 
-//! Class to handle lists of paths.
-/**
-   \todo Ability to return Paths by itself.
-
-   It is simple to use, and good, for all PathList you want.
-   just create a new Pathlist, and add Paths.
-*/
-class PathList
-{
- public:
-  PathList();
-  PathList(char* pName);
-
-  ~PathList();
-  void addPath (char* pName);
-  char* pathName;          //!< The Name of the current Path.
-  PathList* next;          //!< Pointer to the next Pathlist.
-};
 
 
@@ -92 +62 @@
 
  private:
-  //! Struct to handle Infos about an Image
-  struct Image
-  {
-    int rowSpan;    //!< The count of the rows this Image has.
-    GLuint width;   //!< The width of the Image.
-    GLuint height;  //!< The height of the Image.
-    GLuint bpp;     //!< BitsPerPixel
-    GLuint type;    //!< Type of the Image.
-    GLubyte *data;  //!< The Image Data comes here! DANGER: uncompressed data.
-  };
-
-
   char* name;        //!< The Name of the Material.
   int illumModel;    //!< The IlluminationModel is either flat or smooth.
@@ -112 +70 @@
   float transparency;//!< The transperency of the Material.
 
-  static PathList* pathList; //!< A pointer to the first element of Pathlist. This is static, because pathlists are global \todo copy this to the Globals.h or DataTank for deletion at the end.
-  
-  GLuint diffuseTexture; //!< The diffuse texture of the Material.
-  GLuint ambientTexture; //!< The ambient texture of the Material.
-  GLuint specularTexture;//!< The specular texture of the Material.
+  Texture* diffuseTexture; //!< The diffuse texture of the Material.
+  Texture* ambientTexture; //!< The ambient texture of the Material.
+  Texture* specularTexture;//!< The specular texture of the Material.
   
   bool diffuseTextureSet; //!< Chekcs if the diffuse texture is Set.
@@ -124 +80 @@
   Material* nextMat; //!< pointer to the Next Material of the List. NULL if no next exists.
 
-  // TEXTURING
-  bool loadTexToGL (Image* pImage, GLuint* texture);
 
-  bool loadImage(char* imageName, GLuint* texture);
-#ifndef HAVE_SDL_SDL_IMAGE_H
-
-  bool loadBMP (char* bmpName, GLuint* texture);
-
-  bool loadJPG (char* jpgName, GLuint* texture);
-
-  /// TGA ///
-
-  bool loadTGA(const char * tgaName, GLuint* texture);
-  bool loadUncompressedTGA(const char * filename, FILE * fTGA, GLuint* texture);
-  bool loadCompressedTGA(const char * filename, FILE * fTGA, GLuint* texture);
-
-  bool loadPNG(const char* pngName, GLuint* texture);
-#endif
 };
 #endif

orxonox/trunk/src/list.h

@@ -78 +78 @@
   
 
-  void add(WorldEntity* entity);
-  void remove(WorldEntity* entity);
+  void add(T* entity);
+  void remove(T* entity);
   void destroy();
   T* firstElement();
@@ -104 +104 @@
 
 template<class T>
-void tList<T>::add(WorldEntity* entity)
+void tList<T>::add(T* entity)
 {
   listElement* el = new listElement;
@@ -120 +120 @@
 
 template<class T>
-void tList<T>::remove(WorldEntity* entity)
+void tList<T>::remove(T* entity)
 {
   this->currentEl = this->first;

orxonox/trunk/src/orxonox.cc

@@ -115 +115 @@
   // Set video mode
   // TO DO: parse arguments for settings
-  SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
-  SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5);
-  SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5);
-  SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
-  
+  //SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
+  //SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5);
+  //SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5);
+  //SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
+  
+
+  SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );   
+  SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, 16);    
+  SDL_GL_SetAttribute( SDL_GL_STENCIL_SIZE, 0);  
+  SDL_GL_SetAttribute( SDL_GL_ACCUM_RED_SIZE, 0);
+  SDL_GL_SetAttribute( SDL_GL_ACCUM_GREEN_SIZE, 0);
+  SDL_GL_SetAttribute( SDL_GL_ACCUM_BLUE_SIZE, 0);
+  SDL_GL_SetAttribute( SDL_GL_ACCUM_ALPHA_SIZE, 0);
+
+
+
   int bpp = 16;
   int width = 640;
   int height = 480;
-  Uint32 flags = SDL_HWSURFACE | SDL_OPENGL | SDL_GL_DOUBLEBUFFER;
-  
-  if((screen = SDL_SetVideoMode (width, height, bpp, flags)) == NULL)
+  //Uint32 flags = SDL_HWSURFACE | SDL_OPENGL | SDL_GL_DOUBLEBUFFER; /* \todo: SDL_OPENGL doen't permit to load images*/
+  //Uint32 flags = SDL_HWSURFACE | SDL_GL_DOUBLEBUFFER;
+
+  Uint32 videoFlags = SDL_OPENGL | SDL_HWPALETTE | SDL_RESIZABLE;
+
+  /* query SDL for information about our video hardware */
+  const SDL_VideoInfo* videoInfo = SDL_GetVideoInfo ();
+  
+  if( videoInfo == NULL)
+    {
+      printf ("Orxonox::initVideo() - Failed getting Video Info :%s\n", SDL_GetError()); 
+      SDL_Quit ();
+    }
+  if( videoInfo->hw_available)
+    videoFlags |= SDL_HWSURFACE;
+  else 
+    videoFlags |= SDL_SWSURFACE;
+  /*
+  if(VideoInfo -> blit_hw)                            
+    VideoFlags |= SDL_HWACCEL;
+  */
+  
+  if((this->screen = SDL_SetVideoMode (width, height, bpp, videoFlags)) == NULL)
   {
-    printf("Could not SDL_SetVideoMode(%d, %d, %d, %d): %s\n", width, height, bpp, flags, SDL_GetError());
+    printf("Could not SDL_SetVideoMode(%d, %d, %d, %d): %s\n", width, height, bpp, videoFlags, SDL_GetError());
     SDL_Quit();
     return -1;
@@ -133 +164 @@
   
   // Set window labeling
-  SDL_WM_SetCaption("Orxonox " PACKAGE_VERSION, "Orxonox " PACKAGE_VERSION);
+  SDL_WM_SetCaption ("Orxonox " PACKAGE_VERSION, "Orxonox " PACKAGE_VERSION);
   
   // TO DO: Create a cool icon and use it here
@@ -139 +170 @@
 
   // OpenGL stuff
-  // (Is this all we initialize globally???)
-  glClearColor(0.0, 0.0, 0.0, 0.0);
-  glEnable(GL_DEPTH_TEST);
+  glClearColor (0.0, 0.0, 0.0, 0.0);
+  glEnable (GL_DEPTH_TEST);
  
   // LIGHTING
@@ -148 +178 @@
   GLfloat lightPosition[] = {10.0, 10, 19.0, 0.0};
 
-  glLightfv(GL_LIGHT0, GL_DIFFUSE, whiteLight);
-  glLightfv(GL_LIGHT0, GL_SPECULAR, whiteLight);
-  glEnable(GL_LIGHTING);
-  glEnable(GL_LIGHT0);
-  glEnable(GL_DEPTH_TEST);
-  glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
-  glLightfv(GL_LIGHT0, GL_DIFFUSE, whiteLight);
+  glLightfv (GL_LIGHT0, GL_DIFFUSE, whiteLight);
+  glLightfv (GL_LIGHT0, GL_SPECULAR, whiteLight);
+  glEnable (GL_LIGHTING);
+  glEnable (GL_LIGHT0);
+  glEnable (GL_DEPTH_TEST);
+  glLightfv (GL_LIGHT0, GL_POSITION, lightPosition);
+  glLightfv (GL_LIGHT0, GL_DIFFUSE, whiteLight);
    
+  //glEnable (GL_TEXTURE_2D); 
   //  glEnable(GL_COLOR);
   //  glShadeModel(GL_SMOOTH);
@@ -311 +342 @@
 
 
+SDL_Surface* Orxonox::getScreen ()
+{
+  return this->screen;
+}
 
 

orxonox/trunk/src/orxonox.h

@@ -68 +68 @@
   Camera* getCamera();
   World* getWorld();
+  SDL_Surface* getScreen ();
   
   //void mainLoop();

orxonox/trunk/src/p_node.cc

@@ -14 +14 @@
    main-programmer: Patrick Boenzli
    co-programmer: ...
+
+   \todo Null-Parent => center of the coord system - singleton
+   \todo Smooth-Parent: delay, speed
+   \todo destroy the stuff again, delete...
 */
 
@@ -28 +32 @@
    \todo this constructor is not jet implemented - do it
 */
-PNode::PNode () {}
+PNode::PNode () 
+{
+  this->children = new tList<PNode>();
+  this->bRelCoorChanged = true;
+  this->bAbsCoorChanged = false;
+  this->bRelDirChanged = true;
+  this->bAbsDirChanged = false;
+  this->parent = NULL;
+}
+
+
+/**
+   \brief constructor with coodinates
+*/
+PNode::PNode (Vector* absCoordinate, PNode* parent )
+{
+  this->absCoordinate = *absCoordinate;
+  this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
+  
+  this->children = new tList<PNode>();
+  this->bRelCoorChanged = true;
+  this->bAbsCoorChanged = false;
+  this->bRelDirChanged = true;
+  this->bAbsDirChanged = false;
+  this->parent = parent;
+
+  parent->addChild (this);
+}
 
 
@@ -36 +67 @@
    \todo this deconstructor is not jet implemented - do it
 */
-PNode::~PNode () {}
-
+PNode::~PNode () 
+{
+  /*
+  delete &this->children;
+  delete &this->relCoordinate;
+  delete &this->absCoordinate;
+  delete &this->relDirection;
+  delete &this->absDirection;
+  */
+  this->parent = NULL;
+  /* there is currently a problem with cleaning up - fix*/
+}
+
+
+/**
+   \brief deletes the hole pnode tree
+
+   cleans up all pnodes
+*/
+void PNode::destroy ()
+{
+  PNode* pn = this->children->enumerate();
+  while( pn != NULL) 
+    { 
+      pn->destroy ();
+      pn = this->children->nextElement();
+    } 
+  this->children->destroy ();
+}
+
+
+/**
+   \brief get relative coordinates
+   \returns relative coordinates to its parent
+*/
+Vector PNode::getRelCoor ()
+{
+  Vector r = this->relCoordinate; /* return a copy, so it can't be modified */
+  return r;
+}
+
+
+/**
+   \brief set relative coordinates
+   \param relative coordinates to its parent
+
+   it is very importand, that you use this function, if you want to update the
+   relCoordinates. If you don't use this, the PNode won't recognize, that something
+   has changed and won't update the children Nodes.
+*/
+void PNode::setRelCoor (Vector* relCoord)
+{
+  this->bRelCoorChanged = true;
+  this->relCoordinate = *relCoord;
+}
+
+
+/**
+   \brief get absolute coordinates
+   \returns absolute coordinates from (0,0,0)
+*/
+Vector PNode::getAbsCoor ()
+{
+  return this->absCoordinate;
+}
+
+
+/**
+   \brief get relative coordinates
+   \returns relative coordinates to its parent
+
+   it is very importand, that you use this function, if you want to update the
+   absCoordinates. If you don't use this, the PNode won't recognize, that something
+   has changed and won't update the children Nodes.
+*/
+void PNode::setAbsCoor (Vector* absCoord)
+{
+  this->bAbsCoorChanged = true;
+  this->absCoordinate = *absCoord;
+}
+
+
+/**
+   \brief shift coordinate (abs and rel)
+   \param shift vector
+
+   this function shifts the current coordinates about the vector shift. this is
+   usefull because from some place else you can:
+   PNode* someNode = ...;
+   Vector objectMovement = calculateShift();
+   someNode->shiftCoor(objectMovement);
+
+   elsewhere you would have to:
+   PNode* someNode = ...;
+   Vector objectMovement = calculateShift();
+   Vector currentCoor = someNode->getRelCoor();
+   Vector newCoor = currentCoor + objectMovement;
+   someNode->setRelCoor(newCoor);
+   
+   yea right... shorter...
+
+*/
+void PNode::shiftCoor (Vector* shift)
+{
+  if( this->bAbsCoorChanged)
+    {
+      this->absCoordinate = this->absCoordinate + *shift;
+    }
+  else 
+    {
+      this->relCoordinate = this->relCoordinate + *shift;
+      this->bRelCoorChanged = true;
+    }
+}
+
+
+
+/**
+   \brief get relative direction
+   \returns relative direction to its parent
+*/
+Quaternion PNode::getRelDir ()
+{
+  return this->relDirection;
+}
+
+
+/**
+   \brief set relative direction
+   \param relative direction to its parent
+
+   it is very importand, that you use this function, if you want to update the
+   relDirection. If you don't use this, the PNode won't recognize, that something
+   has changed and won't update the children Nodes.
+*/
+void PNode::setRelDir (Quaternion* relDir)
+{
+  this->bRelCoorChanged = true;
+  this->relDirection = *relDir;
+}
+
+
+/**
+   \brief gets the absolute direction (0,0,1)
+   \returns absolute coordinates
+*/
+Quaternion PNode::getAbsDir ()
+{}
+
+
+/**
+   \brief sets the absolute direction (0,0,1)
+   \param absolute coordinates
+
+   it is very importand, that you use this function, if you want to update the
+   absDirection. If you don't use this, the PNode won't recognize, that something
+   has changed and won't update the children Nodes.
+*/
+void PNode::setAbsDir (Quaternion* absDir)
+{}
+
+
+/**
+   \brief shift coordinate (abs and rel)
+   \param shift vector
+
+   this function shifts the current coordinates about the vector shift. this is
+   usefull because from some place else you can:
+   PNode* someNode = ...;
+   Quaternion objectMovement = calculateShift();
+   someNode->shiftCoor(objectMovement);
+
+   elsewhere you would have to:
+   PNode* someNode = ...;
+   Quaternion objectMovement = calculateShift();
+   Quaternion currentCoor = someNode->getRelCoor();
+   Quaternion newCoor = currentCoor + objectMovement;
+   someNode->setRelCoor(newCoor);
+   
+   yea right... shorter...
+
+*/
+void PNode::shiftDir (Quaternion* shift)
+{}
+
+
+
+/**
+   \brief adds a child and makes this node to a parent
+   \param child reference
+
+   use this to add a child to this node.
+*/
+void PNode::addChild (PNode* pNode)
+{
+  this->addChild(pNode, DEFAULT_MODE);
+}
+
+
+/**
+   \brief adds a child and makes this node to a parent
+   \param child reference
+   \param on which changes the child should also change ist state
+
+   use this to add a child to this node.
+*/
+void PNode::addChild (PNode* pNode, parentingMode mode)
+{
+  pNode->mode = mode;
+  pNode->parent = this;
+  this->children->add (pNode);
+}
+
+
+/**
+   /brief removes a child from the node
+*/
+void PNode::removeChild (PNode* pNode)
+{
+  this->children->remove (pNode);
+}
+
+
+/**
+   \brief sets the parent of this PNode
+*/
+void PNode::setParent (PNode* parent)
+{
+  this->parent = parent;
+}
+
+/**
+   \brief set the mode of this parent manualy
+*/
+void PNode::setMode (parentingMode mode)
+{
+  this->mode = mode;
+}
+
+/**
+   \brief has to be called, if the parent coordinate has changed
+   
+   normaly this will be done by the parent itself automaticaly. If you call this, you
+   will force an update of the coordinated of the node.
+*/
+void PNode::parentCoorChanged ()
+{
+  this->bRelCoorChanged = true;
+}
+
+
+/**
+   \brief has to be called, if the parent direction has changed
+   
+   normaly this will be done by the parent itself automaticaly. If you call this, you
+   will force an update of the direction of the node.
+*/
+void PNode::parentDirChanged ()
+{
+  this->bRelDirChanged = true;
+}
+
+
+/**
+   \brief updates the absCoordinate/absDirection
+
+   this is used to go through the parent-tree to update all the absolute coordinates
+   and directions. this update should be done by the engine, so you don't have to 
+   worry, normaly...
+*/
+void PNode::update (float timeStamp)
+{
+  printf ("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
+
+      if( this->mode == MOVEMENT || this->mode == ALL)
+        {
+          if( this->bAbsCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+            {
+              printf("PNode::update () - this->bAbsCoorChanged = true\n");
+              /* if you have set the absolute coordinates this overrides all other changes */
+              this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
+            }
+          else if( this->bRelCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+            {
+              /*this is bad style... must be deleted later - just for testing*/
+              if( this->parent == NULL)
+                {
+                this->absCoordinate = this->relCoordinate;
+                }
+              else
+                this->absCoordinate = parent->getAbsCoor () + this->relCoordinate;            /* update the current absCoordinate */
+            }
+        }
+      
+      if( this->mode == ROTATION && this->mode == ALL)
+        {
+          if( this->bAbsDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+            {
+              /* if you have set the absolute coordinates this overrides all other changes */
+              this->relDirection = this->absDirection - parent->getAbsDir ();
+            }
+          else if( this->bRelDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+            {
+              /* update the current absDirection - remember * means rotation around sth.*/
+              this->absDirection = parent->getAbsDir () * this->relDirection;
+            }
+        }    
+      // }
+  PNode* pn = this->children->enumerate();
+  while( pn != NULL) 
+    { 
+      /* if this node has changed, make sure, that all children are updated also */
+      if( this->bRelCoorChanged || this->bAbsCoorChanged)
+        pn->parentCoorChanged ();
+      if( this->bRelDirChanged || this->bAbsDirChanged)
+        pn->parentDirChanged ();
+      pn->update(timeStamp);
+      pn = this->children->nextElement();
+    }
+
+  this->timeStamp = timeStamp;
+  this->bRelCoorChanged = false;
+  this->bAbsCoorChanged = false;
+  this->bRelDirChanged = false;
+  this->bAbsDirChanged = false;
+}
+
+
+/*
+  \brief tick
+*/
+void PNode::processTick (float dt)
+{
+  this->tick (dt);
+  PNode* pn = this->children->enumerate();
+  while( pn != NULL) 
+    { 
+      pn->processTick (dt);
+      pn = this->children->nextElement();
+    } 
+}
+
+
+void PNode::tick (float dt)
+{}
+
+
+void PNode::debug()
+{
+  printf("PNode::debug() - absCoord: (%f, %f, %f)\n", 
+         this->absCoordinate.x, 
+         this->absCoordinate.y,
+         this->absCoordinate.z);
+}
+
+
+/*
+  \brief set the name of the node
+
+  for debug purposes realy usefull, not used to work properly
+*/
+void PNode::setName (char* newName)
+{
+  this->objectName = newName;
+}
+
+
+/*
+  \brief gets the name of the node
+*/
+char* PNode::getName ()
+{
+  return this->objectName;
+}

orxonox/trunk/src/p_node.h

@@ -14 +14 @@
     this conditions make it cheaper to recalculate the tree (reduces redundant work).
 
-    remember: if you have to change the coordinates, because the object (point) did move,
-    don't forget to reset both relCoor and absCoor (offset is the same)
+    remember: if you have to change the coordinates or the directions, use the functions
+    that are defined to execute this operation - otherwhise there will be big problems...
 */
 
@@ -24 +24 @@
 #include "stdincl.h"
 
+class PNode; /* forward decleration, so that parentEntry has access to PNode */
 
-class PNode {
+typedef enum parentingMode {MOVEMENT = 0, ROTATION, ALL};
+#define DEFAULT_MODE ALL
+
+class PNode : public BaseObject {
 
  public:
   PNode ();
-  ~PNode ();
+  PNode (Vector* absCoordinate, PNode* pNode);
+  virtual ~PNode ();
+
+  void destroy ();
+
+  PNode* parent; //! a pointer to the parent node
+  tList<PNode>* children; //! list of the children
+
+  parentingMode mode;
 
   Vector getRelCoor ();
-  void setRelCoor (Vector relCoord);
+  void setRelCoor (Vector* relCoord);
+  //void setRelCoor (Vector relCoord);
   Vector getAbsCoor ();
-  void setAbsCoor (Vector absCoord);
+  void setAbsCoor (Vector* absCoord);
+  //void setAbsCoor (Vector absCoord);
+  void shiftCoor (Vector* shift);
+  //void shiftCoor (Vector shift);
 
   Quaternion getRelDir ();
-  void setRelDir (Quaternion relDir);
+  void setRelDir (Quaternion* relDir);
   Quaternion getAbsDir ();
-  void setAbsCoor (Quaternion absDir);
+  void setAbsDir (Quaternion* absDir);
+  void shiftDir (Quaternion* shift);
 
   void addChild (PNode* pNode);
+  void addChild (PNode* pNode, parentingMode mode);
   void removeChild (PNode* pNode);
+  void setParent (PNode* parent);
+  void parentCoorChanged ();
+  void parentDirChanged ();
+  void setMode (parentingMode mode);
 
- private:
-  long timeStamp; //! this the timeStamp of when the abs{Coordinat, Direction} has been calculated
-  bool bCoorChanged;
-  bool bDirChanged;
+  virtual void update (float timeStamp);
+  void processTick (float dt);
+  virtual void tick (float dt);
+
+  void setName (char* newName);
+  char* getName ();
+
+
+  void debug ();
+
+  float timeStamp;   //! this the timeStamp of when the abs{Coordinat, Direction} has been calculated
+  char* objectName;
+  bool bAbsCoorChanged;
+  bool bRelCoorChanged;
+  bool bRelDirChanged;
+  bool bAbsDirChanged;
 
   Vector relCoordinate;  //! coordinates relative to the parent
@@ -54 +88 @@
   Quaternion absDirection; //! absolute direvtion in the world ( from (0,0,1) )
 
-  tList<PNode>* children; //! list of the children
-
 };
 

orxonox/trunk/src/player.cc

@@ -19 +19 @@
 #include "stdincl.h"
 #include "collision.h"
+#include "importer/model.h"
 
 using namespace std;
@@ -26 +27 @@
 {
 
-  this->obj = new Object("reaplow.obj");
+  this->model = new Model("reaplow.obj");
   /*
   objectList = glGenLists(1);
@@ -54 +55 @@
 }
 
-Player::~Player()
+Player::~Player ()
 {
-  delete this->obj;
+  delete this->model;
 }
 
-void Player::postSpawn()
+void Player::postSpawn ()
 {
   travelSpeed = 15.0;
@@ -69 +70 @@
 }
 
-void Player::tick(float time)
+void Player::tick (float time)
 {
   // movement
-  move (time);
+  this->move (time);
 }
 
-void Player::hit(WorldEntity* weapon, Vector loc)
+void Player::hit (WorldEntity* weapon, Vector loc)
 {
 }
 
-void Player::destroy()
+void Player::destroy ()
 {
 }
 
-void Player::collide(WorldEntity* other, Uint32 ownhitflags, Uint32 otherhitflags)
+void Player::collide (WorldEntity* other, Uint32 ownhitflags, Uint32 otherhitflags)
 {
 }
 
-void Player::command(Command* cmd)
+void Player::command (Command* cmd)
 {
   //printf("Player|recieved command [%s]\n", cmd->cmd);
@@ -97 +98 @@
 }
 
-void Player::draw()
+void Player::draw ()
 { 
   glMatrixMode(GL_MODELVIEW);
@@ -103 +104 @@
   float matrix[4][4];
   
-  glTranslatef(getPlacement()->r.x, getPlacement()->r.y, getPlacement()->r.z);
-  getPlacement()->w.matrix (matrix);
+  glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
+  //rotate
+  this->getAbsDir ().matrix (matrix);
   glMultMatrixf((float*)matrix);
   
   glMatrixMode(GL_MODELVIEW);
-  glRotatef(-90, 0,1,0);
-  obj->draw();
+  this->model->draw();
   // glCallList(objectList);
-
-  
-  
 }
 
+
+/*PN
 void Player::getLookat(Location* locbuf)
 {
@@ -121 +121 @@
   //locbuf->dist += 5.0;
 }
+*/
 
-void Player::leftWorld()
+void Player::leftWorld ()
 {
 }
 
-void Player::move(float time)
+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();
+  //Placement *pos = getPlacement();
+  
   /* calculate the direction in which the craft is heading  */
-  Vector direction(0.0, 0.0, 1.0);
-  direction = pos->w.apply(direction);
-  Vector orthDirection(0.0, 0.0, 1.0);
-  orthDirection = orthDirection.cross(direction);
+  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( bLeft ) { accel = accel - (orthDirection*acceleration); }
+  if( bRight ) { accel = accel + (orthDirection*acceleration); }
   if( bAscend ) { /* not yet implemented but just: (0,0,1)*acceleration */}
   if( bDescend) {/* FIXME */} /* \todo up and down player movement */
 
-  Location* l = getLocation();
+  //Location* l = getLocation();
   
   // r(t) = r(0) + v(0)*t + 1/2*a*t^2
@@ -152 +154 @@
 
   /* this the base-speed of the player: determines how fast and how the player follows the track*/
-  l->dist = l->dist + travelSpeed * time;
-
+  //l->dist = l->dist + travelSpeed * time;
+  
+  Vector* shift = new Vector (this->travelSpeed * time, 0, 0);
+  this->shiftCoor (shift);
+  
   /* this updates the player position on the track - user interaction */
-  l->pos = l->pos + accel*time;
+  //l->pos = l->pos + accel*time;
+  Vector move = accel * time;
+  this->shiftCoor (&move);
 }

orxonox/trunk/src/player.h

@@ -8 +8 @@
 
 #include "world_entity.h"
-#include "importer/object.h"
+
+class Model;
 
 //! Basic controllable WorldEntity
@@ -27 +28 @@
   
   virtual void draw();
-  virtual void getLookat(Location* locbuf);
+  // virtual void getLookat(Location* locbuf);
   
   virtual void leftWorld();
@@ -38 +39 @@
   float acceleration;
   GLuint objectList;
-  Object* obj;
   
   void move(float time);

orxonox/trunk/src/proto_class.cc

@@ -27 +27 @@
    \todo this constructor is not jet implemented - do it
 */
-ProtoClass::ProtoClass () {}
+ProtoClass::ProtoClass () 
+{
+   this->setClassName ("ProtoClass");
+}
 
 

orxonox/trunk/src/proto_class.h

@@ -19 +19 @@
    here can be some longer description of this class
 */
-class ProtoClass {
+class ProtoClass : public BaseObject {
 
  public:

orxonox/trunk/src/stdincl.h

@@ -10 +10 @@
 
 #define null 0   //!< null
+
+typedef unsigned char byte;
 
 // this includes the information from configure/makefiles
@@ -31 +33 @@
 
 #include "vector.h"
-#include "coordinates.h"
+#include "matrix.h"
+#include "curve.h"
+//#include "coordinates.h"
 #include "list.h"
 #include "list_template.h"
@@ -38 +42 @@
 #include "message_structures.h"
 #include "orxonox.h"
+#include "data_tank.h"
+#include "base_object.h"
 
 #endif /* _STDINCL_H */

orxonox/trunk/src/story_entity.h

@@ -12 +12 @@
 
 //! A class that represents something to play in orxonox. it is a container for worlds, movies, mission briefings, etc...
-class StoryEntity {
+class StoryEntity : public BaseObject {
 
  public:

orxonox/trunk/src/track.cc

@@ -29 +29 @@
   this->end = NULL;
   this->nextID = 0;
+  this->setClassName ("Track");
 }
 
@@ -44 +45 @@
   this->end = finish;
   this->nextID = next;
+  this->setClassName ("Track");
 }
 
@@ -59 +61 @@
 
 
-/**
-   \brief calculate a camera Placement from a "look at"-Location
-   \param lookat: the Location the camera should be centered on
-   \param camplc: pointer to a buffer where the new camera Placement should be put into
-   
-   Theoretically you can place the camera wherever you want, but for the sake of 
-   common sense I suggest that you at least try to keep the thing that should be looked
-   at inside camera boundaries.
-*/
-void Track::mapCamera (Location* lookat, Placement* camplc)
-{
-  Line trace(*offset, *end - *offset);
-  float l = trace.len ();
-  
-  //    camplc->r = *offset + Vector(0,0,0.5);
-  //    camplc->w = Quaternion (trace.a, Vector(0,0,1));
-  float r = (lookat->dist)*PI / l;
-  camplc->r = trace.r + (trace.a * ((lookat->dist-10.0) / l)) + Vector(0,0,5.0);
-  
-  Vector w(0.0,0.0,0.0);
-  w=Vector(0,0,0) - ((trace.r + (trace.a * ((lookat->dist) / l)) - camplc->r));
-  //Vector up(0.0,sin(r),cos(r)); // corrupt...
-  Vector up(0.0, 0.0, 1.0);
 
-  camplc->w = Quaternion(w, up);
-
-  //printf("\n------\nup vector: [%f, %f, %f]\n", up.x, up.y, up.z);
-  //printf("direction: [%f, %f, %f]\n", w.x, w.y, w.z);
-  //printf("quaternion: w[ %f ], v[ %f, %f, %f ]\n", camplc->w.w, camplc->w.v.x, camplc->w.v.y, camplc->w.v.z);
-}
-
-/**
-   \brief calculate a Placement from a given Location
-   \param loc: the Location the entity is in
-   \param plc: a pointer to a buffer where the corresponding Placement should be put
-   into
-   \return: true if track changes - false if track stays
-   
-   There are no limitations to how you transform a Location into a Placement, but for 
-   the sake of placement compatibility between track parts you should make sure that 
-   the resulting Placement at dist == 0 is equal to the offset Vector and the Placement
-   at dist == len() is equal to the end Vector. Elseway there will be ugly artifacts 
-   when transfering between track parts.
-*/
-bool Track::mapCoords (Location* loc, Placement* plc)
-{
-  Line trace(*offset, *end - *offset);
-  float l = trace.len ();
-  
-  /* change to the next track? */
-  if( loc->dist > l)
-    {
-      loc->dist -= l;
-      loc->part = nextID;
-      //FIXME: loc->track = this;
-      return true;
-    }
-  
-  /* this quaternion represents the rotation from start-vector (0,0,1) to the direction of
-   * the track */
-  Quaternion dir(trace.a, Vector(0,0,1)); 
-  
-  plc->r = trace.r + (trace.a * ((loc->dist) / l)) + /*dir.apply*/(loc->pos);
-  plc->w = dir * loc->rot;
-  
-  return false;
-}
 
 

orxonox/trunk/src/track.h

@@ -14 +14 @@
    To create special levels with special camera movement, rules or whatever, derive from this base class.
 */
-class Track 
+class Track : public BaseObject
 {
  private:
@@ -35 +35 @@
   virtual void postLeave (WorldEntity* entity);
   virtual void tick (float deltaT);
-  virtual void mapCamera (Location* lookat, Placement* camplc);
-  virtual bool mapCoords (Location* loc, Placement* plc);       // this should return true if the entity left track boundaries
 };
 

orxonox/trunk/src/vector.cc

@@ -844 +844 @@
 }
 
-
-/**
-   \brief Creates a new BezierCurve
-*/
-BezierCurve::BezierCurve (void)
-{
-  nodeCount = 0;
-  firstNode = new PathNode;
-  currentNode = firstNode;
-
-  firstNode->position = Vector (.0, .0, .0);
-  firstNode->number = 0;
-  firstNode->next = 0; // not sure if this really points to NULL!!
-
-  return;
-}
-
-/**
-   \brief Deletes a BezierCurve.
-   It does this by freeing all the space taken over from the nodes
-*/
-BezierCurve::~BezierCurve (void)
-{
-  PathNode* tmpNode;
-  currentNode = firstNode;
-  while (tmpNode != 0)
-    {
-      tmpNode = currentNode;
-      currentNode = currentNode->next;
-      delete tmpNode;
-    }
-}
-
-/**
-   \brief adds a new Node to the bezier Curve
-   \param newNode a Vector to the position of the new node
-*/
-void BezierCurve::addNode(const Vector& newNode)
-{
-  PathNode* tmpNode;
-  if (nodeCount == 0 )
-    tmpNode = firstNode;
-  else
-    {
-      tmpNode = new PathNode;
-      currentNode = currentNode->next = tmpNode;
-    }
-  tmpNode->position = newNode;
-  tmpNode->next = 0; // not sure if this really points to NULL!!
-  tmpNode->number = (++nodeCount);
-  return;
-}
-
-/**
-   \brief calculates the Position on the curve
-   \param t The position on the Curve (0<=t<=1)
-   \return the Position on the Path
-*/
-Vector BezierCurve::calcPos(float t) 
-{
-  if (nodeCount <=4)
-    {
-      //      if (verbose >= 1)
-      //      printf ("Please define at least 4 nodes, until now you have only defined %i.\n", nodeCount);
-      curvePoint = Vector(0,0,0);
-    }
-  PathNode* tmpNode = firstNode;
-    
-  int k,kn,nn,nkn;
-  double blend,muk,munk;
-  Vector b = Vector(0.0,0.0,0.0);
-  
-  muk = 1;
-  munk = pow(1-t,(double)nodeCount);
-  
-  for (k=0; k<=nodeCount; k++) {
-    nn = nodeCount;
-    kn = k;
-    nkn = nodeCount - k;
-    blend = muk * munk;
-    muk *= t;
-    munk /= (1-t);
-    while (nn >= 1) {
-      blend *= nn;
-      nn--;
-      if (kn > 1) {
-        blend /= (double)kn;
-        kn--;
-      }
-      if (nkn > 1) {
-        blend /= (double)nkn;
-        nkn--;
-      }
-    }
-    b.x += tmpNode->position.x * blend;
-    b.y += tmpNode->position.y * blend;
-    b.z += tmpNode->position.z * blend;
-
-    tmpNode = tmpNode->next;
-  }
-  return b;
-}
-
-Vector BezierCurve::calcDirection (float t)
-{
-  double diff = .00000000001;
-  
-  Vector diffV = ((calcPos(t+diff) - calcPos(t))/diff);
-  diffV.normalize();
-  return diffV;
-}
-
-/**
-  \brief returns the Position of the point calculated on the Curve
-  \return a Vector to the calculated position
-*/
-Vector BezierCurve::getPos() const
-{
-  return curvePoint;
-}

orxonox/trunk/src/vector.h

@@ -149 +149 @@
 };
 
-
-
-//! Bezier Curve
-/**
-   Class to handle bezier curves in 3-dimesnsional space
-   
-   needed for  the Tracking system in OrxOnoX.
-*/
-class BezierCurve
-{
- private:
-  int nodeCount;
-  Vector curvePoint;
-  
-  struct PathNode
-  {
-    int number;
-    Vector position;
-    PathNode* next;
-  };
-
-  PathNode* firstNode; 
-  PathNode* currentNode; 
-
- public:
-  BezierCurve (void);
-  ~BezierCurve (void);
-  void addNode (const Vector& newNode);
-  Vector calcPos (float t);
-  Vector calcDirection (float t);
-  
-  Vector getPos () const;
-};
-
-
-
 #endif /* _VECTOR_H */

orxonox/trunk/src/world.cc

@@ -18 +18 @@
 #include "world_entity.h"
 #include "collision.h"
+#include "track_manager.h"
 #include "track.h"
 #include "player.h"
@@ -23 +24 @@
 #include "camera.h"
 #include "environment.h"
+#include "p_node.h"
+#include "null_parent.h"
+#include "helper_parent.h"
+#include "glmenu_imagescreen.h"
 
 using namespace std;
@@ -34 +39 @@
 World::World (char* name)
 {
+  this->setClassName ("World");
   this->worldName = name;
   this->debugWorldNr = -1;
@@ -48 +54 @@
 /** 
     \brief remove the World from memory
+    
+    delete everything explicitly, that isn't contained in the parenting tree!
+    things contained in the tree are deleted automaticaly
 */
 World::~World ()
@@ -57 +66 @@
   this->localCamera->destroy();
 
+  this->nullParent->destroy ();
+
+  //delete this->trackManager;
+
+  /*
   WorldEntity* entity = entities->enumerate();  
   while( entity != NULL ) 
@@ -64 +78 @@
     }
   this->entities->destroy();
-
-  delete this->entities;
-  delete this->localCamera;
+  */
+
+  /* FIX the parent list has to be cleared - not possible if we got the old list also*/
+
+
+  //delete this->entities;
+  //delete this->localCamera;
   /* this->localPlayer hasn't to be deleted explicitly, it is 
      contained in entities*/
 }
+
+GLfloat ctrlpoints[4][3] = {
+  {20.0, 10.0, 5.0}, {40.0, -10.0, 0.0},
+  {60.0, -10.0, 5.0}, {80.0, 10.0, 5.0}};
 
 
@@ -78 +100 @@
   cn->addToWorld(this);
   cn->enable(true);
-}
+
+  //glMap1f (GL_MAP1_VERTEX_3, 0.0, 1.0, 3, 4, &ctrlpoints[0][0]);
+  //glEnable (GL_MAP1_VERTEX_3);
+  
+  //theNurb = gluNewNurbsRenderer ();
+  //gluNurbsProperty (theNurb, GLU_NURBS_MODE, GLU_NURBS_TESSELLATOR);
+  //gluNurbsProperty (theNurb, GLU_NURBS_VERTEX, vertexCallback );
+
+}
+
+
 
 ErrorMessage World::start()
@@ -99 +131 @@
 }
 
+
 ErrorMessage World::resume()
 {
@@ -104 +137 @@
 }
 
+
 void World::destroy()
 {
-
-}
+}
+
+
+void World::displayLoadScreen ()
+{
+  printf ("World::displayLoadScreen - start\n"); 
+  
+  //GLMenuImageScreen* 
+  glmis = new GLMenuImageScreen();
+  glmis->init();
+  glmis->draw();
+ 
+  printf ("World::displayLoadScreen - end\n"); 
+}
+
+
+void World::releaseLoadScreen ()
+{
+  printf ("World::releaseLoadScreen - start\n"); 
+
+  printf ("World::releaseLoadScreen - end\n"); 
+}
+
 
 void World::load()
 {
+  //  BezierCurve* tmpCurve = new BezierCurve();
   if(this->debugWorldNr != -1)
     {
+      trackManager = TrackManager::getInstance();
+      trackManager->addPoint(Vector(0,-5,0));
+      trackManager->addPoint(Vector(10,0,5));
+      trackManager->addPoint(Vector(20,0,-5));
+      trackManager->addPoint(Vector(30,0,5));
+      trackManager->addPoint(Vector(40,0,5));
+      trackManager->setDuration(.5);
+      trackManager->setSavePoint();
+      trackManager->addPoint(Vector(50,10,10));
+      trackManager->addPoint(Vector(60,0, 10));
+      trackManager->addPoint(Vector(70,0, 10));
+      trackManager->addPoint(Vector(80,0,-10));
+      trackManager->addPoint(Vector(90,0,-10));
+      trackManager->setDuration(.5);
+      trackManager->setSavePoint();
+      trackManager->addPoint(Vector(110,0,5));
+      trackManager->addPoint(Vector(120,0, 10));
+      trackManager->addPoint(Vector(130,0, 10));
+      trackManager->addPoint(Vector(140,0,-10));
+      trackManager->addPoint(Vector(150,0,-10));
+      trackManager->setDuration(.5);
+      int fork11, fork12, fork13, fork14;
+      trackManager->fork(4, &fork11, &fork12, &fork13, &fork14);
+      trackManager->workOn(fork11);
+      trackManager->addPoint(Vector(170, 0, -15));
+      trackManager->addPoint(Vector(180, 0, -15));
+      trackManager->workOn(fork12);
+      trackManager->addPoint(Vector(170, 0, 10));
+      trackManager->addPoint(Vector(180, 0, 10));
+      trackManager->addPoint(Vector(190,2,5));
+      trackManager->addPoint(Vector(200,2,5));
+      int fork21, fork22;
+      trackManager->fork(2, &fork21, &fork22);
+      trackManager->workOn(fork21);
+      trackManager->addPoint(Vector(220, 10,-10));
+      trackManager->addPoint(Vector(230, 0,-10));
+      trackManager->addPoint(Vector(240, 0, 2));
+      trackManager->addPoint(Vector(250, 0, 0));
+      trackManager->addPoint(Vector(260, 0, 5));
+      trackManager->join(2, fork12, fork11);
+      trackManager->workOn(fork22);
+      trackManager->addPoint(Vector(220, -10,10));
+      trackManager->addPoint(Vector(230, 0, 10));
+      trackManager->addPoint(Vector(240, 0, 10));
+      trackManager->addPoint(Vector(250, 0, 5));
+      trackManager->workOn(fork13);
+      trackManager->addPoint(Vector(200,-10,5));
+      trackManager->addPoint(Vector(250,-10,5));
+      printf("fork14: %d\n", fork14);
+      trackManager->workOn(fork14);
+      trackManager->addPoint(Vector(200,15,0));
+      trackManager->addPoint(Vector(210,0,10));
+
+
+
+      trackManager->join(4, fork21, fork22, fork13, fork14);
+
+      /*
+      tmpCurve->addNode(Vector(10,0,-10));
+      //tmpCurve->addNode(Vector(10,2,5));
+      //tmpCurve->addNode(Vector(10,3,-5));
+      //      tmpCurve->addNode(Vector(10,1,5));
+      tmpCurve->addNode(Vector(10,0,5));
+      */
       switch(this->debugWorldNr)
         {
@@ -123 +243 @@
         case DEBUG_WORLD_0:
           {
+            this->nullParent = NullParent::getInstance ();
+            this->nullParent->setName ("NullParent");
+
             // create some path nodes
             this->pathnodes = new Vector[6];
@@ -141 +264 @@
             // !\todo old track-system has to be removed
 
+            //create helper for player
+            HelperParent* hp = new HelperParent ();
+            /* the player has to be added to this helper */
+
             // create a player
-            WorldEntity* myPlayer = new Player();
-            this->spawn(myPlayer);
+            WorldEntity* myPlayer = new Player ();
+            myPlayer->setName ("player");
+            this->spawn (myPlayer);
             this->localPlayer = myPlayer;           
 
             // bind input
-            Orxonox *orx = Orxonox::getInstance();
+            Orxonox *orx = Orxonox::getInstance ();
             orx->getLocalInput()->bind (myPlayer);
             
             // bind camera
             this->localCamera = new Camera(this);
-            this->getCamera()->bind (myPlayer); 
-
-            Placement* plc = new Placement;
-            plc->r = Vector(100, 10, 10);
-            plc->w = Quaternion();
+            this->localCamera->setName ("camera");
+            this->getCamera()->bind (myPlayer);
+            this->localPlayer->addChild (this->localCamera);
+            
+
+            Vector* es = new Vector (50, 2, 0);
+            Quaternion* qs = new Quaternion ();
             WorldEntity* env = new Environment();
-            this->spawn(env, plc);
+            env->setName ("env");
+            this->spawn(env, es, qs);
+
 
             break;
@@ -164 +296 @@
         case DEBUG_WORLD_1:
           {
+            /*
+            this->testCurve = new UPointCurve();
+            this->testCurve->addNode(Vector( 0, 0, 0));
+            this->testCurve->addNode(Vector(10, 0, 5));
+            this->testCurve->addNode(Vector(20, -5,-5));
+            this->testCurve->addNode(Vector(30, 5, 10));
+            this->testCurve->addNode(Vector(40, 0,-10));
+            this->testCurve->addNode(Vector(50, 0,-10));
+            */
+
+            this->nullParent = NullParent::getInstance ();
+            this->nullParent->setName ("NullParent");
+
             // create some path nodes
             this->pathnodes = new Vector[6];
@@ -173 +318 @@
             this->pathnodes[5] = Vector(30, 50, 0);
             
+
+
+
             // create the tracks
             this->tracklen = 6;
@@ -183 +331 @@
             // create a player
             WorldEntity* myPlayer = new Player();
+            myPlayer->setName ("player");
             this->spawn(myPlayer);
             this->localPlayer = myPlayer;           
@@ -191 +340 @@
             
             // bind camera
-            this->localCamera = new Camera(this);
+            this->localCamera = new Camera (this);
+            this->localCamera->setName ("camera");
             this->getCamera()->bind (myPlayer); 
+            this->localPlayer->addChild (this->localCamera);
             break;
           }
@@ -212 +363 @@
 
   int sizeX = 100;
-  int sizeY = 80;
+  int sizeZ = 80;
   float length = 1000;
   float width = 200;
   float widthX = float (length /sizeX);
-  float widthY = float (width /sizeY);
-  
-  float height [sizeX][sizeY];
-  Vector normal_vectors[sizeX][sizeY];
+  float widthZ = float (width /sizeZ);
+  
+  float height [sizeX][sizeZ];
+  Vector normal_vectors[sizeX][sizeZ];
   
   
   for ( int i = 0; i<sizeX-1; i+=1)
-    for (int j = 0; j<sizeY-1;j+=1)
+    for (int j = 0; j<sizeZ-1;j+=1)
       //height[i][j] = rand()/20046 + (j-25)*(j-25)/30;
 #ifdef __WIN32__
@@ -231 +382 @@
 #endif
 
-  //Die Hügel ein wenig glätten
+  //Die Huegel ein wenig glaetten
   for (int h=1; h<2;h++)
     for (int i=1;i<sizeX-2 ;i+=1 )
-      for(int j=1;j<sizeY-2;j+=1)
+      for(int j=1;j<sizeZ-2;j+=1)
         height[i][j]=(height[i+1][j]+height[i][j+1]+height[i-1][j]+height[i][j-1])/4;
   
   //Berechnung von normalen Vektoren
-
   for(int i=1;i<sizeX-2;i+=1)
-    for(int j=1;j<sizeY-2 ;j+=1)
+    for(int j=1;j<sizeZ-2 ;j+=1)
       {
-        Vector v1 = Vector (widthX*(1),      widthY*(j)  ,      height[i][j]);
-        Vector v2 = Vector (widthX*(i-1),    widthY*(j)  ,      height[i-1][j]);
-        Vector v3 = Vector (widthX*(i),      widthY*(j+1),      height[i][j+1]);
-        Vector v4 = Vector (widthX*(i+1),    widthY*(j),        height[i+1][j]);
-        Vector v5 = Vector (widthX*(i),      widthY*(j-1),      height[i][j-1]);
+        Vector v1 = Vector (widthX*(1),      height[i][j],      widthZ*(j) );
+        Vector v2 = Vector (widthX*(i-1),    height[i-1][j],    widthZ*(j));
+        Vector v3 = Vector (widthX*(i),      height[i][j+1],    widthZ*(j+1));
+        Vector v4 = Vector (widthX*(i+1),    height[i+1][j],    widthZ*(j));
+        Vector v5 = Vector (widthX*(i),      height[i][j-1],    widthZ*(j-1));
         
         Vector c1 = v2 - v1;
@@ -253 +403 @@
         Vector c4 = v5 - v1;
         Vector zero = Vector (0,0,0);
-        normal_vectors[i][j]=c1.cross(v4-v2)+c2.cross(v1-v3)+c3.cross(v2-v4)+c4.cross(v3-v1);
+        normal_vectors[i][j]=c1.cross(v3-v5)+c2.cross(v4-v2)+c3.cross(v5-v3)+c4.cross(v2-v4);
         normal_vectors[i][j].normalize();
       }
@@ -259 +409 @@
   int snowheight=3;
   for ( int i = 0; i<sizeX; i+=1)
-    for (int j = 0; j<sizeY;j+=1)
+    for (int j = 0; j<sizeZ;j+=1)
       {   
-        Vector v1 = Vector (widthX*(i),      widthY*(j)  -width/2,      height[i][j]-20 );
-        Vector v2 = Vector (widthX*(i+1),    widthY*(j)  -width/2,      height[i+1][j]-20);
-        Vector v3 = Vector (widthX*(i+1),    widthY*(j+1)-width/2,    height[i+1][j+1]-20);
-        Vector v4 = Vector (widthX*(i),      widthY*(j+1)-width/2,    height[i][j+1]-20);
+        Vector v1 = Vector (widthX*(i),      height[i][j]-20,       widthZ*(j)  -width/2);
+        Vector v2 = Vector (widthX*(i+1),    height[i+1][j]-20,     widthZ*(j)  -width/2);
+        Vector v3 = Vector (widthX*(i+1),    height[i+1][j+1]-20,   widthZ*(j+1)-width/2);
+        Vector v4 = Vector (widthX*(i),      height[i][j+1]-20,     widthZ*(j+1)-width/2);
         float a[3];
         if(height[i][j]<snowheight){
@@ -371 +521 @@
   //draw track
   glBegin(GL_LINES);
-  glColor3f(0,1,1);
+  glColor3f(0.0, 1.0, 1.0);
   for( int i = 0; i < tracklen; i++)
     {
@@ -378 +528 @@
     }
   glEnd();
+  
+  /*
+  glBegin(GL_LINE_STRIP);
+  glColor3f(1.0, 5.0, 1.0);
+  for( int i = 0; i <= 30; i++)
+    {
+      glEvalCoord1f ((GLfloat) i/30.0);
+    }
+  glEnd();
+  */
+
+  trackManager->drawGraph(.01);
+  trackManager->debug(2);
+  delete trackManager;
+  
+  /*
+  glBegin(GL_LINES);
+  float i;
+  for(i = 0.0; i<1; i+=.01)
+    {
+      printf("%f, %f, %f\n",tmpCurve->calcPos(i).x, tmpCurve->calcPos(i).y, tmpCurve->calcPos(i).z);
+      glVertex3f(tmpCurve->calcPos(i).x, tmpCurve->calcPos(i).y, tmpCurve->calcPos(i).z);
+    }
+  glEnd();
+  */
   glEndList();
 }
@@ -430 +605 @@
 void World::draw ()
 {
-  // draw geometry
-  
   // draw entities
   WorldEntity* entity;
-  
   entity = this->entities->enumerate();
   while( entity != NULL ) 
@@ -440 +612 @@
       if( entity->bDraw ) entity->draw();
       entity = this->entities->nextElement();
-    }
-  
-  
+    } 
+  
+  //glmis = new GLMenuImageScreen();
+  ///glmis->init();
+
   // draw debug coord system
   glCallList (objectList);
-
 
 }
@@ -459 +632 @@
 void World::update ()
 {
+  /*
   //List<WorldEntity> *l;
   WorldEntity* entity;
@@ -477 +651 @@
           t = loc->part;
           
-          /* check if entity has still a legal track-id */
           if( t >= tracklen )
             {
@@ -500 +673 @@
       else
         {
-          /* \todo: implement check whether this particular free entity 
-             is out of the game area
-             \todo: call function to notify the entity that it left 
-             the game area
-          */
         }
       
       entity = entities->nextElement();
     }
-  
+  */  
 }
 
@@ -522 +690 @@
   float seconds = deltaT / 1000.0;
   
+  this->nullParent->update (seconds);
+  //this->nullParent->processTick (seconds);
+
   entity = entities->enumerate(); 
   while( entity != NULL) 
@@ -542 +713 @@
 
 
-
-/**
-   \brief calls the correct mapping function to convert a given "look at"-Location to a 
-   Camera Placement
-*/
-void World::calcCameraPos (Location* loc, Placement* plc)
-{
-  track[loc->part].mapCamera (loc, plc);
-}
-
-
 void World::setTrackLen(Uint32 len)
 {
@@ -571 +731 @@
 void World::debug()
 {
-  //List<WorldEntity> *l;
+  printf ("World::debug() - starting debug\n");
+  PNode* p1 = NullParent::getInstance ();
+  PNode* p2 = new PNode (new Vector(2, 2, 2), p1);
+  PNode* p3 = new PNode (new Vector(4, 4, 4), p1);
+  PNode* p4 = new PNode (new Vector(6, 6, 6), p2);
+
+  p1->debug ();
+  p2->debug ();
+  p3->debug ();
+  p4->debug ();
+
+  p1->shiftCoor (new Vector(-1, -1, -1));
+
+  printf("World::debug() - shift\n");
+  p1->debug ();
+  p2->debug ();
+  p3->debug ();
+  p4->debug ();
+  
+  p1->update (1);
+
+  printf ("World::debug() - update\n");
+  p1->debug ();
+  p2->debug ();
+  p3->debug ();
+  p4->debug ();
+
+  p2->shiftCoor (new Vector(-1, -1, -1));
+  p1->update (2);
+
+  p1->debug ();
+  p2->debug ();
+  p3->debug ();
+  p4->debug ();
+
+  p2->setAbsCoor (new Vector(1,2,3));
+
+
+ p1->update (2);
+
+  p1->debug ();
+  p2->debug ();
+  p3->debug ();
+  p4->debug ();
+
+  p1->destroy ();
+  
+  
+  /*
   WorldEntity* entity;
-  
   printf("counting all entities\n");
   printf("World::debug() - enumerate()\n");
@@ -582 +789 @@
       entity = entities->nextElement();
     }
+  */
 }
 
@@ -594 +802 @@
 void World::mainLoop()
 {
-  this->lastFrame = SDL_GetTicks();
+  this->lastFrame = SDL_GetTicks ();
   printf("World::mainLoop() - Entering main loop\n");
   while( !this->bQuitOrxonox && !this->bQuitCurrentGame) /* \todo implement pause */
     {
       // Network
-      synchronize();
+      this->synchronize ();
       // Process input
-      handleInput();
+      this->handleInput ();
       if( this->bQuitCurrentGame || this->bQuitOrxonox)
         {
@@ -608 +816 @@
         }
       // Process time
-      timeSlice();
+      this->timeSlice ();
       // Process collision
-      collision();
+      this->collision ();
       // Draw
-      display();
-  
-      for(int i = 0; i < 10000000; i++) {}
+      this->display ();
+  
+      for( int i = 0; i < 5000000; i++) {}
+      /* \todo this is to slow down the program for openGl Software emulator computers, reimplement*/
     }
   printf("World::mainLoop() - Exiting the main loop\n");
@@ -701 +910 @@
   this->draw();
   // draw HUD
+  /* \todo draw HUD */
   // flip buffers
   SDL_GL_SwapBuffers();
+  //SDL_Surface* screen = Orxonox::getInstance()->getScreen ();
+  //SDL_Flip (screen);
 }
 
@@ -723 +935 @@
 void World::spawn(WorldEntity* entity)
 {
-  Location zeroloc;
-  Location* loc = NULL;
-  WorldEntity* owner;
-
-  entities->add (entity);
-  zeroloc.dist = 0;
-  zeroloc.part = 0;
-  zeroloc.pos = Vector();
-  zeroloc.rot = Quaternion();
-  loc = &zeroloc;
-  entity->init (loc, owner);
-  if (entity->bFree)
-    {
-      this->track[loc->part].mapCoords( loc, entity->getPlacement());
-    }
+  if( this->nullParent != NULL && entity->parent == NULL)
+    this->nullParent->addChild (entity);
+
+  this->entities->add (entity);
+
   entity->postSpawn ();
 }
@@ -747 +949 @@
    \param location where to add
 */
-void World::spawn(WorldEntity* entity, Location* loc)
-{
-  Location zeroLoc;
-  WorldEntity* owner;
+void World::spawn(WorldEntity* entity, Vector* absCoor, Quaternion* absDir)
+{
+  entity->setAbsCoor (absCoor);
+  entity->setAbsDir (absDir);
+  
+  if( this->nullParent != NULL && entity->parent == NULL)
+    this->nullParent->addChild (entity);
+
   this->entities->add (entity);
-  if( loc == NULL)
-    {
-      zeroLoc.dist = 0;
-      zeroLoc.part = 0;
-      zeroLoc.pos = Vector();
-      zeroLoc.rot = Quaternion();
-      loc = &zeroLoc;
-    }
-  entity->init (loc, owner);
-  if (entity->bFree)
-    {
-      this->track[loc->part].mapCoords( loc, entity->getPlacement());
-    }
+
   entity->postSpawn ();
-  //return entity;
-}
-
-
-/**
-   \brief add and spawn a new entity to this world
-   \param entity to be added
-   \param place where to be added
-*/
-void World::spawn(WorldEntity* entity, Placement* plc)
-{
-  Placement zeroPlc;
-  WorldEntity* owner;
-  if( plc == NULL)
-    {
-      zeroPlc.r = Vector();
-      zeroPlc.w = Quaternion();
-      plc = &zeroPlc;
-    }
-  this->entities->add (entity);
-  entity->init (plc, owner);
-  entity->postSpawn ();
-  //return entity;
-}
+}
+
 
 
@@ -800 +972 @@
   return false;
 }
+
+
+
+
+void World::swap (unsigned char &a, unsigned char &b)
+{
+  unsigned char temp;
+  temp = a;
+  a    = b;
+  b    = temp;
+}

orxonox/trunk/src/world.h

@@ -11 +11 @@
 
 
-
+class TrackManager;
 class Track;
 class WorldEntity;
 class Camera;
+class PNode;
+class GLMenuImageScreen;
 
 //! The game environment
@@ -23 +25 @@
   World (int worldID);
   virtual ~World ();
-
-  template<typename T> 
-    T* spawn (Location* loc, WorldEntity* owner);       // template to be able to spawn any derivation of WorldEntity
-  template<typename T> 
-    T* spawn (Placement* plc, WorldEntity* owner);
   
   virtual ErrorMessage init ();
@@ -38 +35 @@
   virtual void destroy ();
 
+  //static void vertexCallback (GLfloat* vertex);
+
   void timeSlice (Uint32 deltaT);
   void collide ();
   void draw ();
   void update ();       // maps Locations to Placements
-  void calcCameraPos (Location* loc, Placement* plc);
+  //void calcCameraPos (Location* loc, Placement* plc);
         
   void unload ();
   bool command (Command* cmd);
+  virtual void displayLoadScreen();
+  virtual void releaseLoadScreen();
   
   void setTrackLen (Uint32 tracklen);
@@ -53 +54 @@
 
   void spawn (WorldEntity* entity);
-  void spawn (WorldEntity* entity, Location* loc);
-  void spawn (WorldEntity* entity, Placement* plc);
+  void spawn (WorldEntity* entity, Vector* absCoor, Quaternion* absDir);
 
   tList<WorldEntity>* entities;
   
   // base level data
+  TrackManager* trackManager;
   Track* track;
   Uint32 tracklen;   // number of Tracks the World consist of
@@ -64 +65 @@
   Camera* localCamera;  
 
+
+  UPointCurve* testCurve;
  private:
   Uint32 lastFrame; //!> last time of frame
@@ -70 +73 @@
   bool bPause;
 
+  GLMenuImageScreen* glmis;
+
   char* worldName;
   int debugWorldNr;
   GLuint objectList;
+  SDL_Surface *loadImage;
 
   WorldEntity* localPlayer;
-  
+ 
+  PNode* nullParent;
+ 
   void mainLoop ();
   void synchronize ();
@@ -83 +91 @@
   void display ();
   void debug ();
+
+  void swap (unsigned char &a, unsigned char &b); /* \todo: this function doesn't belong here, this should be part of a image class*/
 };
 

orxonox/trunk/src/world_entity.cc

@@ -36 +36 @@
 WorldEntity::WorldEntity (bool isFree) : bFree(isFree)
 {
+  this->setClassName ("WorldEntity");
   this->bDraw = true;
   collisioncluster = NULL;
-  owner = NULL;
 }
 
@@ -53 +53 @@
    \return a pointer to location
 */
+/*PN
 Location* WorldEntity::getLocation ()
 {
   return &loc;
 }
+*/
 
 /**
@@ -62 +64 @@
    \return a pointer to placement
 */
+ /*PN
 Placement* WorldEntity::getPlacement ()
 {
   return &place;
 }
-
+ */
 /**
    \brief query whether the WorldEntity in question is free
@@ -89 +92 @@
 }
 
+
 /**
    \brief this method is called every frame
@@ -99 +103 @@
 }
 
+
+/** 
+    \brief process draw function 
+*/
+void WorldEntity::processDraw ()
+{
+  this->draw ();
+  PNode* pn = this->children->enumerate ();
+  while( pn != NULL) 
+    { 
+      ((WorldEntity*)pn)->processDraw ();
+      pn = this->children->nextElement();
+    } 
+}
+
+
+void WorldEntity::setDrawable (bool bDraw)
+{
+  this->bDraw = bDraw;
+}
+
+
 /**
    \brief the entity is drawn onto the screen with this function
@@ -105 +131 @@
 */
 void WorldEntity::draw() 
-{
-}
+{}
 
 /**
@@ -134 +159 @@
 void WorldEntity::destroy() {}
 
-
-/**
-   \brief basic initialisation for bound Entities
-*/
-void WorldEntity::init( Location* spawnloc, WorldEntity* spawnowner)
-{
-  loc = *spawnloc;
-  owner = spawnowner;
-}
-
-/**
-   \brief basic initialisation for free Entities
-*/
-void WorldEntity::init( Placement* spawnplc, WorldEntity* spawnowner)
-{
-  place = *spawnplc;
-  owner = spawnowner;
-}
 
 /**
@@ -181 +188 @@
    to look at the location you return with this.
 */
+/*PN
 void WorldEntity::getLookat (Location* locbuf)
 {
 }
+*/
 
 /**

orxonox/trunk/src/world_entity.h

@@ -8 +8 @@
 
 #include "stdincl.h"
+#include "p_node.h"
 
 class CollisionCluster;
+class Model;
 
 //! Basic class from which all interactive stuff in the world is derived from
-class WorldEntity
+class WorldEntity : public PNode
 {       
   friend class World;
-  
+
  public:
   WorldEntity (bool isFree = false);
   virtual ~WorldEntity ();
+
+  Model* model;
   
-  Location* getLocation ();
-  Placement* getPlacement ();
   void setCollision (CollisionCluster* newhull);
   
@@ -35 +37 @@
   virtual void collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags);
   virtual void command (Command* cmd);
-  
+
+  void processDraw ();
   virtual void draw ();
-  virtual void getLookat (Location* locbuf);
+  void setDrawable (bool bDraw);
   
   virtual void leftWorld ();
@@ -45 +48 @@
   bool bCollide;
   bool bDraw;
-  
-  WorldEntity* owner;
+
   CollisionCluster* collisioncluster;
-  Placement place;
-  Location loc;
-  
-  void init( Location* spawnloc, WorldEntity* spawnowner);
-  void init( Placement* spawnplc, WorldEntity* spawnowner);
 };