Nothing special
This commit is contained in:
+3
-3
@@ -8,15 +8,15 @@
|
|||||||
int main()
|
int main()
|
||||||
{
|
{
|
||||||
Scene scene;
|
Scene scene;
|
||||||
Window window(1920, 1080);
|
Window window(800, 600);
|
||||||
scene.render(
|
scene.render(
|
||||||
Camera{
|
Camera{
|
||||||
.position = glm::vec3(10, 0, 0),
|
.position = glm::vec3(10, 0, 0),
|
||||||
.direction = glm::vec3(-1, 0, 0),
|
.direction = glm::vec3(-1, 0, 0),
|
||||||
},
|
},
|
||||||
RenderParameter{
|
RenderParameter{
|
||||||
.width = 1920,
|
.width = 800,
|
||||||
.height = 1080,
|
.height = 600,
|
||||||
.numSamples = 10000,
|
.numSamples = 10000,
|
||||||
});
|
});
|
||||||
while (true)
|
while (true)
|
||||||
|
|||||||
+8
-4
@@ -9,7 +9,7 @@ Scene::Scene()
|
|||||||
glm::mat4(glm::vec4(1.0f, 0.0f, 0.0f, 0.0f),
|
glm::mat4(glm::vec4(1.0f, 0.0f, 0.0f, 0.0f),
|
||||||
glm::vec4(0.0f, 1.0f, 0.0f, 0.0f),
|
glm::vec4(0.0f, 1.0f, 0.0f, 0.0f),
|
||||||
glm::vec4(0.0f, 0.0f, 1.0f, 0.0f),
|
glm::vec4(0.0f, 0.0f, 1.0f, 0.0f),
|
||||||
glm::vec4(0.0f, 0.0f, 0.0f, 1.0f)));
|
glm::vec4(0.0f, 0.0f, 4.0f, 0.0f)));
|
||||||
bvh.generate();
|
bvh.generate();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -48,10 +48,14 @@ void Scene::render(Camera cam, RenderParameter params)
|
|||||||
.origin = glm::vec3(0.0f),
|
.origin = glm::vec3(0.0f),
|
||||||
.direction = glm::normalize(glm::vec3((float)std::rand() / RAND_MAX, (float)std::rand() / RAND_MAX, (float)std::rand() / RAND_MAX))
|
.direction = glm::normalize(glm::vec3((float)std::rand() / RAND_MAX, (float)std::rand() / RAND_MAX, (float)std::rand() / RAND_MAX))
|
||||||
};
|
};
|
||||||
bvh.traceRay(r);
|
|
||||||
|
|
||||||
accumulator[w + h * params.width] +=
|
auto intersectionInfo = bvh.traceRay(r);
|
||||||
glm::vec3(w / float(params.width * params.numSamples), h / float(params.height * params.numSamples), 0);
|
|
||||||
|
if(intersectionInfo.has_value())
|
||||||
|
{
|
||||||
|
accumulator[w + h * params.width] += intersectionInfo->albedo;
|
||||||
|
//glm::vec3(w / float(params.width * params.numSamples), h / float(params.height * params.numSamples), 0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user