New textures

src/dawn/scene/components/display/CameraTexture.cpp

@@ -10,34 +10,15 @@ using namespace Dawn;
 CameraTexture::CameraTexture(SceneItem *item) :
   SceneItemComponent(item),
   camera(nullptr),
-  renderTarget(32.0f, 32.0f),
+  renderTarget(32.0f, 32.0f)
-  updateOrtho(true)
 {
 }
 
 void CameraTexture::onStart() {
   if(this->camera == nullptr) this->camera = item->getComponent<Camera>();
 
-  auto effectCamera = [&]{
+  useEffect([&]{
-    if(this->camera == nullptr) return teardown = [&]{};
+    if(this->camera == nullptr) return;
     this->camera->renderTarget = &this->renderTarget;
-
+  }, camera)();
-    if(!this->updateOrtho) return teardown = [&]{};
-
-    this->updateOrthoValues();
-    return teardown = useEvent([&](float_t w, float_t h){
-      this->updateOrthoValues();
-    }, this->camera->eventRenderTargetResized);
-  };
-  
-  useEffectWithTeardown(effectCamera, this->camera);
-  useEffectWithTeardown(effectCamera, this->updateOrtho)();
-}
-
-void CameraTexture::updateOrthoValues() {
-  assertNotNull(this->camera);
-  float_t wr = this->camera->renderTarget->getWidth() / this->camera->renderTarget->getHeight();
-  wr *= 0.5f;//TODO: allow this to be editable
-  this->camera->orthoLeft = -wr;
-  this->camera->orthoRight = wr;
 }

src/dawn/scene/components/display/CameraTexture.hpp

@@ -9,22 +9,12 @@
 
 namespace Dawn {
   class CameraTexture : public SceneItemComponent {
-    protected:
-      std::function<void()> teardown;
-
-      void updateOrthoValues();
-
     public:
       // @optional
       StateProperty<Camera*> camera;
-
-      // @optional
-      StateProperty<bool_t> updateOrtho;
-
       TextureRenderTarget renderTarget;
 
       CameraTexture(SceneItem *item);
-
       void onStart() override;
   };
 }

src/dawn/scene/components/display/PixelPerfectCamera.cpp

@@ -10,20 +10,16 @@ using namespace Dawn;
 
 PixelPerfectCamera::PixelPerfectCamera(SceneItem *i) :
   SceneItemComponent(i),
-  scale(1.0f)
+  scale(1.0f),
+  camera(nullptr)
 {
 
 }
 
