Text archives Help
- From: boulos@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [Manta] r1696 - in trunk: CMake StandAlone scenes
- Date: Thu, 30 Aug 2007 21:51:01 -0600 (MDT)
Author: boulos
Date: Thu Aug 30 21:50:59 2007
New Revision: 1696
Modified:
trunk/CMake/FindParsers.cmake
trunk/StandAlone/displaytest.cc
trunk/scenes/0.cc
Log:
CMake/FindParsers.cmake
Apple's version of bison works slightly differently than linux and
requires a -o flag to be useful. This fixes the galileo scene.
StandAlone/displaytest.cc
Apple places GLUT in GLUT/glut.h instead of GL/glut.h .
scenes/0.cc
Fixing a missed AccelerationStructure usage from my previous change
in the AccelerationStructure interface
Modified: trunk/CMake/FindParsers.cmake
==============================================================================
--- trunk/CMake/FindParsers.cmake (original)
+++ trunk/CMake/FindParsers.cmake Thu Aug 30 21:50:59 2007
@@ -90,7 +90,7 @@
ADD_CUSTOM_COMMAND(
OUTPUT ${BISON_TAB_C} ${BISON_TAB_H}
COMMAND ${BISON_EXECUTABLE}
- ARGS "${parser}" ${parser_args} "--defines"
+ ARGS ${parser_args} -o ${BISON_TAB_C} --defines ${parser}
DEPENDS "${parser}"
COMMENT "Generating ${BISON_TAB_C} ${BISON_TAB_H} from ${parser}"
)
Modified: trunk/StandAlone/displaytest.cc
==============================================================================
--- trunk/StandAlone/displaytest.cc (original)
+++ trunk/StandAlone/displaytest.cc Thu Aug 30 21:50:59 2007
@@ -1,6 +1,12 @@
#define GL_GLEXT_PROTOTYPES
+
+#ifdef __APPLE__
+#include <GLUT/glut.h>
+#else
#include <GL/glut.h>
+#endif
+
#include <MantaSSE.h>
#include <Interface/Image.h>
@@ -206,7 +212,7 @@
// Fragment::ConsecutiveX|Fragment::ConstantEye);
// fragment.setSize(Fragment::MaxSize);
// fillFragment(fragment);
-
+
#ifdef MANTA_SSE
__m128i vec_4 = _mm_set1_epi32(4);
__m128i vec_cascade = _mm_set_epi32(3, 2, 1, 0);
@@ -253,7 +259,7 @@
for(int i=0;i<fsize;i++)
fragment.pixel[1][i] = y;
#endif
-
+
fillFragment(fragment);
image->set(fragment);
}
@@ -281,7 +287,7 @@
glutDisplayFunc(display);
glutKeyboardFunc (keyboard);
glutMainLoop();
-
-
+
+
return 0;
}
Modified: trunk/scenes/0.cc
==============================================================================
--- trunk/scenes/0.cc (original)
+++ trunk/scenes/0.cc Thu Aug 30 21:50:59 2007
@@ -168,12 +168,13 @@
if(as) {
world->add(as);
- as->rebuild(group);
+ as->setGroup(group);
+ as->rebuild();
}
- else
+ else
world->add(group);
-
+
#if 0
double ambient_scale=1.0;
Color bgcolor(RGB(0.1, 0.2, 0.45));
- [Manta] r1696 - in trunk: CMake StandAlone scenes, boulos, 08/30/2007
Archive powered by MHonArc 2.6.16.