???

shiinamiyuki · Dec 26, 2019 · a4c8fd8 · a4c8fd8
1 parent 0f8370b
commit a4c8fd8
Show file tree

Hide file tree

Showing 10 changed files with 75 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,8 +15,8 @@ if(MSVC)
 endif()
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     IF(WIN32)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -target x86_64-pc-windows-gnu -femulated-tls ")
-        set(CXX_FS_LIBS stdc++fs)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ")
+        set(CXX_FS_LIBS)
     ENDIF()
 elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")

diff --git a/data/breakfast_room/image.png b/data/breakfast_room/image.png
diff --git a/data/breakfast_room/out.png b/data/breakfast_room/out.png
diff --git a/data/breakfast_room/scene.json b/data/breakfast_room/scene.json
@@ -28,7 +28,8 @@
   "integrator": {
     "type": "PathTracer",
     "props": {
-      "spp": 1024,
+      "spp": 32,
+      "occludeDistance": 2,
       "minDepth": 3,
       "maxDepth": 7
     }

diff --git a/include/miyuki.renderer/accelerator.h b/include/miyuki.renderer/accelerator.h
@@ -25,6 +25,7 @@
 
 #include <miyuki.renderer/shape.h>
 
+
 namespace miyuki::core {
     class Scene;
 
@@ -35,6 +36,14 @@ namespace miyuki::core {
         virtual void build(Scene &scene) = 0;
 
         virtual bool intersect(const Ray &ray, Intersection &isct) = 0;
+
+        virtual bool4 intersect4(const Ray4 &ray, Intersection4 &isct) {
+            MIYUKI_NOT_IMPLEMENTED();
+        }
+
+        virtual bool8 intersect8(const Ray8 &ray, Intersection8 &isct) {
+            MIYUKI_NOT_IMPLEMENTED();
+        }
     };
 
 }

diff --git a/include/miyuki.renderer/ray.h b/include/miyuki.renderer/ray.h
@@ -25,6 +25,7 @@
 
 #include <miyuki.foundation/defs.h>
 #include <miyuki.foundation/math.hpp>
+#include <miyuki.foundation/vectorize.hpp>
 
 namespace miyuki::core {
     struct Ray {
@@ -50,7 +51,7 @@ namespace miyuki::core {
 
     struct Intersection {
         const MeshTriangle *shape = nullptr;
-        const Material * material = nullptr;
+        const Material *material = nullptr;
         float distance = MaxFloat;
         Vec3f wo;
         Point3f p;
@@ -84,5 +85,30 @@ namespace miyuki::core {
             return Ray(this->p, (p - this->p), RayBias, 1);
         }
     };
+
+    MYK_VEC_STRUCT_BEGIN(Ray)
+        MYK_VEC_MEMBER(tMin)
+        MYK_VEC_MEMBER(tMax)
+        MYK_VEC_MEMBER(o)
+        MYK_VEC_MEMBER(d)
+    MYK_VEC_STRUCT_END
+
+    using Ray4 = TRay<4>;
+    using Ray8 = TRay<8>;
+
+    MYK_VEC_STRUCT_BEGIN(Intersection)
+        MYK_VEC_MEMBER(shape)
+        MYK_VEC_MEMBER(material)
+        MYK_VEC_MEMBER(distance)
+        MYK_VEC_MEMBER(wo)
+        MYK_VEC_MEMBER(p)
+        MYK_VEC_MEMBER(Ns)
+        MYK_VEC_MEMBER(Ng)
+        MYK_VEC_MEMBER(uv)
+        MYK_VEC_MEMBER(localFrame)
+    MYK_VEC_STRUCT_END
+
+    using Intersection4 = TIntersection<4>;
+    using Intersection8 = TIntersection<8>;
 }
 #endif //MIYUKIRENDERER_RAY_H
diff --git a/src/core/accelerators/embree-backend.cpp b/src/core/accelerators/embree-backend.cpp
@@ -35,7 +35,7 @@ namespace miyuki::core {
         RTCScene rtcScene = nullptr;
         const Scene *scene;
 
-      public:
+    public:
         Impl() {
             device = rtcNewDevice(nullptr);
             if (rtcGetDeviceError(device) != RTC_ERROR_NONE) {
@@ -45,7 +45,9 @@ namespace miyuki::core {
             QUERY_PROP(RTC_DEVICE_PROPERTY_NATIVE_RAY8_SUPPORTED);
             QUERY_PROP(RTC_DEVICE_PROPERTY_NATIVE_RAY16_SUPPORTED);
         }
+
         ~Impl() { rtcReleaseDevice(device); }
+
         void build(const Scene &scene) {
             if (rtcScene != nullptr) {
                 rtcReleaseScene(rtcScene);
@@ -55,13 +57,16 @@ namespace miyuki::core {
             int id = 0;
             for (const auto &mesh : scene.meshes) {
                 auto geometry = rtcNewGeometry(device, RTC_GEOMETRY_TYPE_TRIANGLE);
-                auto vertices = (Float *)rtcSetNewGeometryBuffer(geometry, RTC_BUFFER_TYPE_VERTEX, 0, RTC_FORMAT_FLOAT3,
-                                                                 sizeof(Float) * 3, mesh->_vertex_data.position.size());
-                auto triangles = (uint32_t *)rtcSetNewGeometryBuffer(
-                    geometry, RTC_BUFFER_TYPE_INDEX, 0, RTC_FORMAT_UINT3, sizeof(uint32_t) * 3, mesh->triangles.size());
+                auto vertices = (Float *) rtcSetNewGeometryBuffer(geometry, RTC_BUFFER_TYPE_VERTEX, 0,
+                                                                  RTC_FORMAT_FLOAT3,
+                                                                  sizeof(Float) * 3,
+                                                                  mesh->_vertex_data.position.size());
+                auto triangles = (uint32_t *) rtcSetNewGeometryBuffer(
+                        geometry, RTC_BUFFER_TYPE_INDEX, 0, RTC_FORMAT_UINT3, sizeof(uint32_t) * 3,
+                        mesh->triangles.size());
                 for (size_t i = 0; i < mesh->triangles.size(); i++) {
                     for (size_t j = 0; j < 3; j++) {
-                        triangles[3 * i + j] =mesh->triangles[i].indices.position[j];
+                        triangles[3 * i + j] = mesh->triangles[i].indices.position[j];
                     }
                 }
                 for (size_t i = 0; i < mesh->_vertex_data.position.size(); i++) {
@@ -75,6 +80,7 @@ namespace miyuki::core {
             }
             rtcCommitScene(rtcScene);
         }
+
         static inline RTCRay toRTCRay(const Ray &_ray) {
             RTCRay ray;
             auto _o = _ray.o;
@@ -89,6 +95,7 @@ namespace miyuki::core {
             ray.flags = 0;
             return ray;
         }
+
         bool intersect(const Ray &ray, Intersection &isct) {
             RTCRayHit rayHit;
             rayHit.ray = toRTCRay(ray);
@@ -110,20 +117,30 @@ namespace miyuki::core {
             return true;
         }
     };
+
     EmbreeAccelerator::EmbreeAccelerator() : impl(new Impl()) {}
 
     void EmbreeAccelerator::build(Scene &scene) { impl->build(scene); }
 
     bool EmbreeAccelerator::intersect(const Ray &ray, Intersection &isct) { return impl->intersect(ray, isct); }
+
     EmbreeAccelerator::~EmbreeAccelerator() { delete impl; }
 
+    bool4 EmbreeAccelerator::intersect4(const Ray4 &ray, Intersection4 &isct) {
+        return Accelerator::intersect4(ray, isct);
+    }
+
+    bool8 EmbreeAccelerator::intersect8(const Ray8 &ray, Intersection8 &isct) {
+        return Accelerator::intersect8(ray, isct);
+    }
+
 #else
-void miyuki::core::EmbreeAccelerator::build(miyuki::core::Scene &scene) { MIYUKI_NOT_IMPLEMENTED(); }
+    void miyuki::core::EmbreeAccelerator::build(miyuki::core::Scene &scene) { MIYUKI_NOT_IMPLEMENTED(); }
 
-bool miyuki::core::EmbreeAccelerator::intersect(const miyuki::core::Ray &ray, miyuki::core::Intersection &isct) {
-    MIYUKI_NOT_IMPLEMENTED();
-}
-return false;
+    bool miyuki::core::EmbreeAccelerator::intersect(const miyuki::core::Ray &ray, miyuki::core::Intersection &isct) {
+        MIYUKI_NOT_IMPLEMENTED();
+    }
+    return false;
 
 #endif
 }
diff --git a/src/core/accelerators/embree-backend.h b/src/core/accelerators/embree-backend.h
@@ -40,7 +40,11 @@ namespace miyuki::core {
 
         bool intersect(const Ray &ray, Intersection &isct) override;
 
-		~EmbreeAccelerator();
+        bool4 intersect4(const Ray4 &ray, Intersection4 &isct) override;
+
+        bool8 intersect8(const Ray8 &ray, Intersection8 &isct) override;
+
+        ~EmbreeAccelerator();
 
     };
 

diff --git a/src/core/shaders/expr-shader.cpp b/src/core/shaders/expr-shader.cpp
@@ -25,6 +25,7 @@
 #include <PerlinNoise.hpp>
 #include <memory>
 #include <miyuki.foundation/imageloader.h>
+#include <sstream>
 
 static const siv::PerlinNoise perlin(0);
 

diff --git a/src/mesh-importer/importer.cpp b/src/mesh-importer/importer.cpp
@@ -56,7 +56,7 @@ int main(int argc, char **argv) {
 
         auto outFile = fs::path(argv[1]).stem().string().append(".mesh");
         result.mesh->writeToFile(outFile);
-        graph.shapes.emplace_back(result.mesh);
+        graph.shapes.push_back(result.mesh);
         std::ofstream out(sceneFile);
         out << serialize::toJson(*ctx, graph).dump(2) << std::endl;
     }