Changeset 6286 in orxonox.OLD for branches/avi_play/src
- Timestamp:
- Dec 25, 2005, 5:26:11 PM (19 years ago)
- Location:
- branches/avi_play/src
- Files:
-
- 1 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/avi_play/src/lib/graphics/importer/media_container.cc
r6260 r6286 121 121 if(frame_finished) 122 122 { 123 PRINTF(1)("frame_number: %i\n", this->getFrameNumber());123 //PRINTF(1)("frame_number: %i\n", this->getFrameNumber()); 124 124 // Conversion from YUV to RGB 125 125 // Most codecs return images in YUV 420 format -
branches/avi_play/src/subprojects/importer/Makefile.am
r6049 r6286 7 7 8 8 bin_PROGRAMS = importer \ 9 multitex 9 multitex \ 10 movie_player_test 10 11 11 12 importer_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \ … … 63 64 $(MAINSRCDIR)/lib/util/executor/executor.cc \ 64 65 $(MAINSRCDIR)/util/loading/factory.cc 66 67 movie_player_test_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \ 68 $(MAINSRCDIR)/lib/parser/tinyxml/libtinyxml.a \ 69 $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \ 70 $(MAINSRCDIR)/lib/shell/libORXshell.a \ 71 $(MAINSRCDIR)/lib/sound/libORXsound.a \ 72 $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a 73 74 movie_player_test_SOURCES= ../framework.cc \ 75 movie_player_test.cc \ 76 $(MAINSRCDIR)/util/state.cc \ 77 $(MAINSRCDIR)/world_entities/camera.cc \ 78 $(MAINSRCDIR)/lib/lang/base_object.cc \ 79 $(MAINSRCDIR)/lib/lang/class_list.cc \ 80 $(MAINSRCDIR)/lib/math/vector.cc \ 81 $(MAINSRCDIR)/util/loading/resource_manager.cc \ 82 $(MAINSRCDIR)/lib/parser/ini_parser/ini_parser.cc \ 83 $(MAINSRCDIR)/lib/coord/p_node.cc \ 84 $(MAINSRCDIR)/lib/coord/null_parent.cc \ 85 $(MAINSRCDIR)/util/loading/load_param.cc \ 86 $(MAINSRCDIR)/util/loading/load_param_description.cc \ 87 $(MAINSRCDIR)/lib/util/helper_functions.cc \ 88 $(MAINSRCDIR)/lib/util/substring.cc \ 89 $(MAINSRCDIR)/lib/util/color.cc \ 90 $(MAINSRCDIR)/lib/util/multi_type.cc \ 91 $(MAINSRCDIR)/lib/util/executor/executor.cc \ 92 $(MAINSRCDIR)/util/loading/factory.cc -
branches/avi_play/src/subprojects/importer/importer.cc
r6160 r6286 10 10 11 11 ### File Specific: 12 main-programmer: Benjamin Grauer12 main-programmer: David Hasenfratz 13 13 co-programmer: ... 14 14 … … 20 20 #include "light.h" 21 21 22 #include "objModel.h"23 #include "primitive_model.h"24 22 #include "media_container.h" 25 23 #include <stdlib.h> … … 27 25 #include "resource_manager.h" 28 26 29 Model* obj;30 27 MediaContainer* movie; 31 28 … … 44 41 void Framework::moduleEventHandler(SDL_Event* event) 45 42 { 46 switch (event->type) 47 { 48 case SDL_KEYDOWN: 49 switch (event->key.keysym.sym) 50 { 51 case SDLK_i: 52 break; 53 } 54 } 43 55 44 } 56 45 … … 66 55 } 67 56 68 69 57 void Framework::moduleHelp(void) const 70 58 { -
branches/avi_play/src/subprojects/importer/multitex.cc
r6260 r6286 10 10 11 11 ### File Specific: 12 main-programmer: Benjamin Grauer12 main-programmer: David Hasenfratz 13 13 co-programmer: ... 14 14 … … 22 22 #include "texture_sequence.h" 23 23 #include "material.h" 24 25 #include "objModel.h"26 24 27 25 #include "primitive_model.h"
Note: See TracChangeset
for help on using the changeset viewer.