GLM_FORCE_ROW_MAJOR削除

Author: yknishidate

include/reactive/math.hpp

@@ -4,12 +4,12 @@
 #define GLM_FORCE_SWIZZLE
 #define GLM_FORCE_RADIANS
 #define GLM_FORCE_DEPTH_ZERO_TO_ONE
-#define GLM_FORCE_ROW_MAJOR
 #include <glm/glm.hpp>
 #include <glm/gtx/hash.hpp>
 #include <glm/gtc/type_ptr.hpp>
 #include <glm/gtx/transform.hpp>
 #include <glm/gtc/quaternion.hpp>
 #include <glm/gtx/quaternion.hpp>
 #include <glm/gtx/string_cast.hpp>
+#include <glm/gtc/matrix_inverse.hpp>
 #include <glm/gtc/matrix_transform.hpp>

sample/hello_compute/CMakeLists.txt

@@ -4,7 +4,7 @@ set(TARGET_NAME "HelloCompute")
 
 file(GLOB_RECURSE sources *.cpp)
 file(GLOB_RECURSE headers *.hpp)
-file(GLOB_RECURSE shaders shader/*)
+file(GLOB_RECURSE shaders *.slang)
 add_executable(${TARGET_NAME} ${sources} ${headers} ${shaders})
 
 source_group("Shader Files" FILES ${shaders})

sample/hello_graphics/CMakeLists.txt

@@ -4,7 +4,7 @@ set(TARGET_NAME "HelloGraphics")
 
 file(GLOB_RECURSE sources *.cpp)
 file(GLOB_RECURSE headers *.hpp)
-file(GLOB_RECURSE shaders shader/*)
+file(GLOB_RECURSE shaders *.slang)
 add_executable(${TARGET_NAME} ${sources} ${headers} ${shaders})
 
 source_group("Shader Files" FILES ${shaders})

sample/hello_mesh_shader/CMakeLists.txt

@@ -4,7 +4,7 @@ set(TARGET_NAME "HelloMeshShader")
 
 file(GLOB_RECURSE sources *.cpp)
 file(GLOB_RECURSE headers *.hpp)
-file(GLOB_RECURSE shaders shader/*)
+file(GLOB_RECURSE shaders *.slang)
 add_executable(${TARGET_NAME} ${sources} ${headers} ${shaders})
 
 source_group("Shader Files" FILES ${shaders})

sample/hello_raytracing/CMakeLists.txt

@@ -4,7 +4,7 @@ set(TARGET_NAME "HelloRaytracing")
 
 file(GLOB_RECURSE sources *.cpp)
 file(GLOB_RECURSE headers *.hpp)
-file(GLOB_RECURSE shaders shader/*)
+file(GLOB_RECURSE shaders *.slang)
 add_executable(${TARGET_NAME} ${sources} ${headers} ${shaders})
 
 source_group("Shader Files" FILES ${shaders})

src/Graphics/DescriptorSet.cpp

@@ -19,23 +19,23 @@ DescriptorSet::DescriptorSet(const Context& context, const DescriptorSetCreateIn
 
     // 各リソースのディスクリプタ情報を設定
     for (const auto& [name, buffers] : createInfo.buffers) {
-        RV_ASSERT(m_descriptors.contains(name), "Unknown m_buffer m_name. Resource m_name must match the m_name on the m_shader.");
+        RV_ASSERT(m_descriptors.contains(name), "Unknown buffer name({}). Resource name must match the name on the shader.", name);
         if (std::holds_alternative<uint32_t>(buffers)) {
             m_descriptors[name].binding.setDescriptorCount(std::get<uint32_t>(buffers));
         } else {
             set(name, std::get<ArrayProxy<BufferHandle>>(buffers));
         }
     }
     for (const auto& [name, images] : createInfo.images) {
-        RV_ASSERT(m_descriptors.contains(name), "Unknown m_image m_name. Resource m_name must match the m_name on the m_shader.");
+        RV_ASSERT(m_descriptors.contains(name), "Unknown image name({}). Resource name must match the name on the shader.", name);
         if (std::holds_alternative<uint32_t>(images)) {
             m_descriptors[name].binding.setDescriptorCount(std::get<uint32_t>(images));
         } else {
             set(name, std::get<ArrayProxy<ImageHandle>>(images));
         }
     }
     for (const auto& [name, accels] : createInfo.accels) {
-        RV_ASSERT(m_descriptors.contains(name), "Unknown m_accel m_name. Resource m_name must match the m_name on the m_shader.");
+        RV_ASSERT(m_descriptors.contains(name), "Unknown accel name({}). Resource name must match the name on the shader.", name);
         if (std::holds_alternative<uint32_t>(accels)) {
             m_descriptors[name].binding.setDescriptorCount(std::get<uint32_t>(accels));
         } else {

src/Scene/Camera.cpp

@@ -31,7 +31,7 @@ void Camera::processMouseDragLeft(glm::vec2 dragDelta) {
         m_eulerRotation.x = m_eulerRotation.x - dragDelta.y * 0.001f;
         m_eulerRotation.y = m_eulerRotation.y - dragDelta.x * 0.001f;
     } else {
-        m_eulerRotation.x = m_eulerRotation.x + dragDelta.y * 0.002f;
+        m_eulerRotation.x = m_eulerRotation.x - dragDelta.y * 0.002f;
         m_eulerRotation.y = m_eulerRotation.y - dragDelta.x * 0.002f;
     }
 }