Text archives Help
- From: bigler@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r829 - in branches/vertical: Interface Model/Materials SwigInterface
- Date: Thu, 5 Jan 2006 16:58:45 -0700 (MST)
Author: bigler
Date: Thu Jan 5 16:58:38 2006
New Revision: 829
Modified:
branches/vertical/Interface/RayPacket.h
branches/vertical/Model/Materials/Dielectric.cc
branches/vertical/SwigInterface/manta.i
Log:
Interface/RayPacket.h
For some odd reason, SWIG can't figure out that Color::NumComponents
is in the Manta scope. I'm just helping it out a bit.
Model/Materials/Dielectric.cc
RayPacket::normalizeNormals() no longer exists and isn't needed.
SwigInterface/manta.i
Reduce warnings by including parent template:
Texture<Manta::ColorComponent>.
Modified: branches/vertical/Interface/RayPacket.h
==============================================================================
--- branches/vertical/Interface/RayPacket.h (original)
+++ branches/vertical/Interface/RayPacket.h Thu Jan 5 16:58:38 2006
@@ -44,8 +44,8 @@
Real inverseDirection[3][Size];
// Color-based arrays
- Color::ComponentType color[Color::NumComponents][Size];
- Color::ComponentType importance[Color::NumComponents][Size]; //
1-attenuation, where eye rays have importance == 1
+ Color::ComponentType color[Manta::Color::NumComponents][Size];
+ Color::ComponentType importance[Manta::Color::NumComponents][Size]; //
1-attenuation, where eye rays have importance == 1
// Int-based arrays
int whichEye[Size];
Modified: branches/vertical/Model/Materials/Dielectric.cc
==============================================================================
--- branches/vertical/Model/Materials/Dielectric.cc (original)
+++ branches/vertical/Model/Materials/Dielectric.cc Thu Jan 5 16:58:38
2006
@@ -64,7 +64,6 @@
rays.computeHitPositions();
rays.normalizeDirections();
rays.computeNormals(context);
- rays.normalizeNormals();
Real n_values[RayPacket::MaxSize];
Real nt_values[RayPacket::MaxSize];
Modified: branches/vertical/SwigInterface/manta.i
==============================================================================
--- branches/vertical/SwigInterface/manta.i (original)
+++ branches/vertical/SwigInterface/manta.i Thu Jan 5 16:58:38 2006
@@ -233,6 +233,7 @@
%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>;
}
- [MANTA] r829 - in branches/vertical: Interface Model/Materials SwigInterface, bigler, 01/05/2006
Archive powered by MHonArc 2.6.16.