Adjusted all scenes a bit.

Signed-off-by: [email protected] <[email protected]>

Author: Friduric

Source/Scene/Scenes/DragonScene.cpp

@@ -6,121 +6,105 @@
 #include <gtx/rotate_vector.hpp>
 
 #include "../../Graphic/Lighting/PointLight.h"
+#include "../../Graphic/Camera/Camera.h"
+#include "../../Graphic/Camera/PerspectiveCamera.h"
 #include "../../Time/Time.h"
 #include "../../Utility/ObjLoader.h"
 #include "../../Graphic/Renderer/MeshRenderer.h"
 #include "../../Graphic/Material/MaterialSetting.h"
+#include "../../Application.h"
 
-namespace {
-	constexpr float UTAH_TEAPOT_SIZE = 1.0f; // 18.0f;
-	unsigned int teapotIndex = 0;
-	unsigned int lightCubeIndex = 0;
-}
+namespace { MeshRenderer * lampRenderer; }
 
 void DragonScene::init(unsigned int viewportWidth, unsigned int viewportHeight) {
 	FirstPersonScene::init(viewportWidth, viewportHeight);
 
 	// Cornell box.
 	Shape * cornell = ObjLoader::loadObjFile("Assets\\Models\\cornell.obj");
 	shapes.push_back(cornell);
-	for (unsigned int i = 0; i < cornell->meshes.size(); ++i) {
-		renderers.push_back(new MeshRenderer(&(cornell->meshes[i])));
-	}
+	for (unsigned int i = 0; i < cornell->meshes.size(); ++i) renderers.push_back(new MeshRenderer(&(cornell->meshes[i])));
 	for (auto & r : renderers) {
 		r->transform.position -= glm::vec3(0.00f, 0.0f, 0);
 		r->transform.scale = glm::vec3(0.995f);
 		r->transform.updateTransformMatrix();
 	}
-	teapotIndex = renderers.size();
-
-	// Dragon.
-	Shape * dragon = ObjLoader::loadObjFile("Assets\\Models\\dragon.obj");
-	shapes.push_back(dragon);
-	for (unsigned int i = 0; i < dragon->meshes.size(); ++i) {
-		renderers.push_back(new MeshRenderer(&(dragon->meshes[i])));
-	}
-	lightCubeIndex = renderers.size();
-
-	// Light cube.
-	Shape * lightCube = ObjLoader::loadObjFile("Assets\\Models\\sphere.obj");
-	shapes.push_back(lightCube);
-	for (unsigned int i = 0; i < lightCube->meshes.size(); ++i) {
-		renderers.push_back(new MeshRenderer(&(lightCube->meshes[i])));
-	}
-
-	/*
-	Shape * sponza = ObjLoader::loadObjFile("Assets\\Models\\sponza.obj");
-	shapes.push_back(sponza);
-	for (unsigned int i = 0; i < sponza->meshes.size(); ++i) {
-	renderers.push_back(new MeshRenderer(&(sponza->meshes[i])));
-	}
-	*/
 
-	// Cornell box.
 	renderers[0]->materialSetting = MaterialSetting::Red(); // Green wall.
 	renderers[1]->materialSetting = MaterialSetting::White(); // Floor.
 	renderers[2]->materialSetting = MaterialSetting::White(); // Roof.
 	renderers[3]->materialSetting = MaterialSetting::Blue(); // Red wall.
-	renderers[3]->tweakable = true;
 	renderers[4]->materialSetting = MaterialSetting::White(); // White wall.
 	renderers[5]->materialSetting = MaterialSetting::White(); // Left box.
 	renderers[6]->materialSetting = MaterialSetting::White(); // Right box.
 	renderers[5]->enabled = false; // Disable boxes.
 	renderers[6]->enabled = false; // Disable boxes.
 
 	// Dragon.
-	renderers[teapotIndex]->materialSetting = MaterialSetting::White();
-	renderers[teapotIndex]->materialSetting->specularColor = glm::vec3(1.0, 0.9, 0.15);
-	renderers[teapotIndex]->materialSetting->diffuseColor = renderers[teapotIndex]->materialSetting->specularColor;
-	renderers[teapotIndex]->materialSetting->emissivity = 0.0f;
-	renderers[teapotIndex]->materialSetting->specularReflectivity = 1.0;
-	renderers[teapotIndex]->materialSetting->diffuseReflectivity = 0.0;
-	renderers[teapotIndex]->materialSetting->specularDiffusion = 4.5;
-	renderers[teapotIndex]->tweakable = true;
-
-	// Dragon pot.
-	for (unsigned int i = teapotIndex; i < renderers.size(); ++i) {
-		auto & r = renderers[i];
-		r->transform.scale = glm::vec3(1.5f);
-		r->transform.rotation = glm::vec3(0, 1.0, 0);
-		r->transform.position = glm::vec3(0, -0.3, 0);
-		r->transform.updateTransformMatrix();
+	int dragonIndex = renderers.size();
+	Shape * dragon = ObjLoader::loadObjFile("Assets\\Models\\dragon.obj");
+	shapes.push_back(dragon);
+	for (unsigned int i = 0; i < dragon->meshes.size(); ++i) {
+		renderers.push_back(new MeshRenderer(&(dragon->meshes[i])));
 	}
-
-	// Light cube.
-	renderers[lightCubeIndex]->materialSetting = MaterialSetting::Emissive();
-	renderers[lightCubeIndex]->materialSetting->diffuseColor.r = 1.0f;
-	renderers[lightCubeIndex]->materialSetting->diffuseColor.g = 1.0f;
-	renderers[lightCubeIndex]->materialSetting->diffuseColor.b = 1.0f;
-	renderers[lightCubeIndex]->materialSetting->emissivity = 2.0f;
-	renderers[lightCubeIndex]->materialSetting->specularReflectivity = 0.0f;
-	renderers[lightCubeIndex]->materialSetting->diffuseReflectivity = 0.0f;
-
-	// Lighting.
+	auto * dragonRenderer = renderers[dragonIndex];
+	dragonRenderer->transform.scale = glm::vec3(1.79f);
+	dragonRenderer->transform.rotation = glm::vec3(0, 2.0, 0);
+	dragonRenderer->transform.position = glm::vec3(-0.09f, -0.50f, 0.01f);
+	dragonRenderer->transform.updateTransformMatrix();
+	dragonRenderer->tweakable = true;
+	dragonRenderer->name = "Dragon";
+	dragonRenderer->materialSetting = MaterialSetting::White();
+
+	auto * dragonMaterialSetting = dragonRenderer->materialSetting;
+	dragonMaterialSetting->specularColor = glm::vec3(0.95, 1, 0.95);
+	dragonMaterialSetting->diffuseColor = dragonMaterialSetting->specularColor;
+	dragonMaterialSetting->emissivity = 0.00f;
+	dragonMaterialSetting->transparency = 0.00f;
+	dragonMaterialSetting->refractiveIndex = 1.18f;
+	dragonMaterialSetting->specularReflectivity = 1.00f;
+	dragonMaterialSetting->diffuseReflectivity = 0.0f;
+	dragonMaterialSetting->specularDiffusion = 2.0f;
+
+	// Light.
+	Shape * light = ObjLoader::loadObjFile("Assets\\Models\\quad.obj");
+	shapes.push_back(light);
+	lampRenderer = new MeshRenderer(&(light->meshes[0]));
+	renderers.push_back(lampRenderer);
+
+	lampRenderer->materialSetting = MaterialSetting::Emissive();
+	lampRenderer->materialSetting->diffuseColor.r = 1.f;
+	lampRenderer->materialSetting->diffuseColor.g = 1.f;
+	lampRenderer->materialSetting->diffuseColor.b = 1.f;
+	lampRenderer->materialSetting->emissivity = 1.0f;
+	lampRenderer->materialSetting->specularReflectivity = 0.0f;
+	lampRenderer->materialSetting->diffuseReflectivity = 1.0f;
+
+	lampRenderer->transform.position = glm::vec3(0, 0.975, 0);
+	lampRenderer->transform.rotation = glm::vec3(-3.1414 * 0.5, 3.1414 * 0.5, 0);
+	lampRenderer->transform.scale = glm::vec3(0.14f, 0.34f, 1.0f);
+	lampRenderer->transform.updateTransformMatrix();
+	lampRenderer->name = "Ceiling lamp";
+
+	// Point light.
 	PointLight p;
-	p.color = glm::vec3(0.75f, 0.1f, 0.1f);
+	p.color = glm::vec3(0.5);
+	p.position = lampRenderer->transform.position - glm::vec3(0, 0.2, 0);
 	pointLights.push_back(p);
-	pointLights[0].color = glm::vec3(1.4f, 0.9f, 0.35f);
-	pointLights[0].color = normalize(pointLights[0].color);
 }
 
 void DragonScene::update() {
 	FirstPersonScene::update();
 
-	glm::vec3 r = glm::vec3(sinf(float(Time::time * 0.97)), sinf(float(Time::time * 0.45)), sinf(float(Time::time * 0.32)));
-
-	// Lighting.
-	renderers[lightCubeIndex]->transform.position = glm::vec3(0, 0.5, 0) + r * 0.1f;
-	renderers[lightCubeIndex]->transform.position.x *= 4.5f;
-	renderers[lightCubeIndex]->transform.position.z *= 4.5f;
-	renderers[lightCubeIndex]->transform.rotation = r;
-	renderers[lightCubeIndex]->transform.scale = glm::vec3(0.049f);
-	renderers[lightCubeIndex]->transform.updateTransformMatrix();
-	pointLights[0].position = renderers[lightCubeIndex]->transform.position;
-	renderers[lightCubeIndex]->materialSetting->diffuseColor = pointLights[0].color;
+	glm::vec3 col = pointLights[0].color;
+	float m = col.r;
+	m = glm::max(m, col.b);
+	m = glm::max(m, col.g);
+
+	lampRenderer->materialSetting->diffuseColor = col /= m;
+	lampRenderer->materialSetting->emissivity = 2 * m;
 }
 
 DragonScene::~DragonScene() {
-	for (auto * r : renderers) delete r;
 	for (auto * s : shapes) delete s;
+	for (auto * r : renderers) delete r;
 }

Source/Scene/Scenes/DragonScene.h

@@ -2,11 +2,12 @@
 
 #include <vector>
 
+#include "../Scene.h"
 #include "../Templates/FirstPersonScene.h"
 
 class Shape;
 
-/// <summary> A scene with a dragon and a lamp in the ceiling. </summary>
+/// <summary> A scene with a specular dragon and a ceiling lamp. </summary>
 class DragonScene : public FirstPersonScene {
 public:
 	void update() override;

Source/Scene/Scenes/GlassScene.cpp

@@ -52,8 +52,10 @@ void GlassScene::init(unsigned int viewportWidth, unsigned int viewportHeight) {
 	renderers[6]->materialSetting = MaterialSetting::White(); // Right box.
 	renderers[6]->enabled = false;
 
+
+	// Buddha.
 	int buddhaIndex = renderers.size();
-	Shape * buddha = ObjLoader::loadObjFile("Assets\\Models\\dragon.obj");
+	Shape * buddha = ObjLoader::loadObjFile("Assets\\Models\\buddha.obj");
 	shapes.push_back(buddha);
 	for (unsigned int i = 0; i < buddha->meshes.size(); ++i) {
 		renderers.push_back(new MeshRenderer(&(buddha->meshes[i])));
@@ -85,6 +87,7 @@ void GlassScene::init(unsigned int viewportWidth, unsigned int viewportHeight) {
 	renderers[lightCubeIndex]->materialSetting->specularReflectivity = 0.0f;
 	renderers[lightCubeIndex]->materialSetting->diffuseReflectivity = 0.0f;
 
+	// An additional wall (behind the camera).
 	int backWallIndex = renderers.size();
 	Shape * backWall = ObjLoader::loadObjFile("Assets\\Models\\quadn.obj");
 	shapes.push_back(backWall);

Source/Scene/Scenes/MultipleObjectsScene.cpp

@@ -58,7 +58,7 @@ void MultipleObjectsScene::init(unsigned int viewportWidth, unsigned int viewpor
 	objectMaterialSetting->specularReflectivity = 1.0f;
 	objectMaterialSetting->diffuseReflectivity = 0.0f;
 	objectMaterialSetting->specularDiffusion = 3.2f;
-	objectMaterialSetting->transparency = 0.9f;
+	objectMaterialSetting->transparency = 1.0f;
 	objectRenderer->tweakable = true;
 	objectRenderer->transform.scale = glm::vec3(0.23f);
 	objectRenderer->transform.rotation = glm::vec3(0.00, 0.30, 0.00);

voxel-cone-tracing.vcxproj

@@ -106,7 +106,7 @@
       <AdditionalOptions>/NODEFAULTLIB:libcmt.lib %(AdditionalOptions)</AdditionalOptions>
     </Link>
     <PostBuildEvent>
-        <Command>copy /Y "$(TargetDir)$(ProjectName).dll" "$(SolutionDir)lib\$(ProjectName).dll"</Command>
+      <Command>copy /Y "$(TargetDir)$(ProjectName).dll" "$(SolutionDir)lib\$(ProjectName).dll"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -187,7 +187,6 @@
     <ClInclude Include="Source\Scene\Scene.h" />
     <ClInclude Include="Source\Scene\ScenePack.h" />
     <ClInclude Include="Source\Scene\Scenes\GlassScene.h" />
-    <ClInclude Include="Source\Scene\Scenes\TransparencyScene.h" />
     <ClInclude Include="Source\Scene\Scenes\CornellScene.h" />
     <ClInclude Include="Source\Scene\Scenes\DragonScene.h" />
     <ClInclude Include="Source\Scene\Scenes\MultipleObjectsScene.h" />
@@ -217,7 +216,6 @@
     <ClCompile Include="Source\Graphic\Texture2D.cpp" />
     <ClCompile Include="Source\Graphic\Texture3D.cpp" />
     <ClCompile Include="Source\Scene\Scenes\GlassScene.cpp" />
-    <ClCompile Include="Source\Scene\Scenes\TransparencyScene.cpp" />
     <ClCompile Include="Source\Scene\Scenes\CornellScene.cpp" />
     <ClCompile Include="Source\Scene\Scenes\DragonScene.cpp" />
     <ClCompile Include="Source\Scene\Scenes\MultipleObjectsScene.cpp" />
@@ -236,4 +234,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

voxel-cone-tracing.vcxproj.filters

@@ -102,9 +102,6 @@
     <ClInclude Include="Source\Scene\ScenePack.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Source\Scene\Scenes\TransparencyScene.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Source\Scene\Scenes\MultipleObjectsScene.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -182,9 +179,6 @@
     <ClCompile Include="Source\Scene\Templates\FirstPersonScene.h">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\Scene\Scenes\TransparencyScene.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Source\Scene\Scenes\MultipleObjectsScene.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>