dungeon_crawler

changeset 12:e95462632f9a

find changesets by author, revision, files, or words in the commit message
foo
author John Tsiombikas <nuclear@member.fsf.org>
date Sun, 19 Aug 2012 05:35:00 +0300
parents e5567ddbf2ef
children 6a650b3b7084
files prototype/Makefile prototype/src/material.cc prototype/src/tile.cc
diffstat 3 files changed, 6 insertions(+), 3 deletions(-) [+]
line diff
     1.1 --- a/prototype/Makefile	Sun Aug 19 03:11:36 2012 +0300
     1.2 +++ b/prototype/Makefile	Sun Aug 19 05:35:00 2012 +0300
     1.3 @@ -28,3 +28,5 @@
     1.4  .PHONY: clean
     1.5  clean:
     1.6  	rm -f $(obj) $(bin) $(dep)
     1.7 +
     1.8 +include build/macapp.mk

     2.1 --- a/prototype/src/material.cc	Sun Aug 19 03:11:36 2012 +0300
     2.2 +++ b/prototype/src/material.cc	Sun Aug 19 05:35:00 2012 +0300
     2.3 @@ -1,3 +1,4 @@
     2.4 +#include <stdio.h>
     2.5  #include <assert.h>
     2.6  #include <assimp/material.h>
     2.7  #include "opengl.h"
     2.8 @@ -24,7 +25,7 @@
     2.9  	val = 60.0;
    2.10  	aiGetMaterialFloatArray(assmat, AI_MATKEY_SHININESS, &val, &sz);
    2.11  	if(val > 127) {
    2.12 -		printf("GOT SHININESS: %f\n", val);
    2.13 +		fprintf(stderr, "Warning: shininess %f... setting to 127\n", val);
    2.14  		val = 127;
    2.15  	}
    2.16  	shin = val;

     3.1 --- a/prototype/src/tile.cc	Sun Aug 19 03:11:36 2012 +0300
     3.2 +++ b/prototype/src/tile.cc	Sun Aug 19 05:35:00 2012 +0300
     3.3 @@ -116,7 +116,7 @@
     3.4  		}
     3.5  		meshes.push_back(mesh);
     3.6  
     3.7 -		printf("    mesh: \"%s\"", name);
     3.8 +		//printf("    mesh: \"%s\"", name);
     3.9  
    3.10  		// find which side is this mesh on
    3.11  		unsigned int side = 0;
    3.12 @@ -135,7 +135,7 @@
    3.13  		if(!side) {
    3.14  			side = TILE_ALL;
    3.15  		}
    3.16 -		printf(" (0x0%x)\n", side);
    3.17 +		//printf(" (0x0%x)\n", side);
    3.18  		mesh_side.push_back(side);
    3.19  
    3.20  		count++;