add draw types
This commit is contained in:
@@ -86,14 +86,22 @@ void Sandbox::onLoad() {
|
||||
|
||||
void Sandbox::run() {
|
||||
|
||||
static float scale = 100.0f;
|
||||
static float scale = 1.0f;
|
||||
|
||||
static glm::vec3 pos(0), rot(0);
|
||||
|
||||
static glm::vec3 camPos(0.0f, 0.0f, 3.0f), camRot(0.0f, 0.0f, 0.0f);
|
||||
static glm::vec3 camPos(0.0f, 0.0f, 3.0f), camRot(0.0f, glm::pi<float>(), 0.0f);
|
||||
|
||||
static glm::mat4 orthoCamera, perspCamera, cameraTransform;
|
||||
|
||||
std::vector<glm::vec3> otf = {
|
||||
glm::vec3(0.5f, 0.5f, 0.0f),
|
||||
glm::vec3(-0.5f, -0.5f, 0.0f),
|
||||
|
||||
glm::vec3(-0.5f, 0.5f, 0.0f),
|
||||
glm::vec3(0.5f, -0.5f, 0.0f)
|
||||
};
|
||||
|
||||
/*
|
||||
cameraTransform = glm::mat4(1.0f);
|
||||
cameraTransform = glm::translate(cameraTransform, camPos);
|
||||
@@ -104,7 +112,7 @@ void Sandbox::run() {
|
||||
|
||||
cameraTransform = glm::lookAt(
|
||||
camPos,
|
||||
glm::normalize(glm::vec3(glm::cos(camRot.y) * glm::cos(camRot.x), glm::sin(camRot.x), glm::sin(camRot.y) * glm::cos(camRot.x))),
|
||||
camPos + glm::normalize(glm::vec3(glm::sin(camRot.y) * glm::cos(camRot.x), glm::sin(camRot.x), glm::cos(camRot.y) * glm::cos(camRot.x))),
|
||||
glm::vec3(0.0f, 1.0f, 0.0f)
|
||||
);
|
||||
/*
|
||||
@@ -152,7 +160,7 @@ void Sandbox::run() {
|
||||
|
||||
//window->getRenderer()->draw(grid);
|
||||
window->getRenderer()->draw(cube);
|
||||
|
||||
|
||||
|
||||
{
|
||||
ImGuiIO& io = ImGui::GetIO();
|
||||
@@ -169,9 +177,9 @@ void Sandbox::run() {
|
||||
|
||||
ImGui::Text("Properties");
|
||||
|
||||
ImGui::SliderFloat("pitch", &rot.x, -3.14159265359f, 3.14159265359f);
|
||||
ImGui::SliderFloat("yaw", &rot.y, -3.14159265359f, 3.14159265359f);
|
||||
ImGui::SliderFloat("roll", &rot.z, -3.14159265359f, 3.14159265359f);
|
||||
ImGui::SliderFloat("pitch", &rot.x, -glm::pi<float>(), glm::pi<float>());
|
||||
ImGui::SliderFloat("yaw", &rot.y, -glm::pi<float>(), glm::pi<float>());
|
||||
ImGui::SliderFloat("roll", &rot.z, -glm::pi<float>(), glm::pi<float>());
|
||||
|
||||
ImGui::SliderFloat("scale", &scale, 0.1f, 10.0f);
|
||||
|
||||
@@ -180,10 +188,10 @@ void Sandbox::run() {
|
||||
ImGui::SliderFloat("z", &pos.z, -10.0f, 10.0f);
|
||||
|
||||
ImGui::Text("Camera Properties");
|
||||
|
||||
ImGui::SliderFloat("c_pitch", &camRot.x, -3.14159265359f, 3.14159265359f);
|
||||
ImGui::SliderFloat("c_yaw", &camRot.y, -3.14159265359f, 3.14159265359f);
|
||||
ImGui::SliderFloat("c_roll", &camRot.z, -3.14159265359f, 3.14159265359f);
|
||||
|
||||
ImGui::SliderFloat("c_pitch", &camRot.x, -glm::pi<float>(), glm::pi<float>());
|
||||
ImGui::SliderFloat("c_yaw", &camRot.y, 0, 2 * glm::pi<float>());
|
||||
ImGui::SliderFloat("c_roll", &camRot.z, -glm::pi<float>(), glm::pi<float>());
|
||||
|
||||
ImGui::SliderFloat("c_x", &camPos.x, -10.0f, 10.0f);
|
||||
ImGui::SliderFloat("c_y", &camPos.y, -10.0f, 10.0f);
|
||||
|
||||
Reference in New Issue
Block a user