Update the handing of texture mapping class with shared_ptr.

tatsy · Mar 26, 2016 · cc5bff5 · cc5bff5
1 parent ca759c0
commit cc5bff5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/sources/image/film.cc b/sources/image/film.cc
@@ -34,7 +34,7 @@ void Film::save(int id) const {
     const char* format = filename_.c_str();
     sprintf(savefile, format, id);
 
-    if (ext == ".hdr") {
+    if (ext != ".hdr") {
         GammaTmo tmo(2.2);
         res = tmo.apply(res);
     }

diff --git a/sources/texture/imagemap.cc b/sources/texture/imagemap.cc
@@ -8,10 +8,10 @@
 namespace spica {
 
 ImageTexture::ImageTexture(const Image& image,
-                           std::unique_ptr<TextureMapping2D> texmap,
+                           const std::shared_ptr<TextureMapping2D>& texmap,
                            ImageWrap wrap)
     : mipmap_{ std::make_unique<MipMap>(image, wrap) }
-    , texmap_{ std::move(texmap) } {
+    , texmap_{ texmap } {
 }
 
 Spectrum ImageTexture::evaluate(const SurfaceInteraction& intr) const {

diff --git a/sources/texture/imagemap.h b/sources/texture/imagemap.h
@@ -16,18 +16,18 @@
 
 namespace spica {
 
-class ImageTexture : public Texture<Spectrum> {
+class SPICA_EXPORTS ImageTexture : public Texture<Spectrum> {
 public:
     ImageTexture(const Image& image,
-                 std::unique_ptr<TextureMapping2D> texmap,
+                 const std::shared_ptr<TextureMapping2D>& texmap,
                  ImageWrap wrap);
 
     Spectrum evaluate(const SurfaceInteraction& intr) const;
 
 private:
     // Private field
     std::unique_ptr<MipMap> mipmap_;
-    std::unique_ptr<TextureMapping2D> texmap_;
+    std::shared_ptr<TextureMapping2D> texmap_;
 };
 
 }  // namespace spica

diff --git a/sources/texture/spica_texture.h b/sources/texture/spica_texture.h
@@ -7,6 +7,7 @@
 
 #include "texture.h"
 #include "constant.h"
+#include "imagemap.h"
 #include "uv.h"
 
 #endif  // _SPICA_TEXTURE_HEADERS_H_