Merge branch 'dev' into object-transportation-project-fixes

Author: brenocq

.github/workflows/linux.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install cmake xorg-dev curl 
+          sudo apt-get install cmake xorg-dev curl
 
       - name: Build
         run: ./build.sh --jobs 2 --compiler ${{ matrix.config.compiler }}

.github/workflows/updateReadmeButtons.yml

@@ -1,6 +1,6 @@
 name: Update readme buttons
 
-on: 
+on:
   project_card:
     types: [created, deleted, moved]
   project:

.github/workflows/web.yml

@@ -16,8 +16,8 @@ jobs:
         }
 
     steps:
-      - uses: mymindstorm/setup-emsdk@v9
-        
+      - uses: mymindstorm/setup-emsdk@v13
+
       - name: Checkout atta
         uses: actions/checkout@v2
 

.gitignore

@@ -25,6 +25,8 @@ tags
 imgui.ini
 
 # Debugging/Profile
+.cache/
 perf.*
 .gdb_history
 profile/
+compile_commands.json

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.14)
 
-project(atta VERSION 0.4.0 LANGUAGES CXX C)
+project(atta VERSION 0.3.2 LANGUAGES CXX C)
 
 OPTION(ATTA_BUILD_TESTS
     "Set to ON to build also the test executables"
@@ -11,17 +11,18 @@ OPTION(ATTA_WEB_BUILD_MODULE
 OPTION(ATTA_BUILD_DOCS
     "Build the documentation"
     OFF)
-option(ATTA_STATIC_PROJECT_FILE 
-    "Project to be linked statically to atta" 
+option(ATTA_STATIC_PROJECT_FILE
+    "Project to be linked statically to atta"
     "")
-option(ATTA_PROFILE 
-    "Set to ON to enable code profiling" 
+option(ATTA_PROFILE
+    "Set to ON to enable code profiling"
     ON)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(ATTA_VERSION_SAFE atta-${CMAKE_PROJECT_VERSION})
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/atta/cmakeConfig.h.in ${CMAKE_CURRENT_SOURCE_DIR}/src/atta/cmakeConfig.h)
 
@@ -82,7 +83,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL Emscripten)#----- Web build
     set(ATTA_BUILD_TESTS OFF CACHE INTERNAL "" FORCE)
 
     # Configure emscripten link flags
-    set(EMSCRIPTEN_LINK_PROPERTIES "-s USE_WEBGL2=1 -s USE_GLFW=3")
+    set(EMSCRIPTEN_LINK_PROPERTIES "-s USE_WEBGL2=1 -s USE_GLFW=3 -s GL_ENABLE_GET_PROC_ADDRESS")
     set(EMSCRIPTEN_LINK_PROPERTIES "${EMSCRIPTEN_LINK_PROPERTIES} -s ALLOW_MEMORY_GROWTH=1 -s FORCE_FILESYSTEM=1")
     set(EMSCRIPTEN_LINK_PROPERTIES "${EMSCRIPTEN_LINK_PROPERTIES} -s NO_DISABLE_EXCEPTION_CATCHING -s EXIT_RUNTIME=1")
     set(EMSCRIPTEN_LINK_PROPERTIES "${EMSCRIPTEN_LINK_PROPERTIES} --preload-file ${CMAKE_CURRENT_SOURCE_DIR}/resources@/resources/")
@@ -123,7 +124,7 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
         list(APPEND ATTA_OPTIONS -Wno-unused-parameter)
         # Script C linkage
         list(APPEND ATTA_OPTIONS -Wno-return-type-c-linkage)
-        # Math anonymous union 
+        # Math anonymous union
         #list(APPEND ATTA_OPTIONS -Wno-nested-anon-types -Wno-gnu-anonymous-struct)
         # Glad opengl definitions
         #list(APPEND ATTA_OPTIONS -Wno-macro-redefined)
@@ -218,7 +219,7 @@ if(ATTA_STATIC_PROJECT)
 endif()
 
 configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/atta/script/scripts.h.in" 
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/atta/script/scripts.h.in"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/atta/script/scripts.h"
 )
 
@@ -236,7 +237,7 @@ if(NOT (ATTA_SYSTEM_NAME MATCHES "Web") AND NOT ATTA_STATIC_PROJECT_FILE)
     ########## Install files ##########
 
     # Install atta executable
-    install(TARGETS atta 
+    install(TARGETS atta
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
         PRIVATE_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${ATTA_VERSION_SAFE}
         PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${ATTA_VERSION_SAFE}

src/atta/atta.cpp

@@ -135,6 +135,7 @@ void Atta::loop() {
 
     file::update();
     graphics::update();
+    resource::update();
 }
 
 void Atta::step() {

src/atta/cmakeConfig.h.in

@@ -9,8 +9,10 @@
 
 #ifdef ATTA_OS_WEB
 #define ATTA_DIR "/"
+#define ATTA_BUILD_DIR "/"
 #else
 #define ATTA_DIR "@CMAKE_SOURCE_DIR@"
+#define ATTA_BUILD_DIR "@CMAKE_BINARY_DIR@"
 #endif
 
 #define ATTA_VERSION "@CMAKE_PROJECT_VERSION@"

src/atta/component/components/cameraSensor.cpp

@@ -64,6 +64,7 @@ const uint8_t* CameraSensor::getImage() {
         if (cameraInfo.component == this)
             return cameraInfo.data.data();
     ASSERT(false, "(component::CameraSensor) Could not get camera frame from sensor::Manager.");
+    return nullptr;
 }
 
 } // namespace atta::component

src/atta/component/components/material.cpp

@@ -12,8 +12,9 @@
 
 namespace atta::component {
 
-void renderComboImage(std::string attribute, StringId& image) {
-    bool isImage = (image != resource::Material::emptyImage);
+bool renderComboImage(std::string attribute, StringId& image) {
+    bool isImage = (image != StringId());
+    bool updated = false;
     std::string imguiId = attribute;
     if (isImage) {
         std::string selectedName = image.getString();
@@ -24,17 +25,22 @@ void renderComboImage(std::string attribute, StringId& image) {
                 if (imageStr == "")
                     imageStr = "##";
                 const bool selected = (rImage == image);
-                if (ImGui::Selectable(imageStr.c_str(), selected))
+                if (ImGui::Selectable(imageStr.c_str(), selected)) {
                     image = rImage;
+                    updated = true;
+                }
                 if (selected)
                     ImGui::SetItemDefaultFocus();
             }
             ImGui::EndCombo();
         }
     }
 
-    if (ImGui::Checkbox(("Is image##IsImage" + imguiId).c_str(), &isImage))
-        image = isImage ? "textures/white.jpg"_sid : resource::Material::emptyImage;
+    if (ImGui::Checkbox(("Is image##IsImage" + imguiId).c_str(), &isImage)) {
+        image = isImage ? "textures/white.png"_sid : StringId();
+        updated = true;
+    }
+    return updated;
 }
 
 void materialRenderImGui(void* data, std::string imguiId) {
@@ -132,29 +138,50 @@ void materialRenderImGui(void* data, std::string imguiId) {
     //---------- Edit ----------//
     ImGui::Text("Color");
     if (!m->colorIsImage()) {
-        ImGui::SliderFloat("R##ColorR", &m->color.x, 0.0f, 1.0f);
-        ImGui::SliderFloat("G##ColorG", &m->color.y, 0.0f, 1.0f);
-        ImGui::SliderFloat("B##ColorB", &m->color.z, 0.0f, 1.0f);
+        vec3 color = m->getColor();
+        bool updated = false;
+        if (ImGui::SliderFloat("R##ColorR", &color.x, 0.0f, 1.0f))
+            updated = true;
+        if (ImGui::SliderFloat("G##ColorG", &color.y, 0.0f, 1.0f))
+            updated = true;
+        if (ImGui::SliderFloat("B##ColorB", &color.z, 0.0f, 1.0f))
+            updated = true;
+        if (updated)
+            m->setColor(color);
     }
-    renderComboImage("Color", m->colorImage);
+    StringId colorImage = m->getColorImage();
+    if (renderComboImage("Color", colorImage))
+        m->setColorImage(colorImage);
 
     ImGui::Text("Roughness");
     if (!m->roughnessIsImage()) {
-        ImGui::SliderFloat("##Roughness", &m->roughness, 0.0f, 1.0f);
+        float roughness = m->getRoughness();
+        if (ImGui::SliderFloat("##Roughness", &roughness, 0.0f, 1.0f))
+            m->setRoughness(roughness);
     }
-    renderComboImage("Roughness", m->roughnessImage);
+    StringId roughnessImage = m->getRoughnessImage();
+    if (renderComboImage("Roughness", roughnessImage))
+        m->setRoughnessImage(roughnessImage);
 
     ImGui::Text("Metallic");
     if (!m->metallicIsImage()) {
-        ImGui::SliderFloat("##Metallic", &m->metallic, 0.0f, 1.0f);
+        float metallic = m->getMetallic();
+        if (ImGui::SliderFloat("##Metallic", &metallic, 0.0f, 1.0f))
+            m->setMetallic(metallic);
     }
-    renderComboImage("Metallic", m->metallicImage);
+    StringId metallicImage = m->getMetallicImage();
+    if (renderComboImage("Metallic", metallicImage))
+        m->setMetallicImage(metallicImage);
 
     ImGui::Text("AO");
     if (!m->aoIsImage()) {
-        ImGui::SliderFloat("##AO", &m->ao, 0.0f, 1.0f);
+        float ao = m->getAo();
+        if (ImGui::SliderFloat("##AO", &ao, 0.0f, 1.0f))
+            m->setAo(ao);
     }
-    renderComboImage("AO", m->aoImage);
+    StringId aoImage = m->getAoImage();
+    if (renderComboImage("AO", aoImage))
+        m->setAoImage(aoImage);
 }
 
 template <>

src/atta/component/manager.cpp

@@ -69,8 +69,9 @@ void Manager::createDefaultImpl() {
     cube.add<Name>()->set("Cube");
     cube.add<Mesh>()->set("meshes/cube.obj");
 
-    resource::Material* rmt = resource::create<resource::Material>("Material", resource::Material::CreateInfo{});
-    rmt->color = {0.5, 0.5, 0.5};
+    resource::Material::CreateInfo mInfo{};
+    mInfo.color = {0.5, 0.5, 0.5};
+    resource::Material* rmt = resource::create<resource::Material>("Material", mInfo);
     cube.add<Material>()->set(rmt);
 
     // Light entity