assets for player

lib/Ray/sources/Canvas.hpp

@@ -10,7 +10,7 @@
 
 namespace RAY {
 	namespace Drawables {
-		class IDrawable;
+		class ADrawable2D;
 	}
 	//! @brief Interface for any drawable surface
 	class Canvas {
@@ -19,7 +19,7 @@ namespace RAY {
 			virtual ~Canvas() = default;
 
 			//! @brief draw drawable
-			virtual void draw(Drawables::IDrawable &) = 0;
+			virtual void draw(Drawables::ADrawable2D &) = 0;
 
 		protected:
 		private:

lib/Ray/sources/Drawables/Image.cpp

@@ -6,6 +6,7 @@
 */
 
 #include "Drawables/Image.hpp"
+#include "Drawables/IDrawable.hpp"
 
 RAY::Image::Image(const std::string &filename):
 	_image(LoadImage(filename.c_str()))

lib/Ray/sources/Window.cpp

@@ -9,6 +9,8 @@
 
 #include <utility>
 #include "Controllers/Mouse.hpp"
+#include "Drawables/ADrawable2D.hpp"
+#include "Drawables/ADrawable3D.hpp"
 
 RAY::Window &RAY::Window::getInstance(int width, int height, const std::string &title, unsigned flags, bool openNow)
 {
@@ -145,7 +147,12 @@ void RAY::Window::setTitle(const std::string &title)
 	this->_title = title;
 }
 
-void RAY::Window::draw(RAY::Drawables::IDrawable &drawable)
+void RAY::Window::draw(RAY::Drawables::ADrawable2D &drawable)
+{
+	drawable.drawOn(*this);
+}
+
+void RAY::Window::draw(RAY::Drawables::ADrawable3D &drawable)
 {
 	drawable.drawOn(*this);
 }

lib/Ray/sources/Window.hpp

@@ -17,13 +17,17 @@
 #include "Camera/Camera3D.hpp"
 #include "Color.hpp"
 #include "Canvas.hpp"
-#include "Drawables/IDrawable.hpp"
+#include "Drawables/ADrawable3D.hpp"
+#include "Drawables/ADrawable2D.hpp"
 #include "Drawables/Texture.hpp"
 #include "Model/Model.hpp"
 
 namespace RAY {
 	class Model;
 	//! @brief Window manager
+	namespace Drawables {
+		class ADrawable3D;
+	}
 	class Window: public Canvas {
 		public:
 			//! @return A widow insta,ce. Only one window can be open at a time
@@ -111,9 +115,13 @@ namespace RAY {
 			void setTitle(const std::string &title);
 
 
-			//! @brief draw rectangle
+			//! @brief draw drawable
 			//! @param drawable The drawable to render on screen
-			void draw(Drawables::IDrawable &drawable) override;
+			void draw(RAY::Drawables::ADrawable2D &drawable) override;
+
+			//! @brief draw drawable
+			//! @param drawable The drawable to render on screen
+			void draw(RAY::Drawables::ADrawable3D &drawable);
 
 			//! @brief draw texture at position
 			//! @param texture The object to render

sources/main.cpp

@@ -10,6 +10,7 @@
 #include "Camera/Camera3D.hpp"
 #include "Controllers/Keyboard.hpp"
 #include "Drawables/2D/Text.hpp"
+#include "Drawables/Image.hpp"
 #include "Drawables/3D/Grid.hpp"
 #include "Drawables/Texture.hpp"
 #include "Model/Model.hpp"
@@ -18,13 +19,29 @@
 #include "Window.hpp"
 #include "TraceLog.hpp"
 
+const std::vector<std::string>textures = {
+	"black", "blue", "pink", "red", "white", "yellow"
+};
+
+std::string get_full_path(const std::string &color)
+{
+	std::string path = "assets/player_";
+
+	path += color;
+	path += ".png";
+	return path;
+}
+
 int main()
 {
-	SetTraceLogLevel(LOG_WARNING);
 	// Initialization
 	//--------------------------------------------------------------------------------------
 	const int screenWidth = 800;
 	const int screenHeight = 450;
+	std::vector<std::string>::const_iterator iterator = textures.begin();
+	const std::string modelPath = "assets/player.obj";
+	const std::string texturePath = "assets/player_blue.png";
+	//const std::string animationPath = "assets/guy.iqm";
 	RAY::TraceLog::setLevel(LOG_WARNING);
 	RAY::Window &window = RAY::Window::getInstance(screenWidth, screenHeight, "Bidibidibop", FLAG_WINDOW_RESIZABLE);
 	RAY::Camera::Camera3D camera(RAY::Vector3(10.0f, 10.0f, 10.0f),
@@ -32,9 +49,11 @@ int main()
 								 RAY::Vector3(0.0f, 1.0f, 0.0f), 
 								 45.0f, CAMERA_PERSPECTIVE
 								);
-	RAY::Model model("assets/guy.iqm");
+	RAY::Model model(modelPath);
-	RAY::Texture texture("assets/guytex.png");
+	RAY::Image icon("assets/bomberman.ico");
-	RAY::ModelAnimations animations("assets/guy.iqm");
+	RAY::Texture texture(get_full_path(*iterator));
+	window.setIcon(icon);
+	//RAY::ModelAnimations animations(animationPath);
 	RAY::Drawables::Drawables3D::Grid grid(10, 1.0f);
 	RAY::Drawables::Drawables2D::Text instructionText("PRESS SPACE to PLAY MODEL ANIMATION", 10, {10, 20} , MAROON);
 	model.setTextureToMaterial(MAP_DIFFUSE, texture);
@@ -43,6 +62,7 @@ int main()
 
 	camera.setMode(CAMERA_FREE); // Set free camera mode
 
+	float y_rotation = 0;
 	window.setFPS(60);				   // Set our game to run at 60 frames-per-second
 	//--------------------------------------------------------------------------------------
 
@@ -54,10 +74,16 @@ int main()
 		camera.update();
 
 		// Play animation when spacebar is held down
-		if (RAY::Controller::Keyboard::isDown(KEY_SPACE))
+		if (RAY::Controller::Keyboard::isReleased(KEY_SPACE))
 		{
-			animations[0].incrementFrameCounter();
+			++iterator;
-			model.setAnimation(animations[0]);
+			if (iterator == textures.end())
+				iterator = textures.begin();
+			texture.unload();
+			texture.load(get_full_path(*iterator));
+			model.setTextureToMaterial(MAP_DIFFUSE, texture);
+			//animations[0].incrementFrameCounter();
+			//model.setAnimation(animations[0]);
 		}
 		//----------------------------------------------------------------------------------
 
@@ -69,7 +95,7 @@ int main()
 
 			window.useCamera(camera);
 
-				window.draw(model, position, RAY::Vector3(1.0f, 0.0f, 0.0f), -90.0f, RAY::Vector3( 1.0f, 1.0f, 1.0f ));
+				window.draw(model, position, RAY::Vector3(1.0f, 20, 0.0f), -180.0f, RAY::Vector3( 5.0f, 5.0f, 5.0f ));
 
 				window.draw(grid);