Code Refactoring

diff --git a/bin/keepme b/bin/keepme
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/build.cmd b/build.cmd
index 2e4a5c42c5ea63589b64d19615ddf0a46882e49e..60074213ae0ed2358ef49d6c112bbbf8f6d7ebb0 100644 (file)
--- a/build.cmd
+++ b/build.cmd
@@ -1,3 +1,3 @@
 Rem cl C:/prg/cpp/libs/imgui/*.cpp C:/prg/cpp/libs/imgui-sfml/*.cpp /I C:/prg/cpp/libs/imgui /I C:/prg/cpp/libs/imgui-sfml /I C:/prg/cpp/libs/SFML-2.5.1/include /c /Fo:bin/\r
 \r
 Rem cl C:/prg/cpp/libs/imgui/*.cpp C:/prg/cpp/libs/imgui-sfml/*.cpp /I C:/prg/cpp/libs/imgui /I C:/prg/cpp/libs/imgui-sfml /I C:/prg/cpp/libs/SFML-2.5.1/include /c /Fo:bin/\r
 \r

-cl src/main.cpp bin/*.obj /EHsc /I C:/prg/cpp/libs/SFML-2.5.1/include /I C:/prg/cpp/libs/assimp-5.0.1/include /I C:/prg/cpp/libs/assimp-5.0.1/build/include /I C:/prg/cpp/libs/glew-2.1.0/include /I C:/prg/cpp/libs/glm /I C:/prg/cpp/libs/imgui /I C:/prg/cpp/libs/imgui-sfml /link /LIBPATH:"C:/prg/cpp/libs/SFML-2.5.1/build/lib/Release" /LIBPATH:"C:/prg/cpp/libs/assimp-5.0.1/build/code/Release" /LIBPATH:"C:/prg/cpp/libs/glew-2.1.0/lib/Release/x64" sfml-system.lib sfml-window.lib sfml-graphics.lib glew32.lib opengl32.lib assimp-vc142-mt.lib
\ No newline at end of file
+cl src/main.cpp bin/*.obj /Zi /EHsc /I C:/prg/cpp/libs/SFML-2.5.1/include /I C:/prg/cpp/libs/assimp-5.0.1/include /I C:/prg/cpp/libs/assimp-5.0.1/build/include /I C:/prg/cpp/libs/glew-2.1.0/include /I C:/prg/cpp/libs/glm /I C:/prg/cpp/libs/imgui /I C:/prg/cpp/libs/imgui-sfml /link /LIBPATH:"C:/prg/cpp/libs/SFML-2.5.1/build/lib/Release" /LIBPATH:"C:/prg/cpp/libs/assimp-5.0.1/build/code/Release" /LIBPATH:"C:/prg/cpp/libs/glew-2.1.0/lib/Release/x64" sfml-system.lib sfml-window.lib sfml-graphics.lib glew32.lib opengl32.lib assimp-vc142-mt.lib
\ No newline at end of file

diff --git a/models/Isotrop-upperjaw.ply b/models/Isotrop-upperjaw.ply
new file mode 100644 (file)
index 0000000..bc9d965
Binary files /dev/null and b/models/Isotrop-upperjaw.ply differ

diff --git a/shaders/frag.glsl b/shaders/frag.glsl
new file mode 100644 (file)
index 0000000..a92699c
--- /dev/null
+++ b/shaders/frag.glsl
@@ -0,0 +1,25 @@
+#version 330 core\r
+\r
+in vec3 FragPos;\r
+in vec3 Normal;\r
+\r
+out vec4 FragColor;\r
+\r
+uniform vec3 objectColor;\r
+uniform vec3 lightColor;\r
+uniform vec3 lightPos;\r
+\r
+void main()\r
+{\r
+  vec3 norm = normalize(Normal);\r
+  vec3 lightDir = normalize(lightPos - FragPos);\r
+\r
+  float diff = max(dot(norm, lightDir), 0.0);\r
+  vec3 diffuse = diff * lightColor;\r
+\r
+  float ambientStrength = 0.1;\r
+  vec3 ambient = ambientStrength * lightColor;\r
+\r
+  vec3 result = (ambient + diffuse) * objectColor;\r
+  FragColor = vec4(result, 1.0f);\r
+}
\ No newline at end of file

diff --git a/shaders/vert.glsl b/shaders/vert.glsl
new file mode 100644 (file)
index 0000000..fc3721a
--- /dev/null
+++ b/shaders/vert.glsl
@@ -0,0 +1,18 @@
+#version 330 core\r
+\r
+layout (location = 0) in vec3 pos;\r
+layout (location = 1) in vec3 normal;\r
+\r
+out vec3 FragPos;\r
+out vec3 Normal;\r
+\r
+uniform mat4 model;\r
+uniform mat4 view;\r
+uniform mat4 projection;\r
+\r
+void main()\r
+{\r
+  gl_Position = projection * view * model * vec4(pos, 1.0);\r
+  FragPos = vec3(model * vec4(pos, 1));\r
+  Normal = normal;\r
+}
\ No newline at end of file

diff --git a/src/main.cpp b/src/main.cpp
index 564560ddfa49aaa16d49a4ec3b3844b92a8c24e7..f3f19e365ba14c9cb11407cef970be9440b53409 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,4 +1,5 @@
 #include <stdio.h>\r
 #include <stdio.h>\r

+#include <fstream>\r

 \r
 #include <GL/glew.h>\r
 \r
 \r
 #include <GL/glew.h>\r
 \r


@@ -19,140 +20,219 @@
 #include <assimp/postprocess.h>\r
 #include <assimp/scene.h>\r
 \r
 #include <assimp/postprocess.h>\r
 #include <assimp/scene.h>\r
 \r

-const char *vertexShaderSource = R"(\r
-#version 330 core\r
+struct model {\r
+  std::vector<float> vertices;\r
+  std::vector<GLuint> indices;\r

 \r
 \r

-layout (location = 0) in vec3 pos;\r
-layout (location = 1) in vec3 normal;\r
+  void draw() {\r
+    if (VAO == 0) initVAO();\r
+    glBindVertexArray(VAO);\r
+    glDrawElements(GL_TRIANGLES, indices.size(), GL_UNSIGNED_INT, 0);\r
+    glBindVertexArray(0);\r
+  }\r

 \r
 \r

-out vec3 FragPos;\r
-out vec3 Normal;\r
+private:\r
+  void initVAO() {\r
+    GLuint VBO;\r
+    glGenBuffers(1, &VBO);\r

 \r
 \r

-uniform mat4 model;\r
-uniform mat4 view;\r
-uniform mat4 projection;\r
+    GLuint EBO;\r
+    glGenBuffers(1, &EBO);\r

 \r
 \r

-void main()\r
-{\r
-  gl_Position = projection * view * model * vec4(pos, 1.0);\r
-  FragPos = vec3(model * vec4(pos, 1));\r
-  Normal = normal;\r
-}\r
-)";\r
+    glGenVertexArrays(1, &VAO);\r

 \r
 \r

-const char *fragmentShaderSource = R"(\r
-#version 330 core\r
+    glBindVertexArray(VAO);\r

 \r
 \r

-in vec3 FragPos;\r
-in vec3 Normal;\r
+    glBindBuffer(GL_ARRAY_BUFFER, VBO);\r
+    glBufferData(GL_ARRAY_BUFFER, sizeof(float) * vertices.size(),\r
+                vertices.data(), GL_STATIC_DRAW);\r

 \r
 \r

-out vec4 FragColor;\r
+    glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, EBO);\r
+    glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(GLuint) * indices.size(),\r
+                indices.data(), GL_STATIC_DRAW);\r

 \r
 \r

-uniform vec3 objectColor;\r
-uniform vec3 lightColor;\r
-uniform vec3 lightPos;\r
+    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(float) * 6, (void*)(0));\r
+    glEnableVertexAttribArray(0);\r
+    glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, sizeof(float) * 6, (void*)(sizeof(float) * 3));\r
+    glEnableVertexAttribArray(1);\r

 \r
 \r

-void main()\r
-{\r
-  vec3 norm = normalize(Normal);\r
-  vec3 lightDir = normalize(lightPos - FragPos);\r
+    glBindVertexArray(0);\r
+  }\r
+  GLuint VAO = 0;\r
+};\r

 \r
 \r

-  float diff = max(dot(norm, lightDir), 0.0);\r
-  vec3 diffuse = diff * lightColor;\r

 \r
 \r

-  float ambientStrength = 0.1;\r
-  vec3 ambient = ambientStrength * lightColor;\r
+struct freecam {\r
+  glm::vec3 pos = glm::vec3(0, 0, -1);\r
+  glm::vec2 rot;\r

 \r
 \r

-  vec3 result = (ambient + diffuse) * objectColor;\r
-  FragColor = vec4(result, 1.0f);\r
-}\r
-)";\r
+  void update(sf::Window &window) {\r
+    int mouseDeltaX = sf::Mouse::getPosition(window).x - window.getSize().x / 2;\r
+    int mouseDeltaY = sf::Mouse::getPosition(window).y - window.getSize().y / 2;\r
+\r
+    rot.x += mouseDeltaX;\r
+    rot.y += mouseDeltaY;\r

 \r
 \r

-std::vector<float> vertices;\r
-std::vector<GLuint> indices;\r
+    forward = glm::rotate(glm::vec3(0, 0, 1), rot.y / angleFactor, glm::vec3(1, 0, 0));\r
+    forward = glm::rotate(forward, -rot.x / angleFactor, glm::vec3(0, 1, 0));\r

 \r
 \r

-glm::vec3 lightPos(1.2f, 5.0f, 2.0f);\r
+    glm::vec3 left = glm::rotate(glm::vec3(0, 0, 1), -rot.x / angleFactor + glm::radians(90.0f), glm::vec3(0, 1, 0));\r
+\r
+    if (sf::Keyboard::isKeyPressed(sf::Keyboard::Key::LShift))\r
+      moveFactor = 200;\r
+    else\r
+      moveFactor = 20;\r
+\r
+    if (sf::Keyboard::isKeyPressed(sf::Keyboard::W))\r
+      pos += forward / moveFactor;\r
+    if (sf::Keyboard::isKeyPressed(sf::Keyboard::S))\r
+      pos -= forward / moveFactor;\r
+    if (sf::Keyboard::isKeyPressed(sf::Keyboard::A))\r
+      pos += left / moveFactor;\r
+    if (sf::Keyboard::isKeyPressed(sf::Keyboard::D))\r
+      pos -= left / moveFactor;\r
+\r
+    limit();\r
+  }\r
+\r
+  void limit() {\r
+    rot.x = fmod(rot.x, glm::radians(360.0f) * angleFactor);\r
+    rot.y = fmod(rot.y, glm::radians(360.0f) * angleFactor);\r
+  }\r
+\r
+  glm::mat4 getViewMatrix() {\r
+    forward = glm::rotate(glm::vec3(0, 0, 1), rot.y / angleFactor, glm::vec3(1, 0, 0));\r
+    forward = glm::rotate(forward, -rot.x / angleFactor, glm::vec3(0, 1, 0));\r
+    glm::mat4 result = glm::lookAt(pos, pos + forward, up);\r
+    return result;\r
+  }\r
+\r
+private:\r
+  glm::vec3 forward;\r
+  glm::vec3 up = glm::vec3(0, 1, 0);\r
+\r
+  const float angleFactor = 200;\r
+  float moveFactor = 20;\r
+};\r
+\r
+\r
+struct arccam {\r
+  glm::vec2 rot;\r
+  float radius = 1;\r
+\r
+  void update(sf::Window &window) {\r
+    int mouseDeltaX = sf::Mouse::getPosition(window).x - window.getSize().x / 2;\r
+    int mouseDeltaY = sf::Mouse::getPosition(window).y - window.getSize().y / 2;\r
+\r
+    rot.x += mouseDeltaX;\r
+    rot.y += mouseDeltaY;\r
+\r
+    limit(-89, 89);\r
+  }\r

 \r
 \r

-void load(const std::string &filename, std::vector<float> &vertices,\r
-          std::vector<GLuint> &indices) {\r
+  void limit(float minY, float maxY) {\r
+    float angleX = rot.x / angleFactor;\r
+    float angleY = rot.y / angleFactor;\r
+\r
+    rot.x = fmod(rot.x, glm::radians(360.0f) * angleFactor);\r
+\r
+    if (angleY > glm::radians(maxY))\r
+      rot.y = glm::radians(maxY) * angleFactor;\r
+    if (angleY < glm::radians(minY))\r
+      rot.y = glm::radians(minY) * angleFactor;\r
+  }\r
+\r
+  glm::mat4 getViewMatrix() {\r
+    float angle = rot.y / angleFactor;\r
+  \r
+    float camY = sin(angle) * exp(radius);\r
+    float camZ = cos(angle) * exp(radius);\r
+    glm::mat4 result = glm::lookAt(glm::vec3(0.0, camY, camZ), glm::vec3(0, 0, 0), glm::vec3(0, 1, 0));\r
+    result = glm::rotate(result, rot.x / angleFactor, glm::vec3(0, 1, 0));\r
+\r
+    return result;\r
+  }\r
+\r
+private:\r
+  const float angleFactor = 200;\r
+};\r
+\r
+\r
+std::string readFile(std::string filename) {\r
+  std::ifstream ifs(filename, std::ios::binary);\r
+  ifs.seekg(0, ifs.end);\r
+  long length = ifs.tellg();\r
+  ifs.seekg(0, ifs.beg);\r
+  char *buffer = (char*)malloc(length);\r
+  ifs.read(buffer, length);\r
+  ifs.close();\r
+  std::string result(buffer);\r
+  free(buffer);\r
+  return result;\r
+}\r
+\r
+model loadModel(const std::string &filename) {\r

   Assimp::Importer importer;\r
 \r
   const aiScene *scene = importer.ReadFile(\r
       filename, aiProcess_CalcTangentSpace | aiProcess_Triangulate |\r
                     aiProcess_SortByPType | aiProcess_GenSmoothNormals);\r
 \r
   Assimp::Importer importer;\r
 \r
   const aiScene *scene = importer.ReadFile(\r
       filename, aiProcess_CalcTangentSpace | aiProcess_Triangulate |\r
                     aiProcess_SortByPType | aiProcess_GenSmoothNormals);\r
 \r

+  model result;\r
+\r

   for (int i = 0; i < scene->mMeshes[0]->mNumVertices; i++) {\r
     aiVector3D v = scene->mMeshes[0]->mVertices[i];\r
     aiVector3D n = scene->mMeshes[0]->mNormals[i];\r
   for (int i = 0; i < scene->mMeshes[0]->mNumVertices; i++) {\r
     aiVector3D v = scene->mMeshes[0]->mVertices[i];\r
     aiVector3D n = scene->mMeshes[0]->mNormals[i];\r

-    vertices.push_back(v.x);\r
-    vertices.push_back(v.y);\r
-    vertices.push_back(v.z);\r
-    vertices.push_back(n.x);\r
-    vertices.push_back(n.y);\r
-    vertices.push_back(n.z);\r
+    result.vertices.push_back(v.x);\r
+    result.vertices.push_back(v.y);\r
+    result.vertices.push_back(v.z);\r
+    result.vertices.push_back(n.x);\r
+    result.vertices.push_back(n.y);\r
+    result.vertices.push_back(n.z);\r

   }\r
 \r
   for (int i = 0; i < scene->mMeshes[0]->mNumFaces; i++) {\r
     aiFace f = scene->mMeshes[0]->mFaces[i];\r
     for (int j = 0; j < f.mNumIndices; j++) {\r
   }\r
 \r
   for (int i = 0; i < scene->mMeshes[0]->mNumFaces; i++) {\r
     aiFace f = scene->mMeshes[0]->mFaces[i];\r
     for (int j = 0; j < f.mNumIndices; j++) {\r

-      indices.push_back(f.mIndices[j]);\r
+      result.indices.push_back(f.mIndices[j]);\r

     }\r
   }\r
     }\r
   }\r

-}\r
-\r
-int main() {\r
-  // Window Setup\r
-\r
-  sf::ContextSettings settings;\r
-  settings.depthBits = 24;\r
-  settings.antialiasingLevel = 0;\r
-  settings.majorVersion = 4;\r
-  settings.minorVersion = 6;\r
-\r
-  sf::RenderWindow window(sf::VideoMode(1600, 900), "Subsurface Scattering",\r
-                    sf::Style::Default, settings);\r
-  window.setVerticalSyncEnabled(true);\r
-  window.setMouseCursorGrabbed(true);\r
-  window.setMouseCursorVisible(false);\r
-\r
-  ImGui::SFML::Init(window);\r
-\r
-  // Initialize GLEW\r

 \r
 \r

-  if (glewInit() != GLEW_OK) {\r
-  }\r
-\r
-  load("models/Isotrop-upperjaw.ply", vertices, indices);\r
-\r
-  // Compile Shaders\r
+  return result;\r
+}\r

 \r
 \r

-  GLuint vertexShader = glCreateShader(GL_VERTEX_SHADER);\r
-  glShaderSource(vertexShader, 1, &vertexShaderSource, NULL);\r
-  glCompileShader(vertexShader);\r
+GLuint compileShaders(const char *vertFilename, const char *fragFilename) {\r
+  GLuint vertShader = glCreateShader(GL_VERTEX_SHADER);\r
+  std::string vertSource = readFile(vertFilename);\r
+  const char *vertAddr = vertSource.c_str();\r
+  glShaderSource(vertShader, 1, &vertAddr, NULL);\r
+  glCompileShader(vertShader);\r

 \r
   int success;\r
   char infoLog[512];\r
 \r
   int success;\r
   char infoLog[512];\r

-  glGetShaderiv(vertexShader, GL_COMPILE_STATUS, &success);\r
+  glGetShaderiv(vertShader, GL_COMPILE_STATUS, &success);\r

   if (!success) {\r
   if (!success) {\r

-    glGetShaderInfoLog(vertexShader, 512, NULL, infoLog);\r
+    glGetShaderInfoLog(vertShader, 512, NULL, infoLog);\r

     printf("Error compiling vertex shader: %s\n", infoLog);\r
   }\r
 \r
     printf("Error compiling vertex shader: %s\n", infoLog);\r
   }\r
 \r

-  GLuint fragmentShader = glCreateShader(GL_FRAGMENT_SHADER);\r
-  glShaderSource(fragmentShader, 1, &fragmentShaderSource, NULL);\r
-  glCompileShader(fragmentShader);\r
+  GLuint fragShader = glCreateShader(GL_FRAGMENT_SHADER);\r
+  std::string fragSource = readFile(fragFilename);\r
+  const char *fragAddr = fragSource.c_str();\r
+  glShaderSource(fragShader, 1, &fragAddr, NULL);\r
+  glCompileShader(fragShader);\r

 \r
 \r

-  glGetShaderiv(fragmentShader, GL_COMPILE_STATUS, &success);\r
+  glGetShaderiv(fragShader, GL_COMPILE_STATUS, &success);\r

   if (!success) {\r
   if (!success) {\r

-    glGetShaderInfoLog(fragmentShader, 512, NULL, infoLog);\r
+    glGetShaderInfoLog(fragShader, 512, NULL, infoLog);\r

     printf("Error compiling fragment shader: %s\n", infoLog);\r
   }\r
 \r
   // Link Shader Program\r
 \r
   GLuint shaderProgram = glCreateProgram();\r
     printf("Error compiling fragment shader: %s\n", infoLog);\r
   }\r
 \r
   // Link Shader Program\r
 \r
   GLuint shaderProgram = glCreateProgram();\r

-  glAttachShader(shaderProgram, vertexShader);\r
-  glAttachShader(shaderProgram, fragmentShader);\r
+  glAttachShader(shaderProgram, vertShader);\r
+  glAttachShader(shaderProgram, fragShader);\r

   glLinkProgram(shaderProgram);\r
 \r
   glGetProgramiv(shaderProgram, GL_LINK_STATUS, &success);\r
   glLinkProgram(shaderProgram);\r
 \r
   glGetProgramiv(shaderProgram, GL_LINK_STATUS, &success);\r


@@ -161,78 +241,63 @@ int main() {
     printf("Error linking shader program: %s\n", infoLog);\r
   }\r
 \r
     printf("Error linking shader program: %s\n", infoLog);\r
   }\r
 \r

-  glDeleteShader(vertexShader);\r
-  glDeleteShader(fragmentShader);\r
+  glDeleteShader(vertShader);\r
+  glDeleteShader(fragShader);\r

 \r
 \r

-  // Create VBO\r
+  return shaderProgram;\r
+}\r

 \r
 \r

-  GLuint VBO;\r
-  glGenBuffers(1, &VBO);\r

 \r
 \r

-  // Create EBO\r
+int main() {\r
+  // Window Setup\r

 \r
 \r

-  GLuint EBO;\r
-  glGenBuffers(1, &EBO);\r
+  sf::ContextSettings settings;\r
+  settings.depthBits = 24;\r
+  settings.antialiasingLevel = 0;\r
+  settings.majorVersion = 4;\r
+  settings.minorVersion = 6;\r

 \r
 \r

-  // Create VAO\r
+  sf::RenderWindow window(sf::VideoMode(1600, 900), "Subsurface Scattering",\r
+                    sf::Style::Default, settings);\r
+  window.setVerticalSyncEnabled(true);\r

 \r
 \r

-  GLuint VAO;\r
-  glGenVertexArrays(1, &VAO);\r
+  ImGui::SFML::Init(window);\r

 \r
 \r

-  glBindVertexArray(VAO);\r
+  // Initialize GLEW\r

 \r
 \r

-  glBindBuffer(GL_ARRAY_BUFFER, VBO);\r
-  glBufferData(GL_ARRAY_BUFFER, sizeof(float) * vertices.size(),\r
-               vertices.data(), GL_STATIC_DRAW);\r
+  if (glewInit() != GLEW_OK) {\r
+  }\r

 \r
 \r

-  glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, EBO);\r
-  glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(GLuint) * indices.size(),\r
-               indices.data(), GL_STATIC_DRAW);\r
+  GLuint shaderProgram = compileShaders("shaders/vert.glsl", "shaders/frag.glsl");\r

 \r
 \r

-  glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(float) * 6, (void*)(0));\r
-  glEnableVertexAttribArray(0);\r
-  glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, sizeof(float) * 6, (void*)(sizeof(float) * 3));\r
-  glEnableVertexAttribArray(1);\r
+  model m = loadModel("models/Isotrop-upperjaw.ply");\r

 \r
 \r

-  glBindVertexArray(0);\r
+  arccam arcCam;\r
+  freecam freeCam;\r
+      \r
+  glm::vec3 lightPos(1.2f, 5.0f, 2.0f);\r

 \r
 \r

-  // Perspective\r
+  // MVP\r

 \r
   glm::mat4 model = glm::scale(glm::mat4(1.0f), glm::vec3(0.01f, 0.01f, 0.01f));\r
 \r
 \r
   glm::mat4 model = glm::scale(glm::mat4(1.0f), glm::vec3(0.01f, 0.01f, 0.01f));\r
 \r

-  struct {\r
-    float camX = 0;\r
-    float camZ = -5;\r
-    int mouseX = 0;\r
-    int mouseY = 0;\r
-  } arcball;\r
-\r
-  struct {\r
-    int mouseX = 0;\r
-    int mouseY = 0;\r
-  } freecam;\r
-\r
-  glm::vec3 camPos = glm::vec3(0, 0, -3);\r
-  glm::vec3 camForward = glm::vec3(0, 0, 1);\r
-  glm::vec3 camUp = glm::vec3(0, 1, 0);\r
-\r
-  glm::mat4 view =\r
-      glm::lookAt(glm::vec3(arcball.camX, 0.0, arcball.camZ), glm::vec3(0, 0, 0), glm::vec3(0, 1, 0));\r
+  glm::mat4 view;\r

 \r
 \r

-  glm::mat4 proj =\r
-      glm::perspective(glm::radians(45.0f), (float)window.getSize().x / window.getSize().y, 0.001f, 1000.0f);\r
+  glm::mat4 proj = glm::perspective(glm::radians(45.0f), (float)window.getSize().x / window.getSize().y, 0.001f, 1000.0f);\r

 \r
   struct {\r
 \r
   struct {\r

-    bool catchMouse = false;\r

     bool wireframe = false;\r
     bool freecam = false;\r
     bool wireframe = false;\r
     bool freecam = false;\r

-    float radius = 1.0f;\r

   } options;\r
 \r
   sf::Clock deltaClock;\r
 \r
   } options;\r
 \r
   sf::Clock deltaClock;\r
 \r

+  bool prevMouse = false;\r
+\r

   bool running = true;\r
   while (running) {\r
   bool running = true;\r
   while (running) {\r

+    // Events\r
+\r

     sf::Event event;\r
     while (window.pollEvent(event)) {\r
       ImGui::SFML::ProcessEvent(event);\r
     sf::Event event;\r
     while (window.pollEvent(event)) {\r
       ImGui::SFML::ProcessEvent(event);\r


@@ -247,57 +312,51 @@ int main() {
         case keys::Escape:\r
           running = false;\r
           break;\r
         case keys::Escape:\r
           running = false;\r
           break;\r

-        case keys::C:\r
-          options.catchMouse = !options.catchMouse;\r
+        case keys::F:\r
+          options.freecam = !options.freecam;\r

           break;\r
         case keys::R:\r
           break;\r
         case keys::R:\r

-          freecam.mouseX = freecam.mouseY = 0;\r
+          if (options.freecam) {\r
+            freeCam.pos = glm::vec3(0, 0, -1);\r
+            freeCam.rot = glm::vec2(0);\r
+          }\r
+          else {\r
+            arcCam.rot = glm::vec2(0);\r
+            arcCam.radius = 1;\r
+          }\r

           break;\r
         }\r
       } else if (event.type == sf::Event::EventType::MouseWheelScrolled) {\r
           break;\r
         }\r
       } else if (event.type == sf::Event::EventType::MouseWheelScrolled) {\r

-        options.radius -= event.mouseWheelScroll.delta / 5.0f;\r
+        if (! options.freecam) {\r
+          arcCam.radius -= event.mouseWheelScroll.delta / 5.0f;\r
+        }\r

       }\r
     }\r
 \r
       }\r
     }\r
 \r

-    int mouseDeltaX = sf::Mouse::getPosition(window).x - window.getSize().x / 2;\r
-    int mouseDeltaY = sf::Mouse::getPosition(window).y - window.getSize().y / 2;\r
+    // Update\r

 \r
 \r

-    if (options.catchMouse) {\r
-      sf::Mouse::setPosition(sf::Vector2i(\r
-        window.getSize().x / 2,\r
-        window.getSize().y / 2\r
-      ), window);\r
+    if (sf::Mouse::isButtonPressed(sf::Mouse::Right)) {\r
+      window.setMouseCursorVisible(false);\r

 \r
 \r

-      if (options.freecam) {\r
-        freecam.mouseX += mouseDeltaX;\r
-        freecam.mouseY += mouseDeltaY;\r
+      if (prevMouse) {\r
+        if (options.freecam)\r
+          freeCam.update(window);\r
+        else\r
+          arcCam.update(window);\r
+      }\r

 \r
 \r

-        camForward = glm::rotate(glm::vec3(0, 0, 1), freecam.mouseY / 500.0f, glm::vec3(1, 0, 0));\r
-        camForward = glm::rotate(camForward, -freecam.mouseX / 500.0f, glm::vec3(0, 1, 0));\r

 \r
 \r

-        if (sf::Keyboard::isKeyPressed(sf::Keyboard::W)) {\r
-          camPos += camForward / 20.0f;\r
-        }\r
-        if (sf::Keyboard::isKeyPressed(sf::Keyboard::S)) {\r
-          camPos -= camForward / 20.0f;\r
-        }\r
-        if (sf::Keyboard::isKeyPressed(sf::Keyboard::A)) {\r
-          glm::vec3 camLeft = glm::rotate(glm::vec3(0, 0, 1), -freecam.mouseX / 500.0f + glm::radians(90.0f), glm::vec3(0, 1, 0));\r
-          camPos += camLeft / 20.0f;\r
-        }\r
-        if (sf::Keyboard::isKeyPressed(sf::Keyboard::D)) {\r
-          glm::vec3 camRight = glm::rotate(glm::vec3(0, 0, 1), -freecam.mouseX / 500.0f - glm::radians(90.0f), glm::vec3(0, 1, 0));\r
-          camPos += camRight / 20.0f;\r
-        }\r
-      } else {\r
-        if (sf::Mouse::isButtonPressed(sf::Mouse::Left)) {\r
-          arcball.mouseX += mouseDeltaX;\r
-          arcball.mouseY += mouseDeltaY;\r
-        }\r
-      }\r
+      sf::Mouse::setPosition(sf::Vector2i(\r
+          window.getSize().x / 2,\r
+          window.getSize().y / 2\r
+        ), window);  \r
+    } else {\r
+      window.setMouseCursorVisible(true);\r

     }\r
 \r
     }\r
 \r

+    prevMouse = sf::Mouse::isButtonPressed(sf::Mouse::Right);\r

 \r
 \r

+    // Render\r

 \r
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);\r
 \r
 \r
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);\r
 \r


@@ -309,60 +368,47 @@ int main() {
       glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);\r
 \r
     glUseProgram(shaderProgram);\r
       glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);\r
 \r
     glUseProgram(shaderProgram);\r

-\r
-    //rotate\r
-    //model = glm::rotate(model, glm::radians(0.2f), glm::vec3(0.0f, 1.0f, 0.0f));\r
-\r
-    if (options.freecam) {\r
-      view = glm::lookAt(camPos, camPos + camForward, camUp);\r
-    } else {\r
-      float angle = arcball.mouseY / 200.0f;\r
-      if (angle > glm::radians(89.0f)) {\r
-        angle = glm::radians(89.0f);\r
-        arcball.mouseY = angle * 200.0f;\r
-      }\r
-      if (angle < glm::radians(-89.0f)) {\r
-        angle = glm::radians(-89.0f);\r
-        arcball.mouseY = angle * 200.0f;\r
-      }\r
-      arcball.camX = sin(angle) * exp(options.radius);\r
-      arcball.camZ = cos(angle) * exp(options.radius);\r
-      view = glm::lookAt(glm::vec3(0.0, arcball.camX, arcball.camZ), glm::vec3(0, 0, 0), glm::vec3(0, 1, 0));\r
-      view = glm::rotate(view, arcball.mouseX / 100.0f, glm::vec3(0, 1, 0));\r
-    }\r
-\r
-    glUniformMatrix4fv(glGetUniformLocation(shaderProgram, "model"), 1,\r
-                       GL_FALSE, glm::value_ptr(model));\r
-    glUniformMatrix4fv(glGetUniformLocation(shaderProgram, "view"), 1, GL_FALSE,\r
-                       glm::value_ptr(view));\r
-    glUniformMatrix4fv(glGetUniformLocation(shaderProgram, "projection"), 1,\r
-                       GL_FALSE, glm::value_ptr(proj));\r
-\r
-    glUniform3f(glGetUniformLocation(shaderProgram, "objectColor"), 1.0f, 0.5f,\r
-                0.31f);\r
-    glUniform3f(glGetUniformLocation(shaderProgram, "lightColor"), 1.0f, 1.0f,\r
-                1.0f);\r
-    glUniform3fv(glGetUniformLocation(shaderProgram, "lightPos"), 1, glm::value_ptr(lightPos));\r
-\r
-    glBindVertexArray(VAO);\r
-    glDrawElements(GL_TRIANGLES, indices.size(), GL_UNSIGNED_INT, 0);\r
-    glBindVertexArray(0);\r
+    \r
+    if (options.freecam)\r
+      view = freeCam.getViewMatrix();\r
+    else\r
+      view = arcCam.getViewMatrix();\r
+    \r
+    glUniformMatrix4fv(\r
+      glGetUniformLocation(shaderProgram, "model"),\r
+      1, GL_FALSE, glm::value_ptr(model));\r
+    glUniformMatrix4fv(\r
+      glGetUniformLocation(shaderProgram, "view"),\r
+      1, GL_FALSE, glm::value_ptr(view));\r
+    glUniformMatrix4fv(\r
+      glGetUniformLocation(shaderProgram, "projection"),\r
+      1, GL_FALSE, glm::value_ptr(proj));\r
+\r
+    glUniform3f(\r
+      glGetUniformLocation(shaderProgram, "objectColor"),\r
+      1.0f, 0.5f, 0.31f);\r
+    glUniform3f(\r
+      glGetUniformLocation(shaderProgram, "lightColor"),\r
+      1.0f, 1.0f, 1.0f);\r
+    glUniform3fv(\r
+      glGetUniformLocation(shaderProgram, "lightPos"),\r
+      1, glm::value_ptr(lightPos));\r
+\r
+    m.draw();\r

     \r
     glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);\r
 \r
     ImGui::SFML::Update(window, deltaClock.restart());\r
 \r
     ImGui::Begin("Options");\r
     \r
     glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);\r
 \r
     ImGui::SFML::Update(window, deltaClock.restart());\r
 \r
     ImGui::Begin("Options");\r

-    ImGui::LabelText("Cursor Locked", "%d", options.catchMouse);\r

     ImGui::Checkbox("Wireframe", &options.wireframe);\r
     ImGui::Checkbox("Wireframe", &options.wireframe);\r

-    ImGui::Checkbox("Free Cam", &options.freecam);\r
+    ImGui::Checkbox("Free Cam (F)", &options.freecam);\r

     if (options.freecam) {\r
     if (options.freecam) {\r

-      ImGui::LabelText("Position", "%f %f %f", camPos.x, camPos.y, camPos.z);\r
-      ImGui::LabelText("Forward", "%f %f %f", camForward.x, camForward.y, camForward.z);\r
-      ImGui::LabelText("Mouse", "%d %d", freecam.mouseX, freecam.mouseY);\r
+      ImGui::LabelText("Position", "%f %f %f", freeCam.pos.x, freeCam.pos.y, freeCam.pos.z);\r
+      ImGui::LabelText("Rotation", "%f %f", freeCam.rot.x, freeCam.rot.y);\r

     } else {\r
     } else {\r

-      ImGui::LabelText("Rotation", "%f %f", arcball.camX, arcball.camZ);\r
-      ImGui::InputFloat("Radius", &options.radius);\r
+      ImGui::LabelText("Rotation", "%f %f", arcCam.rot.x, arcCam.rot.y);\r
+      ImGui::InputFloat("Radius", &arcCam.radius);\r

     }\r
     ImGui::End();\r
 \r
     }\r
     ImGui::End();\r
 \r