-
sparker
thiago
Manta Interactive Ray Tracer Development Mailing List
Text archives Help
- From: abe@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r641 - in branches/itanium2: Model/AmbientLights fox
- Date: Fri, 21 Oct 2005 05:14:01 -0600 (MDT)
Author: abe
Date: Fri Oct 21 05:13:55 2005
New Revision: 641
Modified:
branches/itanium2/Model/AmbientLights/ArcAmbient.cc
branches/itanium2/fox/sc_demo.cc
Log:
Minor changes:
Copied over ColorComponent cast from dm_demo
M fox/sc_demo.cc
Fixed icpc compiler error.
M Model/AmbientLights/ArcAmbient.cc
Modified: branches/itanium2/Model/AmbientLights/ArcAmbient.cc
==============================================================================
--- branches/itanium2/Model/AmbientLights/ArcAmbient.cc (original)
+++ branches/itanium2/Model/AmbientLights/ArcAmbient.cc Fri Oct 21 05:13:55
2005
@@ -27,7 +27,7 @@
for(int i=0;i<rays.getSize();i++){
RayPacket::Element& e = rays.get(i);
Real cosine = Dot(e.normal, up);
- Real sine = Sqrt(1-cosine*cosine);
+ Real sine = SCIRun::Sqrt(1-cosine*cosine);
// So we want to do the computation for w0 and w1 as type Real,
// because that is what all the other computation will be done,
// but we would like to cast that to type ColorComponent, because
Modified: branches/itanium2/fox/sc_demo.cc
==============================================================================
--- branches/itanium2/fox/sc_demo.cc (original)
+++ branches/itanium2/fox/sc_demo.cc Fri Oct 21 05:13:55 2005
@@ -418,18 +418,20 @@
Material* red=new Phong(Color(RGBColor(.6,0,0)),
Color(RGBColor(.6,.6,.6)), 32, 0.4);
- Material* plane_matl = new Phong(new
CheckerTexture<Color>(Color(RGBColor(.6,.6,.6)),
-
Color(RGBColor(0,0,0)),
-
Vector(1,0,0),
-
Vector(0,1,0)),
-
new
Constant<Color>(Color(RGBColor(.6,.6,.6))),
-
32,
-
new
CheckerTexture<Real>((Real)0.2,
- (Real)0.5,
-
Vector(1,0,0),
-
Vector(0,1,0)));
-
+
+ Material* plane_matl = new Phong(new
CheckerTexture<Color>(Color(RGBColor(.6,.6,.6)),
+
Color(RGBColor(0,0,0)),
+ Vector(1,0,0),
+ Vector(0,1,0)),
+ new
Constant<Color>(Color(RGBColor(.6,.6,.6))),
+ 32,
+ new
CheckerTexture<ColorComponent>
+ ((ColorComponent)0.2,
+ (ColorComponent)0.5,
+ Vector(1,0,0),
+ Vector(0,1,0)));
+
Group* world = new Group();
Primitive* floor = new Parallelogram(plane_matl, Point(-20,-20,0),
Vector(40,0,0), Vector(0,40,0));
- [MANTA] r641 - in branches/itanium2: Model/AmbientLights fox, abe, 10/21/2005
Archive powered by MHonArc 2.6.16.
