add cube + color contructable from hsv

This commit is contained in:
arthur.jamet
2021-05-21 13:32:35 +02:00
parent 94312bd6ad
commit 536de9a488
7 changed files with 191 additions and 39 deletions
+78 -35
View File
@@ -10,6 +10,11 @@
#include "Window.hpp"
#include "Drawables/2D/Text.hpp"
#include "Drawables/2D/Circle.hpp"
#include "Controllers/Keyboard.hpp"
#include "Camera/Camera3D.hpp"
#include "Drawables/3D/Grid.hpp"
#include "Drawables/3D/Cube.hpp"
#include <cmath>
int main()
{
@@ -18,49 +23,87 @@ int main()
const int screenWidth = 800;
const int screenHeight = 450;
RAY::Window &window = RAY::Window::getInstance(screenWidth, screenHeight, "Ta mère en slip", false);
RAY::Drawables::Drawables2D::Text text("Hello World", 100, {190, 200}, RED);
RAY::Drawables::Drawables2D::Circle circle(400, 225, 50, RED);
RAY::Vector2 ballPosition = { (float)screenWidth/2, (float)screenHeight/2 };
RAY::Window &window = RAY::Window::getInstance(screenWidth, screenHeight, "Ta mère en slip");
RAY::Camera::Camera3D camera((Vector3){ 30.0f, 20.0f, 30.0f }, (Vector3){ 0.0f, 0.0f, 0.0f },
(Vector3){ 0.0f, 1.0f, 0.0f }, 70.0, CAMERA_PERSPECTIVE);
RAY::Drawables::Drawables3D::Grid grid(10, 5.0f);
RAY::Drawables::Drawables3D::Cube cube({0}, {0}, {0});
window.open();
window.setFPS(60); // Set our game to run at 60 frames-per-second
//--------------------------------------------------------------------------------------
// Specify the amount of blocks in each direction
const int numBlocks = 15;
// Main game loop
while (!window.shouldClose()) // Detect window close button or ESC key
{
// Update
//----------------------------------------------------------------------------------
// TODO: Update your variables here
//----------------------------------------------------------------------------------
window.setFPS(60);
//--------------------------------------------------------------------------------------
// Draw
//----------------------------------------------------------------------------------
window.beginDrawing();
// Main game loop
while (!window.shouldClose()) // Detect window close button or ESC key
{
// Update
//----------------------------------------------------------------------------------
double time = GetTime();
window.clear();
// Calculate time scale for cube position and size
float scale = (2.0f + (float)sin(time))*0.7f;
window.draw(circle);
window.draw(text);
// Move camera around the scene
double cameraTime = time*0.3;
camera.setPosition({(float)cos(cameraTime)*40.0f, 20.0f, (float)sin(cameraTime)*40.0f});
//----------------------------------------------------------------------------------
window.endDrawing();
//----------------------------------------------------------------------------------
}
// Draw
//----------------------------------------------------------------------------------
window.beginDrawing();
// De-Initialization
//--------------------------------------------------------------------------------------
window.close(); // Close window and OpenGL context
//--------------------------------------------------------------------------------------
window.clear(RAYWHITE);
return 0;
/*WAL::Wal wal;
window.beginMode3D(camera);
try {
wal.run();
return 0;
} catch (const std::exception &ex) {
std::cerr << ex.what() << std::endl;
return 84;
}*/
window.draw(grid);
for (int x = 0; x < numBlocks; x++)
{
for (int y = 0; y < numBlocks; y++)
{
for (int z = 0; z < numBlocks; z++)
{
// Scale of the blocks depends on x/y/z positions
float blockScale = (x + y + z)/30.0f;
// Scatter makes the waving effect by adding blockScale over time
float scatter = sinf(blockScale*20.0f + (float)(time*4.0f));
// Calculate the cube position
cube.setPosition({
(float)(x - numBlocks/2)*(scale*3.0f) + scatter,
(float)(y - numBlocks/2)*(scale*2.0f) + scatter,
(float)(z - numBlocks/2)*(scale*3.0f) + scatter
});
// Pick a color with a hue depending on cube position for the rainbow color effect
cube.setColor(RAY::Color((float)(((x + y + z)*18)%360), 0.75f, 0.9f));
// Calculate cube size
float cubeSize = (2.4f - scale)*blockScale;
cube.setDimensions({cubeSize, cubeSize, cubeSize});
// And finally, draw the cube!
window.draw(cube);
}
}
}
window.endMode3D();
window.endDrawing();
//----------------------------------------------------------------------------------
}
// De-Initialization
//--------------------------------------------------------------------------------------
window.close(); // Close window and OpenGL context
//--------------------------------------------------------------------------------------
return 0;
}