ProtectedVariable · ProtectedVariable · Dec 25, 2020 · Nov 27, 2020 · Nov 27, 2020 · Nov 28, 2020
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -0,0 +1,67 @@
+name: CMake
+
+on:
+  push:
+    branches:
+      - master
+      - c-i
+  pull_request:
+    branches:
+      - master
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    # The CMake configure and build commands are platform agnostic and should work equally
+    # well on Windows or Mac.  You can convert this to a matrix build if you need
+    # cross-platform coverage.
+    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macOS-latest, windows-latest, ubuntu-latest]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Linux dev lib
+      if: runner.os == 'Linux'
+      run:  |
+            sudo apt-get update
+            sudo add-apt-repository ppa:ubuntu-toolchain-r/test
+            sudo apt-get update
+            sudo apt-get install -y gcc-10 g++-10
+            sudo apt-get install -y libxrandr-dev xorg-dev libglu1-mesa-dev
+            sudo apt-get install -y libgtk-3-dev
+            export CC=gcc-10
+            export CXX=g++-10
+
+    - name: Create Build Environment
+      # Some projects don't allow in-source building, so create a separate build directory
+      # We'll use this as our working directory for all subsequent commands
+      run: cmake -E make_directory ${{runner.workspace}}/build
+    - name: Configure CMake
+      # Use a bash shell so we can use the same syntax for environment variable
+      # access regardless of the host operating system
+      shell: bash
+      working-directory: ${{runner.workspace}}/build
+      # Note the current convention is to use the -S and -B options here to specify source 
+      # and build directories, but this is only available with CMake 3.13 and higher.  
+      # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+
+    - name: Build
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      # Execute the build.  You can specify a specific target with "--target <NAME>"
+      run: cmake --build . --config $BUILD_TYPE
+
+    #- name: Test
+    #  working-directory: ${{runner.workspace}}/build
+    #  shell: bash
+      # Execute tests defined by the CMake configuration.  
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+    #  run: ctest -C $BUILD_TYPE
+
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 .idea/
 libs/
 cmake-*
+build/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,37 +1,95 @@
 cmake_minimum_required(VERSION 3.17)
 project(ICE)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
