Text archives Help
- From: abe@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r718 - branches/itanium2/fox
- Date: Tue, 22 Nov 2005 16:32:15 -0700 (MST)
Author: abe
Date: Tue Nov 22 16:32:14 2005
New Revision: 718
Modified:
branches/itanium2/fox/FMantaWindow.cc
branches/itanium2/fox/dm_demo.cc
Log:
Added -imagetraverser and -pixelsampler command line options to dm_demo.
M dm_demo.cc
Uncommented Shadow, Sampler, and Traverser menus.
M FMantaWindow.cc
Modified: branches/itanium2/fox/FMantaWindow.cc
==============================================================================
--- branches/itanium2/fox/FMantaWindow.cc (original)
+++ branches/itanium2/fox/FMantaWindow.cc Tue Nov 22 16:32:14 2005
@@ -121,7 +121,7 @@
new FXMenuCommand( shadow_menu, "Hard Shadows", 0, this, ID_HARD_SHADOWS );
new FXMenuCommand( shadow_menu, "No Shadows", 0, this, ID_NO_SHADOWS );
new FXMenuCommand( shadow_menu, "Enter Text...", 0, this, ID_TEXT_SHADOWS
);
- // new FXMenuTitle ( menu_bar, "Shadows", 0, shadow_menu );
+ new FXMenuTitle ( menu_bar, "Shadows", 0, shadow_menu );
// Sampler menu.
sampler_menu = new FXMenuPane( this );
@@ -130,7 +130,7 @@
new FXMenuCommand( sampler_menu, "Jitter 4 Samples", 0, this,
ID_JITTER4_SAMPLER );
new FXMenuCommand( sampler_menu, "Jitter 8 Samples", 0, this,
ID_JITTER8_SAMPLER );
new FXMenuCommand( sampler_menu, "Enter Text...", 0, this,
ID_TEXT_SAMPLER );
- // new FXMenuTitle( menu_bar, "Samplers", 0, sampler_menu );
+ new FXMenuTitle( menu_bar, "Samplers", 0, sampler_menu );
// Traverser Menu.
traverser_menu = new FXMenuPane( this );
@@ -138,7 +138,7 @@
new FXMenuCommand( traverser_menu, "Frameless", 0, this,
ID_FRAMELESS_TRAVERSER );
new FXMenuCommand( traverser_menu, "Dissolve Tiled", 0, this,
ID_DISSOLVETILED_TRAVERSER );
new FXMenuCommand( traverser_menu, "Enter Text...", 0, this,
ID_TEXT_TRAVERSER );
- // new FXMenuTitle( menu_bar, "Traversers", 0, traverser_menu );
+ new FXMenuTitle( menu_bar, "Traversers", 0, traverser_menu );
// Options menu.
options_menu = new FXMenuPane( this );
Modified: branches/itanium2/fox/dm_demo.cc
==============================================================================
--- branches/itanium2/fox/dm_demo.cc (original)
+++ branches/itanium2/fox/dm_demo.cc Tue Nov 22 16:32:14 2005
@@ -89,7 +89,11 @@
int np = 1;
char *scene_text = 0;
string bookmark_file_name;
- string default_camera = "pinhole(-eye 3 3 2 -lookat 0 0 0.3 -up 0 0 1 -fov
60)";
+
+ string default_camera = "pinhole(-eye 3 3 2 -lookat 0 0 0.3 -up 0
0 1 -fov 60)";
+ string default_imagetraverser = "tiled";
+ string default_pixelsampler = "singlesample";
+
bool use_stereo = false;
@@ -111,6 +115,12 @@
else if (arg == "-camera") {
default_camera = argv[++i];
}
+ else if (arg == "-imagetraverser") {
+ default_imagetraverser = argv[++i];
+ }
+ else if (arg == "-pixelsampler" ) {
+ default_pixelsampler = argv[++i];
+ }
}
std::cerr << "Using " << np << " workers plus one gui thread." <<
std::endl;
@@ -146,10 +156,8 @@
manta_interface->selectImageType ( "rgba8" );
// manta_interface->selectImageType ( "rgbafloat" );
manta_interface->selectLoadBalancer ( "workqueue" );
- manta_interface->selectImageTraverser ( "tiled" );
- // manta_interface->selectPixelSampler ( "jittersample(
-numberOfSamples 4 )" );
- // manta_interface->setPixelSampler ( new
Histx_Manta::SingleSamplerCounter );
- manta_interface->selectPixelSampler ( "singlesample" );
+ manta_interface->selectImageTraverser ( default_imagetraverser );
+ manta_interface->selectPixelSampler ( default_pixelsampler );
manta_interface->selectRenderer ( "raytracer" );
manta_interface->selectShadowAlgorithm( "hard" );
- [MANTA] r718 - branches/itanium2/fox, abe, 11/22/2005
Archive powered by MHonArc 2.6.16.