diff --git a/CharcoalBuiltin/AutoPrerenderingScene.h b/CharcoalBuiltin/AutoPrerenderingScene.h index dc30268..560f28a 100644 --- a/CharcoalBuiltin/AutoPrerenderingScene.h +++ b/CharcoalBuiltin/AutoPrerenderingScene.h @@ -10,11 +10,10 @@ namespace charcoal { namespace builtin { - class AutoPrerenderingScene : public Scene + class AutoPrerenderingScene : public charcoal::Scene { public: - AutoPrerenderingScene(Application& application) : Scene(application) {} - virtual ~AutoPrerenderingScene() {} + using charcoal::Scene::Scene; void prerender() override; diff --git a/CharcoalBuiltin/BasicBatch.h b/CharcoalBuiltin/BasicBatch.h index 22f7087..807bc44 100644 --- a/CharcoalBuiltin/BasicBatch.h +++ b/CharcoalBuiltin/BasicBatch.h @@ -12,18 +12,7 @@ namespace charcoal class Batch : public PoseableBatch { public: - Batch( - Renderable* renderable, - int element_count - ) : PoseableBatch(renderable, element_count) - {} - - Batch( - Renderable* renderable, - int element_count, - int element_render_count - ) : PoseableBatch(renderable, element_count, element_render_count) - {} + using PoseableBatch::PoseableBatch; protected: void setup_vao() override; diff --git a/CharcoalBuiltin/BasicScene.h b/CharcoalBuiltin/BasicScene.h index db255c4..bfc8931 100644 --- a/CharcoalBuiltin/BasicScene.h +++ b/CharcoalBuiltin/BasicScene.h @@ -23,7 +23,6 @@ namespace charcoal { public: Scene(Application& application) : AutoPrerenderingScene(application) {} - virtual ~Scene() {} void init() override; diff --git a/CharcoalBuiltin/BuiltinBatch.h b/CharcoalBuiltin/BuiltinBatch.h index 278d2a3..d9706a3 100644 --- a/CharcoalBuiltin/BuiltinBatch.h +++ b/CharcoalBuiltin/BuiltinBatch.h @@ -11,10 +11,7 @@ namespace charcoal class Batch : public Prerenderable, public charcoal::Batch { public: - Batch( - const RenderableT* renderable, - int element_render_count - ) : charcoal::Batch(renderable, element_render_count) {} + using charcoal::Batch::Batch; void prerender() override { charcoal::Batch::prerender(); } }; diff --git a/CharcoalBuiltin/BuiltinCamera2D.h b/CharcoalBuiltin/BuiltinCamera2D.h index 1944d1b..3412c2b 100644 --- a/CharcoalBuiltin/BuiltinCamera2D.h +++ b/CharcoalBuiltin/BuiltinCamera2D.h @@ -10,10 +10,7 @@ namespace charcoal class Camera2D : public Prerenderable, public charcoal::Camera2D { public: - Camera2D(const vec2& size, const vec2& position = vec2(0.0f, 0.0f)) - : charcoal::Camera2D(size, position) {} - Camera2D(const vec3& size = vec3(2.0f, 2.0f, 2.0f), const vec3& position = vec3(0.0f, 0.0f, 0.0f)) - : charcoal::Camera2D(size, position) {} + using charcoal::Camera2D::Camera2D; void prerender() override { charcoal::Camera2D::prerender(); } }; diff --git a/CharcoalBuiltin/BuiltinCamera3D.h b/CharcoalBuiltin/BuiltinCamera3D.h index 0ae3ff4..8b667b0 100644 --- a/CharcoalBuiltin/BuiltinCamera3D.h +++ b/CharcoalBuiltin/BuiltinCamera3D.h @@ -10,16 +10,7 @@ namespace charcoal class Camera3D : public Prerenderable, public charcoal::Camera3D { public: - Camera3D( - float fov_y, - float aspect_ratio, - float znear, - float zfar, - const vec3& position, - const vec3& forward = vec3(0.0f, 0.0f, 1.0f), - const vec3& up = vec3(0.0f, 1.0f, 0.0f), - const vec3& right = vec3(0.0f) // Zero for auto-calculated - ) : charcoal::Camera3D(fov_y, aspect_ratio, znear, zfar, position, forward, up, right) {} + using charcoal::Camera3D::Camera3D; void prerender() override { charcoal::Camera3D::prerender(); } }; diff --git a/CharcoalBuiltin/CharcoalBuiltin.vcxproj.filters b/CharcoalBuiltin/CharcoalBuiltin.vcxproj.filters index 4658e95..21883e1 100644 --- a/CharcoalBuiltin/CharcoalBuiltin.vcxproj.filters +++ b/CharcoalBuiltin/CharcoalBuiltin.vcxproj.filters @@ -107,9 +107,6 @@ Header Files\Scenes\Textured - - Header Files\Scenes\LitShadowed - Header Files\Scenes\LitShadowed @@ -191,5 +188,8 @@ Header Files\General + + Header Files\Scenes\Lit + \ No newline at end of file diff --git a/CharcoalBuiltin/ImageScene.h b/CharcoalBuiltin/ImageScene.h index a10945f..500cb23 100644 --- a/CharcoalBuiltin/ImageScene.h +++ b/CharcoalBuiltin/ImageScene.h @@ -18,7 +18,6 @@ namespace charcoal { public: Scene(Application& application) : AutoPrerenderingScene(application) {} - virtual ~Scene() {} void init() override; diff --git a/CharcoalBuiltin/LitBatch.h b/CharcoalBuiltin/LitBatch.h index 902ec08..55d96c7 100644 --- a/CharcoalBuiltin/LitBatch.h +++ b/CharcoalBuiltin/LitBatch.h @@ -12,18 +12,7 @@ namespace charcoal class Batch : public PoseableBatch { public: - Batch( - Renderable* renderable, - int element_count - ) : PoseableBatch(renderable, element_count) - {} - - Batch( - Renderable* renderable, - int element_count, - int element_render_count - ) : PoseableBatch(renderable, element_count, element_render_count) - {} + using PoseableBatch::PoseableBatch; protected: void setup_vao() override; diff --git a/CharcoalBuiltin/LitScene.h b/CharcoalBuiltin/LitScene.h index c232558..7db52cc 100644 --- a/CharcoalBuiltin/LitScene.h +++ b/CharcoalBuiltin/LitScene.h @@ -21,7 +21,6 @@ namespace charcoal { public: Scene(Application& application) : AutoPrerenderingScene(application) {} - virtual ~Scene() {} void init() override; diff --git a/CharcoalBuiltin/LitShadowedBatch.h b/CharcoalBuiltin/LitShadowedBatch.h index 01cb843..4f313a4 100644 --- a/CharcoalBuiltin/LitShadowedBatch.h +++ b/CharcoalBuiltin/LitShadowedBatch.h @@ -12,18 +12,7 @@ namespace charcoal class Batch : public PoseableBatch { public: - Batch( - Renderable* renderable, - int element_count - ) : PoseableBatch(renderable, element_count) - {} - - Batch( - Renderable* renderable, - int element_count, - int element_render_count - ) : PoseableBatch(renderable, element_count, element_render_count) - {} + using PoseableBatch::PoseableBatch; protected: void setup_vao() override; diff --git a/CharcoalBuiltin/LitShadowedScene.h b/CharcoalBuiltin/LitShadowedScene.h index 7b52d1c..49e6c0f 100644 --- a/CharcoalBuiltin/LitShadowedScene.h +++ b/CharcoalBuiltin/LitShadowedScene.h @@ -21,7 +21,6 @@ namespace charcoal { public: Scene(Application& application) : AutoPrerenderingScene(application) {} - virtual ~Scene() {} void init() override; diff --git a/CharcoalBuiltin/PoseableBatch.h b/CharcoalBuiltin/PoseableBatch.h index 523fab4..d18327a 100644 --- a/CharcoalBuiltin/PoseableBatch.h +++ b/CharcoalBuiltin/PoseableBatch.h @@ -14,7 +14,6 @@ namespace charcoal class PoseableBatch : public builtin::Batch { public: - // TODO: Figure out how to get rid of this typename garbage. If that it figured out, m_element_buffers should get fixed. PoseableBatch( RenderableT* renderable, int element_count diff --git a/CharcoalBuiltin/SpriteBatch.h b/CharcoalBuiltin/SpriteBatch.h index f06d4fa..5395962 100644 --- a/CharcoalBuiltin/SpriteBatch.h +++ b/CharcoalBuiltin/SpriteBatch.h @@ -14,21 +14,8 @@ namespace charcoal { public: // Note: This is VERY similar to builtin::textured::Batch - // TODO: Use Poseable2D for each sprite's position - // TODO: Have a texture // Note: Uses GL_TEXTURE0. The uniform for this texture should be set in the scene before rendering. - SpriteBatch( - TextureRenderable* renderable, - int element_count - ) : Poseable2DBatch >(renderable, element_count) - {} - - SpriteBatch( - TextureRenderable* renderable, - int element_count, - int element_render_count - ) : Poseable2DBatch >(renderable, element_count, element_render_count) - {} + using Poseable2DBatch >::Poseable2DBatch; void preprender() const override { diff --git a/CharcoalBuiltin/TexturedBatch.h b/CharcoalBuiltin/TexturedBatch.h index 0ffc2b3..440be21 100644 --- a/CharcoalBuiltin/TexturedBatch.h +++ b/CharcoalBuiltin/TexturedBatch.h @@ -12,18 +12,7 @@ namespace charcoal class Batch : public PoseableBatch { public: - Batch( - Renderable* renderable, - int element_count - ) : PoseableBatch(renderable, element_count) - {} - - Batch( - Renderable* renderable, - int element_count, - int element_render_count - ) : PoseableBatch(renderable, element_count, element_render_count) - {} + using PoseableBatch::PoseableBatch; void preprender() const override; diff --git a/CharcoalBuiltin/TexturedScene.h b/CharcoalBuiltin/TexturedScene.h index cdb64d5..0f24613 100644 --- a/CharcoalBuiltin/TexturedScene.h +++ b/CharcoalBuiltin/TexturedScene.h @@ -19,7 +19,6 @@ namespace charcoal { public: Scene(Application& application) : AutoPrerenderingScene(application) {} - virtual ~Scene() {} void init() override;