Text archives Help
- From: boulos@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [Manta] r1693 - in trunk: Interface Model/Groups Model/Groups/private
- Date: Thu, 30 Aug 2007 15:47:27 -0600 (MDT)
Author: boulos
Date: Thu Aug 30 15:47:27 2007
New Revision: 1693
Modified:
trunk/Interface/AccelerationStructure.h
trunk/Model/Groups/DynBVH.cc
trunk/Model/Groups/DynBVH.h
trunk/Model/Groups/private/CGT.cc
trunk/Model/Groups/private/CGT.h
Log:
Interface/AccelerationStructure.h
Model/Groups/DynBVH.cc
Model/Groups/DynBVH.h
Model/Groups/private/CGT.cc
Model/Groups/private/CGT.h
Adding a getGroup() function to AccelerationStructure.
Modified: trunk/Interface/AccelerationStructure.h
==============================================================================
--- trunk/Interface/AccelerationStructure.h (original)
+++ trunk/Interface/AccelerationStructure.h Thu Aug 30 15:47:27 2007
@@ -16,6 +16,8 @@
// of Manta. setGroup can be called when "building" your scene.
virtual void setGroup(Group* new_group) = 0;
+ virtual Group* getGroup() const = 0;
+
// update tells the acceleration structure that the underlying
// geometry has probably "moved" so that the bounds need to be
// updated. No actual changes in the amount of geometry has
Modified: trunk/Model/Groups/DynBVH.cc
==============================================================================
--- trunk/Model/Groups/DynBVH.cc (original)
+++ trunk/Model/Groups/DynBVH.cc Thu Aug 30 15:47:27 2007
@@ -431,6 +431,10 @@
currGroup = new_group;
}
+Group* DynBVH::getGroup() const {
+ return currGroup;
+}
+
void DynBVH::preprocess(const PreprocessContext& context)
{
//cerr << MANTA_FUNC << endl;
Modified: trunk/Model/Groups/DynBVH.h
==============================================================================
--- trunk/Model/Groups/DynBVH.h (original)
+++ trunk/Model/Groups/DynBVH.h Thu Aug 30 15:47:27 2007
@@ -72,6 +72,7 @@
{}
void setGroup(Group* new_group);
+ Group* getGroup() const;
void preprocess(const PreprocessContext&);
void intersect(const RenderContext& context, RayPacket& rays) const;
Modified: trunk/Model/Groups/private/CGT.cc
==============================================================================
--- trunk/Model/Groups/private/CGT.cc (original)
+++ trunk/Model/Groups/private/CGT.cc Thu Aug 30 15:47:27 2007
@@ -17,6 +17,10 @@
currGroup = new_group;
}
+Group* Grid::getGroup() const {
+ return currGroup;
+}
+
void Grid::preprocess(const PreprocessContext& context)
{
context.manta_interface->registerSerialPreRenderCallback(
Modified: trunk/Model/Groups/private/CGT.h
==============================================================================
--- trunk/Model/Groups/private/CGT.h (original)
+++ trunk/Model/Groups/private/CGT.h Thu Aug 30 15:47:27 2007
@@ -168,6 +168,7 @@
void computeBounds(const PreprocessContext& context, BBox& bbox) const;
void setGroup(Group* new_group);
+ Group* getGroup() const;
void preprocess(const PreprocessContext&);
void build(int proc, int numProcs, bool &);
void preFrameSetup(int proc, int numProcs);
- [Manta] r1693 - in trunk: Interface Model/Groups Model/Groups/private, boulos, 08/30/2007
Archive powered by MHonArc 2.6.16.