Text archives Help
- From: shirley@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [Manta] r1763 - trunk/scenes
- Date: Sun, 7 Oct 2007 13:28:26 -0600 (MDT)
Author: shirley
Date: Sun Oct 7 13:28:25 2007
New Revision: 1763
Modified:
trunk/scenes/CMakeLists.txt
trunk/scenes/softshadow.cc
Log:
Shrank by 10x to cure acne. Worked. Thanks James!
Modified: trunk/scenes/CMakeLists.txt
==============================================================================
--- trunk/scenes/CMakeLists.txt (original)
+++ trunk/scenes/CMakeLists.txt Sun Oct 7 13:28:25 2007
@@ -47,6 +47,13 @@
TARGET_LINK_LIBRARIES(scene_softshadow ${MANTA_SCENE_LINK})
ENDIF(SCENE_SOFT_SHADOW)
+# instances of fences
+SET(SCENE_FENCE TRUE CACHE BOOL "Soft Shadow test")
+IF(SCENE_FENCE)
+ ADD_LIBRARY(scene_fence fence.cc)
+ TARGET_LINK_LIBRARIES(scene_fence ${MANTA_SCENE_LINK})
+ENDIF(SCENE_FENCE)
+
# octree isosurface
SET(SCENE_OCTISOVOL 0 CACHE BOOL "octree isosurface")
IF(SCENE_OCTISOVOL)
Modified: trunk/scenes/softshadow.cc
==============================================================================
--- trunk/scenes/softshadow.cc (original)
+++ trunk/scenes/softshadow.cc Sun Oct 7 13:28:25 2007
@@ -72,26 +72,26 @@
Material* white = new Lambertian(Color::white() * 0.8);
//vertica posts
- group->add( new Cube(white, Vector(910,-80,-200), Vector(990,0,400)) );
- group->add( new Cube(white, Vector(-90,-80,-200), Vector(-10,0,400)) );
- group->add( new Cube(white, Vector(-1090,-80,-200), Vector(-1010,0,400)) );
+ group->add( new Cube(white, Vector(91,-8,-20), Vector(99,0,40)) );
+ group->add( new Cube(white, Vector(-9,-8,-20), Vector(-1,0,40)) );
+ group->add( new Cube(white, Vector(-109,-8,-20), Vector(-101,0,40)) );
//cross bars
- group->add( new Cube(white, Vector(-1090,-80,400), Vector(990,0,440)) );
- group->add( new Cube(white, Vector(-1090,-80,0), Vector(990,0,40)) );
+ group->add( new Cube(white, Vector(-109,-8,40), Vector(99,0,44)) );
+ group->add( new Cube(white, Vector(-109,-8,0), Vector(99,0,4)) );
//slats
- group->add( new Cube(white, Vector(900,-100,-150), Vector(1000,-80,600)) );
- group->add( new Cube(white, Vector(700,-100,-150), Vector(800,-80,600)) );
- group->add( new Cube(white, Vector(500,-100,-150), Vector(600,-80,600)) );
- group->add( new Cube(white, Vector(300,-100,-150), Vector(400,-80,600)) );
- group->add( new Cube(white, Vector(100,-100,-150), Vector(200,-80,600)) );
- group->add( new Cube(white, Vector(-100,-100,-150), Vector(0,-80,600)) );
- group->add( new Cube(white, Vector(-300,-100,-150), Vector(-200,-80,600))
);
- group->add( new Cube(white, Vector(-500,-100,-150), Vector(-400,-80,600))
);
- group->add( new Cube(white, Vector(-700,-100,-150), Vector(-600,-80,600))
);
- group->add( new Cube(white, Vector(-900,-100,-150), Vector(-800,-80,600))
);
- group->add( new Cube(white, Vector(-1100,-100,-150),
Vector(-1000,-80,600)) );
+ group->add( new Cube(white, Vector(90,-10,-15), Vector(100,-8,60)) );
+ group->add( new Cube(white, Vector(70,-10,-15), Vector(80,-8,60)) );
+ group->add( new Cube(white, Vector(50,-10,-15), Vector(60,-8,60)) );
+ group->add( new Cube(white, Vector(30,-10,-15), Vector(40,-8,60)) );
+ group->add( new Cube(white, Vector(10,-10,-15), Vector(20,-8,60)) );
+ group->add( new Cube(white, Vector(-10,-10,-15), Vector(0,-8,60)) );
+ group->add( new Cube(white, Vector(-30,-10,-15), Vector(-20,-8,60)) );
+ group->add( new Cube(white, Vector(-50,-10,-15), Vector(-40,-8,60)) );
+ group->add( new Cube(white, Vector(-70,-10,-15), Vector(-60,-8,60)) );
+ group->add( new Cube(white, Vector(-90,-10,-15), Vector(-80,-8,60)) );
+ group->add( new Cube(white, Vector(-110,-10,-15), Vector(-100,-8,60)) );
}
@@ -100,9 +100,9 @@
Material* white = new Lambertian(Color::white() * 0.8);
Object* floor=new Rect(white,
- Vector(-1000,-1000,-200),
- Vector(3200,0,0),
- Vector(0,3200,0));
+ Vector(-100,-100,-20),
+ Vector(320,0,0),
+ Vector(0,320,0));
group->add(floor);
}
@@ -133,9 +133,9 @@
void addLights( LightSet* lights, int num_lights, float width_scale)
{
- float minx = -2000; float scalex = 300*width_scale;
- float minz = 4000; float scalez = 300*width_scale;
- float y = 4000;
+ float minx = -200; float scalex = 30*width_scale;
+ float minz = 400; float scalez = 30*width_scale;
+ float y = 400;
Color col = Color(RGB(0.8,0.8,0.8)) * (1.0/num_lights);
float *u = new float[num_lights];
float *v = new float[num_lights];
@@ -194,8 +194,8 @@
scene->setLights(lights);
// Add a default camera
- Vector eye(-2000,-2000,800);
- Vector lookat(-300,-300,0);
+ Vector eye(-200,-200,80);
+ Vector lookat(-30,-30,0);
Real fov=45;
scene->addBookmark("default view", eye, lookat, up, fov, fov);
- [Manta] r1763 - trunk/scenes, shirley, 10/07/2007
Archive powered by MHonArc 2.6.16.