Text archives Help
- From: abe@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r1393 - in trunk: Engine/Shadows Model/Groups Model/Primitives
- Date: Wed, 16 May 2007 15:16:44 -0600 (MDT)
Author: abe
Date: Wed May 16 15:16:43 2007
New Revision: 1393
Modified:
trunk/Engine/Shadows/NoShadows.cc
trunk/Engine/Shadows/NoShadows.h
trunk/Model/Groups/ObjGroup.cc
trunk/Model/Primitives/WaldTriangle.cc
Log:
Switched ObjGroup to use Wald triangle instead of Heavy triangle.
M Model/Groups/ObjGroup.cc
M Model/Primitives/WaldTriangle.cc
Added Empty constructor for creation from python.
M Engine/Shadows/NoShadows.cc
M Engine/Shadows/NoShadows.h
Modified: trunk/Engine/Shadows/NoShadows.cc
==============================================================================
--- trunk/Engine/Shadows/NoShadows.cc (original)
+++ trunk/Engine/Shadows/NoShadows.cc Wed May 16 15:16:43 2007
@@ -11,6 +11,10 @@
return new NoShadows(args);
}
+NoShadows::NoShadows()
+{
+}
+
NoShadows::NoShadows(const vector<string>& /*args*/)
{
}
Modified: trunk/Engine/Shadows/NoShadows.h
==============================================================================
--- trunk/Engine/Shadows/NoShadows.h (original)
+++ trunk/Engine/Shadows/NoShadows.h Wed May 16 15:16:43 2007
@@ -12,6 +12,7 @@
using namespace std;
class NoShadows : public ShadowAlgorithm {
public:
+ NoShadows();
NoShadows(const vector<string>& args);
virtual ~NoShadows();
Modified: trunk/Model/Groups/ObjGroup.cc
==============================================================================
--- trunk/Model/Groups/ObjGroup.cc (original)
+++ trunk/Model/Groups/ObjGroup.cc Wed May 16 15:16:43 2007
@@ -13,6 +13,7 @@
#include <Model/Materials/Flat.h>
#include <Model/Primitives/TexTriangle.h>
#include <Model/Primitives/HeavyTriangle.h>
+#include <Model/Primitives/WaldTriangle.h>
#include <iostream>
@@ -252,7 +253,7 @@
vertex[0], vertex[1]-vertex[0],
vertex[2]-vertex[0],
normal[0], normal[1], normal[2]);
} else {
- triangle = new HeavyTriangle( material,
+ triangle = new WaldTriangle( material,
vertex[0], vertex[1], vertex[2]);
}
}
Modified: trunk/Model/Primitives/WaldTriangle.cc
==============================================================================
--- trunk/Model/Primitives/WaldTriangle.cc (original)
+++ trunk/Model/Primitives/WaldTriangle.cc Wed May 16 15:16:43 2007
@@ -66,6 +66,21 @@
b_d *= s;
n_k = normal[k];
+#if 0
+ std::cerr << "n_u: " << n_u << std::endl
+ << "n_v: " << n_v << std::endl
+ << "n_d: " << n_d << std::endl
+ << "k: " << k << std::endl
+
+ << "b_nu: " << b_nu << std::endl
+ << "b_nv: " << b_nv << std::endl
+ << "b_d: " << b_d << std::endl
+ << "n_k: " << n_k << std::endl
+
+ << "c_nu: " << c_nu << std::endl
+ << "c_nv: " << c_nv << std::endl
+ << "c_d: " << c_d << std::endl;
+#endif
}
#ifdef MANTA_SSE
- [MANTA] r1393 - in trunk: Engine/Shadows Model/Groups Model/Primitives, abe, 05/16/2007
Archive powered by MHonArc 2.6.16.