Changeset 6286 in orxonox.OLD for branches/avi_play/src/subprojects

Timestamp:

Dec 25, 2005, 5:26:11 PM (19 years ago)

Author:

hdavid

Message:

branches\avi_play: added new file to the importer subproject

Location:

branches/avi_play/src/subprojects/importer

Files:

• Makefile.am (modified) (2 diffs)
• importer.cc (modified) (5 diffs)
• movie_player_test.cc (added)
• multitex.cc (modified) (2 diffs)

branches/avi_play/src/subprojects/importer/Makefile.am

@@ -7 +7 @@
 
 bin_PROGRAMS = importer \
-               multitex
+               multitex \
+                                                         movie_player_test
 
 importer_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \
@@ -63 +64 @@
                   $(MAINSRCDIR)/lib/util/executor/executor.cc \
                   $(MAINSRCDIR)/util/loading/factory.cc
+
+movie_player_test_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \
+                                                        $(MAINSRCDIR)/lib/parser/tinyxml/libtinyxml.a \
+                                                        $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
+                                                        $(MAINSRCDIR)/lib/shell/libORXshell.a \
+                                                        $(MAINSRCDIR)/lib/sound/libORXsound.a \
+                                                        $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a
+
+movie_player_test_SOURCES= ../framework.cc \
+                                                 movie_player_test.cc \
+                                                 $(MAINSRCDIR)/util/state.cc \
+                                                 $(MAINSRCDIR)/world_entities/camera.cc \
+                                                 $(MAINSRCDIR)/lib/lang/base_object.cc \
+                                                                                                         $(MAINSRCDIR)/lib/lang/class_list.cc \
+                                                                                                         $(MAINSRCDIR)/lib/math/vector.cc \
+                                                                                                         $(MAINSRCDIR)/util/loading/resource_manager.cc \
+                                                                                                         $(MAINSRCDIR)/lib/parser/ini_parser/ini_parser.cc \
+                                                                                                         $(MAINSRCDIR)/lib/coord/p_node.cc \
+                                                                                                         $(MAINSRCDIR)/lib/coord/null_parent.cc \
+                                                                                                         $(MAINSRCDIR)/util/loading/load_param.cc \
+                                                                                                         $(MAINSRCDIR)/util/loading/load_param_description.cc \
+                                                                                                         $(MAINSRCDIR)/lib/util/helper_functions.cc \
+                                                                                                         $(MAINSRCDIR)/lib/util/substring.cc \
+                                                                                                         $(MAINSRCDIR)/lib/util/color.cc \
+                                                                                                         $(MAINSRCDIR)/lib/util/multi_type.cc \
+                                                                                                         $(MAINSRCDIR)/lib/util/executor/executor.cc \
+                                                                                                         $(MAINSRCDIR)/util/loading/factory.cc

branches/avi_play/src/subprojects/importer/importer.cc

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: Benjamin Grauer
+   main-programmer: David Hasenfratz
    co-programmer: ...
 
@@ -20 +20 @@
 #include "light.h"
 
-#include "objModel.h"
-#include "primitive_model.h"
 #include "media_container.h"
 #include <stdlib.h>
@@ -27 +25 @@
 #include "resource_manager.h"
 
-Model* obj;
 MediaContainer* movie;
 
@@ -44 +41 @@
 void Framework::moduleEventHandler(SDL_Event* event)
 {
-  switch (event->type)
-    {
-    case SDL_KEYDOWN:
-      switch (event->key.keysym.sym)
-        {
-        case SDLK_i:
-          break;
-        }
-    }
+
 }
 
@@ -66 +55 @@
 }
 
-
 void Framework::moduleHelp(void) const
 {

branches/avi_play/src/subprojects/importer/multitex.cc

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: Benjamin Grauer
+   main-programmer: David Hasenfratz
    co-programmer: ...
 
@@ -22 +22 @@
 #include "texture_sequence.h"
 #include "material.h"
-
-#include "objModel.h"
 
 #include "primitive_model.h"