-
sparker
thiago
Manta Interactive Ray Tracer Development Mailing List
Text archives Help
- From: boulos@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [Manta] r1902 - in trunk/scenes: . galileo
- Date: Mon, 3 Dec 2007 19:36:52 -0700 (MST)
Author: boulos
Date: Mon Dec 3 19:36:49 2007
New Revision: 1902
Modified:
trunk/scenes/complexitytest.cc
trunk/scenes/dynlt.cc
trunk/scenes/fence.cc
trunk/scenes/galileo/galileo.cc
trunk/scenes/gridisovol.cc
trunk/scenes/hdritest.cc
trunk/scenes/octisovol.cc
trunk/scenes/primtest.cc
trunk/scenes/softshadow.cc
trunk/scenes/teapotRoom.cc
trunk/scenes/triangleSceneViewer.cc
trunk/scenes/volumeTest.cc
trunk/scenes/vorpal.cc
Log:
scenes/complexitytest.cc
scenes/dynlt.cc
scenes/fence.cc
scenes/galileo/galileo.cc
scenes/gridisovol.cc
scenes/hdritest.cc
scenes/octisovol.cc
scenes/primtest.cc
scenes/softshadow.cc
scenes/teapotRoom.cc
scenes/triangleSceneViewer.cc
scenes/volumeTest.cc
scenes/vorpal.cc
Updating all scenes to use MANTA_PLUGINEXPORT.
Also sorting all the includes (using sort-lines in emacs)
Modified: trunk/scenes/complexitytest.cc
==============================================================================
--- trunk/scenes/complexitytest.cc (original)
+++ trunk/scenes/complexitytest.cc Mon Dec 3 19:36:49 2007
@@ -1,10 +1,10 @@
/*
- Adding a new scene designed to stress acceleration structures.
+ Adding a new scene designed to stress acceleration structures.
The scene creates a number of instanced objects randomly distributed
throughout a cube.
It takes the following options:
-
+
-num - number of objects to render
-type - type of objects to render [sphere, cone, disk, box]
-model - load this mesh instead of using a builtin primitive [OBJ or PLY]
@@ -13,7 +13,7 @@
-material - use a named shader instead of a constant color [lambertian,
constant, null]
-DynBVH - use DynBVH as the acceleration structure [default]
-CGT - use CGT as the acceleration structure
-
+
Here are some example command lines:
-Visualize the BVH
@@ -21,17 +21,20 @@
-Load a bunch of bunnies
bin/manta -scene "lib/libscene_complexitytest.dylib(-num 20 -object_scale
2 -material lambertian -model bun_zipper.ply)"
-
+
-Big cubes
bin/manta -scene "lib/libscene_complexitytest.dylib (-type box
-object_scale 10 -cube_scale 3)"
*/
-#include <Model/Textures/ImageTexture.h>
-#include <Image/TGAFile.h>
-#include <Core/Exceptions/IllegalArgument.h>
-#include <Core/Util/Args.h>
+
+
#include <Core/Color/ColorDB.h>
+#include <Core/Exceptions/IllegalArgument.h>
#include <Core/Exceptions/UnknownColor.h>
+#include <Core/Math/MinMax.h>
+#include <Core/Util/Args.h>
+#include <Core/Util/Preprocessor.h>
+#include <Image/TGAFile.h>
#include <Interface/LightSet.h>
#include <Interface/Scene.h>
#include <Model/AmbientLights/ArcAmbient.h>
@@ -45,6 +48,11 @@
#include <Model/Groups/Mesh.h>
#include <Model/Groups/ObjGroup.h>
#include <Model/Groups/GriddedGroup.h>
+#include <Model/Instances/Instance.h>
+#include <Model/Instances/InstanceRT.h>
+#include <Model/Instances/InstanceRST.h>
+#include <Model/Instances/InstanceST.h>
+#include <Model/Instances/InstanceT.h>
#include <Model/Lights/PointLight.h>
#include <Model/Materials/Checker.h>
#include <Model/Materials/Dielectric.h>
@@ -54,11 +62,6 @@
#include <Model/Materials/NullMaterial.h>
#include <Model/Materials/Flat.h>
#include <Model/Materials/CopyTextureMaterial.h>
-#include <Model/Instances/Instance.h>
-#include <Model/Instances/InstanceRT.h>
-#include <Model/Instances/InstanceRST.h>
-#include <Model/Instances/InstanceST.h>
-#include <Model/Instances/InstanceT.h>
#include <Model/Primitives/Cone.h>
#include <Model/Primitives/Cube.h>
#include <Model/Primitives/Disk.h>
@@ -74,12 +77,13 @@
#include <Model/TexCoordMappers/UniformMapper.h>
#include <Model/Textures/Constant.h>
#include <Model/Textures/CheckerTexture.h>
+#include <Model/Textures/ImageTexture.h>
#include <Model/Textures/MarbleTexture.h>
#include <Model/Textures/NormalTexture.h>
#include <Model/Readers/PlyReader.h>
#include <Model/Textures/WoodTexture.h>
#include <Model/Textures/OakTexture.h>
-#include <Core/Math/MinMax.h>
+
#include <string>
#include <vector>
#include <iostream>
@@ -92,7 +96,7 @@
using namespace Manta;
using namespace std;
-AccelerationStructure* getAS(string type)
+AccelerationStructure* getAS(string type)
{
if(type == "DynBVH")
return new DynBVH();
@@ -131,7 +135,7 @@
return new CopyTextureMaterial(c);
}
-extern "C"
+MANTA_PLUGINEXPORT
Scene* make_scene(const ReadContext&, const vector<string>& args)
{
Real object_scale = 1.0;
@@ -237,7 +241,7 @@
if(no_instances) {
Vector origin = Vector(drand48(), drand48(), drand48())*cube_scale;
Color color = Color(RGB(drand48(), drand48(), drand48()));
-
+
group->add(new Sphere(no_instance_matl, origin, object_scale));
} else {
Modified: trunk/scenes/dynlt.cc
==============================================================================
--- trunk/scenes/dynlt.cc (original)
+++ trunk/scenes/dynlt.cc Mon Dec 3 19:36:49 2007
@@ -3,7 +3,9 @@
#include <Core/Color/RegularColorMap.h>
#include <Core/Exceptions/IllegalArgument.h>
#include <Core/Geometry/Vector.h>
+#include <Core/Thread/Thread.h>
#include <Core/Util/Args.h>
+#include <Core/Util/Preprocessor.h>
#include <DynLT/DynLTContext.h>
#include <DynLT/DynLTGridSpheres.h>
#include <DynLT/DynLTCGT.h>
@@ -22,7 +24,7 @@
#include <Model/Lights/PointLight.h>
#include <Model/Primitives/Sphere.h>
#include <Model/Readers/ParticleNRRD.h>
-#include <Core/Thread/Thread.h>
+
#include <iostream>
@@ -33,7 +35,7 @@
using namespace Manta;
using namespace std;
-extern "C"
+MANTA_PLUGINEXPORT
Scene* make_scene(ReadContext const& context, vector<string> const& args)
{
Group* world=0;
Modified: trunk/scenes/fence.cc
==============================================================================
--- trunk/scenes/fence.cc (original)
+++ trunk/scenes/fence.cc Mon Dec 3 19:36:49 2007
@@ -1,37 +1,32 @@
+#include <Core/Exceptions/IllegalArgument.h>
+#include <Core/Exceptions/IllegalValue.h>
+#include <Core/Util/Args.h>
+#include <Core/Util/Preprocessor.h>
+
#include <Interface/Scene.h>
#include <Interface/LightSet.h>
+#include <Model/AmbientLights/ArcAmbient.h>
+#include <Model/Backgrounds/ConstantBackground.h>
#include <Model/Groups/ObjGroup.h>
#include <Model/Groups/DynBVH.h>
-
-
+#include <Model/Instances/Instance.h>
+#include <Model/Instances/InstanceRT.h>
+#include <Model/Instances/InstanceRST.h>
+#include <Model/Instances/InstanceST.h>
+#include <Model/Instances/InstanceT.h>
+#include <Model/Lights/PointLight.h>
#include <Model/Materials/Checker.h>
#include <Model/Materials/CopyTextureMaterial.h>
#include <Model/Materials/Dielectric.h>
#include <Model/Materials/Lambertian.h>
#include <Model/Materials/MetalMaterial.h>
#include <Model/Materials/Phong.h>
-
-#include <Model/Textures/Constant.h>
-#include <Model/Textures/MarbleTexture.h>
-
#include <Model/Primitives/Cube.h>
#include <Model/Primitives/Sphere.h>
#include <Model/Primitives/Parallelogram.h>
-#include <Model/Instances/Instance.h>
-#include <Model/Instances/InstanceRT.h>
-#include <Model/Instances/InstanceRST.h>
-#include <Model/Instances/InstanceST.h>
-#include <Model/Instances/InstanceT.h>
-
-
-#include <Model/Backgrounds/ConstantBackground.h>
-#include <Model/Lights/PointLight.h>
-#include <Model/AmbientLights/ArcAmbient.h>
-
-#include <Core/Exceptions/IllegalArgument.h>
-#include <Core/Exceptions/IllegalValue.h>
-#include <Core/Util/Args.h>
+#include <Model/Textures/Constant.h>
+#include <Model/Textures/MarbleTexture.h>
#include <iostream>
@@ -112,22 +107,22 @@
}
// generate N points on [0,1]^2
-void getLightSamples( float *u_, float *v_, int n)
+void getLightSamples( float *u_, float *v_, int n)
{
- //for (int i = 0; i < n; i++) {
+ //for (int i = 0; i < n; i++) {
// u[i] = drand48();
// v[i] = drand48();
//}
// hammersley from 97 jgt article
float p, u, v;
int k, kk, pos;
-
+
for (k=0, pos=0 ; k<n ; k++)
{
u = 0;
for (p=0.5, kk=k ; kk ; p*=0.5, kk>>=1)
if (kk & 1) // kk mod 2 == 1
- u += p;
+ u += p;
v = (k + 0.5) / n;
@@ -145,7 +140,7 @@
float *u = new float[num_lights];
float *v = new float[num_lights];
getLightSamples( u, v, num_lights );
- for (int i = 0; i < num_lights; i++) {
+ for (int i = 0; i < num_lights; i++) {
lights->add(new PointLight(Vector(minx + u[i] * scalex, y, minz +
v[i]*scalez), col));
}
delete [] u;
@@ -153,7 +148,7 @@
}
-extern "C"
+MANTA_PLUGINEXPORT
Scene* make_scene(const ReadContext&, const vector<string>& args)
{
int num_lights = 16;
@@ -186,7 +181,7 @@
DynBVH* bvh = new DynBVH();
bvh->setGroup(section0);
fence->add(bvh);
-
+
AffineTransform t;
t.initWithIdentity();
t.translate(Vector(200,0,0));
Modified: trunk/scenes/galileo/galileo.cc
==============================================================================
--- trunk/scenes/galileo/galileo.cc (original)
+++ trunk/scenes/galileo/galileo.cc Mon Dec 3 19:36:49 2007
@@ -1,25 +1,26 @@
-#include <Core/Geometry/Vector.h>
#include <Core/Exceptions/IllegalArgument.h>
+#include <Core/Geometry/AffineTransform.h>
+#include <Core/Geometry/Vector.h>
#include <Core/Util/Args.h>
+#include <Core/Util/NotFinished.h>
+#include <Core/Util/Preprocessor.h>
+#include <Engine/Factory/Factory.h>
#include <Interface/Context.h>
#include <Interface/LightSet.h>
#include <Interface/MantaInterface.h>
#include <Interface/Scene.h>
-#include <Model/AmbientLights/ConstantAmbient.h>
#include <Model/AmbientLights/ArcAmbient.h>
+#include <Model/AmbientLights/ConstantAmbient.h>
#include <Model/Backgrounds/LinearBackground.h>
-#include <Model/Groups/Group.h>
#include <Model/Groups/GriddedGroup.h>
+#include <Model/Groups/Group.h>
#include <Model/Lights/PointLight.h>
#include <Model/Materials/Lambertian.h>
#include <Model/Materials/MetalMaterial.h>
#include <Model/Primitives/Parallelogram.h>
#include <Model/Primitives/Sphere.h>
#include <Model/Textures/CheckerTexture.h>
-#include <Core/Geometry/AffineTransform.h>
-#include <Core/Util/NotFinished.h>
-#include <Engine/Factory/Factory.h>
#include <iostream>
@@ -33,7 +34,7 @@
extern int yyparse(void);
extern Group* world;
-extern "C"
+MANTA_PLUGINEXPORT
Scene* make_scene(const ReadContext& context, const vector<string>& args)
{
// Group* world = new Group();
@@ -42,7 +43,7 @@
// world->add(new Sphere(matl0, Vector(1, 1, 1), 1.0f));
cerr << "args[0] = "<<args[0]<<"\n";
-
+
yyin = fopen(args[0].c_str(), "r");
if (!yyin) {
perror("Can't open file");
@@ -52,11 +53,11 @@
perror("Error parsing");
}
fclose(yyin);
-
+
Scene* scene = new Scene();
scene->setBackground(new LinearBackground(Color(RGB(0.2, 0.4, 0.9)),
- Color::black(),
- Vector(0,0,1)));
+ Color::black(),
+ Vector(0,0,1)));
scene->setObject(world);
scene->addBookmark("default view",
Modified: trunk/scenes/gridisovol.cc
==============================================================================
--- trunk/scenes/gridisovol.cc (original)
+++ trunk/scenes/gridisovol.cc Mon Dec 3 19:36:49 2007
@@ -5,37 +5,38 @@
// May 2006
-#include <Core/Geometry/Vector.h>
-#include <Core/Geometry/BBox.h>
+#include <Core/Containers/Array3.h>
#include <Core/Exceptions/IllegalArgument.h>
#include <Core/Exceptions/InputError.h>
+#include <Core/Geometry/AffineTransform.h>
+#include <Core/Geometry/BBox.h>
+#include <Core/Geometry/Vector.h>
+#include <Core/Thread/Time.h>
#include <Core/Util/Args.h>
+#include <Core/Util/Preprocessor.h>
#include <Interface/Context.h>
#include <Interface/LightSet.h>
#include <Interface/MantaInterface.h>
#include <Interface/Scene.h>
#include <Model/AmbientLights/ArcAmbient.h>
+#include <Model/AmbientLights/ConstantAmbient.h>
#include <Model/Backgrounds/ConstantBackground.h>
+#include <Model/Cameras/PinholeCamera.h>
#include <Model/Groups/Group.h>
-#include <Model/Primitives/OctreeVolume.h>
-#include <Model/Primitives/IsosurfaceGridVolume.h>
-#include <Model/Lights/PointLight.h>
#include <Model/Lights/HeadLight.h>
-#include <Model/Materials/Phong.h>
+#include <Model/Lights/PointLight.h>
#include <Model/Materials/Lambertian.h>
-#include <Model/Cameras/PinholeCamera.h>
-#include <Core/Geometry/AffineTransform.h>
-#include <Model/AmbientLights/ConstantAmbient.h>
+#include <Model/Materials/Phong.h>
#include <Model/MiscObjects/CuttingPlane.h>
-#include <Core/Containers/Array3.h>
-#include <Core/Thread/Time.h>
+#include <Model/Primitives/IsosurfaceGridVolume.h>
+#include <Model/Primitives/OctreeVolume.h>
using namespace Manta;
enum CuttingPlaneType { CUTTING_NONE, CUTTING_DEFAULT, CUTTING_SPECIFIED };
///////////////////////////////////////////////////////////////////////////
-extern "C"
+MANTA_PLUGINEXPORT
Scene* make_scene(const ReadContext& context, const vector<string>& args) {
string filename = "";
Modified: trunk/scenes/hdritest.cc
==============================================================================
--- trunk/scenes/hdritest.cc (original)
+++ trunk/scenes/hdritest.cc Mon Dec 3 19:36:49 2007
@@ -1,38 +1,31 @@
-#include <Interface/Scene.h>
+#include <Core/Exceptions/IllegalArgument.h>
+#include <Core/Exceptions/IllegalValue.h>
+#include <Core/Util/Args.h>
+#include <Core/Util/Preprocessor.h>
#include <Interface/LightSet.h>
-
+#include <Interface/Scene.h>
+#include <Model/AmbientLights/ConstantAmbient.h>
+#include <Model/Backgrounds/ConstantBackground.h>
+#include <Model/Backgrounds/EnvMapBackground.h>
#include <Model/Groups/DynBVH.h>
-
-
+#include <Model/Instances/Instance.h>
+#include <Model/Instances/InstanceRST.h>
+#include <Model/Instances/InstanceRT.h>
+#include <Model/Instances/InstanceST.h>
+#include <Model/Instances/InstanceT.h>
+#include <Model/Lights/PointLight.h>
#include <Model/Materials/Checker.h>
#include <Model/Materials/CopyTextureMaterial.h>
#include <Model/Materials/Dielectric.h>
#include <Model/Materials/Lambertian.h>
#include <Model/Materials/MetalMaterial.h>
#include <Model/Materials/Phong.h>
-
-#include <Model/Textures/Constant.h>
-#include <Model/Textures/MarbleTexture.h>
-#include <Model/Textures/ImageTexture.h>
-#include <Model/Backgrounds/EnvMapBackground.h>
-
#include <Model/Primitives/Cube.h>
-#include <Model/Primitives/Sphere.h>
#include <Model/Primitives/Parallelogram.h>
-#include <Model/Instances/Instance.h>
-#include <Model/Instances/InstanceRT.h>
-#include <Model/Instances/InstanceRST.h>
-#include <Model/Instances/InstanceST.h>
-#include <Model/Instances/InstanceT.h>
-
-
-#include <Model/Backgrounds/ConstantBackground.h>
-#include <Model/Lights/PointLight.h>
-#include <Model/AmbientLights/ConstantAmbient.h>
-
-#include <Core/Exceptions/IllegalArgument.h>
-#include <Core/Exceptions/IllegalValue.h>
-#include <Core/Util/Args.h>
+#include <Model/Primitives/Sphere.h>
+#include <Model/Textures/Constant.h>
+#include <Model/Textures/ImageTexture.h>
+#include <Model/Textures/MarbleTexture.h>
#include <iostream>
@@ -57,7 +50,7 @@
}
-extern "C"
+MANTA_PLUGINEXPORT
Scene* make_scene(const ReadContext&, const vector<string>& args)
{
@@ -78,7 +71,7 @@
if ( !env_filename.empty() ) {
ImageTexture<Color>* t = LoadColorImageTexture( env_filename, &std::cerr
);
- scene->setBackground( new EnvMapBackground( t,
+ scene->setBackground( new EnvMapBackground( t,
EnvMapBackground::CylindricalEqualArea, right, up ) );
} else {
scene->setBackground( new ConstantBackground( Color(RGB(.3, .3, .9) ) )
);
@@ -90,7 +83,7 @@
LightSet* lights = new LightSet();
addLights( lights );
-
+
lights->setAmbientLight(new ConstantAmbient( Color( RGB(0.5, 0.5, 0) ) ) );
scene->setLights(lights);
Modified: trunk/scenes/octisovol.cc
==============================================================================
--- trunk/scenes/octisovol.cc (original)
+++ trunk/scenes/octisovol.cc Mon Dec 3 19:36:49 2007
@@ -4,36 +4,35 @@
// knolla@sci.utah.edu
// May 2006
-
-#include <Core/Geometry/Vector.h>
-#include <Core/Geometry/BBox.h>
+#include <Core/Containers/Array3.h>
#include <Core/Exceptions/IllegalArgument.h>
#include <Core/Exceptions/InputError.h>
+#include <Core/Geometry/AffineTransform.h>
+#include <Core/Geometry/BBox.h>
+#include <Core/Geometry/Vector.h>
+#include <Core/Thread/Time.h>
#include <Core/Util/Args.h>
+#include <Core/Util/Preprocessor.h>
#include <Interface/Context.h>
#include <Interface/LightSet.h>
#include <Interface/MantaInterface.h>
#include <Interface/Scene.h>
#include <Model/AmbientLights/ArcAmbient.h>
+#include <Model/AmbientLights/ConstantAmbient.h>
#include <Model/Backgrounds/ConstantBackground.h>
+#include <Model/Cameras/PinholeCamera.h>
#include <Model/Groups/Group.h>
-#include <Model/Primitives/OctreeVolume.h>
-#include <Model/Primitives/IsosurfaceOctreeVolume.h>
-#include <Model/Lights/PointLight.h>
#include <Model/Lights/HeadLight.h>
-#include <Model/Materials/Phong.h>
+#include <Model/Lights/PointLight.h>
#include <Model/Materials/Lambertian.h>
-#include <Model/Cameras/PinholeCamera.h>
-#include <Core/Geometry/AffineTransform.h>
-#include <Model/AmbientLights/ConstantAmbient.h>
+#include <Model/Materials/Phong.h>
#include <Model/MiscObjects/CuttingPlane.h>
-#include <Core/Containers/Array3.h>
-#include <Core/Thread/Time.h>
-
+#include <Model/Primitives/IsosurfaceOctreeVolume.h>
+#include <Model/Primitives/OctreeVolume.h>
using namespace Manta;
///////////////////////////////////////////////////////////////////////////
-extern "C"
+MANTA_PLUGINEXPORT
Scene* make_scene(const ReadContext& context, const vector<string>& args) {
string filename = "";
Modified: trunk/scenes/primtest.cc
==============================================================================
--- trunk/scenes/primtest.cc (original)
+++ trunk/scenes/primtest.cc Mon Dec 3 19:36:49 2007
@@ -1,57 +1,59 @@
-#include <Model/Textures/ImageTexture.h>
-#include <Image/TGAFile.h>
-#include <Core/Exceptions/IllegalArgument.h>
-#include <Core/Util/Args.h>
#include <Core/Color/ColorDB.h>
+#include <Core/Exceptions/IllegalArgument.h>
#include <Core/Exceptions/UnknownColor.h>
+#include <Core/Math/MinMax.h>
+#include <Core/Util/Args.h>
+#include <Core/Util/Preprocessor.h>
+#include <Image/TGAFile.h>
#include <Interface/LightSet.h>
#include <Interface/Scene.h>
#include <Model/AmbientLights/ArcAmbient.h>
-#include <Model/Backgrounds/LinearBackground.h>
#include <Model/Backgrounds/ConstantBackground.h>
-#include <Model/MiscObjects/Difference.h>
-#include <Model/MiscObjects/Intersection.h>
-#include <Model/MiscObjects/KeyFrameAnimation.h>
+#include <Model/Backgrounds/LinearBackground.h>
#include <Model/Groups/DynBVH.h>
#include <Model/Groups/Group.h>
#include <Model/Groups/Mesh.h>
#include <Model/Groups/ObjGroup.h>
+#include <Model/Instances/Instance.h>
+#include <Model/Instances/InstanceRST.h>
+#include <Model/Instances/InstanceRT.h>
+#include <Model/Instances/InstanceST.h>
+#include <Model/Instances/InstanceT.h>
#include <Model/Lights/PointLight.h>
#include <Model/Materials/Checker.h>
+#include <Model/Materials/CopyTextureMaterial.h>
#include <Model/Materials/Dielectric.h>
+#include <Model/Materials/Flat.h>
#include <Model/Materials/Lambertian.h>
#include <Model/Materials/MetalMaterial.h>
-#include <Model/Materials/Phong.h>
#include <Model/Materials/NullMaterial.h>
-#include <Model/Materials/Flat.h>
-#include <Model/Materials/CopyTextureMaterial.h>
-#include <Model/Instances/Instance.h>
-#include <Model/Instances/InstanceRT.h>
-#include <Model/Instances/InstanceRST.h>
-#include <Model/Instances/InstanceST.h>
-#include <Model/Instances/InstanceT.h>
+#include <Model/Materials/Phong.h>
+#include <Model/MiscObjects/Difference.h>
+#include <Model/MiscObjects/Intersection.h>
+#include <Model/MiscObjects/KeyFrameAnimation.h>
#include <Model/Primitives/Cone.h>
#include <Model/Primitives/Cube.h>
#include <Model/Primitives/Disk.h>
+#include <Model/Primitives/Heightfield.h>
#include <Model/Primitives/Hemisphere.h>
#include <Model/Primitives/Parallelogram.h>
#include <Model/Primitives/Sphere.h>
#include <Model/Primitives/SuperEllipsoid.h>
#include <Model/Primitives/Torus.h>
-#include <Model/Primitives/Heightfield.h>
#include <Model/Primitives/WaldTriangle.h>
+#include <Model/Readers/PlyReader.h>
#include <Model/TexCoordMappers/LinearMapper.h>
#include <Model/TexCoordMappers/SphericalMapper.h>
#include <Model/TexCoordMappers/UniformMapper.h>
-#include <Model/Textures/Constant.h>
#include <Model/Textures/CheckerTexture.h>
+#include <Model/Textures/Constant.h>
+#include <Model/Textures/ImageTexture.h>
#include <Model/Textures/MarbleTexture.h>
#include <Model/Textures/NormalTexture.h>
-#include <Model/Readers/PlyReader.h>
-#include <Model/Textures/WoodTexture.h>
#include <Model/Textures/OakTexture.h>
-#include <Core/Math/MinMax.h>
+#include <Model/Textures/WoodTexture.h>
+
#include <string>
#include <vector>
#include <iostream>
@@ -66,7 +68,7 @@
using namespace Manta;
using namespace std;
-extern "C"
+MANTA_PLUGINEXPORT
Scene* make_scene(const ReadContext&, const vector<string>& args)
{
std::cout << "Make_scene args: " << args.size() << std::endl;
Modified: trunk/scenes/softshadow.cc
==============================================================================
--- trunk/scenes/softshadow.cc (original)
+++ trunk/scenes/softshadow.cc Mon Dec 3 19:36:49 2007
@@ -1,31 +1,25 @@
-#include <Interface/Scene.h>
+#include <Core/Exceptions/IllegalArgument.h>
+#include <Core/Exceptions/IllegalValue.h>
+#include <Core/Util/Args.h>
+#include <Core/Util/Preprocessor.h>
#include <Interface/LightSet.h>
-
-#include <Model/Groups/ObjGroup.h>
+#include <Interface/Scene.h>
+#include <Model/AmbientLights/ArcAmbient.h>
+#include <Model/Backgrounds/ConstantBackground.h>
#include <Model/Groups/DynBVH.h>
-
-
+#include <Model/Groups/ObjGroup.h>
+#include <Model/Lights/PointLight.h>
#include <Model/Materials/Checker.h>
#include <Model/Materials/CopyTextureMaterial.h>
#include <Model/Materials/Dielectric.h>
#include <Model/Materials/Lambertian.h>
#include <Model/Materials/MetalMaterial.h>
#include <Model/Materials/Phong.h>
-
-#include <Model/Textures/Constant.h>
-#include <Model/Textures/MarbleTexture.h>
-
#include <Model/Primitives/Cube.h>
-#include <Model/Primitives/Sphere.h>
#include <Model/Primitives/Parallelogram.h>
-
-#include <Model/Backgrounds/ConstantBackground.h>
-#include <Model/Lights/PointLight.h>
-#include <Model/AmbientLights/ArcAmbient.h>
-
-#include <Core/Exceptions/IllegalArgument.h>
-#include <Core/Exceptions/IllegalValue.h>
-#include <Core/Util/Args.h>
+#include <Model/Primitives/Sphere.h>
+#include <Model/Textures/Constant.h>
+#include <Model/Textures/MarbleTexture.h>
#include <iostream>
@@ -120,22 +114,22 @@
}
// generate N points on [0,1]^2
-void getLightSamples( float *u_, float *v_, int n)
+void getLightSamples( float *u_, float *v_, int n)
{
- //for (int i = 0; i < n; i++) {
+ //for (int i = 0; i < n; i++) {
// u[i] = drand48();
// v[i] = drand48();
//}
// hammersley from 97 jgt article
float p, u, v;
int k, kk, pos;
-
+
for (k=0, pos=0 ; k<n ; k++)
{
u = 0;
for (p=0.5, kk=k ; kk ; p*=0.5, kk>>=1)
if (kk & 1) // kk mod 2 == 1
- u += p;
+ u += p;
v = (k + 0.5) / n;
@@ -153,7 +147,7 @@
float *u = new float[num_lights];
float *v = new float[num_lights];
getLightSamples( u, v, num_lights );
- for (int i = 0; i < num_lights; i++) {
+ for (int i = 0; i < num_lights; i++) {
lights->add(new PointLight(Vector(minx + u[i] * scalex, y, minz +
v[i]*scalez), col));
}
delete [] u;
@@ -161,7 +155,7 @@
}
-extern "C"
+MANTA_PLUGINEXPORT
Scene* make_scene(const ReadContext&, const vector<string>& args)
{
int num_lights = 16;
Modified: trunk/scenes/teapotRoom.cc
==============================================================================
--- trunk/scenes/teapotRoom.cc (original)
+++ trunk/scenes/teapotRoom.cc Mon Dec 3 19:36:49 2007
@@ -1,33 +1,27 @@
-#include <Interface/Scene.h>
+#include <Core/Exceptions/IllegalArgument.h>
+#include <Core/Util/Args.h>
+#include <Core/Util/Preprocessor.h>
#include <Interface/LightSet.h>
-
-#include <Model/Groups/ObjGroup.h>
+#include <Interface/Scene.h>
+#include <Model/AmbientLights/ArcAmbient.h>
+#include <Model/Backgrounds/ConstantBackground.h>
#include <Model/Groups/DynBVH.h>
-#include <Model/Readers/PlyReader.h>
-
+#include <Model/Groups/ObjGroup.h>
#include <Model/Instances/Instance.h>
-
+#include <Model/Lights/PointLight.h>
#include <Model/Materials/Checker.h>
#include <Model/Materials/CopyTextureMaterial.h>
#include <Model/Materials/Dielectric.h>
#include <Model/Materials/Lambertian.h>
#include <Model/Materials/MetalMaterial.h>
#include <Model/Materials/Phong.h>
-
#include <Model/Primitives/Cube.h>
#include <Model/Primitives/Parallelogram.h>
#include <Model/Primitives/Sphere.h>
-
+#include <Model/Readers/PlyReader.h>
#include <Model/Textures/Constant.h>
#include <Model/Textures/MarbleTexture.h>
-#include <Model/Backgrounds/ConstantBackground.h>
-#include <Model/Lights/PointLight.h>
-#include <Model/AmbientLights/ArcAmbient.h>
-
-#include <Core/Exceptions/IllegalArgument.h>
-#include <Core/Util/Args.h>
-
#include <iostream>
using namespace Manta;
@@ -123,7 +117,7 @@
if (bunny)
group->add(bunny);
}
-
+
// Teapot
{
AffineTransform teapotT;
@@ -243,10 +237,10 @@
// group->add( // ceiling (roomtb)
// new Rect(white, Vector(0,0,140.0), Vector(0,160.0,0),
Vector(160.0, 0,0))
// );
-
+
}
-extern "C"
+MANTA_PLUGINEXPORT
Scene* make_scene(const ReadContext&, const vector<string>& args)
{
for(size_t i=0;i<args.size();i++){
Modified: trunk/scenes/triangleSceneViewer.cc
==============================================================================
--- trunk/scenes/triangleSceneViewer.cc (original)
+++ trunk/scenes/triangleSceneViewer.cc Mon Dec 3 19:36:49 2007
@@ -1,21 +1,23 @@
-#include <Core/Exceptions/IllegalArgument.h>
-#include <Core/Util/Args.h>
#include <Core/Color/ColorDB.h>
+#include <Core/Exceptions/IllegalArgument.h>
#include <Core/Exceptions/UnknownColor.h>
+#include <Core/Util/Args.h>
+#include <Core/Util/Preprocessor.h>
#include <Interface/LightSet.h>
#include <Interface/Scene.h>
#include <Model/AmbientLights/ArcAmbient.h>
-#include <Model/Backgrounds/LinearBackground.h>
#include <Model/Backgrounds/ConstantBackground.h>
-#include <Model/MiscObjects/KeyFrameAnimation.h>
+#include <Model/Backgrounds/LinearBackground.h>
+#include <Model/Groups/DynBVH.h>
#include <Model/Groups/Group.h>
#include <Model/Groups/KDTree.h>
#include <Model/Groups/ObjGroup.h>
-#include <Model/Groups/DynBVH.h>
#include <Model/Lights/PointLight.h>
-#include <Model/Textures/Constant.h>
+#include <Model/MiscObjects/KeyFrameAnimation.h>
#include <Model/Readers/PlyReader.h>
+#include <Model/Textures/Constant.h>
#include <Core/Math/MinMax.h>
+
#include <string>
#include <vector>
#include <iostream>
@@ -50,7 +52,7 @@
throw IllegalArgument("scene primtest", i, args);
}
-extern "C"
+MANTA_PLUGINEXPORT
Scene* make_scene(const ReadContext&, const vector<string>& args)
{
std::cout << "Make_scene args: " << args.size() << std::endl;
@@ -118,14 +120,14 @@
KeyFrameAnimation *animation = new KeyFrameAnimation();
if (smoothAnimation)
animation->setInterpolation(KeyFrameAnimation::linear);
-
+
group->add(animation);
animation->useAccelerationStructure(as);
string modelName = fileNames[0];
if (!strncmp(modelName.c_str()+modelName.length()-5, ".anim", 5)) {
fileNames.clear();
- //read in data from modelName and
+ //read in data from modelName and
ifstream in(modelName.c_str());
while (in) {
in >> modelName;
@@ -140,7 +142,7 @@
if (!strncmp(modelName.c_str()+modelName.length()-4, ".ply", 4)) {
frame = new Mesh;
- if (!readPlyFile(modelName, AffineTransform::createIdentity(), frame,
0, triangleType))
+ if (!readPlyFile(modelName, AffineTransform::createIdentity(), frame,
0, triangleType))
printf("error loading or reading ply file: %s\n", modelName.c_str());
}
else if (!strncmp(modelName.c_str()+modelName.length()-4, ".obj", 4)) {
@@ -151,7 +153,7 @@
if (interpolateNormals && !frame->hasVertexNormals())
frame->interpolateNormals();
-
+
}
animation->push_back(frame);
}
Modified: trunk/scenes/volumeTest.cc
==============================================================================
--- trunk/scenes/volumeTest.cc (original)
+++ trunk/scenes/volumeTest.cc Mon Dec 3 19:36:49 2007
@@ -5,62 +5,58 @@
*
*/
-
-
-#include <Model/Materials/Volume.h>
-
-#include <Core/Color/ColorDB.h>
#include <Core/Color/Color.h>
-#include <Core/Geometry/Vector.h>
+#include <Core/Color/ColorDB.h>
+#include <Core/Color/RegularColorMap.h>
#include <Core/Exceptions/IllegalArgument.h>
+#include <Core/Geometry/AffineTransform.h>
+#include <Core/Geometry/Vector.h>
#include <Core/Util/Args.h>
+#include <Core/Util/NotFinished.h>
+#include <Core/Util/Preprocessor.h>
+#include <Engine/Factory/Factory.h>
#include <Interface/Context.h>
#include <Interface/LightSet.h>
#include <Interface/MantaInterface.h>
#include <Interface/Scene.h>
#include <Model/AmbientLights/ArcAmbient.h>
-#include <Model/Backgrounds/LinearBackground.h>
#include <Model/Backgrounds/ConstantBackground.h>
+#include <Model/Backgrounds/LinearBackground.h>
+#include <Model/Cameras/PinholeCamera.h>
+#include <Model/Groups/GriddedGroup.h>
#include <Model/Groups/Group.h>
+#include <Model/Instances/Instance.h>
+#include <Model/Instances/InstanceRST.h>
+#include <Model/Instances/InstanceRT.h>
+#include <Model/Instances/InstanceST.h>
+#include <Model/Instances/InstanceT.h>
#include <Model/Lights/PointLight.h>
+#include <Model/Materials/Checker.h>
+#include <Model/Materials/Flat.h>
#include <Model/Materials/Lambertian.h>
#include <Model/Materials/MetalMaterial.h>
#include <Model/Materials/Phong.h>
-#include <Model/Materials/Checker.h>
-#include <Model/Materials/Flat.h>
-#include <Model/Primitives/Parallelogram.h>
-#include <Model/Primitives/Sphere.h>
+#include <Model/Materials/Volume.h>
+#include <Model/MiscObjects/CuttingPlane.h>
+#include <Model/MiscObjects/Difference.h>
+#include <Model/MiscObjects/Intersection.h>
#include <Model/Primitives/Cube.h>
#include <Model/Primitives/Disk.h>
-#include <Model/Primitives/Parallelogram.h>
-#include <Model/Primitives/SuperEllipsoid.h>
#include <Model/Primitives/Heightfield.h>
#include <Model/Primitives/Hemisphere.h>
-#include <Model/MiscObjects/Intersection.h>
-#include <Model/MiscObjects/Difference.h>
+#include <Model/Primitives/Parallelogram.h>
+#include <Model/Primitives/Parallelogram.h>
+#include <Model/Primitives/Sphere.h>
+#include <Model/Primitives/SuperEllipsoid.h>
+#include <Model/TexCoordMappers/LinearMapper.h>
+#include <Model/TexCoordMappers/SphericalMapper.h>
+#include <Model/TexCoordMappers/UniformMapper.h>
#include <Model/Textures/CheckerTexture.h>
#include <Model/Textures/MarbleTexture.h>
-//#include <Model/Textures/NormalTexture.h>
-#include <Model/Textures/WoodTexture.h>
#include <Model/Textures/OakTexture.h>
-#include <Model/TexCoordMappers/UniformMapper.h>
-#include <Model/TexCoordMappers/SphericalMapper.h>
-#include <Model/TexCoordMappers/LinearMapper.h>
-#include <Core/Geometry/AffineTransform.h>
-#include <Core/Util/NotFinished.h>
-#include <Model/Groups/GriddedGroup.h>
-#include <Model/Instances/InstanceRT.h>
-#include <Model/Instances/InstanceT.h>
-#include <Model/Instances/InstanceST.h>
-#include <Model/Instances/InstanceRST.h>
-#include <Model/Instances/Instance.h>
-#include <Model/Cameras/PinholeCamera.h>
-#include <Core/Color/RegularColorMap.h>
+#include <Model/Textures/WoodTexture.h>
//#include <Model/Readers/ParticleNRRD.h>
-
-#include <Engine/Factory/Factory.h>
-
-#include <Model/MiscObjects/CuttingPlane.h>
+//#include <Model/Textures/NormalTexture.h>
#include <iostream>
@@ -72,7 +68,7 @@
using namespace Manta;
using namespace std;
-extern "C"
+MANTA_PLUGINEXPORT
Scene* make_scene(const ReadContext& context, const vector<string>& args)
{
double t_inc = 0.00125;
@@ -93,69 +89,69 @@
string arg = args[i];
if(arg == "-t")
{
- if(!getDoubleArg(i, args, t_inc))
- throw IllegalArgument("scene volumeTest -t",i,args);
+ if(!getDoubleArg(i, args, t_inc))
+ throw IllegalArgument("scene volumeTest -t",i,args);
}
else if(arg == "-dataMinMax")
{
- if(!(getDoubleArg(i, args, dataMin) && getDoubleArg(i, args,
dataMax)))
- throw IllegalArgument("scene volumeTest -dataMinMax",i,args);
- cout << "datamin/max: " << dataMin << " " << dataMax << endl;
+ if(!(getDoubleArg(i, args, dataMin) && getDoubleArg(i, args,
dataMax)))
+ throw IllegalArgument("scene volumeTest -dataMinMax",i,args);
+ cout << "datamin/max: " << dataMin << " " << dataMax << endl;
}
else if(arg == "-minBound")
{
- if(!(getDoubleArg(i, args, x) && !getDoubleArg(i, args, y) &&
!getDoubleArg(i, args, z)))
- throw IllegalArgument("scene volumeTest -minBound",i,args);
- minBound = Vector(x,y,z);
+ if(!(getDoubleArg(i, args, x) && !getDoubleArg(i, args, y) &&
!getDoubleArg(i, args, z)))
+ throw IllegalArgument("scene volumeTest -minBound",i,args);
+ minBound = Vector(x,y,z);
}
else if(arg == "-maxBound")
{
if(!(getDoubleArg(i, args, x) && !getDoubleArg(i, args, y) &&
!getDoubleArg(i, args, z)))
throw IllegalArgument("scene volumeTest -maxBound",i,args);
- maxBound = Vector(x,y,z);
+ maxBound = Vector(x,y,z);
}
else if(arg == "-i")
{
if(!getStringArg(i, args, volFile))
- throw IllegalArgument("scene volumeTest -i", i, args);
+ throw IllegalArgument("scene volumeTest -i", i, args);
}
else if (arg == "-depth") {
if (!getIntArg(i, args, depth))
throw IllegalArgument("scene volumeTest -depth", i, args);
- cout << "i: " << i << endl;
+ cout << "i: " << i << endl;
}
else if (arg == "-cMapFile")
{
- if(!getStringArg(i, args, cMapFile))
- throw IllegalArgument("scene volumeTest -cMapFile",i,args);
- ifstream in(cMapFile.c_str());
- float pos,r,g,b,a;
- while (in >> pos && in >> r && in >> g && in >> b && in >> a)
- slices.push_back(ColorSlice(pos, RGBAColor(r,g,b,a)));
- in.close();
- cMap = new RGBAColorMap(slices);
+ if(!getStringArg(i, args, cMapFile))
+ throw IllegalArgument("scene volumeTest -cMapFile",i,args);
+ ifstream in(cMapFile.c_str());
+ float pos,r,g,b,a;
+ while (in >> pos && in >> r && in >> g && in >> b && in >> a)
+ slices.push_back(ColorSlice(pos, RGBAColor(r,g,b,a)));
+ in.close();
+ cMap = new RGBAColorMap(slices);
}
else if (arg == "-cMapType")
{
- if(!getStringArg(i, args, cMapType))
- throw IllegalArgument("scene volumeTest -cMapType",i,args);
+ if(!getStringArg(i, args, cMapType))
+ throw IllegalArgument("scene volumeTest -cMapType",i,args);
if(cMapType == "Rainbow")
- cMap = new RGBAColorMap(RGBAColorMap::Rainbow);
- else if(cMapType == "InvRainbow")
- cMap = new RGBAColorMap(RGBAColorMap::InvRainbow);
- else if(cMapType == "BlackBody")
- cMap = new RGBAColorMap(RGBAColorMap::BlackBody);
- else if(cMapType == "InvBlackBody")
- cMap = new RGBAColorMap(RGBAColorMap::InvBlackBody);
- else if(cMapType == "GreyScale")
- cMap = new RGBAColorMap(RGBAColorMap::GreyScale);
- else if(cMapType == "InvGreyScale")
- cMap = new RGBAColorMap(RGBAColorMap::InvGreyScale);
- else if(cMapType == "InvRainbowIso")
- cMap = new RGBAColorMap(RGBAColorMap::InvRainbowIso);
- else
- throw IllegalArgument("scene volumeTest -cMapType",i,args);
-
+ cMap = new RGBAColorMap(RGBAColorMap::Rainbow);
+ else if(cMapType == "InvRainbow")
+ cMap = new RGBAColorMap(RGBAColorMap::InvRainbow);
+ else if(cMapType == "BlackBody")
+ cMap = new RGBAColorMap(RGBAColorMap::BlackBody);
+ else if(cMapType == "InvBlackBody")
+ cMap = new RGBAColorMap(RGBAColorMap::InvBlackBody);
+ else if(cMapType == "GreyScale")
+ cMap = new RGBAColorMap(RGBAColorMap::GreyScale);
+ else if(cMapType == "InvGreyScale")
+ cMap = new RGBAColorMap(RGBAColorMap::InvGreyScale);
+ else if(cMapType == "InvRainbowIso")
+ cMap = new RGBAColorMap(RGBAColorMap::InvRainbowIso);
+ else
+ throw IllegalArgument("scene volumeTest -cMapType",i,args);
+
} else {
cerr<<"Valid options for scene pcgt:\n";
cerr<<" -depth <int> depth of macrocells (1-5 is good, 2
default)\n";
@@ -169,10 +165,10 @@
}
}
- Group* group = new Group();
-
- float div = 1.0/255.0;
- float a = 1.0;
+ Group* group = new Group();
+
+ float div = 1.0/255.0;
+ float a = 1.0;
/*
slices.push_back(ColorSlice(0.0f, RGBAColor(Color(RGB(0, 0, 0)) * div,
0*a)));
@@ -207,29 +203,29 @@
slices.push_back(ColorSlice(0.85f, RGBAColor(Color(RGB(255, 247, 120)) *
div, 0.43*a)));
slices.push_back(ColorSlice(0.92f, RGBAColor(Color(RGB(255, 255, 180)) *
div, 0.47*a)));
slices.push_back(ColorSlice(1.0f, RGBAColor(Color(RGB(255, 255, 255)) *
div, 0.5*a)));
-
+
/*Array1<Color> matls;
Array1<AlphaPos> alphas;
matls.add(Color(RGB(0, 0, 0)) * div);
matls.add(Color(RGB(52, 0, 0)) * div);
- matls.add(Color(RGB(102, 2, 0)) * div);
+ matls.add(Color(RGB(102, 2, 0)) * div);
matls.add(Color(RGB(153, 18, 0)) * div);
- matls.add(Color(RGB(200, 41, 0)) * div);
+ matls.add(Color(RGB(200, 41, 0)) * div);
matls.add(Color(RGB(230, 71, 0)) * div);
- matls.add(Color(RGB(255, 120, 0)) * div);
+ matls.add(Color(RGB(255, 120, 0)) * div);
matls.add(Color(RGB(255, 163, 20)) * div);
- matls.add(Color(RGB(255, 204, 55)) * div);
+ matls.add(Color(RGB(255, 204, 55)) * div);
matls.add(Color(RGB(255, 228, 80)) * div);
- matls.add(Color(RGB(255, 247, 120)) * div);
+ matls.add(Color(RGB(255, 247, 120)) * div);
matls.add(Color(RGB(255, 255, 180)) * div);
matls.add(Color(RGB(255, 255, 255)) * div);
alphas.add(AlphaPos(0 , 0)); // pos 0
- alphas.add(AlphaPos(0.109804, 0));
- alphas.add(AlphaPos(0.328571, 0.216667));
- alphas.add(AlphaPos(0.618367, 0.3375));
- alphas.add(AlphaPos(1, 0.5));
+ alphas.add(AlphaPos(0.109804, 0));
+ alphas.add(AlphaPos(0.328571, 0.216667));
+ alphas.add(AlphaPos(0.618367, 0.3375));
+ alphas.add(AlphaPos(1, 0.5));
CDColorMap2* cmap2 = new CDColorMap2(matls, alphas, 256, t_inc);
*/
cMap = new RGBAColorMap(slices);
@@ -238,13 +234,13 @@
cMap->scaleAlphas(t_inc);
Volume<float>* mat = new Volume<float>(volFile, cMap, minBound, maxBound,
t_inc, 10.0, depth, dataMin, dataMax);
- //double min, max;
- //mat->getMinMax(&min, &max);
- //cmap2->setMinMax(min, max);
- Primitive* prim = new Cube(mat, minBound - Vector(0.001, 0.001,
0.001), maxBound + Vector(0.001, 0.001, 0.001));
- group->add(prim);
+ //double min, max;
+ //mat->getMinMax(&min, &max);
+ //cmap2->setMinMax(min, max);
+ Primitive* prim = new Cube(mat, minBound - Vector(0.001, 0.001,
0.001), maxBound + Vector(0.001, 0.001, 0.001));
+ group->add(prim);
+
-
Scene* scene = new Scene();
scene->setBackground(new LinearBackground(Color(RGB(0.2, 0.4, 0.9)),
Color(RGB(0.0,0.0,0.0)),
@@ -259,7 +255,7 @@
lights->setAmbientLight(new ArcAmbient(cup, cdown, up));
scene->setLights(lights);
-
+
return scene;
}
Modified: trunk/scenes/vorpal.cc
==============================================================================
--- trunk/scenes/vorpal.cc (original)
+++ trunk/scenes/vorpal.cc Mon Dec 3 19:36:49 2007
@@ -1,22 +1,24 @@
#include <Core/Exceptions/IllegalArgument.h>
+#include <Core/Math/MinMax.h>
#include <Core/Util/Args.h>
-#include <Interface/LightSet.h>
+#include <Core/Util/Preprocessor.h>
#include <Interface/Context.h>
+#include <Interface/LightSet.h>
#include <Interface/Scene.h>
-#include <Model/Textures/HeightColorMap.h>
-#include <Model/Materials/Lambertian.h>
-#include <Model/Materials/Phong.h>
#include <Model/AmbientLights/ArcAmbient.h>
#include <Model/AmbientLights/ConstantAmbient.h>
#include <Model/Backgrounds/LinearBackground.h>
-#include <Model/Groups/Group.h>
#include <Model/Groups/DynBVH.h>
+#include <Model/Groups/Group.h>
#include <Model/Lights/PointLight.h>
+#include <Model/Materials/Lambertian.h>
+#include <Model/Materials/Phong.h>
#include <Model/MiscObjects/KeyFrameAnimation.h>
-#include <Model/Primitives/Sphere.h>
#include <Model/Primitives/Heightfield.h>
+#include <Model/Primitives/Sphere.h>
#include <Model/Readers/PlyReader.h>
-#include <Core/Math/MinMax.h>
+#include <Model/Textures/HeightColorMap.h>
+
#include <string>
#include <iostream>
#include <fstream>
@@ -69,7 +71,7 @@
return particles;
}
-extern "C"
+MANTA_PLUGINEXPORT
Scene* make_scene(const ReadContext&, const vector<string>& args)
{
std::cout << "Make_scene args: " << args.size() << std::endl;
- [Manta] r1902 - in trunk/scenes: . galileo, boulos, 12/03/2007
Archive powered by MHonArc 2.6.16.
