Text archives Help
- From: thiago@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r1446 - trunk/Model/Primitives
- Date: Thu, 5 Jul 2007 18:33:55 -0600 (MDT)
Author: thiago
Date: Thu Jul 5 18:33:54 2007
New Revision: 1446
Modified:
trunk/Model/Primitives/HeavyTriangle.cc
trunk/Model/Primitives/TexTriangle.cc
trunk/Model/Primitives/TexTriangle.h
Log:
Just cleaning up the code. No real changes.
Modified: trunk/Model/Primitives/HeavyTriangle.cc
==============================================================================
--- trunk/Model/Primitives/HeavyTriangle.cc (original)
+++ trunk/Model/Primitives/HeavyTriangle.cc Thu Jul 5 18:33:54 2007
@@ -151,7 +151,6 @@
n[0] = n[1] = n[2] = Vector(0,0,0);
for (int i=0; i < keyframes.size(); ++i) {
- Interpolable::keyframe_t kt = keyframes[i];
HeavyTriangle *tri = dynamic_cast<HeavyTriangle*>(keyframes[i].keyframe);
if (tri == NULL)
return notInterpolable;
Modified: trunk/Model/Primitives/TexTriangle.cc
==============================================================================
--- trunk/Model/Primitives/TexTriangle.cc (original)
+++ trunk/Model/Primitives/TexTriangle.cc Thu Jul 5 18:33:54 2007
@@ -33,15 +33,15 @@
setTexCoordMapper( this );
}
-HeavyTriangle* TexTriangle::clone(CloneDepth depth, Clonable* incoming)
+TexTriangle* TexTriangle::clone(CloneDepth depth, Clonable* incoming)
{
TexTriangle *copy;
if (incoming)
- copy = static_cast<TexTriangle*>(static_cast<HeavyTriangle*>(incoming));
+ copy = static_cast<TexTriangle*>(incoming);
else
copy = new TexTriangle();
- HeavyTriangle::clone(depth, static_cast<HeavyTriangle*>(copy));
+ HeavyTriangle::clone(depth, copy);
copy->tex[0] = tex[0];
copy->tex[1] = tex[1];
Modified: trunk/Model/Primitives/TexTriangle.h
==============================================================================
--- trunk/Model/Primitives/TexTriangle.h (original)
+++ trunk/Model/Primitives/TexTriangle.h Thu Jul 5 18:33:54 2007
@@ -50,7 +50,7 @@
const Vector &tex0_, const Vector &tex1_, const Vector
&tex2_ );
virtual ~TexTriangle() { };
- virtual HeavyTriangle* clone(CloneDepth depth, Clonable* incoming=NULL);
+ virtual TexTriangle* clone(CloneDepth depth, Clonable* incoming=NULL);
virtual void computeTexCoords2(const RenderContext& context, RayPacket&
rays) const;
virtual void computeTexCoords3(const RenderContext& context, RayPacket&
rays) const {
- [MANTA] r1446 - trunk/Model/Primitives, thiago, 07/05/2007
Archive powered by MHonArc 2.6.16.