From 2ba07f86c2b9f3eaf746b2fdb70f4c8b0038e872 Mon Sep 17 00:00:00 2001 From: SArpnt <36542932+SArpnt@users.noreply.github.com> Date: Wed, 17 Feb 2021 08:14:37 -0500 Subject: [PATCH 1/3] better fov and position values --- engine/main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/engine/main.cpp b/engine/main.cpp index 4a51ed19..f62cafe0 100644 --- a/engine/main.cpp +++ b/engine/main.cpp @@ -76,7 +76,7 @@ int main(int argc, char* argv[]) { ce::Window* window = new ce::Window("Cinnabar"); ce::RenderingEngine* renderingEngine = new ce::RenderingEngine(); - renderingEngine->setFOV(45.0f); + renderingEngine->setFOV(75.0f); renderingEngine->setSize(window->getWindowSize()); @@ -87,13 +87,13 @@ int main(int argc, char* argv[]) { mesh->sendToShader(material->getShader()); glm::mat4 proj = glm::perspective( - glm::radians(45.0f), window->getAspectRatio(), 0.1f, 100.0f); + glm::radians(75.0f), window->getAspectRatio(), 0.1f, 100.0f); float mouseSensitivity = 0.1f; ce::Camera* camera = new ce::Camera(); // Seperate so i can put in a player class later glm::vec3 cameraVelocity(0.0f); - camera->getTransform()->setPosition(0.0f, 0.0f, 3.0f); + camera->getTransform()->setPosition(0.0f, 0.0f, 1.5f); camera->getTransform()->setYaw(-90.0f); /* * Game Loop @@ -159,7 +159,7 @@ int main(int argc, char* argv[]) { glm::vec2 size = window->getWindowSize(); glViewport(0, 0, size.x, size.y); proj = glm::perspective( - glm::radians(45.0f), window->getAspectRatio(), 0.1f, 100.0f); + glm::radians(75.0f), window->getAspectRatio(), 0.1f, 100.0f); break; } } From 1ce1083069fd5f6c1bd5aec72e9b1e661eb3e5de Mon Sep 17 00:00:00 2001 From: SArpnt <36542932+SArpnt@users.noreply.github.com> Date: Wed, 17 Feb 2021 08:24:12 -0500 Subject: [PATCH 2/3] better fov values --- engine/main.cpp | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/engine/main.cpp b/engine/main.cpp index f62cafe0..42125365 100644 --- a/engine/main.cpp +++ b/engine/main.cpp @@ -73,13 +73,12 @@ int main(int argc, char* argv[]) { LOG_INFO("Hello World"); ce::Time* time = new ce::Time(); - + ce::Window* window = new ce::Window("Cinnabar"); ce::RenderingEngine* renderingEngine = new ce::RenderingEngine(); renderingEngine->setFOV(75.0f); renderingEngine->setSize(window->getWindowSize()); - ce::Transform* transform = new ce::Transform(); ce::Mesh* mesh = new ce::Mesh(vertices, vertexCount, indices, indexCount); ce::Material* material = new ce::Material(new ce::Shader("basic")); @@ -168,29 +167,29 @@ int main(int argc, char* argv[]) { transform->roll(25.0f * time->getDeltaTime()); transform->yaw(50.0f * time->getDeltaTime()); transform->pitch(100.0f * time->getDeltaTime()); - + // TODO: <PUT THIS IN THE RENDER ENGINE> material->update(); - // Camera glm::vec3 cameraFront = camera->getTransform()->getForward(), cameraRight = camera->getRight(), cameraUp = ce::Transform::GetGlobalUp(); - camera->getTransform()->translate((cameraFront * cameraVelocity.z)+(cameraRight * cameraVelocity.x)+(cameraUp * cameraVelocity.y)); - - + camera->getTransform()->translate( + (cameraFront * cameraVelocity.z) + + (cameraRight * cameraVelocity.x) + + (cameraUp * cameraVelocity.y)); + transform->sendToShader(material->getShader()); - material->getShader()->setMat4("transform.proj",proj); + material->getShader()->setMat4("transform.proj", proj); camera->sendToShader(material->getShader()); - - + // TODO: </PUT THIS IN THE RENDER ENGINE> - + /* Render */ - renderingEngine->registerCommand({transform,material,mesh,mesh->GetIndexCount()}); - + renderingEngine->registerCommand({transform, material, mesh, mesh->GetIndexCount()}); + renderingEngine->render(); window->swapBuffers(); From 1abf27c5aeaaac41263b68bcdd600835e13dd9c3 Mon Sep 17 00:00:00 2001 From: SArpnt <36542932+SArpnt@users.noreply.github.com> Date: Wed, 17 Feb 2021 08:24:29 -0500 Subject: [PATCH 3/3] added future clang format options --- .clang-format | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.clang-format b/.clang-format index d4198c1a..4712f84d 100644 --- a/.clang-format +++ b/.clang-format @@ -1,5 +1,6 @@ BasedOnStyle: LLVM +ColumnLimit: 0 IndentWidth: '3' TabWidth: '3' AccessModifierOffset: '-2' @@ -10,11 +11,14 @@ UseTab: ForContinuationAndIndentation IndentCaseLabels: 'true' #IndentPPDirectives: BeforeHash NamespaceIndentation: All +#SpacesInLineCommentPrefix: 1 # clang 13 only +#SortIncludes # clang 13 only, setting needs to be figured out DerivePointerAlignment: 'false' PointerAlignment: Left BreakBeforeBraces: Attach +# https://reviews.llvm.org/D33029 add this when it gets implemented BreakAfterJavaFieldAnnotations: 'true' BreakBeforeBinaryOperators: None @@ -27,4 +31,4 @@ AllowShortFunctionsOnASingleLine: Inline AllowShortLoopsOnASingleLine: 'false' AlignAfterOpenBracket: DontAlign -FixNamespaceComments: false +FixNamespaceComments: false \ No newline at end of file