Text archives Help
- From: bigler@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r1358 - in trunk: . Model/Groups Model/Materials StandAlone scenes
- Date: Thu, 26 Apr 2007 14:05:37 -0600 (MDT)
Author: bigler
Date: Thu Apr 26 14:05:36 2007
New Revision: 1358
Modified:
trunk/Model/Groups/DynBVH.cc
trunk/Model/Materials/Phong.cc
trunk/Model/Materials/ThinDielectric.cc
trunk/StandAlone/manta_path_plot.pl
trunk/commandlines
trunk/scenes/iwviewer.cc
Log:
Model/Groups/DynBVH.cc
Print out the bounding box after building.
Model/Materials/Phong.cc
Build sub-packets for reflection rays based on the luminance of the
rays' importance. Could be improved for efficiency (all the
reflection rays are compute regardless of whether it will be used or
not). This will be a working solution until something better comes
along.
Model/Materials/ThinDielectric.cc
Oh, refraction ray directions that leave the dielectric should be
the same as when they entered. This was pretty much a copy/paste
error.
StandAlone/manta_path_plot.pl
The color command caused problems for me. I changed this eons ago,
and I'm sick of seeing it in my changed list.
commandlines
Commands for starting up the NewMini model and DD acura_rdx model.
scenes/iwviewer.cc
Put new variables in case statements in their own scope to quiet
warnings.
Modified: trunk/Model/Groups/DynBVH.cc
==============================================================================
--- trunk/Model/Groups/DynBVH.cc (original)
+++ trunk/Model/Groups/DynBVH.cc Thu Apr 26 14:05:36 2007
@@ -466,7 +466,10 @@
cerr << "\nDynBVH build time: Total ("<<end-start<<")\n"
<< "object_ids initialization ("<<build_start-start<<")\n"
<< "build ("<<updateBound_start-build_start<<")\n"
- << "updateBounds ("<<end-updateBound_start<<")\n\n";
+ << "updateBounds ("<<end-updateBound_start<<")\n"
+ << "BBox = ("<<nodes[0].bounds.getMin()<<",
"<<nodes[0].bounds.getMax()<<"\n\n";
+
+
}
}
Modified: trunk/Model/Materials/Phong.cc
==============================================================================
--- trunk/Model/Materials/Phong.cc (original)
+++ trunk/Model/Materials/Phong.cc Thu Apr 26 14:05:36 2007
@@ -493,7 +493,21 @@
#endif // ifdef MANTA_SSE
refl_rays.resetHits();
- context.renderer->traceRays(context, refl_rays);
+ // Look for runs where the ray importance is significant
+ Real cutoff = context.scene->getRenderParameters().importanceCutoff;
+ for(int i = refl_rays.begin(); i < refl_rays.end(); ++i) {
+ if (refl_rays.getImportance(i).luminance() > cutoff) {
+ int end = i+1;
+ while(end < refl_rays.end() &&
+ refl_rays.getImportance(i).luminance() > cutoff)
+ ++end;
+ RayPacket subPacket(refl_rays, i, end);
+ context.renderer->traceRays(context, refl_rays);
+ i = end;
+ } else {
+ refl_rays.setColor(i, Color::black());
+ }
+ }
#ifdef MANTA_SSE
if(b == e){
for(int i = rays.begin(); i < rays.end(); i++){
Modified: trunk/Model/Materials/ThinDielectric.cc
==============================================================================
--- trunk/Model/Materials/ThinDielectric.cc (original)
+++ trunk/Model/Materials/ThinDielectric.cc Thu Apr 26 14:05:36 2007
@@ -179,7 +179,7 @@
eta_inverse, costheta, costheta2);
refracted_rays.setImportance(num_refr, refr_importance);
Vector refr_orig = hitpos + refr_dir * refraction_ray_length;
- refracted_rays.setRay(num_refr, refr_orig, refr_dir);
+ refracted_rays.setRay(num_refr, refr_orig, rayD);
if (debugFlag) { cerr << "refr_dir.length() =
"<<refr_dir.length()<<"\n"; }
refr_source[num_refr] = i;
num_refr++;
Modified: trunk/StandAlone/manta_path_plot.pl
==============================================================================
--- trunk/StandAlone/manta_path_plot.pl (original)
+++ trunk/StandAlone/manta_path_plot.pl Thu Apr 26 14:05:36 2007
@@ -214,7 +214,8 @@
print HTML "</pre>\n";
print GNUPLOT "set data style linespoints\n";
-print GNUPLOT "set term png small color\n";
+# print GNUPLOT "set term png small color\n";
+print GNUPLOT "set term png small\n";
print GNUPLOT "set xlabel \"" . $plot_label[$plot_x-1] . "\"\n";
print GNUPLOT "set ylabel \"" . $plot_label[$plot_y-1] . "\"\n";
print GNUPLOT "set title \"$input_file: $title Summary\"\n";
@@ -540,7 +541,8 @@
print GNUPLOT "set ylabel \"" . $plot_label[$plot_y-1] . "\"\n";
print GNUPLOT "set title \"$input_file command $line\"\n";
- print GNUPLOT "set term png small color\n";
+# print GNUPLOT "set term png small color\n";
+ print GNUPLOT "set term png small\n";
print GNUPLOT "set output \"$png_file\"\n";
print GNUPLOT "plot \"$out_file\" using $plot_x:$plot_y title
\"$subtitle\"\n";
Modified: trunk/commandlines
==============================================================================
--- trunk/commandlines (original)
+++ trunk/commandlines Thu Apr 26 14:05:36 2007
@@ -7,3 +7,5 @@
bin/dm_demo -bookmarks /scratch/bigler/Boeing777/Boeing777.v3c1.txt -np 10
-scene "lib/libscene_boeing777.so ( -file
/scratch/bigler/Boeing777/Boeing777.v3c1 -np 10 )"
commandlines
bin/manta -res 2000x2000 -ui null -pixelsampler
"jittersample(-numberOfSamples 9)" -bench 1 0 -imagetype rgba8 -camera
"pinhole( -eye 220.825 -259.284 304.412 -lookat 266.845 6.34768 208.678 -up
0.100322 0.213002 0.971888 -fov 46.7236 )" -imagedisplay "file(-type tga
-prefix boeing)" -np 15 -scene "lib/libscene_boeing777.so( -file
/scratch/bigler/Boeing777/Boeing777.v3c1 -alpha 0.3 -np 10 )"
+bin/manta -camera "pinhole(-eye 3 3 2 -lookat 0 0 0.3 -up 0 0 1 -fov 60)"
-scene "lib/libscene_objviewer.dylib ( -file
/usr/sci/data/Geometry/dosch/D3DHCCD2/obj/bmw_newmini/NewMini.obj -DynBVH )"
+bin/manta -res 2048x2048 -imagetype rgb8 -pixelsampler
"jittersample(-numberOfSamples 16)" -np 8 -bgc white -camera "pinhole( -eye
-368.72 122.805 -333.61 -lookat -16.8221 9.83195 -46.7565 -up 0.162165
0.969657 0.182944 -fov 48.1542 )" -imagetraverser "tiled(-square -tilesize
30x5)" -ui null -imagedisplay "file(-base acura -type png)" -bench 1 0 -scene
"lib/libscene_objviewer.so ( -file /home/sci/bigler/data/dd/acura_rdx_tri.obj
-DynBVH )"
Modified: trunk/scenes/iwviewer.cc
==============================================================================
--- trunk/scenes/iwviewer.cc (original)
+++ trunk/scenes/iwviewer.cc Thu Apr 26 14:05:36 2007
@@ -204,9 +204,11 @@
switch (build_type) {
case DynBVH_Build:
- DynBVH *bvh = new DynBVH;
- bvh->rebuild(bvh_group);
- return bvh;
+ {
+ DynBVH *bvh = new DynBVH;
+ bvh->rebuild(bvh_group);
+ return bvh;
+ }
break;
case None_Build:
return bvh_group;
- [MANTA] r1358 - in trunk: . Model/Groups Model/Materials StandAlone scenes, bigler, 04/26/2007
Archive powered by MHonArc 2.6.16.