# HG changeset patch # User John Tsiombikas # Date 1345343700 -10800 # Node ID e95462632f9ad0fbe991cfbff224f9d9002724f3 # Parent e5567ddbf2efe2e644ded09a79333c90ee169649 foo diff -r e5567ddbf2ef -r e95462632f9a prototype/Makefile --- a/prototype/Makefile Sun Aug 19 03:11:36 2012 +0300 +++ b/prototype/Makefile Sun Aug 19 05:35:00 2012 +0300 @@ -28,3 +28,5 @@ .PHONY: clean clean: rm -f $(obj) $(bin) $(dep) + +include build/macapp.mk diff -r e5567ddbf2ef -r e95462632f9a prototype/src/material.cc --- a/prototype/src/material.cc Sun Aug 19 03:11:36 2012 +0300 +++ b/prototype/src/material.cc Sun Aug 19 05:35:00 2012 +0300 @@ -1,3 +1,4 @@ +#include #include #include #include "opengl.h" @@ -24,7 +25,7 @@ val = 60.0; aiGetMaterialFloatArray(assmat, AI_MATKEY_SHININESS, &val, &sz); if(val > 127) { - printf("GOT SHININESS: %f\n", val); + fprintf(stderr, "Warning: shininess %f... setting to 127\n", val); val = 127; } shin = val; diff -r e5567ddbf2ef -r e95462632f9a prototype/src/tile.cc --- a/prototype/src/tile.cc Sun Aug 19 03:11:36 2012 +0300 +++ b/prototype/src/tile.cc Sun Aug 19 05:35:00 2012 +0300 @@ -116,7 +116,7 @@ } meshes.push_back(mesh); - printf(" mesh: \"%s\"", name); + //printf(" mesh: \"%s\"", name); // find which side is this mesh on unsigned int side = 0; @@ -135,7 +135,7 @@ if(!side) { side = TILE_ALL; } - printf(" (0x0%x)\n", side); + //printf(" (0x0%x)\n", side); mesh_side.push_back(side); count++;