-
sparker
thiago
Manta Interactive Ray Tracer Development Mailing List
Text archives Help
- From: vpegorar@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r743 - in branches/fire: Model/Materials scenes
- Date: Thu, 1 Dec 2005 18:32:18 -0700 (MST)
Author: vpegorar
Date: Thu Dec 1 18:32:17 2005
New Revision: 743
Modified:
branches/fire/Model/Materials/InhomogeneousParticipatingMedium.cc
branches/fire/scenes/primtest.cc
Log:
Just some incremental cleaning
Modified: branches/fire/Model/Materials/InhomogeneousParticipatingMedium.cc
==============================================================================
--- branches/fire/Model/Materials/InhomogeneousParticipatingMedium.cc
(original)
+++ branches/fire/Model/Materials/InhomogeneousParticipatingMedium.cc Thu
Dec 1 18:32:17 2005
@@ -9,8 +9,8 @@
using namespace Manta;
+//#define FAST_GRADIENT
//#define DISABLE_REFRACTION
-#define FAST_GRADIENT
//
--------------------------------------------------------------------------------------
@@ -44,6 +44,7 @@
else
m_EmittedLight = NULL;
+#ifndef DISABLE_REFRACTION
if (refractiveIndexFileName)
{
m_RefractiveIndex = new Array3<float>();
@@ -51,6 +52,7 @@
m_DefaultVolume = m_RefractiveIndex;
}
else
+#endif
m_RefractiveIndex = NULL;
if (!m_DefaultVolume)
@@ -559,7 +561,7 @@
rays.setResult(rayInd, accumColor);
}
- if (depthSmallerThanMax) // Transmitted ray
+ if (depthSmallerThanMax) // Transmitted raypacket
{
rayPacket.resize(transRayInd);
rayPacket.resetHit();
Modified: branches/fire/scenes/primtest.cc
==============================================================================
--- branches/fire/scenes/primtest.cc (original)
+++ branches/fire/scenes/primtest.cc Thu Dec 1 18:32:17 2005
@@ -257,18 +257,19 @@
prim->setTexCoordMapper( mapr );
group->add(prim);
} else if (primtype == "volume") {
+ char * abso = "../Data/heptane/abskgIN_M00_0450.nrrd";
+ char * temp = "../Data/heptane/tempIN_M00_0450.nrrd";
+ char * refr = NULL;//"../Data/heptane/refrIN_M00_0450_100X.nrrd";
+
ColorMap * colorMap = new ColorMap(BLACK_BODY_RADIATION, 298.0f,
2234.0f);
- Material * matIPM = new InhomogeneousParticipatingMedium(
"../Data/heptane/abskgIN_M00_0450.nrrd",
-
"../Data/heptane/tempIN_M00_0450.nrrd",
-
colorMap,
-
NULL,
//"../Data/heptane/refrIN_M00_0450_100.nrrd",
-
Point(-0.21, -0.21, 0.19),
Point(0.21, 0.21, 0.61),
-
1.0, 10.0, 0.3f);
- Material * matL = new Lambertian(Color(RGB(.6,0,0)));
+ Material * matIPM = new InhomogeneousParticipatingMedium(abso, temp,
colorMap, refr, Point(-0.205, -0.205, 0.195), Point(0.205, 0.205, 0.605),
1.0, 10.0, 0.3f);
Primitive * primC = new Cube(matIPM, Point(-0.2, -0.2, 0.2), 0.4,
0.4, 0.4);
- Primitive * primS = new Sphere(matL, Point(0.0, 0.0, 0.4), 0.1);
group->add(primC);
-// group->add(primS);
+
+ // Any object can be embedded inside the volume
+ Material * matL = new Lambertian(Color(RGB(0.6, 0.0, 0.0)));
+ Primitive * primS = new Sphere(matL, Point(0.0, 0.0, 0.4), 0.07);
+ group->add(primS);
} else {
throw IllegalArgument("Unknown primitive type for primtest: "+primtype,
0, args);
}
- [MANTA] r743 - in branches/fire: Model/Materials scenes, vpegorar, 12/01/2005
- Re: [MANTA] r743 - in branches/fire: Model/Materials scenes, vpegorar, 12/01/2005
- <Possible follow-up(s)>
- RE: [MANTA] r743 - in branches/fire: Model/Materials scenes, Rocky Rhodes, 12/02/2005
- RE: [MANTA] r743 - in branches/fire: Model/Materials scenes, vpegorar, 12/02/2005
Archive powered by MHonArc 2.6.16.
