cleanup and instrumentation
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
#ifndef SANDBOX_HPP
|
||||
#define SANDBOX_HPP
|
||||
|
||||
#include "open_engine/core/time.hpp"
|
||||
#include <glm/fwd.hpp>
|
||||
#include <open_engine.hpp>
|
||||
|
||||
#include <glm/ext/matrix_transform.hpp>
|
||||
@@ -27,8 +29,7 @@ class SandboxLayer : public OpenEngine::Layer
|
||||
-0.5f, 0.5f, 0.0f, 0.0f, 1.0f,
|
||||
};
|
||||
|
||||
OpenEngine::Ref<OpenEngine::VertexBuffer> vertex_buffer;
|
||||
vertex_buffer.reset(OpenEngine::VertexBuffer::Create(square_vertices, sizeof(square_vertices)));
|
||||
OpenEngine::Ref<OpenEngine::VertexBuffer> vertex_buffer = OpenEngine::VertexBuffer::Create(square_vertices, sizeof(square_vertices));
|
||||
|
||||
OpenEngine::BufferLayout layout = {
|
||||
{ OpenEngine::ShaderDataType::Float3, "a_Position" },
|
||||
@@ -39,8 +40,7 @@ class SandboxLayer : public OpenEngine::Layer
|
||||
square_vertex_array->AddVertexBuffer(vertex_buffer);
|
||||
|
||||
uint32_t indices[6] = { 0, 1, 2, 2, 3, 0 };
|
||||
OpenEngine::Ref<OpenEngine::IndexBuffer> index_buffer;
|
||||
index_buffer.reset(OpenEngine::IndexBuffer::Create(indices, sizeof(indices) / sizeof(uint32_t)));
|
||||
OpenEngine::Ref<OpenEngine::IndexBuffer> index_buffer = OpenEngine::IndexBuffer::Create(indices, sizeof(indices) / sizeof(uint32_t));
|
||||
|
||||
square_vertex_array->SetIndexBuffer(index_buffer);
|
||||
|
||||
@@ -57,8 +57,12 @@ class SandboxLayer : public OpenEngine::Layer
|
||||
camera((float)OpenEngine::Application::Get().GetWindow().GetWidth() /
|
||||
OpenEngine::Application::Get().GetWindow().GetHeight(), 1.0f)
|
||||
{
|
||||
OE_PROFILE_FUNCTION();
|
||||
//vertex_array.reset(OpenEngine::VertexArray::Create());
|
||||
square = CreateSquare();
|
||||
{
|
||||
OE_PROFILE_SCOPE("Creating Square");
|
||||
square = CreateSquare();
|
||||
}
|
||||
|
||||
//float vertices[3 * 7] = {
|
||||
// -0.5f, -0.5f, 0.0f, 0.8f, 0.2f, 0.8f, 1.0f,
|
||||
@@ -86,14 +90,24 @@ class SandboxLayer : public OpenEngine::Layer
|
||||
|
||||
//texture_shader = OpenEngine::Shader::Create("./assets/shaders/texture.glsl");
|
||||
auto texture_shader = shader_library.Load("./assets/shaders/texture.glsl");
|
||||
texture = OpenEngine::Texture2D::Create("./assets/textures/container.jpg");
|
||||
face = OpenEngine::Texture2D::Create("./assets/textures/awesomeface.png");
|
||||
{
|
||||
OE_PROFILE_SCOPE("Creating Textures");
|
||||
texture = OpenEngine::Texture2D::Create("./assets/textures/container.jpg");
|
||||
face = OpenEngine::Texture2D::Create("./assets/textures/awesomeface.png");
|
||||
}
|
||||
|
||||
texture_shader->Bind();
|
||||
texture_shader->SetInt("u_Texture", 0);
|
||||
{
|
||||
OE_PROFILE_SCOPE("Setting up shader uniforms");
|
||||
texture_shader->Bind();
|
||||
texture_shader->SetInt("u_Texture", 0);
|
||||
texture_shader->SetVec4("u_Color", glm::vec4(1.0f));
|
||||
}
|
||||
|
||||
for (auto joystick : OpenEngine::Input::GetJoystickList())
|
||||
OE_DEBUG("Joystick {}: {}", joystick.first, joystick.second);
|
||||
{
|
||||
OE_PROFILE_SCOPE("Listing Joysticks");
|
||||
for (auto joystick : OpenEngine::Input::GetJoystickList())
|
||||
OE_DEBUG("Joystick {}: {}", joystick.first, joystick.second);
|
||||
}
|
||||
|
||||
bindings = {
|
||||
{"fwd/bckwd", 1},
|
||||
|
||||
Reference in New Issue
Block a user