Changeset 5865 in orxonox.OLD for trunk/src/subprojects
- Timestamp:
- Dec 1, 2005, 11:00:49 PM (19 years ago)
- Location:
- trunk/src/subprojects/importer
- Files:
-
- 1 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/subprojects/importer/Makefile.am
r5750 r5865 6 6 importer_LDFLAGS = $(MWINDOWS) 7 7 8 bin_PROGRAMS = importer 8 bin_PROGRAMS = importer \ 9 multitex 9 10 10 11 importer_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \ … … 32 33 $(MAINSRCDIR)/lib/util/color.cc \ 33 34 $(MAINSRCDIR)/lib/util/multi_type.cc \ 35 $(MAINSRCDIR)/lib/util/executor/executor.cc \ 34 36 $(MAINSRCDIR)/util/loading/factory.cc 37 38 39 multitex_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \ 40 $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \ 41 $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \ 42 $(MAINSRCDIR)/lib/shell/libORXshell.a \ 43 $(MAINSRCDIR)/lib/sound/libORXsound.a \ 44 $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a 45 46 multitex_SOURCES= ../framework.cc \ 47 multitex.cc \ 48 $(MAINSRCDIR)/util/state.cc \ 49 $(MAINSRCDIR)/world_entities/camera.cc \ 50 $(MAINSRCDIR)/lib/lang/base_object.cc \ 51 $(MAINSRCDIR)/lib/lang/class_list.cc \ 52 $(MAINSRCDIR)/lib/math/vector.cc \ 53 $(MAINSRCDIR)/util/loading/resource_manager.cc \ 54 $(MAINSRCDIR)/lib/util/ini_parser.cc \ 55 $(MAINSRCDIR)/lib/coord/p_node.cc \ 56 $(MAINSRCDIR)/lib/coord/null_parent.cc \ 57 $(MAINSRCDIR)/util/loading/load_param.cc \ 58 $(MAINSRCDIR)/util/loading/load_param_description.cc \ 59 $(MAINSRCDIR)/lib/util/helper_functions.cc \ 60 $(MAINSRCDIR)/lib/util/substring.cc \ 61 $(MAINSRCDIR)/lib/util/color.cc \ 62 $(MAINSRCDIR)/lib/util/multi_type.cc \ 63 $(MAINSRCDIR)/lib/util/executor/executor.cc \ 64 $(MAINSRCDIR)/util/loading/factory.cc -
trunk/src/subprojects/importer/multitex.cc
r5857 r5865 20 20 #include "light.h" 21 21 22 #include "texture_sequence.h" 23 #include "material.h" 24 22 25 #include "objModel.h" 26 23 27 #include "primitive_model.h" 24 28 #include <stdlib.h> … … 27 31 28 32 Model* obj; 33 TextureSequence* seq; 34 Texture* test; 35 float counter = 0; 29 36 30 37 void Framework::moduleInit(int argc, char** argv) … … 32 39 ResourceManager::getInstance()->addImageDir("./"); 33 40 34 for (int i = 0; i < argc; i++) 41 seq = new TextureSequence(); 42 for (int i = 1; i < argc; i++) 35 43 { 44 seq->addFrame(argv[i]); 36 45 printf("%s\n", argv[i]); 37 46 } 47 test = new Texture(argv[1]); 48 38 49 ResourceManager::getInstance()->addImageDir(""); 39 50 40 51 41 if (argc>=3) 42 obj = new OBJModel (argv[1], atof(argv[2])); 43 else if (argc>=2) 44 obj = new OBJModel(argv[1]); 45 else 46 obj = new PrimitiveModel(PRIM_CYLINDER); 52 obj = new PrimitiveModel(PRIM_CYLINDER); 47 53 48 54 ResourceManager::getInstance()->debug(); … … 69 75 void Framework::moduleTick(float dt) 70 76 { 77 counter+=dt; 71 78 79 seq->gotoFrame((unsigned int)counter); 80 if ((unsigned int)counter > seq->getFrameCount()) 81 counter = 0; 72 82 } 73 83 74 84 void Framework::moduleDraw(void) const 75 85 { 86 float diffuse[] = {1,1,1,1}; 87 float ambient[] = {1,0,0,1}; 88 float specular[] = {1,0,1,1}; 89 // setting diffuse color 90 // glColor3f (diffuse[0], diffuse[1], diffuse[2]); 91 glMaterialfv(GL_FRONT, GL_DIFFUSE, diffuse); 92 93 // setting ambient color 94 glMaterialfv(GL_FRONT, GL_AMBIENT, ambient); 95 96 // setting up Sprecular 97 glMaterialfv(GL_FRONT, GL_SPECULAR, specular); 98 99 // setting up Shininess 100 glMaterialf(GL_FRONT, GL_SHININESS, .4); 101 glShadeModel(GL_SMOOTH); 102 103 glEnable(GL_TEXTURE_2D); 104 glBindTexture(GL_TEXTURE_2D, seq->getTexture()); 105 // printf("Number = %d\n", seq->getTexture()); 106 /* This allows alpha blending of 2D textures with the scene */ 107 // if (seq->hasAlpha()) 108 // { 109 // glEnable(GL_BLEND); 110 // glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 111 // } 112 76 113 obj->draw(); 77 114
Note: See TracChangeset
for help on using the changeset viewer.