diff --git a/source/glest_game/global/config.cpp b/source/glest_game/global/config.cpp index 31c2a41c..bcf31334 100644 --- a/source/glest_game/global/config.cpp +++ b/source/glest_game/global/config.cpp @@ -772,8 +772,6 @@ bool Config::replaceFileWithLocalFile(const vector &dirList, string file string Config::findValidLocalFileFromPath(string fileName) { string result = fileName; - // /home/user1/SCM/megaglest-trunk/mk/linux//techs/megapack/factions/tech/units/blacksmith/images/particle.bmp - // /home/user1/SCM/megaglest-trunk/mk/linux//tutorials/3_advanced_tutorial/3_advanced_tutorial.xml if(fileName.find("maps/") != fileName.npos ) { size_t pos = fileName.find("maps/"); diff --git a/source/glest_game/main/intro.cpp b/source/glest_game/main/intro.cpp index 5df07723..df1d97d3 100644 --- a/source/glest_game/main/intro.cpp +++ b/source/glest_game/main/intro.cpp @@ -505,10 +505,6 @@ Intro::Intro(Program *program): if(GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false) { renderer.swapBuffers(); } - //test = NULL; - //Shared::Graphics::md5::initMD5OpenGL(data_path + "data/core/shaders/"); - //md5Test = Shared::Graphics::md5::getMD5ObjectFromLoaderScript("/home/softcoder/Code/megaglest/trunk/mk/linux/mydata/test/mv1/mv1.loader"); - //md5Test = Shared::Graphics::md5::getMD5ObjectFromLoaderScript("/home/softcoder/Code/megaglest/trunk/mk/linux/mydata/test/mv1/mv2.loader"); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); @@ -520,11 +516,6 @@ Intro::Intro(Program *program): if(SystemFlags::VERBOSE_MODE_ENABLED) printf("Intro Video [%s] [%s]\n",introVideoFile.c_str(),introVideoFileFallback.c_str()); - //renderer.clearBuffers(); - //renderer.reset3dMenu(); - //renderer.clearZBuffer(); - //renderer.reset2d(); - Context *c= GraphicsInterface::getInstance().getCurrentContext(); SDL_Surface *screen = static_cast(c)->getPlatformContextGlPtr()->getScreen(); @@ -689,62 +680,9 @@ void Intro::render() { renderer.clearZBuffer(); renderer.loadCameraMatrix(&camera); -// const Vec3f &position= camera.getConstPosition(); -// Quaternion orientation= camera.getOrientation().conjugate(); -// Shared::Graphics::md5::Matrix4x4f modelViewMatrix; -// float *mtx = orientation.toMatrix4().ptr(); -// for(unsigned int i = 0; i < 16; ++i) { -// modelViewMatrix._m[i] = mtx[i]; -// } - renderModelBackground(); renderer.renderParticleManager(rsMenu); - //printf("animTimer.deltaTime () = %f anim = %f animTimer.deltaTime() / 25.0 = %f\n",animTimer.deltaTime (),anim,animTimer.deltaTime() / 25.0); - //double anim = animTimer.deltaTime(); - //Shared::Graphics::md5::renderMD5Object(md5Test, animTimer.deltaTime() / 30.0, &modelViewMatrix); - - //Shared::Graphics::md5::renderMD5Object(md5Test, animTimer.deltaTime() / 30.0, NULL); - -// if(test == NULL) { -// glClearColor (0.0, 0.0, 0.0, 0.0); -// glEnable(GL_DEPTH_TEST); -// glShadeModel (GL_SMOOTH); -// -// test = glmReadOBJ("/home/softcoder/Code/megaglest/trunk/mk/linux/r_stack_fall.obj"); -// glmUnitize(test); -// glmFacetNormals(test); -// glmVertexNormals(test, 90.0); -// -// int h = 900; -// int w = 1680; -// glViewport (0, 0, (GLsizei) w, (GLsizei) h); -// glMatrixMode (GL_PROJECTION); -// glLoadIdentity (); -// gluPerspective(60.0, (GLfloat) w/(GLfloat) h, 1.0, 20.0); -// glMatrixMode (GL_MODELVIEW); -// } -// if(test != NULL) { -// -// glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); -// glLoadIdentity(); -// glTranslatef(0,0,-5); -// -// glPushMatrix(); -// // I added these to be able to rotate the whole scene so you can see the box and textures -// glRotatef(90,1,0,0); -// glRotatef(0,0,1,0); -// glRotatef(0,0,0,1); -// glmDraw(test, GLM_SMOOTH| GLM_TEXTURE); -// //glmDraw(test, GLM_SMOOTH| GLM_TEXTURE|GLM_COLOR); -// //glmDraw(test, GLM_FLAT); -// glPopMatrix(); -// -// renderer.swapBuffers(); -// return; -// //printf("Rendering test"); -// } - renderer.reset2d(); for(int i = 0; i < texts.size(); ++i) { diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp index dc4e634a..e26809ee 100644 --- a/source/glest_game/main/main.cpp +++ b/source/glest_game/main/main.cpp @@ -4178,18 +4178,6 @@ int glestMain(int argc, char** argv) { return 0; } - //vector techPaths; - //vector techDataPaths = config.getPathListForType(ptTechs); - //findDirs(techDataPaths, techPaths); - - //int32 techCRC = getFolderTreeContentsCheckSumRecursively(techDataPaths, string("/") + "megapack" + string("/*"), ".xml", NULL, true); - //return -1; - - // - //removeFolder("/home/softcoder/Code/megaglest/trunk/mk/linux/mydata/tilesets/mother_board"); - //return -1; - // - program= new Program(); mainProgram = program; renderer.setProgram(program);