-set(GLFW_BUILD_EXAMPLES OFF CACHE INTERNAL "Build the GLFW example programs")
-set(GLFW_BUILD_TESTS OFF CACHE INTERNAL "Build the GLFW test programs")
-set(GLFW_BUILD_DOCS OFF CACHE INTERNAL "Build the GLFW documentation")
-set(GLFW_INSTALL OFF CACHE INTERNAL "Generate installation target")
-
-set(CMAKE_CXX_STANDARD 14)
-add_library(glfw3 STATIC IMPORTED includes/OBJLoader/OBJLoader.h)
-set_property(TARGET glfw3 PROPERTY IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/libs/glfw/libglfw3.a)
-find_library(COCOA_LIBRARY Cocoa REQUIRED)
-find_library(OPENGL_LIBRARY OpenGL REQUIRED)
-find_library(IOKIT_LIBRARY IOKit REQUIRED)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+set(CMAKE_CXX_STANDARD 17)
+set(GLFW_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libs/glfw/")
+
+set(GLFW_INSTALL OFF CACHE BOOL "" FORCE)
+set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
+set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+
+
+set(EXTRA_SRC "")
+if(NOT EXISTS "${GLFW_LIB_PATH}")
+	execute_process(COMMAND git clone https://github.com/glfw/glfw.git "${GLFW_LIB_PATH}")
+endif()
+add_subdirectory(libs/glfw/)
+
+
+if(APPLE)
+	find_library(COCOA_LIBRARY Cocoa REQUIRED)
+	find_library(OPENGL_LIBRARY OpenGL REQUIRED)
+	find_library(IOKIT_LIBRARY IOKit REQUIRED)
+	set(EXTRA_SRC ICE/src/Platform/OSX/dialog.mm)
+elseif(WIN32)
+	set(EXTRA_SRC ICE/src/Platform/Win32/dialog.cpp)
+else()
+	link_libraries(-lstdc++fs)
+	set(EXTRA_SRC ICE/src/Platform/Linux/dialog.cpp)
+endif()
 include_directories(includes)
 include_directories(ICE/src)
 add_executable(ICE
+		"${EXTRA_SRC}"
+		includes/GL/gl3w.h
+        includes/ImGUI/gl3w.c
+        includes/OBJLoader/tiny_obj_loader.h
         includes/ImGUI/imgui_impl_glfw.cpp
         includes/ImGUI/imgui_impl_opengl3.cpp
         includes/ImGUI/imgui_impl_glfw.h
         includes/ImGUI/imgui_impl_opengl3.h
-        includes/ImGUI/gl3w.c
         includes/ImGUI/imgui.cpp
         includes/ImGUI/imgui_widgets.cpp
         includes/ImGUI/imgui_draw.cpp
         includes/ImGUI/imgui_demo.cpp
+		includes/ImGUI/ImCurveEdit.cpp
+		includes/ImGUI/ImGradient.cpp
+		includes/ImGUI/ImGuizmo.cpp
+		includes/ImGUI/ImSequencer.cpp
         ICE/src/Scene/Entity.cpp ICE/src/Scene/Entity.h ICE/src/Scene/Component.h ICE/src/Scene/TransformComponent.cpp ICE/src/Scene/TransformComponent.h ICE/src/Scene/RenderComponent.cpp ICE/src/Scene/RenderComponent.h ICE/src/Graphics/Material.cpp ICE/src/Graphics/Material.h ICE/src/Graphics/Mesh.cpp ICE/src/Graphics/Mesh.h
-        ICE/src/Scene/Scene.cpp ICE/src/Scene/Scene.h ICE/src/Util/OBJLoader.cpp ICE/src/Util/OBJLoader.h ICE/src/Graphics/Renderer.h ICE/src/Graphics/RenderSystem.cpp ICE/src/Graphics/RenderSystem.h ICE/src/Core/System.h ICE/src/Graphics/RendererConfig.h ICE/src/Graphics/RenderCommand.h ICE/src/Graphics/Buffers.h ICE/src/Graphics/FrameBuffer.h ICE/src/Graphics/Context.h ICE/src/Graphics/VertexArray.h ICE/src/Graphics/API/GraphicsAPI.h ICE/src/Graphics/API/OpenGL/OpenGLVertexArray.cpp ICE/src/Graphics/API/OpenGL/OpenGLVertexArray.h ICE/src/Graphics/API/OpenGL/OpenGLContext.cpp ICE/src/Graphics/API/OpenGL/OpenGLContext.h ICE/src/Graphics/API/OpenGL/OpenGLRendererAPI.cpp ICE/src/Graphics/API/OpenGL/OpenGLRendererAPI.h ICE/src/Graphics/API/OpenGL/OpenGLBuffers.cpp ICE/src/Graphics/API/OpenGL/OpenGLBuffers.h ICE/src/Graphics/API/GraphicsAPI.cpp ICE/src/Graphics/Shader.h ICE/src/Graphics/API/OpenGL/OpenGLShader.cpp ICE/src/Graphics/API/OpenGL/OpenGLShader.h ICE/src/Graphics/ForwardRenderer.cpp ICE/src/Graphics/ForwardRenderer.h ICE/src/Graphics/Camera.cpp ICE/src/Graphics/Camera.h ICE/src/Scene/LightComponent.cpp ICE/src/Scene/LightComponent.h ICE/src/Util/BufferUtils.cpp ICE/src/Util/BufferUtils.h ICE/src/Util/ICEMath.h ICE/src/Util/Logger.cpp ICE/src/Util/Logger.h ICE/src/Util/ICEMath.cpp ICE/src/Scene/CameraComponent.cpp ICE/src/Scene/CameraComponent.h ICE/src/Core/ICEEngine.cpp ICE/src/Core/ICEEngine.h)
+        ICE/src/Scene/Scene.cpp ICE/src/Scene/Scene.h ICE/src/Util/OBJLoader.cpp ICE/src/Util/OBJLoader.h ICE/src/Graphics/Renderer.h ICE/src/Graphics/RenderSystem.cpp ICE/src/Graphics/RenderSystem.h ICE/src/Core/System.h ICE/src/Graphics/RendererConfig.h ICE/src/Graphics/RenderCommand.h ICE/src/Graphics/Buffers.h ICE/src/Graphics/Framebuffer.h ICE/src/Graphics/Context.h ICE/src/Graphics/VertexArray.h ICE/src/Graphics/API/GraphicsAPI.h ICE/src/Graphics/API/OpenGL/OpenGLVertexArray.cpp ICE/src/Graphics/API/OpenGL/OpenGLVertexArray.h ICE/src/Graphics/API/OpenGL/OpenGLContext.cpp ICE/src/Graphics/API/OpenGL/OpenGLContext.h ICE/src/Graphics/API/OpenGL/OpenGLRendererAPI.cpp ICE/src/Graphics/API/OpenGL/OpenGLRendererAPI.h ICE/src/Graphics/API/OpenGL/OpenGLBuffers.cpp ICE/src/Graphics/API/OpenGL/OpenGLBuffers.h ICE/src/Graphics/API/GraphicsAPI.cpp ICE/src/Graphics/Shader.h ICE/src/Graphics/API/OpenGL/OpenGLShader.cpp ICE/src/Graphics/API/OpenGL/OpenGLShader.h ICE/src/Graphics/ForwardRenderer.cpp ICE/src/Graphics/ForwardRenderer.h ICE/src/Graphics/Camera.cpp ICE/src/Graphics/Camera.h ICE/src/Scene/LightComponent.cpp ICE/src/Scene/LightComponent.h ICE/src/Util/BufferUtils.cpp ICE/src/Util/BufferUtils.h ICE/src/Util/ICEMath.h ICE/src/Util/Logger.cpp ICE/src/Util/Logger.h ICE/src/Util/ICEMath.cpp ICE/src/Scene/CameraComponent.cpp ICE/src/Scene/CameraComponent.h ICE/src/Core/ICEEngine.cpp ICE/src/Core/ICEEngine.h ICE/src/GUI/ICEGUI.cpp ICE/src/GUI/ICEGUI.h ICE/src/Graphics/API/OpenGL/OpenGLFramebuffer.cpp ICE/src/Graphics/API/OpenGL/OpenGLFramebuffer.h ICE/src/GUI/HierarchyPane.cpp ICE/src/GUI/HierarchyPane.h ICE/src/GUI/ICEPane.h ICE/src/Assets/AssetBank.cpp ICE/src/Assets/AssetBank.h ICE/src/GUI/InspectorPane.cpp ICE/src/GUI/InspectorPane.h ICE/src/GUI/Components/UIComponentRenderer.cpp ICE/src/GUI/Components/UIComponentRenderer.h ICE/src/GUI/AssetPane.cpp ICE/src/GUI/AssetPane.h ICE/src/GUI/AssetViewPane.cpp ICE/src/GUI/AssetViewPane.h ICE/src/GUI/AssetContentPane.cpp ICE/src/GUI/AssetContentPane.h ICE/src/Platform/FileUtils.cpp ICE/src/Platform/FileUtils.h ICE/src/IO/Project.cpp ICE/src/IO/Project.h ICE/src/GUI/ProjectSelectorWindow.cpp ICE/src/GUI/ProjectSelectorWindow.h ICE/src/IO/EngineConfig.cpp ICE/src/IO/EngineConfig.h ICE/src/GUI/NewMaterialPane.cpp ICE/src/GUI/NewMaterialPane.h ICE/src/Util/ICEException.cpp ICE/src/Util/ICEException.h ICE/src/Graphics/Texture.h ICE/src/Graphics/API/OpenGL/OpenGLTexture.cpp ICE/src/Graphics/API/OpenGL/OpenGLTexture.h includes/stb/stb_image.h)
 
 add_executable(ICE_TEST
+		"${EXTRA_SRC}"
+		ICE/test/Tests.cpp
+		includes/GL/gl3w.h
+		includes/ImGUI/gl3w.c
+		includes/OBJLoader/tiny_obj_loader.h
+		includes/ImGUI/imgui_impl_glfw.cpp
+		includes/ImGUI/imgui_impl_opengl3.cpp
+		includes/ImGUI/imgui_impl_glfw.h
+		includes/ImGUI/imgui_impl_opengl3.h
+		includes/ImGUI/imgui.cpp
+		includes/ImGUI/imgui_widgets.cpp
+		includes/ImGUI/imgui_draw.cpp
+		includes/ImGUI/imgui_demo.cpp
+		includes/ImGUI/ImCurveEdit.cpp
+		includes/ImGUI/ImGradient.cpp
+		includes/ImGUI/ImGuizmo.cpp
+		includes/ImGUI/ImSequencer.cpp
         ICE/src/Scene/Entity.cpp ICE/src/Scene/Entity.h ICE/src/Scene/Component.h ICE/src/Scene/TransformComponent.cpp ICE/src/Scene/TransformComponent.h ICE/src/Scene/RenderComponent.cpp ICE/src/Scene/RenderComponent.h ICE/src/Graphics/Material.cpp ICE/src/Graphics/Material.h ICE/src/Graphics/Mesh.cpp ICE/src/Graphics/Mesh.h
-        ICE/test/Tests.cpp
-        ICE/src/Scene/Scene.cpp ICE/src/Scene/Scene.h ICE/src/Util/OBJLoader.cpp ICE/src/Util/OBJLoader.h ICE/src/Graphics/Renderer.h ICE/src/Graphics/RenderSystem.cpp ICE/src/Graphics/RenderSystem.h ICE/src/Core/System.h ICE/src/Graphics/RendererConfig.h ICE/src/Graphics/Buffers.h ICE/src/Graphics/FrameBuffer.h ICE/src/Graphics/Context.h ICE/src/Graphics/VertexArray.h ICE/src/Graphics/API/GraphicsAPI.h ICE/src/Graphics/API/OpenGL/OpenGLVertexArray.cpp ICE/src/Graphics/API/OpenGL/OpenGLVertexArray.h ICE/src/Graphics/API/OpenGL/OpenGLContext.cpp ICE/src/Graphics/API/OpenGL/OpenGLContext.h ICE/src/Graphics/API/OpenGL/OpenGLRendererAPI.cpp ICE/src/Graphics/API/OpenGL/OpenGLRendererAPI.h ICE/src/Graphics/API/OpenGL/OpenGLBuffers.cpp ICE/src/Graphics/API/OpenGL/OpenGLBuffers.h ICE/src/Graphics/API/GraphicsAPI.cpp ICE/src/Graphics/Shader.h ICE/src/Graphics/API/OpenGL/OpenGLShader.cpp ICE/src/Graphics/API/OpenGL/OpenGLShader.h ICE/src/Graphics/ForwardRenderer.cpp ICE/src/Graphics/ForwardRenderer.h ICE/src/Graphics/Camera.cpp ICE/src/Graphics/Camera.h ICE/src/Scene/LightComponent.cpp ICE/src/Scene/LightComponent.h ICE/src/Util/BufferUtils.cpp ICE/src/Util/BufferUtils.h ICE/src/Util/ICEMath.h ICE/src/Util/Logger.cpp ICE/src/Util/Logger.h ICE/src/Util/ICEMath.cpp ICE/src/Scene/CameraComponent.cpp ICE/src/Scene/CameraComponent.h ICE/src/Core/ICEEngine.cpp ICE/src/Core/ICEEngine.h)
+        ICE/src/Scene/Scene.cpp ICE/src/Scene/Scene.h ICE/src/Util/OBJLoader.cpp ICE/src/Util/OBJLoader.h ICE/src/Graphics/Renderer.h ICE/src/Graphics/RenderSystem.cpp ICE/src/Graphics/RenderSystem.h ICE/src/Core/System.h ICE/src/Graphics/RendererConfig.h ICE/src/Graphics/Buffers.h ICE/src/Graphics/Framebuffer.h ICE/src/Graphics/Context.h ICE/src/Graphics/VertexArray.h ICE/src/Graphics/API/GraphicsAPI.h ICE/src/Graphics/API/OpenGL/OpenGLVertexArray.cpp ICE/src/Graphics/API/OpenGL/OpenGLVertexArray.h ICE/src/Graphics/API/OpenGL/OpenGLContext.cpp ICE/src/Graphics/API/OpenGL/OpenGLContext.h ICE/src/Graphics/API/OpenGL/OpenGLRendererAPI.cpp ICE/src/Graphics/API/OpenGL/OpenGLRendererAPI.h ICE/src/Graphics/API/OpenGL/OpenGLBuffers.cpp ICE/src/Graphics/API/OpenGL/OpenGLBuffers.h ICE/src/Graphics/API/GraphicsAPI.cpp ICE/src/Graphics/Shader.h ICE/src/Graphics/API/OpenGL/OpenGLShader.cpp ICE/src/Graphics/API/OpenGL/OpenGLShader.h ICE/src/Graphics/ForwardRenderer.cpp ICE/src/Graphics/ForwardRenderer.h ICE/src/Graphics/Camera.cpp ICE/src/Graphics/Camera.h ICE/src/Scene/LightComponent.cpp ICE/src/Scene/LightComponent.h ICE/src/Util/BufferUtils.cpp ICE/src/Util/BufferUtils.h ICE/src/Util/ICEMath.h ICE/src/Util/Logger.cpp ICE/src/Util/Logger.h ICE/src/Util/ICEMath.cpp ICE/src/Scene/CameraComponent.cpp ICE/src/Scene/CameraComponent.h ICE/src/Core/ICEEngine.cpp ICE/src/Core/ICEEngine.h ICE/src/GUI/ICEGUI.cpp ICE/src/GUI/ICEGUI.h ICE/src/Graphics/API/OpenGL/OpenGLFramebuffer.cpp ICE/src/Graphics/API/OpenGL/OpenGLFramebuffer.h ICE/src/GUI/HierarchyPane.cpp ICE/src/GUI/HierarchyPane.h ICE/src/GUI/ICEPane.h ICE/src/Assets/AssetBank.cpp ICE/src/Assets/AssetBank.h ICE/src/GUI/InspectorPane.cpp ICE/src/GUI/InspectorPane.h ICE/src/GUI/Components/UIComponentRenderer.cpp ICE/src/GUI/Components/UIComponentRenderer.h ICE/src/GUI/AssetPane.cpp ICE/src/GUI/AssetPane.h ICE/src/GUI/AssetViewPane.cpp ICE/src/GUI/AssetViewPane.h ICE/src/GUI/AssetContentPane.cpp ICE/src/GUI/AssetContentPane.h ICE/src/Platform/FileUtils.cpp ICE/src/Platform/FileUtils.h ICE/src/IO/Project.cpp ICE/src/IO/Project.h ICE/src/GUI/ProjectSelectorWindow.cpp ICE/src/GUI/ProjectSelectorWindow.h ICE/src/IO/EngineConfig.cpp ICE/src/IO/EngineConfig.h ICE/src/GUI/NewMaterialPane.cpp ICE/src/GUI/NewMaterialPane.h ICE/src/Util/ICEException.cpp ICE/src/Util/ICEException.h ICE/src/Graphics/Texture.h ICE/src/Graphics/API/OpenGL/OpenGLTexture.cpp ICE/src/Graphics/API/OpenGL/OpenGLTexture.h includes/stb/stb_image.h)
 
