Text archives Help
- From: abe@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r410 - in branches/itanium2: . Model/Cameras Model/Groups fox
- Date: Fri, 24 Jun 2005 19:08:45 -0600 (MDT)
Author: abe
Date: Fri Jun 24 19:08:42 2005
New Revision: 410
Modified:
branches/itanium2/Model/Cameras/PinholeCamera.cc
branches/itanium2/Model/Groups/CMakeLists.txt
branches/itanium2/fox/FMantaTrackballNav.cc
branches/itanium2/fox/fox_manta.cc
branches/itanium2/manta-commands.txt
Log:
Small updates for demo
Modified: branches/itanium2/Model/Cameras/PinholeCamera.cc
==============================================================================
--- branches/itanium2/Model/Cameras/PinholeCamera.cc (original)
+++ branches/itanium2/Model/Cameras/PinholeCamera.cc Fri Jun 24 19:08:42
2005
@@ -149,7 +149,7 @@
{
Vector d = (lookat - eye) * scale;
eye += d;
- lookat += d; // Maybe we need two types of dolly.
+ // lookat += d; // Maybe we need two types of dolly. // Maybe not.
setup();
}
Modified: branches/itanium2/Model/Groups/CMakeLists.txt
==============================================================================
--- branches/itanium2/Model/Groups/CMakeLists.txt (original)
+++ branches/itanium2/Model/Groups/CMakeLists.txt Fri Jun 24 19:08:42
2005
@@ -2,6 +2,8 @@
SET (Manta_Groups_SRCS
Groups/BVH.h
Groups/BVH.cc
+ Groups/Bvh.h
+ Groups/Bvh.cc
Groups/Group.h
Groups/Group.cc
Groups/kdtree.h
Modified: branches/itanium2/fox/FMantaTrackballNav.cc
==============================================================================
--- branches/itanium2/fox/FMantaTrackballNav.cc (original)
+++ branches/itanium2/fox/FMantaTrackballNav.cc Fri Jun 24 19:08:42 2005
@@ -97,7 +97,7 @@
// Create a rotation event.
AffineTransform rotation;
- rotation.initWithRotation( rotate_from, rotate_to );
+ rotation.initWithRotation( rotate_to, rotate_from );
// Send the rotation to manta.
manta_interface->addTransaction("trackball rotate",
@@ -138,16 +138,12 @@
// These functions are called by the manta thread.
void FMantaTrackballNav::mantaLookat( Point lookat ) {
- std::cout << "New lookat: " << lookat << std::endl;
-
Camera *camera = manta_interface->getCamera( manta_channel );
// Move the camera.
camera->reset( camera->getPosition(), camera->getUp(), lookat );
}
void FMantaTrackballNav::mantaTrackball( AffineTransform rotation ) {
-
- std::cout << "Rotation: " << std::endl;
Camera *camera = manta_interface->getCamera( manta_channel );
Modified: branches/itanium2/fox/fox_manta.cc
==============================================================================
--- branches/itanium2/fox/fox_manta.cc (original)
+++ branches/itanium2/fox/fox_manta.cc Fri Jun 24 19:08:42 2005
@@ -72,7 +72,8 @@
manta_interface->selectImageType ( "rgba8" );
manta_interface->selectLoadBalancer ( "workqueue" );
manta_interface->selectImageTraverser ( "tiled" );
- manta_interface->selectPixelSampler ( "jittersample(
-numberOfSamples 4 )" );
+ //manta_interface->selectPixelSampler ( "jittersample(
-numberOfSamples 4 )" );
+ manta_interface->selectPixelSampler ( "singlesample" );
manta_interface->selectRenderer ( "raytracer" );
manta_interface->selectShadowAlgorithm( "hard" );
Modified: branches/itanium2/manta-commands.txt
==============================================================================
--- branches/itanium2/manta-commands.txt (original)
+++ branches/itanium2/manta-commands.txt Fri Jun 24 19:08:42 2005
@@ -14,4 +14,7 @@
dplace -c 1-511 bin/manta -res 46080x14400 -bench 1 0 -np 508 -scene
"lib/libscene_boeing777.so( -file /dev/shm/Boeing777.v3c1 -np 64 -cutting
default )" -camera "pinhole( -eye 1408.56 -2172.05 110.736 -lookat 1350.55
188.313 354.277 -up 0.0117111 -0.465077 0.885192 -fov 60 )" -shadows
noshadows -imagedisplay "file( /tmp/test_img46080x14400 )
# Boeing demo.
-dplace -c 1-121 bin/fox_manta -np 118 -scene "lib/libscene_boeing777.so(
-file /dev/shm/Boeing777.v3c1 -np 64 )"
\ No newline at end of file
+dplace -c 1-121 bin/fox_manta -np 118 -scene "lib/libscene_boeing777.so(
-file /dev/shm/Boeing777.v3c1 -np 64 )"
+
+# Fox demo
+bin/fox_manta -np 54 -scene "lib/libscene_boeing777.so( -file
/dev/shm/Boeing777.v3c1 -np 32 )"
- [MANTA] r410 - in branches/itanium2: . Model/Cameras Model/Groups fox, abe, 06/24/2005
Archive powered by MHonArc 2.6.16.