moved animation track class to libcore

include/mitsuba/core/track.h

@@ -17,8 +17,8 @@
 */
 
 #pragma once
-#if !defined(__MITSUBA_RENDER_TRACK_H_)
-#define __MITSUBA_RENDER_TRACK_H_
+#if !defined(__MITSUBA_CORE_TRACK_H_)
+#define __MITSUBA_CORE_TRACK_H_
 
 #include <mitsuba/core/quat.h>
 #include <mitsuba/core/simplecache.h>
@@ -32,7 +32,7 @@ template <typename T> class AnimationTrack;
  * \brief Base class of animation tracks
  * \ingroup librender
  */
-class MTS_EXPORT_RENDER AbstractAnimationTrack : public Object {
+class MTS_EXPORT_CORE AbstractAnimationTrack : public Object {
 	template<typename T> friend class AnimationTrack;
 public:
 	enum EType {
@@ -321,7 +321,7 @@ template<> inline void AnimationTrack<Quaternion>::serialize(Stream *stream, con
  * \brief Animated transformation with an underlying keyframe representation
  * \ingroup librender
  */
-class MTS_EXPORT_RENDER AnimatedTransform : public Object {
+class MTS_EXPORT_CORE AnimatedTransform : public Object {
 private:
 	/// Internal functor used by \ref eval() and \ref SimpleCache
 	struct MTS_EXPORT_RENDER TransformFunctor {
@@ -484,4 +484,4 @@ private:
 
 MTS_NAMESPACE_END
 
-#endif /* __MITSUBA_RENDER_TRACK_H_ */
+#endif /* __MITSUBA_CORE_TRACK_H_ */

include/mitsuba/render/emitter.h

@@ -21,7 +21,7 @@
 #define __MITSUBA_RENDER_EMITTER_H_
 
 #include <mitsuba/render/common.h>
-#include <mitsuba/render/track.h>
+#include <mitsuba/core/track.h>
 #include <mitsuba/core/properties.h>
 #include <mitsuba/core/cobject.h>
 #include <mitsuba/render/shader.h>

src/converter/collada.cpp

@@ -22,7 +22,7 @@
 #include <mitsuba/core/fstream.h>
 #include <mitsuba/core/timer.h>
 #include <mitsuba/core/version.h>
-#include <mitsuba/render/track.h>
+#include <mitsuba/core/track.h>
 #include <dom/domCOLLADA.h>
 #include <dae.h>
 #include <dae/daeErrorHandler.h>

src/emitters/collimated.cpp

@@ -18,7 +18,7 @@
 
 #include <mitsuba/render/emitter.h>
 #include <mitsuba/render/medium.h>
-#include <mitsuba/render/track.h>
+#include <mitsuba/core/track.h>
 
 MTS_NAMESPACE_BEGIN
 

src/emitters/point.cpp

@@ -18,7 +18,7 @@
 
 #include <mitsuba/render/emitter.h>
 #include <mitsuba/render/medium.h>
-#include <mitsuba/render/track.h>
+#include <mitsuba/core/track.h>
 #include <mitsuba/hw/gpuprogram.h>
 #include <mitsuba/core/warp.h>
 

src/libcore/CMakeLists.txt

@@ -70,6 +70,7 @@ set(HDRS
   ${INCLUDE_DIR}/thread.h
   ${INCLUDE_DIR}/timer.h
   ${INCLUDE_DIR}/tls.h
+  ${INCLUDE_DIR}/track.h
   ${INCLUDE_DIR}/transform.h
   ${INCLUDE_DIR}/triangle.h
   ${INCLUDE_DIR}/util.h
@@ -118,6 +119,7 @@ set(SRCS
   thread.cpp
   timer.cpp
   tls.cpp
+  track.cpp
   transform.cpp
   triangle.cpp
   util.cpp

src/libcore/properties.cpp

@@ -18,7 +18,7 @@
 
 #include <mitsuba/core/properties.h>
 #include <mitsuba/core/netobject.h>
-#include <mitsuba/render/track.h>
+#include <mitsuba/core/track.h>
 
 /* Keep the boost::variant includes outside of properties.h,
    since they noticeably add to the overall compile times */

src/libcore/track.cpp

@@ -1,4 +1,4 @@
-#include <mitsuba/render/track.h>
+#include <mitsuba/core/track.h>
 #include <mitsuba/core/aabb.h>
 
 MTS_NAMESPACE_BEGIN

src/librender/CMakeLists.txt

@@ -42,7 +42,6 @@ set(HDRS
   ${INCLUDE_DIR}/subsurface.h
   ${INCLUDE_DIR}/testcase.h
   ${INCLUDE_DIR}/texture.h
-  ${INCLUDE_DIR}/track.h
   ${INCLUDE_DIR}/triaccel.h
   ${INCLUDE_DIR}/triaccel_sse.h
   ${INCLUDE_DIR}/trimesh.h
@@ -82,7 +81,6 @@ set(SRCS
   subsurface.cpp
   testcase.cpp
   texture.cpp
-  track.cpp
   trimesh.cpp
   util.cpp
   volume.cpp

src/librender/emitter.cpp

@@ -18,7 +18,7 @@
 
 #include <mitsuba/render/emitter.h>
 #include <mitsuba/render/medium.h>
-#include <mitsuba/render/track.h>
+#include <mitsuba/core/track.h>
 #include <mitsuba/render/shape.h>
 
 MTS_NAMESPACE_BEGIN

src/librender/sensor.cpp

@@ -18,7 +18,7 @@
 
 #include <mitsuba/render/sensor.h>
 #include <mitsuba/render/medium.h>
-#include <mitsuba/render/track.h>
+#include <mitsuba/core/track.h>
 #include <mitsuba/core/plugin.h>
 #include <boost/algorithm/string.hpp>
 

src/sensors/fluencemeter.cpp

@@ -18,7 +18,7 @@
 
 #include <mitsuba/render/sensor.h>
 #include <mitsuba/render/medium.h>
-#include <mitsuba/render/track.h>
+#include <mitsuba/core/track.h>
 #include <mitsuba/core/warp.h>
 
 MTS_NAMESPACE_BEGIN

src/sensors/orthographic.cpp

@@ -18,7 +18,7 @@
 
 #include <mitsuba/render/sensor.h>
 #include <mitsuba/render/medium.h>
-#include <mitsuba/render/track.h>
+#include <mitsuba/core/track.h>
 #include <mitsuba/core/frame.h>
 #include <mitsuba/core/warp.h>
 

src/sensors/perspective.cpp

@@ -18,7 +18,7 @@
 
 #include <mitsuba/render/sensor.h>
 #include <mitsuba/render/medium.h>
-#include <mitsuba/render/track.h>
+#include <mitsuba/core/track.h>
 #include <mitsuba/core/frame.h>
 
 MTS_NAMESPACE_BEGIN

src/sensors/radiancemeter.cpp

@@ -18,7 +18,7 @@
 
 #include <mitsuba/render/sensor.h>
 #include <mitsuba/render/medium.h>
-#include <mitsuba/render/track.h>
+#include <mitsuba/core/track.h>
 
 MTS_NAMESPACE_BEGIN
 

src/sensors/spherical.cpp

@@ -18,7 +18,7 @@
 
 #include <mitsuba/render/sensor.h>
 #include <mitsuba/render/medium.h>
-#include <mitsuba/render/track.h>
+#include <mitsuba/core/track.h>
 
 MTS_NAMESPACE_BEGIN
 

src/sensors/telecentric.cpp

@@ -18,7 +18,7 @@
 
 #include <mitsuba/render/sensor.h>
 #include <mitsuba/render/medium.h>
-#include <mitsuba/render/track.h>
+#include <mitsuba/core/track.h>
 #include <mitsuba/core/frame.h>
 #include <mitsuba/core/warp.h>
 

src/sensors/thinlens.cpp

@@ -18,7 +18,7 @@
 
 #include <mitsuba/render/sensor.h>
 #include <mitsuba/render/medium.h>
-#include <mitsuba/render/track.h>
+#include <mitsuba/core/track.h>
 #include <mitsuba/render/shape.h>
 #include <mitsuba/core/frame.h>
 #include <mitsuba/core/plugin.h>