Text archives Help
- From: bigler@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r802 - in trunk: Core/Color Engine/Shadows Image Model/Cameras Model/Groups Model/Primitives SwigInterface fox scenes
- Date: Thu, 22 Dec 2005 16:12:22 -0700 (MST)
Author: bigler
Date: Thu Dec 22 16:12:19 2005
New Revision: 802
Modified:
trunk/Core/Color/ColorSpace.h
trunk/Engine/Shadows/BeamShadows.cc
trunk/Image/NRRDFile.cc
trunk/Model/Cameras/FisheyeCamera.cc
trunk/Model/Cameras/PinholeCamera.cc
trunk/Model/Groups/KDTree.cc
trunk/Model/Groups/KDTreeLoader.cc
trunk/Model/Groups/RealisticBvh.cc
trunk/Model/Groups/RealisticBvh.h
trunk/Model/Groups/TransparentKDTree.cc
trunk/Model/Primitives/BvhTriangleMesh.cc
trunk/Model/Primitives/TexTriangle.cc
trunk/SwigInterface/CMakeLists.txt
trunk/SwigInterface/manta.i
trunk/SwigInterface/runmanta.py
trunk/fox/FMantaImageFrame.cc
trunk/fox/FMantaRecorder.h
trunk/fox/FMantaStereo.h
trunk/fox/FMantaTrackballNav.cc
trunk/fox/FMantaUniformNav.cc
trunk/fox/FMantaUniformNav.h
trunk/fox/FMantaWidgets.h
trunk/fox/FMantaWindow.cc
trunk/fox/FMantaWindow.h
trunk/fox/MediaFusionApp.h
trunk/scenes/objviewer.cc
Log:
Most of these are error and warning fixes for the Irix version.
Core/Color/ColorSpace.h
Include RGBTraits, so that Traits::ComponentType would be found
properly.
Engine/Shadows/BeamShadows.cc
Replaced "/sqrt_two" with "*M_SQRT1_2", and include math.h to make
sure we get it.
Image/NRRDFile.cc
Model/Cameras/FisheyeCamera.cc
Model/Cameras/PinholeCamera.cc
Model/Groups/KDTreeLoader.cc
Removed unused variables.
Model/Groups/KDTree.cc
Model/Groups/TransparentKDTree.cc
The pragma swp doesn't work on __sgi platforms (i.e. Irix).
Model/Groups/RealisticBvh.cc
Model/Groups/RealisticBvh.h
Move construction to the start_build function, so that future
additional constructors can take advantage of it.
Model/Primitives/BvhTriangleMesh.cc
Use SCIRun::Assert instead of C's assert.
Model/Primitives/TexTriangle.cc
Removed unused cassert include.
SwigInterface/CMakeLists.txt
Added -DSCI_NOPERSISTENT to the SWIG build of manta.
SwigInterface/manta.i
Made sure I was including MantaTypes for the swig interpreter.
Separate the Lights and backgrounds from the textures.
Added definition of Texture_ColorComponent to remove SWIG warning.
Added comment as to why you should do this.
Added RealisticBvh include. Still needs a constructor we can use
for python.
Added Array1<Object*> template. It doesn't quite work right now
because arguments to the add function (add(Object*&)) don't get
their address taken before being called, so you send it an Object*
instead of an Object**.
SwigInterface/runmanta.py
Default depth for dielectric scene is 25 now instead of 2.
fox/FMantaImageFrame.cc
fox/FMantaTrackballNav.cc
fox/FMantaUniformNav.cc
fox/FMantaWindow.cc
Removed unused function parameters and local variables.
fox/FMantaRecorder.h
fox/FMantaStereo.h
fox/FMantaWindow.h
Don't do Class::MemberFunction in the class definition. SGI's
compiler doesn't like it.
fox/FMantaUniformNav.h
Added newline to end of file to remove warning.
fox/FMantaWidgets.h
Class FMantaColorFrame should inherit publicly from
FXHorizontalFrame.
fox/MediaFusionApp.h
Removed extra ";".
scenes/objviewer.cc
Removed unused include of cassert and added sgi_stl_warnings_off/on
headers around STL includes.
Modified: trunk/Core/Color/ColorSpace.h
==============================================================================
--- trunk/Core/Color/ColorSpace.h (original)
+++ trunk/Core/Color/ColorSpace.h Thu Dec 22 16:12:19 2005
@@ -4,6 +4,7 @@
#include <Core/Color/GrayColor.h>
#include <Core/Color/RGBColor.h>
+#include <Core/Color/RGBTraits.h>
#include <Core/Math/Expon.h>
#include <sgi_stl_warnings_off.h>
Modified: trunk/Engine/Shadows/BeamShadows.cc
==============================================================================
--- trunk/Engine/Shadows/BeamShadows.cc (original)
+++ trunk/Engine/Shadows/BeamShadows.cc Thu Dec 22 16:12:19 2005
@@ -10,9 +10,9 @@
#include <Core/Exceptions/IllegalArgument.h>
#include <Core/Math/Noise.h>
-using namespace Manta;
+#include <math.h>
-static const double sqrt_two = 1.414213562373095;
+using namespace Manta;
ShadowAlgorithm* BeamShadows::create(const vector<string>& args)
{
@@ -80,7 +80,7 @@
s.light = lights->colors[l] * 0.25;
s.hitInfo.reset(length);
}
- dir =
lights->centers[l]+Vector(-2.0/3.0/sqrt_two*radius,-6.0/sqrt_two*radius,-1.0/3.0*radius)-e.hitPosition;
+ dir =
lights->centers[l]+Vector(-2.0/3.0*M_SQRT1_2*radius,-6.0*M_SQRT1_2*radius,-1.0/3.0*radius)-e.hitPosition;
if(Dot(dir, e.normal) > 0){
RayPacket::Element& s = shadowRays.get(sidx++);
double length = dir.normalize();
@@ -88,7 +88,7 @@
s.light = lights->colors[l] * 0.25;
s.hitInfo.reset(length);
}
- dir =
lights->centers[l]+Vector(-2.0/3.0/sqrt_two*radius,6.0/sqrt_two*radius,-1.0/3.0*radius)-e.hitPosition;
+ dir =
lights->centers[l]+Vector(-2.0/3.0*M_SQRT1_2*radius,6.0*M_SQRT1_2*radius,-1.0/3.0*radius)-e.hitPosition;
if(Dot(dir, e.normal) > 0){
RayPacket::Element& s = shadowRays.get(sidx++);
double length = dir.normalize();
@@ -96,7 +96,7 @@
s.light = lights->colors[l] * 0.25;
s.hitInfo.reset(length);
}
- dir =
lights->centers[l]+Vector(4.0/3.0/sqrt_two*radius,0,-1.0/3.0*radius)-e.hitPosition;
+ dir =
lights->centers[l]+Vector(4.0/3.0*M_SQRT1_2*radius,0,-1.0/3.0*radius)-e.hitPosition;
if(Dot(dir, e.normal) > 0){
RayPacket::Element& s = shadowRays.get(sidx++);
double length = dir.normalize();
@@ -132,8 +132,8 @@
s.hitInfo.reset(length);
}
dir = ( lights->centers[l] - e.hitPosition +
- (-6.0/sqrt_two) * axis_y +
- (-2.0/3.0/sqrt_two) * axis_x +
+ (-6.0*M_SQRT1_2) * axis_y +
+ (-2.0/3.0*M_SQRT1_2) * axis_x +
(-1.0/3.0) * axis_z );
if(Dot(dir, e.normal) > 0){
RayPacket::Element& s = shadowRays.get(sidx++);
@@ -143,8 +143,8 @@
s.hitInfo.reset(length);
}
dir = ( lights->centers[l] - e.hitPosition +
- (6.0/sqrt_two) * axis_y +
- (-2.0/3.0/sqrt_two) * axis_x +
+ (6.0*M_SQRT1_2) * axis_y +
+ (-2.0/3.0*M_SQRT1_2) * axis_x +
(-1.0/3.0) * axis_z );
if(Dot(dir, e.normal) > 0){
RayPacket::Element& s = shadowRays.get(sidx++);
@@ -154,7 +154,7 @@
s.hitInfo.reset(length);
}
dir = ( lights->centers[l] - e.hitPosition +
- (-4.0/3.0/sqrt_two) * axis_x +
+ (-4.0/3.0*M_SQRT1_2) * axis_x +
(-1.0/3.0) * axis_z );
if(Dot(dir, e.normal) > 0){
RayPacket::Element& s = shadowRays.get(sidx++);
@@ -181,7 +181,7 @@
s.light = lights->colors[l] * 0.25;
s.hitInfo.reset(length);
}
- dir =
lights->centers[l]+Vector(-2.0/3.0/sqrt_two*radius,-6.0/sqrt_two*radius,-1.0/3.0*radius)-e.hitPosition;
+ dir =
lights->centers[l]+Vector(-2.0/3.0*M_SQRT1_2*radius,-6.0*M_SQRT1_2*radius,-1.0/3.0*radius)-e.hitPosition;
dir+=VectorNoise(Point((dir+Vector(0,0,31.4159))*noisefreq))*noiseamp;
if(Dot(dir, e.normal) > 0){
RayPacket::Element& s = shadowRays.get(sidx++);
@@ -190,7 +190,7 @@
s.light = lights->colors[l] * 0.25;
s.hitInfo.reset(length);
}
- dir =
lights->centers[l]+Vector(-2.0/3.0/sqrt_two*radius,6.0/sqrt_two*radius,-1.0/3.0*radius)-e.hitPosition;
+ dir =
lights->centers[l]+Vector(-2.0/3.0*M_SQRT1_2*radius,6.0*M_SQRT1_2*radius,-1.0/3.0*radius)-e.hitPosition;
dir+=VectorNoise(Point((dir+Vector(0,31.4159,0))*noisefreq))*noiseamp;
if(Dot(dir, e.normal) > 0){
RayPacket::Element& s = shadowRays.get(sidx++);
@@ -199,7 +199,7 @@
s.light = lights->colors[l] * 0.25;
s.hitInfo.reset(length);
}
- dir =
lights->centers[l]+Vector(4.0/3.0/sqrt_two*radius,0,-1.0/3.0*radius)-e.hitPosition;
+ dir =
lights->centers[l]+Vector(4.0/3.0*M_SQRT1_2*radius,0,-1.0/3.0*radius)-e.hitPosition;
dir+=VectorNoise(Point((dir+Vector(31.4159,0,0))*noisefreq))*noiseamp;
if(Dot(dir, e.normal) > 0){
RayPacket::Element& s = shadowRays.get(sidx++);
Modified: trunk/Image/NRRDFile.cc
==============================================================================
--- trunk/Image/NRRDFile.cc (original)
+++ trunk/Image/NRRDFile.cc Thu Dec 22 16:12:19 2005
@@ -56,7 +56,6 @@
/////////////////////////////////////////////////////////////////////////////
// Determine the pixel type and size.
- int pixel_size = 0;
if (typeid(*image) == typeid(SimpleImage<RGB8Pixel>)) {
out_nrrd->type = nrrdTypeUChar;
out_nrrd->data =
Modified: trunk/Model/Cameras/FisheyeCamera.cc
==============================================================================
--- trunk/Model/Cameras/FisheyeCamera.cc (original)
+++ trunk/Model/Cameras/FisheyeCamera.cc Thu Dec 22 16:12:19 2005
@@ -61,7 +61,6 @@
void FisheyeCamera::setup()
{
- int i;
vfov = hfov;
direction=lookat-eye;
nearZ=direction.length();
Modified: trunk/Model/Cameras/PinholeCamera.cc
==============================================================================
--- trunk/Model/Cameras/PinholeCamera.cc (original)
+++ trunk/Model/Cameras/PinholeCamera.cc Thu Dec 22 16:12:19 2005
@@ -18,11 +18,6 @@
PinholeCamera::PinholeCamera(const vector<string>& args)
{
- bool gotEye = false;
- bool gotLookat = false;
- bool gotFov = false;
- bool gotUp = false;
- bool gotStereo = false;
normalizeRays = false;
stereo_offset = 0;
@@ -39,23 +34,18 @@
if (arg == "-offset") {
if(!getArg(i, args, stereo_offset))
throw IllegalArgument("PinholeCamera -offset", i, args);
- gotStereo = true;
} else if(arg == "-eye"){
if(!getPointArg(i, args, eye))
throw IllegalArgument("PinholeCamera -eye", i, args);
- gotEye = true;
} else if(arg == "-lookat"){
if(!getPointArg(i, args, lookat))
throw IllegalArgument("PinholeCamera -lookat", i, args);
- gotLookat = true;
} else if(arg == "-up"){
if(!getVectorArg(i, args, up))
throw IllegalArgument("PinholeCamera -up", i, args);
- gotUp = true;
} else if(arg == "-fov"){
if(!getArg<Real>(i, args, hfov))
throw IllegalArgument("PinholeCamera -fov", i, args);
- gotFov = true;
} else if(arg == "-normalizeRays"){
normalizeRays = true;
} else {
@@ -92,7 +82,6 @@
void PinholeCamera::setup()
{
- int i, j, k;
vfov = hfov; // set field of view
direction=lookat-eye; // the normal vector
nearZ=direction.length(); // lenghth to near plane
Modified: trunk/Model/Groups/KDTree.cc
==============================================================================
--- trunk/Model/Groups/KDTree.cc (original)
+++ trunk/Model/Groups/KDTree.cc Thu Dec 22 16:12:19 2005
@@ -105,8 +105,10 @@
// if (listSize < 40)
// ud->duplicate = 4;
-
+
+#ifndef __sgi
#pragma swp
+#endif
for (i = listBegin; i < listEnd; i++) {
int triIdx = triIndices->get(i);
Triangle &tri = tris->get(triIdx);
@@ -258,7 +260,9 @@
while (travStack[entryPos].prev) {
// Traverse down until we find a leaf node.
+#ifndef __sgi
#pragma swp
+#endif
while (nearNode && nearNode->isInternal()) {
// Determine the axis and the split point.
Modified: trunk/Model/Groups/KDTreeLoader.cc
==============================================================================
--- trunk/Model/Groups/KDTreeLoader.cc (original)
+++ trunk/Model/Groups/KDTreeLoader.cc Thu Dec 22 16:12:19 2005
@@ -596,7 +596,6 @@
nread = fread_64(kdtree->groupNames->getArray(), sizeof(unsigned
char), fileSize, f);
kdtree->groupToNameMap = new VArray<int>;
- int groupNum = 0;
int offset = 4; // skip the integer value in the beginning
while (offset < fileSize) {
kdtree->groupToNameMap->append(offset);
Modified: trunk/Model/Groups/RealisticBvh.cc
==============================================================================
--- trunk/Model/Groups/RealisticBvh.cc (original)
+++ trunk/Model/Groups/RealisticBvh.cc Thu Dec 22 16:12:19 2005
@@ -51,6 +51,46 @@
split_axis = 0;
}
+
+// Construct a bvh given an array of object pointers.
+RealisticBvh::RealisticBvh( Object **array, int size ) : split_axis( 0 ) {
+ start_build(array, size);
+}
+
+
+void
+RealisticBvh::start_build( Object **array, int size ) {
+
+ // Check to see if there is only one node.
+ if (size == 1) {
+ child[0] = child[1] = array[0];
+ return;
+ }
+ if (size == 2) {
+ child[0] = array[0];
+ child[1] = array[1];
+ return;
+ }
+
+ PreprocessContext context;
+
+ // Compute the bounds of the array.
+ for (int i=0;i<size;++i) {
+ array[i]->computeBounds( context, bounds );
+ }
+
+ // Find a pivot point.
+ Point pivot((Vector(bounds[0]) + Vector(bounds[1])) * 0.5);
+
+ // Split along the axis.
+ int mid_point = qsplit( array, size, pivot[0], 0 );
+
+ // Create new left and right children.
+ child[0] = build_branch( array, mid_point, 1 );
+ child[1] = build_branch( array+mid_point, size-mid_point, 1 );
+
+}
+
// Rearrange the pointers in the input array around a pivot point.
int RealisticBvh::qsplit( Object **array, int size, Real pivot, int axis ) {
@@ -112,39 +152,6 @@
new_node->child[1] = build_branch( array+mid_point, size-mid_point,
(axis+1)%3 );
return new_node;
-}
-
-// Construct a bvh given an array of object pointers.
-RealisticBvh::RealisticBvh( Object **array, int size ) : split_axis( 0 ) {
-
- // Check to see if there is only one node.
- if (size == 1) {
- child[0] = child[1] = array[0];
- return;
- }
- if (size == 2) {
- child[0] = array[0];
- child[1] = array[1];
- return;
- }
-
- PreprocessContext context;
-
- // Compute the bounds of the array.
- for (int i=0;i<size;++i) {
- array[i]->computeBounds( context, bounds );
- }
-
- // Find a pivot point.
- Point pivot((Vector(bounds[0]) + Vector(bounds[1])) * 0.5);
-
- // Split along the axis.
- int mid_point = qsplit( array, size, pivot[0], 0 );
-
- // Create new left and right children.
- child[0] = build_branch( array, mid_point, 1 );
- child[1] = build_branch( array+mid_point, size-mid_point, 1 );
-
}
void RealisticBvh::preprocess(const PreprocessContext& context) {
Modified: trunk/Model/Groups/RealisticBvh.h
==============================================================================
--- trunk/Model/Groups/RealisticBvh.h (original)
+++ trunk/Model/Groups/RealisticBvh.h Thu Dec 22 16:12:19 2005
@@ -56,7 +56,8 @@
static int qsplit( Object **array, int size, Real pivot, int
axis );
static Object *build_branch( Object **array, int size, int
axis );
-
+
+ void start_build( Object **array, int size );
public:
// Construct a BVH from an array of objects.
RealisticBvh( Object **array, int size );
Modified: trunk/Model/Groups/TransparentKDTree.cc
==============================================================================
--- trunk/Model/Groups/TransparentKDTree.cc (original)
+++ trunk/Model/Groups/TransparentKDTree.cc Thu Dec 22 16:12:19 2005
@@ -138,7 +138,9 @@
int listEnd = listBegin+listSize;
- #pragma swp
+#ifndef __sgi
+#pragma swp
+#endif
for (i = listBegin; i < listEnd; i++) {
int triIdx = triIndices->get(i);
Triangle &tri = tris->get(triIdx);
Modified: trunk/Model/Primitives/BvhTriangleMesh.cc
==============================================================================
--- trunk/Model/Primitives/BvhTriangleMesh.cc (original)
+++ trunk/Model/Primitives/BvhTriangleMesh.cc Thu Dec 22 16:12:19 2005
@@ -30,9 +30,10 @@
#include <Model/Primitives/BvhTriangleMesh.h>
#include <Model/Intersections/TriangleEdge.h>
#include <Model/Intersections/AxisAlignedBox.h>
-#include <cassert>
+#include <SCIRun/Core/Util/Assert.h>
using namespace Manta;
+using namespace SCIRun;
BvhTriangleMesh::Node::Node( int triangle_index_ ) : triangle_index(
triangle_index_ ) {
@@ -186,7 +187,7 @@
BvhTriangleMesh::Node *BvhTriangleMesh::build_branch( int *array, int size,
int axis ) {
- assert( size != 0 );
+ ASSERT( size != 0 );
// Check two exit conditions.
if (size == 1) {
@@ -217,8 +218,8 @@
new_node->split_axis = axis;
// Create new left and right children.
- assert( mid_point != 0 );
- assert( mid_point != size);
+ ASSERT( mid_point != 0 );
+ ASSERT( mid_point != size);
new_node->child[0] = build_branch( array, mid_point, (axis+1)%3 );
new_node->child[1] = build_branch( array+mid_point, size-mid_point,
(axis+1)%3 );
Modified: trunk/Model/Primitives/TexTriangle.cc
==============================================================================
--- trunk/Model/Primitives/TexTriangle.cc (original)
+++ trunk/Model/Primitives/TexTriangle.cc Thu Dec 22 16:12:19 2005
@@ -5,8 +5,6 @@
#include <Model/Intersections/TriangleEdge.h>
-#include <cassert>
-
using namespace Manta;
using namespace std;
Modified: trunk/SwigInterface/CMakeLists.txt
==============================================================================
--- trunk/SwigInterface/CMakeLists.txt (original)
+++ trunk/SwigInterface/CMakeLists.txt Thu Dec 22 16:12:19 2005
@@ -18,7 +18,7 @@
SWIG_LINK_LIBRARIES(example ${PYTHON_LIBRARIES})
SET_SOURCE_FILES_PROPERTIES(manta.i PROPERTIES CPLUSPLUS ON)
-SET_SOURCE_FILES_PROPERTIES(manta.i PROPERTIES SWIG_FLAGS "`/bin/echo \"\"`")
+SET_SOURCE_FILES_PROPERTIES(manta.i PROPERTIES SWIG_FLAGS
"-DSCI_NOPERSISTENT")
SWIG_ADD_MODULE(manta python manta.i manta.cc manta.h)
Modified: trunk/SwigInterface/manta.i
==============================================================================
--- trunk/SwigInterface/manta.i (original)
+++ trunk/SwigInterface/manta.i Thu Dec 22 16:12:19 2005
@@ -9,6 +9,7 @@
#include <Core/Geometry/PointVector.h>
%}
+%include <MantaTypes.h>
%include <Core/Geometry/PointVector.h>
namespace Manta {
@@ -190,17 +191,14 @@
%include <Interface/LightSet.h>
-
+////////////////////////////////////////////////////////
+// Lights and backgrounds
%{
#include <Interface/AmbientLight.h>
#include <Model/AmbientLights/ConstantAmbient.h>
#include <Interface/Background.h>
#include <Model/Backgrounds/ConstantBackground.h>
#include <Model/Lights/PointLight.h>
-
-#include <Interface/Texture.h>
-#include <Model/Textures/Constant.h>
-#include <Model/Textures/CheckerTexture.h>
%}
%include <Interface/AmbientLight.h>
@@ -209,10 +207,6 @@
%include <Model/Backgrounds/ConstantBackground.h>
%include <Model/Lights/PointLight.h>
-%include <Interface/Texture.h>
-%include <Model/Textures/Constant.h>
-%include <Model/Textures/CheckerTexture.h>
-
namespace Manta {
// This tells SWIG to deallocate the memory from toString functions.
// %newobject *::toString();
@@ -229,16 +223,34 @@
return strdup(self->toString().c_str());
}
};
-
- // Definition for CheckerTexture<Color>
+}
+
+/////////////////////////////////////////////////////
+// Textures
+%{
+#include <Interface/Texture.h>
+#include <Model/Textures/Constant.h>
+#include <Model/Textures/CheckerTexture.h>
+%}
+
+%include <Interface/Texture.h>
+%include <Model/Textures/Constant.h>
+%include <Model/Textures/CheckerTexture.h>
+
+namespace Manta {
+ // Textures. If you add a new texture like FunkyTexture<MagicType>,
+ // you also need to add a template for Texture<MagicType> to reduce
+ // warnings.
%template(Texture_Color) Texture<Color>;
%template(CheckerTexture_Color) CheckerTexture<Color>;
%template(Texture_Real) Texture<Manta::Real>;
%template(CheckerTexture_Real) CheckerTexture<Manta::Real>;
+ %template(Texture_ColorComponent) Texture<Manta::ColorComponent>;
%template(CheckerTexture_ColorComponent)
CheckerTexture<Manta::ColorComponent>;
%template(Constant_Color) Constant<Color>;
}
+/////////////////////////////////////////////////////
// Materials and Primitivs
%{
#include <Interface/Material.h>
@@ -256,6 +268,7 @@
#include <Model/Primitives/Ring.h>
#include <Model/Primitives/Cube.h>
#include <Model/TexCoordMappers/UniformMapper.h>
+#include <Model/Groups/RealisticBvh.h>
%}
%include <Interface/Material.h>
@@ -273,7 +286,19 @@
%include <Model/Primitives/Ring.h>
%include <Model/Primitives/Cube.h>
%include <Model/TexCoordMappers/UniformMapper.h>
+%include <Model/Groups/RealisticBvh.h>
+
+/////////////////////////////////////////////////
+// The Array Containers
+%{
+#include <SCIRun/Core/Containers/Array1.h>
+%}
+%include <SCIRun/Core/Containers/Array1.h>
+
+%template(Array1_ObjectP) SCIRun::Array1<Manta::Object*>;
+////////////////////////////////////////////////
+// Python specific code
%pythoncode %{
# This code is to do crazy stuff like
Modified: trunk/SwigInterface/runmanta.py
==============================================================================
--- trunk/SwigInterface/runmanta.py (original)
+++ trunk/SwigInterface/runmanta.py Thu Dec 22 16:12:19 2005
@@ -78,7 +78,7 @@
print lights
scene.setLights(lights)
- scene.getRenderParameters().maxDepth = 2
+ scene.getRenderParameters().maxDepth = 25
scene.getRenderParameters().importanceCutoff = 0.01
return scene
Modified: trunk/fox/FMantaImageFrame.cc
==============================================================================
--- trunk/fox/FMantaImageFrame.cc (original)
+++ trunk/fox/FMantaImageFrame.cc Thu Dec 22 16:12:19 2005
@@ -70,10 +70,10 @@
}
// Default implementations of the on mouse change and key press.
-long FMantaImageFrame::onMouseChange( FXObject *sender, FXSelector sel, void
*data ) {
+long FMantaImageFrame::onMouseChange( FXObject* sender, FXSelector sel,
+ void* data ) {
FXEvent *event = (FXEvent *)data;
- FXushort sel_type = FXSELTYPE( sel );
// Check for a double click.
if (event->click_count == 2) {
@@ -93,12 +93,11 @@
return 1;
}
-long FMantaImageFrame::onMouseWheel ( FXObject *sender, FXSelector sel, void
*data ) {
+long FMantaImageFrame::onMouseWheel ( FXObject* sender, FXSelector /*sel*/,
+ void* /*data*/ ) {
- FXEvent *event = (FXEvent *)data;
-
- // std::cout << "Mouse wheel code: " << event->code << std::endl;
-
+// FXEvent* event = (FXEvent *)data;
+// std::cout << "Mouse wheel code: " << event->code << std::endl;
return 1;
}
Modified: trunk/fox/FMantaRecorder.h
==============================================================================
--- trunk/fox/FMantaRecorder.h (original)
+++ trunk/fox/FMantaRecorder.h Thu Dec 22 16:12:19 2005
@@ -123,7 +123,7 @@
ID_LAST
};
- FMantaRecorderDialog::FMantaRecorderDialog() { };
+ FMantaRecorderDialog() { };
FMantaRecorderDialog( FMantaWindow *manta_window_,
const FXString &name, FXuint opts=DECOR_ALL,
FXint x=50,FXint y=50,FXint w=0,FXint h=0,FXint
pl=10,
Modified: trunk/fox/FMantaStereo.h
==============================================================================
--- trunk/fox/FMantaStereo.h (original)
+++ trunk/fox/FMantaStereo.h Thu Dec 22 16:12:19 2005
@@ -66,7 +66,7 @@
ID_LAST
};
- FMantaStereoDialog::FMantaStereoDialog() { };
+ FMantaStereoDialog() { };
FMantaStereoDialog( FMantaWindow *manta_window_,
const FXString &name, FXuint opts=DECOR_ALL,
FXint x=50,FXint y=50,FXint w=0,FXint h=0,FXint
pl=10,
Modified: trunk/fox/FMantaTrackballNav.cc
==============================================================================
--- trunk/fox/FMantaTrackballNav.cc (original)
+++ trunk/fox/FMantaTrackballNav.cc Thu Dec 22 16:12:19 2005
@@ -23,9 +23,9 @@
}
// Mouse events.
-long FMantaTrackballNav::onKeyPress ( FXObject *sender, FXSelector sel,
void *data ) {
-
- FXEvent *event = (FXEvent *)data;
+long FMantaTrackballNav::onKeyPress ( FXObject* /*sender*/,
+ FXSelector /*sel*/,
+ void* /*data*/ ) {
return 1;
}
Modified: trunk/fox/FMantaUniformNav.cc
==============================================================================
--- trunk/fox/FMantaUniformNav.cc (original)
+++ trunk/fox/FMantaUniformNav.cc Thu Dec 22 16:12:19 2005
@@ -37,7 +37,6 @@
std::cout << "FMantaUniformNav" << std::endl;
}
- bool action_occured = false;
Action action;
// Get a pointer to this channel's camera.
Modified: trunk/fox/FMantaUniformNav.h
==============================================================================
--- trunk/fox/FMantaUniformNav.h (original)
+++ trunk/fox/FMantaUniformNav.h Thu Dec 22 16:12:19 2005
@@ -81,4 +81,4 @@
};
};
-#endif
\ No newline at end of file
+#endif
Modified: trunk/fox/FMantaWidgets.h
==============================================================================
--- trunk/fox/FMantaWidgets.h (original)
+++ trunk/fox/FMantaWidgets.h Thu Dec 22 16:12:19 2005
@@ -102,7 +102,7 @@
// FMANTA COLOR FRAME FMANTA COLOR FRAME FMANTA COLOR FRAME FMANTA
COLOR F
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
- class FMantaColorFrame : FXHorizontalFrame {
+ class FMantaColorFrame : public FXHorizontalFrame {
FXDECLARE(FMantaColorFrame)
private:
FMantaSetter<Color> *setter;
Modified: trunk/fox/FMantaWindow.cc
==============================================================================
--- trunk/fox/FMantaWindow.cc (original)
+++ trunk/fox/FMantaWindow.cc Thu Dec 22 16:12:19 2005
@@ -896,9 +896,9 @@
return 1;
}
-long FMantaWindow::onCoordSystemUp ( FXObject *sender, FXSelector key, void
*data ) {
+long FMantaWindow::onCoordSystemUp ( FXObject* sender, FXSelector key,
+ void* /*data*/ ) {
- FXEvent *event = (FXEvent *)data;
FXushort id = FXSELID( key );
// Determine which radio button selected.
Modified: trunk/fox/FMantaWindow.h
==============================================================================
--- trunk/fox/FMantaWindow.h (original)
+++ trunk/fox/FMantaWindow.h Thu Dec 22 16:12:19 2005
@@ -227,7 +227,7 @@
mutable Vector dstUp;
// This method is called by the manta thread to change the rendering
mode.
- void FMantaWindow::mantaSetSceneObject( Object *root_object_ ) const;
+ void mantaSetSceneObject( Object *root_object_ ) const;
// This method is called to toggle hide/show selected submeshes.
void mantaToggleHideSelected( int mode );
Modified: trunk/fox/MediaFusionApp.h
==============================================================================
--- trunk/fox/MediaFusionApp.h (original)
+++ trunk/fox/MediaFusionApp.h Thu Dec 22 16:12:19 2005
@@ -44,7 +44,7 @@
//
///////////////////////////////////////////////////////////////////////////////
class MediaFusionApp : public FXApp {
- FXDECLARE(MediaFusionApp);
+ FXDECLARE(MediaFusionApp)
private:
// Id of the window to intercept events for.
int mf_target_id;
Modified: trunk/scenes/objviewer.cc
==============================================================================
--- trunk/scenes/objviewer.cc (original)
+++ trunk/scenes/objviewer.cc Thu Dec 22 16:12:19 2005
@@ -68,10 +68,11 @@
#include <Image/TGAFile.h>
#include <Image/NRRDFile.h>
+#include <sgi_stl_warnings_off.h>
#include <vector>
#include <string>
+#include <sgi_stl_warnings_on.h>
-#include <cassert>
using namespace std;
- [MANTA] r802 - in trunk: Core/Color Engine/Shadows Image Model/Cameras Model/Groups Model/Primitives SwigInterface fox scenes, bigler, 12/22/2005
Archive powered by MHonArc 2.6.16.