manta - [MANTA] r888 - in trunk: Engine/Control Model/Groups Model/Instances Model/Intersections SwigInterface

Closed list
Subscribers: 0
Owners

sparker

thiago

Subscribe
Unsubscribe
Info
Admin
Archive

Post

Shared documents

Manta Interactive Ray Tracer Development Mailing List

Text archives Help

[MANTA] r888 - in trunk: Engine/Control Model/Groups Model/Instances Model/Intersections SwigInterface

From: bigler@sci.utah.edu
To: manta@sci.utah.edu
Subject: [MANTA] r888 - in trunk: Engine/Control Model/Groups Model/Instances Model/Intersections SwigInterface
Date: Sat, 4 Feb 2006 22:06:42 -0700 (MST)

Author: bigler
Date: Sat Feb  4 22:06:37 2006
New Revision: 888

Modified:
   trunk/Engine/Control/RTRT_register.cc
   trunk/Model/Groups/SSEKDTree.cc
   trunk/Model/Groups/SSEKDTree.h
   trunk/Model/Instances/Instance.cc
   trunk/Model/Instances/Instance.h
   trunk/Model/Instances/InstanceRST.cc
   trunk/Model/Instances/InstanceRST.h
   trunk/Model/Instances/InstanceRT.cc
   trunk/Model/Instances/InstanceRT.h
   trunk/Model/Instances/InstanceST.cc
   trunk/Model/Instances/InstanceST.h
   trunk/Model/Instances/InstanceT.cc
   trunk/Model/Instances/InstanceT.h
   trunk/Model/Intersections/TriangleEdge.h
   trunk/SwigInterface/manta.i
Log:

Engine/Control/RTRT_register.cc

  You can also create GriddedGroups and BVHs.  No guarantee about
  whether they work, though.

Model/Groups/SSEKDTree.cc
Model/Groups/SSEKDTree.h

  Moved xmmintrin.h and Aligh.h includes to cc file so as to allow the
  stub file to be compiled properly for non SSE builds.

  Moved the MANTA_ALIGN call to the right place.

Model/Instances/Instance.cc
Model/Instances/Instance.h
Model/Instances/InstanceRST.cc
Model/Instances/InstanceRST.h
Model/Instances/InstanceRT.cc
Model/Instances/InstanceRT.h
Model/Instances/InstanceST.cc
Model/Instances/InstanceST.h
Model/Instances/InstanceT.cc
Model/Instances/InstanceT.h

  Added license.

  Formatted includes and namespaces.

Model/Intersections/TriangleEdge.h

  More float friendly code.

SwigInterface/manta.i

  Include share.h for the SCISHARE macro.  Include Aligh.h for
  RayPacket.h compilability.

Modified: trunk/Engine/Control/RTRT_register.cc
==============================================================================
--- trunk/Engine/Control/RTRT_register.cc       (original)
+++ trunk/Engine/Control/RTRT_register.cc       Sat Feb  4 22:06:37 2006
@@ -100,7 +100,7 @@

     // Register groups
     engine->registerObject("group", &Group::create);
-    //engine->registerObject("grid", &GriddedGroup::create);
-    //engine->registerObject("bvh", &BVH::create);
+    engine->registerObject("grid", &GriddedGroup::create);
+    engine->registerObject("bvh", &BVH::create);
   }
}

Modified: trunk/Model/Groups/SSEKDTree.cc
==============================================================================
--- trunk/Model/Groups/SSEKDTree.cc     (original)
+++ trunk/Model/Groups/SSEKDTree.cc     Sat Feb  4 22:06:37 2006
@@ -39,6 +39,9 @@
#include <SCIRun/Core/Thread/Runnable.h>
#include <SCIRun/Core/Thread/Barrier.h>

+#include <xmmintrin.h>
+#include <Core/Util/Align.h>
+
#include <sgi_stl_warnings_off.h>
#include <iostream>
#include <sgi_stl_warnings_off.h>
@@ -78,8 +81,7 @@

