Text archives Help
- From: brownlee@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [Manta] r2040 - trunk/Interface
- Date: Thu, 7 Feb 2008 01:46:56 -0700 (MST)
Author: brownlee
Date: Thu Feb 7 01:46:54 2008
New Revision: 2040
Modified:
trunk/Interface/Scene.cc
trunk/Interface/Scene.h
Log:
reverting changes to Scene to fix runtime error that was done to fix a swig
warning
Modified: trunk/Interface/Scene.cc
==============================================================================
--- trunk/Interface/Scene.cc (original)
+++ trunk/Interface/Scene.cc Thu Feb 7 01:46:54 2008
@@ -62,11 +62,11 @@
}
namespace Manta {
- MANTA_DECLARE_RTTI_BASECLASS(Bookmark, ConcreteClass, readwriteMethod);
- MANTA_REGISTER_CLASS(Bookmark);
+ MANTA_DECLARE_RTTI_BASECLASS(Scene::Bookmark, ConcreteClass,
readwriteMethod);
+ MANTA_REGISTER_CLASS(Scene::Bookmark);
}
-void Bookmark::readwrite(ArchiveElement* archive)
+void Scene::Bookmark::readwrite(ArchiveElement* archive)
{
archive->readwrite("name", name);
archive->readwrite("cameradata", cameradata);
Modified: trunk/Interface/Scene.h
==============================================================================
--- trunk/Interface/Scene.h (original)
+++ trunk/Interface/Scene.h Thu Feb 7 01:46:54 2008
@@ -8,16 +8,6 @@
#include <vector>
namespace Manta {
- class Scene;
- class ArchiveElement;
- struct Bookmark {
- void readwrite(ArchiveElement* archive);
- private:
- friend class Scene;
- std::string name;
- BasicCameraData cameradata;
- };
-
class Archive;
class Background;
class LightSet;
@@ -91,7 +81,14 @@
}
void readwrite(ArchiveElement*);
-
+ struct Bookmark {
+ void readwrite(ArchiveElement* archive);
+ private:
+ friend class Scene;
+ std::string name;
+ BasicCameraData cameradata;
+ };
+
void setAnimationStartTime(double start) {
animationStartTime = start;
}
- [Manta] r2040 - trunk/Interface, brownlee, 02/07/2008
Archive powered by MHonArc 2.6.16.