little focus fix. Enabled optimizations.

Author: PhilipPragerUrbina

DogeRay.vcxproj

@@ -72,10 +72,14 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Custom</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <OmitFramePointers>true</OmitFramePointers>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -87,6 +91,7 @@
     <CudaCompile>
       <TargetMachinePlatform>64</TargetMachinePlatform>
       <Include>%(AdditionalIncludeDirectories)</Include>
+      <FastMath>false</FastMath>
     </CudaCompile>
   </ItemDefinitionGroup>
   <ItemGroup>

classes/bvhtree.hpp

@@ -70,7 +70,7 @@ class Bvhtree {
 	//build BVH tree
 	void build() {
 		//split
-		std::cout << "building BVH \n";
+		std::cout << "building BVH\n";
 		recursivesplit(traingles);
 		std::cout << "linking BVH \n";
 		createlinks(0, -1);
@@ -106,15 +106,14 @@ class Bvhtree {
 			nodes.push_back(parent);
 			return parentindex;
 		}
-
 		//push current node
 		nodes.push_back(parent);
 		//get axis with most difference
 		int axis = (parent.box.max - parent.box.min).extent();
 		//split by middle
 		int mid = remaining.size() / 2;
 		//sort and split by center of bounding box
-		std::nth_element(remaining.begin(),remaining.begin()+mid, remaining.end(),
+		std::nth_element(remaining.begin(), remaining.begin() + mid, remaining.end(),
 			[axis](const Tri& a, const Tri& b) {
 				return a.box.center[axis] < b.box.center[axis];
 			});

classes/camera.hpp

@@ -14,13 +14,13 @@ class Camera {
     float degreefov = 45;
     Vec3 up{ 0, 1, 0 };
     float aperture = 0;
-    float focusoffset = 0;
+    float focus = 1;
 
     //no constructor to allow this to be in struct
     //calculate camera parameters
     void calculate() {
         //autofocus
-        Vec3 focusdistance = (position - lookposition).length() + focusoffset;
+        Vec3 focusdistance = focus;
         //convert fov from degrees to radians
         radfov = degreefov * M_PI / 180.0f;
         float h = tan(radfov / 2);

classes/gui.hpp

@@ -117,7 +117,7 @@ class Gui {
         changed |= ImGui::DragFloat3("camera position", settings->cam.position.values);
         //more camera options
         if (ImGui::CollapsingHeader("Lens")) {
-            changed |= ImGui::DragFloat("focus distance", &settings->cam.focusoffset);
+            changed |= ImGui::DragFloat("Focus distance", &settings->cam.focus);
             changed |= ImGui::SliderFloat("aperture", &settings->cam.aperture, 0, 5);
             changed |= ImGui::SliderFloat("FOV", &settings->cam.degreefov, 0, 180);
             if (settings->cam.lookat) {

classes/program.hpp

@@ -68,7 +68,7 @@ class Program {
    \:\/.:| |\:\_\ \ \\:\_\ \ \  \:\____/\\ \ `\ \ \\:.\ \  \ \ \::\ \    \:\____/\ 
     \____/_/ \_____\/ \_____\/   \_____\/ \_\/ \_\/ \__\/\__\/  \__\/     \_____\/  )" << std::endl;
 
-        std::cout << "V.2.0   by Philip Prager Urbina   2022" << std::endl;
+        std::cout << "V.2.0.0   by Philip Prager Urbina   2022" << std::endl;
         std::cout << "Find on github: https://github.com/PhilipPragerUrbina/DOGERAY2" << std::endl;
 	}