Text archives Help
- From: bigler@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r1564 - in trunk: SwigInterface fox/FManta
- Date: Thu, 26 Jul 2007 15:20:08 -0600 (MDT)
Author: bigler
Date: Thu Jul 26 15:20:08 2007
New Revision: 1564
Modified:
trunk/SwigInterface/manta.cc
trunk/SwigInterface/runmanta.py
trunk/fox/FManta/FMantaWindow.cc
Log:
SwigInterface/manta.cc
SwigInterface/runmanta.py
fox/FManta/FMantaWindow.cc
Updates for new pair of fovs.
Modified: trunk/SwigInterface/manta.cc
==============================================================================
--- trunk/SwigInterface/manta.cc (original)
+++ trunk/SwigInterface/manta.cc Thu Jul 26 15:20:08 2007
@@ -57,6 +57,6 @@
lights->setAmbientLight(new ConstantAmbient(Color::black()));
scene->setLights(lights);
scene->getRenderParameters().maxDepth = 5;
- scene->addBookmark("default view", Vector(3, 3, 2), Vector(0, 0, 0.3),
Vector(0, 0, 1), 60);
+ scene->addBookmark("default view", Vector(3, 3, 2), Vector(0, 0, 0.3),
Vector(0, 0, 1), 60, 60);
return scene;
}
Modified: trunk/SwigInterface/runmanta.py
==============================================================================
--- trunk/SwigInterface/runmanta.py (original)
+++ trunk/SwigInterface/runmanta.py Thu Jul 26 15:20:08 2007
@@ -50,7 +50,7 @@
lookat = getVectorFromTokens(tokens, tokens.index("-lookat"))
up = getVectorFromTokens(tokens, tokens.index("-up"))
fov = string.atof(tokens[tokens.index("-fov")+1])
- scene.addBookmark(parameters, eye, lookat, up, fov)
+ scene.addBookmark(parameters, eye, lookat, up, fov, fov)
def createDefaultScenePython():
scene = manta_new(Scene())
Modified: trunk/fox/FManta/FMantaWindow.cc
==============================================================================
--- trunk/fox/FManta/FMantaWindow.cc (original)
+++ trunk/fox/FManta/FMantaWindow.cc Thu Jul 26 15:20:08 2007
@@ -412,12 +412,12 @@
switch (id) {
case ID_PINHOLE_CAMERA:
- new_camera = new PinholeCamera( camera->getPosition(),
camera->getLookAt(), camera->getUp(), 60.0 );
+ new_camera = new PinholeCamera( camera->getPosition(),
camera->getLookAt(), camera->getUp(), 60.0, 60.0 );
manta_interface->addTransaction("Camera",
Callback::create(this,&FMantaWindow::mantaCamera1,new_camera));
break;
case ID_ORTHO_CAMERA:
- new_camera = new OrthogonalCamera( camera->getPosition(),
camera->getLookAt(), camera->getUp(), 10.0 );
+ new_camera = new OrthogonalCamera( camera->getPosition(),
camera->getLookAt(), camera->getUp(), 10.0, 10.0 );
manta_interface->addTransaction("Camera",
Callback::create(this,&FMantaWindow::mantaCamera1,new_camera));
break;
@@ -427,7 +427,7 @@
Callback::create(this,&FMantaWindow::mantaCamera1,new_camera));
break;
case ID_FISHEYE_CAMERA:
- new_camera = new FisheyeCamera( camera->getPosition(),
camera->getLookAt(), camera->getUp(), 120 );
+ new_camera = new FisheyeCamera( camera->getPosition(),
camera->getLookAt(), camera->getUp(), 120, 120 );
manta_interface->addTransaction("Camera",
Callback::create(this,&FMantaWindow::mantaCamera1,new_camera));
break;
- [MANTA] r1564 - in trunk: SwigInterface fox/FManta, bigler, 07/26/2007
Archive powered by MHonArc 2.6.16.