+target_compile_definitions(ICE_TEST PUBLIC ICE_TEST)
 file(COPY ICE/Assets DESTINATION ${CMAKE_BINARY_DIR})
 
-target_link_libraries(ICE glfw3 ${COCOA_LIBRARY} ${OPENGL_LIBRARY} ${IOKIT_LIBRARY})
+
+if(APPLE)
+	target_link_libraries(ICE glfw ${COCOA_LIBRARY} ${OPENGL_LIBRARY} ${IOKIT_LIBRARY})
+	target_link_libraries(ICE_TEST glfw ${COCOA_LIBRARY} ${OPENGL_LIBRARY} ${IOKIT_LIBRARY})
+elseif(WIN32)
+	target_link_libraries(ICE glfw)
+	target_link_libraries(ICE_TEST glfw)
+else()
+	find_package(PkgConfig REQUIRED)
+	pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
+
+	include_directories(${GTK3_INCLUDE_DIRS})
+	link_directories(${GTK3_LIBRARY_DIRS})
+
+	add_definitions(${GTK3_CFLAGS_OTHER})
+
+	target_link_libraries(ICE glfw ${GTK3_LIBRARIES} stdc++fs)
+	target_link_libraries(ICE_TEST glfw ${GTK3_LIBRARIES} stdc++fs)
+endif()
diff --git a/ICE/Assets/Fonts/helvetica.ttf b/ICE/Assets/Fonts/helvetica.ttf
diff --git a/ICE/Assets/Meshes/cube.obj b/ICE/Assets/Meshes/cube.obj
@@ -0,0 +1,44 @@
+# Blender v2.82 (sub 7) OBJ File: ''
+# www.blender.org
+o Cube
+v 0.500097 0.500097 -0.500097
+v 0.500097 -0.500097 -0.500097
+v 0.500097 0.500097 0.500097
+v 0.500097 -0.500097 0.500097
+v -0.500097 0.500097 -0.500097
+v -0.500097 -0.500097 -0.500097
+v -0.500097 0.500097 0.500097
+v -0.500097 -0.500097 0.500097
+vt 0.875000 0.500000
+vt 0.625000 0.750000
+vt 0.625000 0.500000
+vt 0.375000 1.000000
+vt 0.375000 0.750000
+vt 0.625000 0.000000
+vt 0.375000 0.250000
+vt 0.375000 0.000000
+vt 0.375000 0.500000
+vt 0.125000 0.750000
+vt 0.125000 0.500000
+vt 0.625000 0.250000
+vt 0.875000 0.750000
+vt 0.625000 1.000000
+vn 0.0000 1.0000 0.0000
+vn 0.0000 0.0000 1.0000
+vn -1.0000 0.0000 0.0000
+vn 0.0000 -1.0000 0.0000
+vn 1.0000 0.0000 0.0000
+vn 0.0000 0.0000 -1.0000
+s off
+f 5/1/1 3/2/1 1/3/1
+f 3/2/2 8/4/2 4/5/2
+f 7/6/3 6/7/3 8/8/3
+f 2/9/4 8/10/4 6/11/4
+f 1/3/5 4/5/5 2/9/5
+f 5/12/6 2/9/6 6/7/6
+f 5/1/1 7/13/1 3/2/1
+f 3/2/2 7/14/2 8/4/2
+f 7/6/3 5/12/3 6/7/3
+f 2/9/4 4/5/4 8/10/4
+f 1/3/5 3/2/5 4/5/5
+f 5/12/6 1/3/6 2/9/6
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ @@
     .idea/
     libs/
     cmake-*
+    build/