add more to task7

Author: lumixraku

.DS_Store

@@ -108,11 +108,19 @@ After you click running, you will see models copied into `~/Library/Developer/Xc
 
 First argument is `output.png`. Second argument is `texture or phone or normal ..`
 
-## for task5
+## for task5 6
 ### No template named 'optional' in namespace 'std'
 
 Set `C++ Language Dialect` to `C++ 17 [std=C++17]`
 
 Set `C++ Standard Library` to `... LLVM C++ ...`
 
 
+## for task 7 
+omp.h
+
+`brew install libomp`
+
+/usr/local/Cellar/libomp/10.0.0/include
+
+https://stackoverflow.com/questions/25990296/how-to-include-omp-h-in-os-x

GAMES101_Lecture_05.pdf

@@ -3,4 +3,22 @@
    uuid = "3D5F5D45-11BA-402E-957C-D442CF1D3186"
    type = "1"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "42886011-A09E-4D31-976F-83A80E494D0C"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "task2/main.cpp"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "40"
+            endingLineNumber = "40"
+            landmarkName = "get_projection_matrix(eye_fov, aspect_ratio, zNear, zFar)"
+            landmarkType = "9">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>

README.md

@@ -37,7 +37,7 @@ Eigen::Matrix4f get_projection_matrix(float eye_fov, float aspect_ratio, float z
     // Then return it.
     float eye_angle = eye_fov *MY_PI / 180;
     float t,b,l,r;
-    t = - zNear * tan(eye_angle /2);//------
+    t =  abs(zNear) * tan(eye_angle /2);//------
     r = t * aspect_ratio;
     l = -r;
     b = -t;
@@ -117,7 +117,7 @@ int main(int argc, const char** argv)
 
         r.set_model(get_model_matrix(angle));
         r.set_view(get_view_matrix(eye_pos));
-        r.set_projection(get_projection_matrix(45, 1, 0.1, 50));
+        r.set_projection(get_projection_matrix(45, 1, -0.1, -50));
 
         r.draw(pos_id, ind_id, col_id, rst::Primitive::Triangle);
         cv::Mat image(700, 700, CV_32FC3, r.frame_buffer().data());
@@ -135,7 +135,7 @@ int main(int argc, const char** argv)
 
         r.set_model(get_model_matrix(angle));
         r.set_view(get_view_matrix(eye_pos));
-        r.set_projection(get_projection_matrix(45, 1, 0.1, 50));
+        r.set_projection(get_projection_matrix(45, 1, -0.1, -50));
 
         r.draw(pos_id, ind_id, col_id, rst::Primitive::Triangle);
 

task2/task2/task2.xcodeproj/project.xcworkspace/xcuserdata/lilin.xcuserdatad/UserInterfaceState.xcuserstate

@@ -233,7 +233,7 @@ void Renderer::Render(const Scene& scene)
             // Also, don't forget to multiply both of them with the variable *scale*, and
             // x (horizontal) variable with the *imageAspectRatio*
             x = imageAspectRatio * (2 * float(i) / (float)scene.width - 1); // 坐标从 1280 * 800 转为 [0, 1] 再转为 [-1, 1] 再转为 [-imageAspectRatio, imageAspectRatio]
-            y = 1 - ( 2 *float(j) / float(scene.height) ); // 做成数学坐标系  越往上 y 值越大  [1, ]
+            y = 1 - (2 * float(j) / float(scene.height));                   // 做成数学坐标系  越往上 y 值越大  [-1, 1]
             //std::cout << x <<"---"<<y <<'\n';
             Vector3f dir = Vector3f(x, y, -1); // Don't forget to normalize this direction!
             dir = normalize(dir);