Text archives Help
- From: cgribble@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r1225 - in trunk/Engine: Renderers Shadows
- Date: Sat, 14 Oct 2006 15:24:01 -0600 (MDT)
Author: cgribble
Date: Sat Oct 14 15:24:00 2006
New Revision: 1225
Modified:
trunk/Engine/Renderers/Raydumper.cc
trunk/Engine/Renderers/Raytracer.h
trunk/Engine/Shadows/HardShadows.h
Log:
Added default constructors to Raytracer and HardShadows to may Raydumper work
with changes in r1224
Modified: trunk/Engine/Renderers/Raydumper.cc
==============================================================================
--- trunk/Engine/Renderers/Raydumper.cc (original)
+++ trunk/Engine/Renderers/Raydumper.cc Sat Oct 14 15:24:00 2006
@@ -4,7 +4,10 @@
#include <Core/Exceptions/InternalError.h>
#include <Core/Exceptions/OutputError.h>
#include <Core/Util/Args.h>
+// #include <Engine/Factory/Factory.h>
+#include <Engine/Renderers/Raytracer.h>
#include <Engine/Renderers/Raydumper.h>
+#include <Engine/Shadows/HardShadows.h>
#include <Interface/Context.h>
#include <cfloat>
@@ -68,17 +71,9 @@
throw IllegalValue<int>("Raydumper does not yet support multi-threaded
rendering",
rtrt->numWorkers());
- // Hi-jack RTRT's Renderer
- if (!rtrt->selectRenderer(renderer_string))
- throw InternalError("renderer not found", __FILE__, __LINE__ );
- renderer = rtrt->getRenderer();
- rtrt->setRenderer(this);
-
- // Hi-jack RTRT's ShadowAlgorithm
- if (!rtrt->selectShadowAlgorithm(shadow_string))
- throw InternalError("shadow algorithm not found", __FILE__, __LINE__ );
- shadows = rtrt->getShadowAlgorithm();
- rtrt->setShadowAlgorithm(this);
+ // Force ray tracer with hard shadows
+ renderer = new Raytracer();
+ shadows = new HardShadows();
// Quit after rendering a single frame
rtrt->addOneShotCallback(MantaInterface::Absolute, 1,
Modified: trunk/Engine/Renderers/Raytracer.h
==============================================================================
--- trunk/Engine/Renderers/Raytracer.h (original)
+++ trunk/Engine/Renderers/Raytracer.h Sat Oct 14 15:24:00 2006
@@ -14,6 +14,7 @@
class Raytracer : public Renderer {
public:
+ Raytracer() {}
Raytracer(const vector<string>& args);
virtual ~Raytracer();
virtual void setupBegin(const SetupContext&, int numChannels);
Modified: trunk/Engine/Shadows/HardShadows.h
==============================================================================
--- trunk/Engine/Shadows/HardShadows.h (original)
+++ trunk/Engine/Shadows/HardShadows.h Sat Oct 14 15:24:00 2006
@@ -12,6 +12,7 @@
using namespace std;
class HardShadows : public ShadowAlgorithm {
public:
+ HardShadows() {}
HardShadows(const vector<string>& args);
virtual ~HardShadows();
- [MANTA] r1225 - in trunk/Engine: Renderers Shadows, cgribble, 10/14/2006
Archive powered by MHonArc 2.6.16.