namespace Manta {
   namespace Kdtree {
-    MANTA_ALIGN(16)
-    struct IntersectPacket {
+    struct MANTA_ALIGN(16) IntersectPacket {
       union { int active_mask[4]; __m128 active_mask4; };
       union { int hit_mask[4];    __m128 hit_mask4; };
       union { float t[4];         __m128 t4; };
@@ -224,7 +226,7 @@

///////////////////////////////////////////////////////////////////////////////

// Traversal Stack Entry.
-MANTA_ALIGN(16) struct Stack {
+struct MANTA_ALIGN(16) Stack {
   union {
     float t_near[TraversalPacketSize];
     __m128 t_near4;

Modified: trunk/Model/Groups/SSEKDTree.h
==============================================================================
--- trunk/Model/Groups/SSEKDTree.h      (original)
+++ trunk/Model/Groups/SSEKDTree.h      Sat Feb  4 22:06:37 2006
@@ -49,11 +49,6 @@
#include <Model/Groups/KdtreeParameters.h>
#include <Model/Groups/VerticalKDTree.h>

-#include <iostream>
-
-#include <xmmintrin.h>
-#include <Core/Util/Align.h>
-
namespace Manta {

   // Note: Kdtree is the namespace: KDTree, VerticalKDTree are classes

Modified: trunk/Model/Instances/Instance.cc
==============================================================================
--- trunk/Model/Instances/Instance.cc   (original)
+++ trunk/Model/Instances/Instance.cc   Sat Feb  4 22:06:37 2006
@@ -1,3 +1,30 @@
+/*
+  For more information, please see: http://software.sci.utah.edu
+
+  The MIT License
+
+  Copyright (c) 2005
+  Scientific Computing and Imaging Institute, University of Utah
+
+  License for the specific language governing rights and limitations under
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
+*/

#include <Model/Instances/Instance.h>
#include <Model/Instances/MPT.h>
@@ -5,9 +32,12 @@
#include <Core/Exceptions/BadPrimitive.h>
#include <Core/Geometry/BBox.h>
#include <Core/Math/MiscMath.h>
+
+#include <sgi_stl_warnings_off.h>
#include <sstream>
-using namespace std;
+#include <sgi_stl_warnings_on.h>
using namespace Manta;
+using namespace std;

// TODO:
// 1. Only transform hit position instead of ray origin/direction
(computeNormal and texCoords)

Modified: trunk/Model/Instances/Instance.h
==============================================================================
--- trunk/Model/Instances/Instance.h    (original)
+++ trunk/Model/Instances/Instance.h    Sat Feb  4 22:06:37 2006
@@ -1,3 +1,30 @@
+/*
+  For more information, please see: http://software.sci.utah.edu
+
+  The MIT License
+
+  Copyright (c) 2005
+  Scientific Computing and Imaging Institute, University of Utah
+
+  License for the specific language governing rights and limitations under
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
+*/

#ifndef Manta_Model_Instance_h
#define Manta_Model_Instance_h

Modified: trunk/Model/Instances/InstanceRST.cc
==============================================================================
--- trunk/Model/Instances/InstanceRST.cc        (original)
+++ trunk/Model/Instances/InstanceRST.cc        Sat Feb  4 22:06:37 2006
@@ -1,3 +1,30 @@
+/*
+  For more information, please see: http://software.sci.utah.edu
+
+  The MIT License
+
+  Copyright (c) 2005
+  Scientific Computing and Imaging Institute, University of Utah
+
+  License for the specific language governing rights and limitations under
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
+*/

#include <Model/Instances/InstanceRST.h>
#include <Interface/RayPacket.h>
@@ -5,10 +32,13 @@
#include <Core/Geometry/BBox.h>
#include <Core/Math/MiscMath.h>
#include <Model/Instances/MPT.h>
+
+#include <sgi_stl_warnings_off.h>
#include <sstream>
-using namespace std;
+#include <sgi_stl_warnings_on.h>

using namespace Manta;
+using namespace std;

InstanceRST::InstanceRST(Object* instance, const AffineTransform& transform_
)
   : instance(instance), transform(transform_),
transform_inv(transform_.inverse())

Modified: trunk/Model/Instances/InstanceRST.h
==============================================================================
--- trunk/Model/Instances/InstanceRST.h (original)
+++ trunk/Model/Instances/InstanceRST.h Sat Feb  4 22:06:37 2006
@@ -1,6 +1,33 @@
+/*
+  For more information, please see: http://software.sci.utah.edu

-#ifndef RTRT_InstanceRST_h
-#define RTRT_InstanceRST_h
+  The MIT License
+
+  Copyright (c) 2005
+  Scientific Computing and Imaging Institute, University of Utah
+
+  License for the specific language governing rights and limitations under
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef Manta_Model_InstanceRST_h
+#define Manta_Model_InstanceRST_h

#include <Interface/Material.h>
#include <Interface/Primitive.h>

Modified: trunk/Model/Instances/InstanceRT.cc
==============================================================================
--- trunk/Model/Instances/InstanceRT.cc (original)
+++ trunk/Model/Instances/InstanceRT.cc Sat Feb  4 22:06:37 2006
@@ -1,3 +1,30 @@
+/*
+  For more information, please see: http://software.sci.utah.edu
+
+  The MIT License
+
+  Copyright (c) 2005
+  Scientific Computing and Imaging Institute, University of Utah
+
+  License for the specific language governing rights and limitations under
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
+*/

#include <Model/Instances/InstanceRT.h>
#include <Model/Instances/MPT.h>
@@ -5,10 +32,13 @@
#include <Core/Exceptions/BadPrimitive.h>
#include <Core/Geometry/BBox.h>
#include <Core/Math/MiscMath.h>
+
+#include <sgi_stl_warnings_off.h>
#include <sstream>
-using namespace std;
+#include <sgi_stl_warnings_on.h>

using namespace Manta;
+using namespace std;

InstanceRT::InstanceRT(Object* instance, const AffineTransform& transform_ )
   : instance(instance), transform( transform_ ), transform_inv(
transform_.inverse() )

Modified: trunk/Model/Instances/InstanceRT.h
==============================================================================
--- trunk/Model/Instances/InstanceRT.h  (original)
+++ trunk/Model/Instances/InstanceRT.h  Sat Feb  4 22:06:37 2006
@@ -1,3 +1,30 @@
+/*
+  For more information, please see: http://software.sci.utah.edu
+
+  The MIT License
+
+  Copyright (c) 2005
+  Scientific Computing and Imaging Institute, University of Utah
+
+  License for the specific language governing rights and limitations under
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
+*/

#ifndef Manta_Model_InstanceRT_h
#define Manta_Model_InstanceRT_h

Modified: trunk/Model/Instances/InstanceST.cc
==============================================================================
--- trunk/Model/Instances/InstanceST.cc (original)
+++ trunk/Model/Instances/InstanceST.cc Sat Feb  4 22:06:37 2006
@@ -1,3 +1,30 @@
+/*
+  For more information, please see: http://software.sci.utah.edu
+
+  The MIT License
+
+  Copyright (c) 2005
+  Scientific Computing and Imaging Institute, University of Utah
+
+  License for the specific language governing rights and limitations under
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
+*/

#include <Model/Instances/InstanceST.h>
#include <Model/Instances/MPT.h>

Modified: trunk/Model/Instances/InstanceST.h
==============================================================================
--- trunk/Model/Instances/InstanceST.h  (original)
+++ trunk/Model/Instances/InstanceST.h  Sat Feb  4 22:06:37 2006
@@ -1,3 +1,30 @@
+/*
+  For more information, please see: http://software.sci.utah.edu
+
+  The MIT License
+
+  Copyright (c) 2005
+  Scientific Computing and Imaging Institute, University of Utah
+
+  License for the specific language governing rights and limitations under
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
+*/

#ifndef Manta_Model_InstanceST_h
#define Manta_Model_InstanceST_h

Modified: trunk/Model/Instances/InstanceT.cc
==============================================================================
--- trunk/Model/Instances/InstanceT.cc  (original)
+++ trunk/Model/Instances/InstanceT.cc  Sat Feb  4 22:06:37 2006
@@ -1,3 +1,30 @@
+/*
+  For more information, please see: http://software.sci.utah.edu
+
+  The MIT License
+
+  Copyright (c) 2005
+  Scientific Computing and Imaging Institute, University of Utah
+
+  License for the specific language governing rights and limitations under
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
+*/

#include <Model/Instances/InstanceT.h>
#include <Model/Instances/MPT.h>

Modified: trunk/Model/Instances/InstanceT.h
==============================================================================
--- trunk/Model/Instances/InstanceT.h   (original)
+++ trunk/Model/Instances/InstanceT.h   Sat Feb  4 22:06:37 2006
@@ -1,3 +1,30 @@
+/*
+  For more information, please see: http://software.sci.utah.edu
+
+  The MIT License
+
+  Copyright (c) 2005
+  Scientific Computing and Imaging Institute, University of Utah
+
+  License for the specific language governing rights and limitations under
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
+*/

#ifndef Manta_Model_InstanceT_h
#define Manta_Model_InstanceT_h

Modified: trunk/Model/Intersections/TriangleEdge.h
==============================================================================
--- trunk/Model/Intersections/TriangleEdge.h    (original)
+++ trunk/Model/Intersections/TriangleEdge.h    Sat Feb  4 22:06:37 2006
@@ -69,18 +69,18 @@
                        Real vv;

                        if (det > 1e-5) {
-                               if (uu < 0.0 || uu > det)
+                               if (uu < 0 || uu > det)
                                        return false;

                                /* calculate V parameter and test bounds */
                                vv = Dot( ray.direction(), qvec );

-                               if (vv < 0.0 || uu + vv > det)
+                               if (vv < 0 || uu + vv > det)
                                        return false;

                        }
                        else if(det < -1e-5f) {
-                               if (uu > 0.0 || uu < det)
+                               if (uu > 0 || uu < det)
                                        return false;

                                /* calculate V parameter and test bounds */
@@ -92,7 +92,7 @@
                                return false;  /* ray is parallell to the
plane of the triangle */
                        }

-                       Real inv_det = 1.0 / det;
+                       Real inv_det = 1 / det;

                        t = (Dot( edge2, qvec ) * inv_det);
                        u = (uu * inv_det);

Modified: trunk/SwigInterface/manta.i
==============================================================================
--- trunk/SwigInterface/manta.i (original)
+++ trunk/SwigInterface/manta.i Sat Feb  4 22:06:37 2006
@@ -18,11 +18,13 @@
}

%{
+#include <Core/Exceptions/share.h>
#include <Core/Exceptions/Exception.h>
#include <Core/Exceptions/IllegalArgument.h>
#include <Core/Exceptions/BadPrimitive.h>
%}

+%include <Core/Exceptions/share.h>
%include <Core/Exceptions/Exception.h>
%include <Core/Exceptions/IllegalArgument.h>
%include <Core/Exceptions/BadPrimitive.h>
@@ -174,6 +176,7 @@
#include <Interface/Object.h>
#include <Interface/Primitive.h>
#include <Interface/TexCoordMapper.h>
+#include <Core/Util/Align.h>
#include <Interface/RayPacket.h>
#include <Interface/Light.h>
#include <Interface/LightSet.h>
@@ -184,6 +187,7 @@
%include <Interface/Object.h>
%include <Interface/Primitive.h>
%include <Interface/TexCoordMapper.h>
+%include <Core/Util/Align.h>
%include <Interface/RayPacket.h>
%include <Interface/Light.h>
%include <Interface/LightSet.h>

[MANTA] r888 - in trunk: Engine/Control Model/Groups Model/Instances Model/Intersections SwigInterface, bigler, 02/04/2006

Archive powered by MHonArc 2.6.16.