Merge pull request #1 from mchenwang/main

fix compiler errors & embree miss

CMakeLists.txt

@@ -5,55 +5,80 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 project(Moer-lite LANGUAGES CXX)
 
+if(MSVC)
+ add_compile_options("/MP")
+ add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
+ add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
+endif(MSVC)
+
+if(WIN32)
+ add_definitions(-DUNICODE -D_UNICODE)
+ add_definitions(-DNOMINMAX)
+endif()
+
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/target/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/target/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/target/bin)
 
 add_subdirectory(./externals)
 
-add_executable(Moer 
-src/main.cpp 
-
-src/CoreLayer/Math/Transform.cpp
-
-src/FunctionLayer/Acceleration/EmbreeBVH.cpp
-src/FunctionLayer/Integrator/NormalIntegrator.cpp
-src/FunctionLayer/Integrator/DirectIntegrator.cpp
-src/FunctionLayer/Camera/Camera.cpp
-src/FunctionLayer/Camera/Pinhole.cpp
-src/FunctionLayer/Scene/Scene.cpp
-src/FunctionLayer/Light/SpotLight.cpp
-src/FunctionLayer/Light/AreaLight.cpp
-src/FunctionLayer/Light/EnvironmentLight.cpp
-src/FunctionLayer/Shape/Shape.cpp
-src/FunctionLayer/Shape/Triangle.cpp
-src/FunctionLayer/Shape/Sphere.cpp
-src/FunctionLayer/Shape/Parallelogram.cpp
-src/FunctionLayer/Texture/NormalTexture.cpp
-src/FunctionLayer/Texture/ImageTexture.cpp
-src/FunctionLayer/Texture/Texture.cpp
-src/FunctionLayer/Texture/Mipmap.cpp
-src/FunctionLayer/Material/Matte.cpp
-src/FunctionLayer/Material/Material.cpp
-src/FunctionLayer/Sampler/IndependentSampler.cpp
-src/ResourceLayer/Image.cpp
-src/ResourceLayer/Mesh.cpp
-src/ResourceLayer/FileUtil.cpp
+add_executable(Moer
+ src/main.cpp
+
+ src/CoreLayer/Math/Transform.cpp
+
+ src/FunctionLayer/Acceleration/EmbreeBVH.cpp
+ src/FunctionLayer/Integrator/NormalIntegrator.cpp
+ src/FunctionLayer/Integrator/DirectIntegrator.cpp
+ src/FunctionLayer/Camera/Camera.cpp
+ src/FunctionLayer/Camera/Pinhole.cpp
+ src/FunctionLayer/Scene/Scene.cpp
+ src/FunctionLayer/Light/SpotLight.cpp
+ src/FunctionLayer/Light/AreaLight.cpp
+ src/FunctionLayer/Light/EnvironmentLight.cpp
+ src/FunctionLayer/Shape/Shape.cpp
+ src/FunctionLayer/Shape/Triangle.cpp
+ src/FunctionLayer/Shape/Sphere.cpp
+ src/FunctionLayer/Shape/Parallelogram.cpp
+ src/FunctionLayer/Texture/NormalTexture.cpp
+ src/FunctionLayer/Texture/ImageTexture.cpp
+ src/FunctionLayer/Texture/Texture.cpp
+ src/FunctionLayer/Texture/Mipmap.cpp
+ src/FunctionLayer/Material/Matte.cpp
+ src/FunctionLayer/Material/Material.cpp
+ src/FunctionLayer/Sampler/IndependentSampler.cpp
+ src/ResourceLayer/Image.cpp
+ src/ResourceLayer/Mesh.cpp
+ src/ResourceLayer/FileUtil.cpp
 )
 
 target_include_directories(Moer PUBLIC ./externals)
 target_include_directories(Moer PUBLIC ./src)
 target_include_directories(Moer PUBLIC ./externals/json/include)
 target_include_directories(Moer PUBLIC ./externals/embree/include)
 
-if (WIN32)
- target_link_directories(Moer PUBLIC ${PROJECT_SOURCE_DIR}/libs/win)
+if(WIN32)
+ set(LIBS_PATH ${PROJECT_SOURCE_DIR}/libs/win)
+ set(EMBREE_DLL ${LIBS_PATH}/embree3.dll ${LIBS_PATH}/tbb12.dll)
 endif()
-if (UNIX AND NOT APPLE)
- target_link_directories(Moer PUBLIC ${PROJECT_SOURCE_DIR}/libs/linux)
+
+if(UNIX AND NOT APPLE)
+ set(LIBS_PATH ${PROJECT_SOURCE_DIR}/libs/linux)
+ set(EMBREE_DLL ${LIBS_PATH}/libembree3.so.3 ${LIBS_PATH}/libtbb.so.12.2)
 endif()
-if (APPLE)
- target_link_directories(Moer PUBLIC ${PROJECT_SOURCE_DIR}/libs/macos)
+
+if(APPLE)
+ set(LIBS_PATH ${PROJECT_SOURCE_DIR}/libs/macos)
+ set(EMBREE_DLL ${LIBS_PATH}/libembree3.3.dylib ${LIBS_PATH}/libtbb.12.2.dylib)
 endif()
+
+target_link_directories(Moer PUBLIC ${LIBS_PATH})
 target_link_directories(Moer PUBLIC ${PROJECT_SOURCE_DIR}/target/lib)
-target_link_libraries(Moer embree3 tinyobjloader)
+
+add_custom_command(TARGET Moer POST_BUILD
+ DEPENDS ${LIBS_PATH}/embree3.dll
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${EMBREE_DLL} $<TARGET_FILE_DIR:Moer>)
+
+target_link_libraries(Moer PUBLIC embree3)
+target_link_libraries(Moer PUBLIC tinyobjloader)

src/CoreLayer/Math/Constant.h

@@ -1,7 +1,12 @@
 #pragma once
+#define _USE_MATH_DEFINES
 #include <cmath>
 #include <limits>
 
+#ifdef FLT_MAX
+#undef FLT_MAX
+#endif // FLT_MAX
+
 constexpr float PI = M_PI;
 constexpr float INV_PI = 1.f / M_PI;
 constexpr float FLT_MAX = std::numeric_limits<float>::max();

src/CoreLayer/Math/Geometry.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <algorithm>
 #include <FastMath/FastMath.h>
 #include <FastMath/VecMat.h>
 //* 对于绝大部分图形应用来说，32位的浮点数足以满足计算精度需求且速度更快，故lite版仅支持float