-std::vector<SceneItemComponent*> PixelPerfectCamera::getDependencies() {
-  return std::vector<SceneItemComponent*>{
-    (this->camera = this->item->getComponent<Camera>())
-  };
-}
-
 void PixelPerfectCamera::updateDimensions() {
+  if(this->camera == nullptr) return;
+
   float_t w, h;
-  assertNotNull(this->camera);
 
   auto target = this->camera->getRenderTarget();
   switch(this->camera->type) {
@@ -52,14 +48,23 @@ void PixelPerfectCamera::updateDimensions() {
 }
 
 void PixelPerfectCamera::onStart() {
-  assertNotNull(this->camera);
+  if(camera == nullptr) camera = item->getComponent<Camera>();
-  this->updateDimensions();
+  
-
-  useEvent([&](float_t w, float_t h){
-    this->updateDimensions();
-  }, this->camera->eventRenderTargetResized);
-
   useEffect([&]{
     this->updateDimensions();
   }, scale);
+
+  useEffectWithTeardown([&]{
+    if(!camera) {
+      return teardown = [&]{};
+    }
+
+    this->updateDimensions();
+
+    return teardown = [&]{
+      useEvent([&](float_t w, float_t h){
+        this->updateDimensions();
+      }, this->camera->eventRenderTargetResized);
+    };
+  }, camera)();
 }

src/dawn/scene/components/display/PixelPerfectCamera.hpp

@@ -9,14 +9,17 @@
 namespace Dawn {
   class PixelPerfectCamera : public SceneItemComponent {
     protected:
-      Camera *camera = nullptr;
+      std::function<void()> teardown;
-
+      
       /**
        * Updates the underlying camera's projection information.
        */
       void updateDimensions();
 
     public:
+      // @optional
+      StateProperty<Camera*> camera;
+
       // @optional
       StateProperty<float_t> scale;
 
@@ -27,7 +30,6 @@ namespace Dawn {
        */
       PixelPerfectCamera(SceneItem *item);
       
-      std::vector<SceneItemComponent*> getDependencies() override;
       void onStart() override;
   };
 }

src/dawnopengl/display/Texture.cpp

@@ -122,34 +122,36 @@ void Texture::updateTextureProperties() {
   ) {
     switch(filter) {
       case TEXTURE_FILTER_MODE_NEAREST: {
-        switch(mapFilterMode) {
+        glTexParameteri(GL_TEXTURE_2D, minMag, GL_NEAREST);
-          case TEXTURE_FILTER_MODE_NEAREST:
+        // switch(mapFilterMode) {
-            glTexParameteri(GL_TEXTURE_2D, minMag, GL_NEAREST_MIPMAP_NEAREST);
+        //   case TEXTURE_FILTER_MODE_NEAREST:
-            break;
+        //     glTexParameteri(GL_TEXTURE_2D, minMag, GL_NEAREST_MIPMAP_NEAREST);
+        //     break;
 
-          case TEXTURE_FILTER_MODE_LINEAR:
+        //   case TEXTURE_FILTER_MODE_LINEAR:
-            glTexParameteri(GL_TEXTURE_2D, minMag, GL_LINEAR_MIPMAP_NEAREST);
+        //     glTexParameteri(GL_TEXTURE_2D, minMag, GL_LINEAR_MIPMAP_NEAREST);
-            break;
+        //     break;
 
-          default:
+        //   default:
-            assertUnreachable();
+        //     assertUnreachable();
-        }
+        // }
         break;
       }
       
       case TEXTURE_FILTER_MODE_LINEAR: {
-        switch(mapFilterMode) {
+        glTexParameteri(GL_TEXTURE_2D, minMag, GL_LINEAR);
-          case TEXTURE_FILTER_MODE_NEAREST:
+        // switch(mapFilterMode) {
-            glTexParameteri(GL_TEXTURE_2D, minMag, GL_NEAREST_MIPMAP_LINEAR);
+        //   case TEXTURE_FILTER_MODE_NEAREST:
-            break;
+        //     glTexParameteri(GL_TEXTURE_2D, minMag, GL_NEAREST_MIPMAP_LINEAR);
+        //     break;
 
-          case TEXTURE_FILTER_MODE_LINEAR:
+        //   case TEXTURE_FILTER_MODE_LINEAR:
-            glTexParameteri(GL_TEXTURE_2D, minMag, GL_LINEAR_MIPMAP_LINEAR);
+        //     glTexParameteri(GL_TEXTURE_2D, minMag, GL_LINEAR_MIPMAP_LINEAR);
-            break;
+        //     break;
 
-          default:
+        //   default:
-            assertUnreachable();
+        //     assertUnreachable();
-        }
+        // }
         break;
       }
 

src/dawnopengl/scene/components/display/material/SimpleTexturedMaterial.cpp

@@ -38,7 +38,6 @@ std::vector<struct ShaderPassItem> SimpleTexturedMaterial::getRenderPasses(IRend
 
   onlyPass.renderFlags = (
     RENDER_MANAGER_RENDER_FLAG_BLEND
-    // RENDER_MANAGER_RENDER_FLAG_DEPTH_TEST
   );
 
   if(this->texture != nullptr) {

src/dawntools/texturetool/TextureTool.cpp

@@ -17,7 +17,11 @@ std::map<std::string, std::string> TextureTool::getOptionalFlags() {
     { "wrapY", "clamp" },
     { "filterMin", "linear" },
     { "filterMax", "linear" },
-    { "scale", "" }
+    { "scale", "" },
+    { "scaleWrapX", "clamp" },
+    { "scaleWrapY", "clamp" },
+    { "scaleFilterX", "nearest" },
+    { "scaleFilterY", "nearest" }
   };
 }
 
@@ -45,11 +49,22 @@ int32_t TextureTool::start() {
   size_t len = STBI_rgb_alpha * w * h;
   uint8_t *dataImage = (uint8_t*)malloc(sizeof(uint8_t) * len);
 
+  float_t scale = 1;
   if(!flags["scale"].empty()) {
-    float_t scale = std::stof(flags["scale"]);
+    scale = std::stof(flags["scale"]);
-    stbir_resize_uint8(imageRaw, w, h, 0, dataImage, w * scale, h * scale, 0, STBI_rgb_alpha);
+  }
+
+  if(scale != 1) {
+    stbir_resize_uint8_generic(
+      imageRaw, w, h, 0,
+      dataImage, w * scale, h * scale, 0,
+      STBI_rgb_alpha,  -1, 0,
+      STBIR_EDGE_CLAMP, STBIR_FILTER_TRIANGLE, STBIR_COLORSPACE_LINEAR,
+      NULL
+    );
     w = w * scale;
     h = h * scale;
+    printf("Changing size to %ix%i\n", w, h);
   } else {
     memcpy(dataImage, imageRaw, len);
   }

src/dawntools/util/CodeGen.cpp

@@ -55,6 +55,11 @@ void CodeGen::classGen(
   }
 
   line(out, "namespace Dawn {", "");
+    auto itTemplates = info.classTemplates.begin();
+    while(itTemplates != info.classTemplates.end()) {
+      line(out, "template<" + itTemplates->second + " " + itTemplates->first + ">", "  ");
+      ++itTemplates;
+    }
     line(out, "class " + info.clazz + (info.extend.size() == 0 ? "{" : " : public " + info.extend + " {" ), "  ");
     if(info.protectedCode.size() > 0) {
       line(out, "protected:", "    ");

src/dawntools/util/CodeGen.hpp

@@ -14,6 +14,8 @@ namespace Dawn {
     std::string constructorArgs = "";
     std::string extendArgs = "";
 
+    std::map<std::string, std::string> classTemplates;
+
     std::vector<std::string> constructorCode;
 
     std::vector<std::string> protectedCode;