Text archives Help

---

Author: sparker
Date: Mon Dec 19 11:31:48 2005
New Revision: 794

Modified:
   branches/vertical/Engine/Control/RTRT.cc
   branches/vertical/Engine/PixelSamplers/SingleSampler.cc
   branches/vertical/Interface/RayPacket.h
   branches/vertical/StandAlone/manta.cc
Log:
Eliminate chatter/cleanup


Modified: branches/vertical/Engine/Control/RTRT.cc
==============================================================================
--- branches/vertical/Engine/Control/RTRT.cc    (original)
+++ branches/vertical/Engine/Control/RTRT.cc    Mon Dec 19 11:31:48 2005
@@ -72,12 +72,10 @@
     ids("RTRT id counter", 1),
     thread_storage( 0 )
 {
-  cerr << "rtrt ctor\n";
   workersWanted=0;
   workersRendering=0;
   workersAnimAndImage=0;
   running=false;
-  cerr << "animstate\n";
   animFrameState.frameNumber = 0;
   animFrameState.frameTime = 0;
   timeMode = MantaInterface::RealTime;
@@ -85,9 +83,7 @@
   frameRate = 15;
   pipelineNeedsSetup = true;
   currentImageCreator = 0;
-  cerr << "register\n";
   registerKnownComponents(this);
-  cerr << "last...\n";
   scene = 0;
   verbose_transactions = false;
   currentPixelSampler = 0;

Modified: branches/vertical/Engine/PixelSamplers/SingleSampler.cc
==============================================================================
--- branches/vertical/Engine/PixelSamplers/SingleSampler.cc     (original)
+++ branches/vertical/Engine/PixelSamplers/SingleSampler.cc     Mon Dec 19 
11:31:48 2005
@@ -4,9 +4,6 @@
 #include <Interface/Fragment.h>
 #include <Interface/RayPacket.h>
 #include <Interface/Renderer.h>
-#include <iostream>
-using namespace std;
-
 using namespace Manta;
 
 PixelSampler* SingleSampler::create(const vector<string>& args)
@@ -97,7 +94,6 @@
     }
     
     // Trace the rays.  The results will automatically go into the fragment
-    cerr << "trace fragment: " << rays.getImageCoordinates(0, 0) << " " << 
rays.getImageCoordinates(0, 1) << "\n";
     context.renderer->traceEyeRays(context, rays);
 
     for(int i=0;i<size;i++){

Modified: branches/vertical/Interface/RayPacket.h
==============================================================================
--- branches/vertical/Interface/RayPacket.h     (original)
+++ branches/vertical/Interface/RayPacket.h     Mon Dec 19 11:31:48 2005
@@ -41,7 +41,7 @@
 
     // Color-based arrays
     Color::ComponentType color[Color::NumComponents][Size];
-    Color::ComponentType importance[Color::NumComponents][Size];
+    Color::ComponentType importance[Color::NumComponents][Size];   // 
1-attenuation, where eye rays have importance == 1
 
     // Int-based arrays
     int whichEye[Size];
@@ -54,12 +54,9 @@
 
 #if 0
     struct Element {
-      Point   texCoords;
       Vector  inverseDirection;
       int     sign[3];      // Mask describing ray direction, 1==negative 
0==positive,zero
-      Color   ambientLight;
       Color   light;
-      Color   importance;  // 1-attenuation, where eye rays have importance 
== 1
 
       int shadowBegin, shadowEnd;
       int whichEye;
@@ -390,17 +387,6 @@
       
       flags |= HaveNormals;
     }
-#if 0
-    void normalizeNormals()
-    {
-      ASSERT(flags & HaveNormals);
-      if(flags & HaveUnitNormals)
-        return;
-      for(int i=0;i<size;i++)
-        data[i].normal.normalize();
-      flags |= HaveUnitNormals;
-    }
-#endif
 
     int getDepth() const {
       return depth;
@@ -432,6 +418,5 @@
   };
 
 } // end namespace Manta
-
 
 #endif

Modified: branches/vertical/StandAlone/manta.cc
==============================================================================
--- branches/vertical/StandAlone/manta.cc       (original)
+++ branches/vertical/StandAlone/manta.cc       Mon Dec 19 11:31:48 2005
@@ -123,14 +123,11 @@
     args.push_back(argv[i]);
        
   try {
-    cerr << "create\n";
     MantaInterface* rtrt = createManta();
-    cerr << "setscenpath\n";
     if(getenv("MANTA_SCENEPATH"))
       rtrt->setScenePath(getenv("MANTA_SCENEPATH"));
     else
       rtrt->setScenePath(".:../scenes");
-    cerr << "changenumworkers\n";
     rtrt->changeNumWorkers(1);
     if(!rtrt->selectImageType("rgba8"))
       throw InternalError("default image not found", __FILE__, __LINE__);

---

• [MANTA] r794 - in branches/vertical: Engine/Control Engine/PixelSamplers Interface StandAlone, sparker, 12/19/2005

---

Archive powered by MHonArc 2.6.16.