camera

Author: Kyjor

src/engine/Camera/Camera.jl

@@ -6,9 +6,8 @@ module CameraModule
     mutable struct Camera
 		backgroundColor::NTuple{4, Int}
         offset::Vector2f
-        position::Vector2f
+        position::Vector3f
         size::Vector2
-        zPosition::Float64
         yaw::Float64
         pitch::Float64
         target::Union{
@@ -17,7 +16,7 @@ module CameraModule
             }
         windowPos::Vector2
 
-        function Camera(size::Vector2, initialPosition::Vector2f, offset::Vector2f, target)
+        function Camera(size::Vector2, initialPosition::Vector3f, offset::Vector2f, target)
             this = new()
 
             this.backgroundColor = (0,0,0, 255)
@@ -26,33 +25,36 @@ module CameraModule
             this.offset = Vector2f(offset.x, offset.y)
             this.target = target
             this.windowPos = Vector2(0,0)
-            this.zPosition = -5.0
             this.yaw = 0.0
             this.pitch = 0.0
 
             return this
         end
     end
 
-    function update(this::Camera, newPosition = nothing)
+    function update(this::Camera, newPosition::Union{Nothing, Vector3f} = nothing)
         SDL2.SDL_SetRenderDrawBlendMode(JulGame.Renderer::Ptr{SDL2.SDL_Renderer}, SDL2.SDL_BLENDMODE_BLEND)
         rgba = (r = Ref(UInt8(0)), g = Ref(UInt8(0)), b = Ref(UInt8(0)), a = Ref(UInt8(255)))
         SDL2.SDL_GetRenderDrawColor(JulGame.Renderer::Ptr{SDL2.SDL_Renderer}, rgba.r, rgba.g, rgba.b, rgba.a)
         SDL2.SDL_SetRenderDrawColor(Renderer, this.backgroundColor[1], this.backgroundColor[2], this.backgroundColor[3], this.backgroundColor[4]);
         SDL2.SDL_RenderFillRectF(Renderer, Ref(SDL2.SDL_FRect(this.windowPos.x, this.windowPos.y, this.size.x, this.size.y)))
         SDL2.SDL_SetRenderDrawColor(JulGame.Renderer::Ptr{SDL2.SDL_Renderer}, rgba.r[], rgba.g[], rgba.b[], rgba.a[]);
 
-        center =  Vector2f(this.size.x/SCALE_UNITS/2, this.size.y/SCALE_UNITS/2)
-        if this.target !== nothing && newPosition === nothing && this.target !== C_NULL && newPosition !== C_NULL
-            targetPos = this.target.position
-            targetScale = this.target.scale
-            this.position = targetPos - center + 0.5 * targetScale + this.offset
+        center_pixels = Vector2f(this.size.x / 2, this.size.y / 2)
+        center_world = center_pixels / SCALE_UNITS
+
+        if this.target !== nothing && this.target !== C_NULL && newPosition === nothing
+            targetPos::Vector3f = this.target.position
+            targetScale::Vector2f = this.target.scale
+            this.position = Vector3f(targetPos.x - center_world.x + 0.5 * targetScale.x + this.offset.x,
+                                     targetPos.y - center_world.y + 0.5 * targetScale.y + this.offset.y, 
+                                     targetPos.z)
             return
         end
-        if newPosition === nothing || newPosition == C_NULL
-            return
+
+        if newPosition !== nothing
+            this.position = newPosition
         end
-        this.position = newPosition
     end
 
     # making set property observable

src/engine/Component/Mesh3D.jl

@@ -579,7 +579,7 @@ module Mesh3DModule
                     println("point at")
                     # Calculate direction to cube
                     cubePos = this.parent.transform.position
-                    cameraPos = vec3d(camera.position.x, camera.position.y, camera.zPosition)
+                    cameraPos = vec3d(camera.position.x, camera.position.y, camera.position.z)
                     direction = MatrixOps.vector_sub(vec3d(cubePos.x, cubePos.y, cubePos.z), cameraPos)
                     direction = MatrixOps.vector_normalize(direction)
 
@@ -613,7 +613,7 @@ module Mesh3DModule
         this.matWorld = MatrixOps.matrix_multiply_matrix(this.matWorld, matTrans)
 
         # Get camera position and create view matrix
-        cameraPos = vec3d(main.scene.camera.position.x, main.scene.camera.position.y, main.scene.camera.zPosition)
+        cameraPos = vec3d(main.scene.camera.position.x, main.scene.camera.position.y, main.scene.camera.position.z)
         vUp = vec3d(0, 1, 0)
         vTarget = vec3d(0, 0, 1)
 
@@ -632,67 +632,52 @@ module Mesh3DModule
         # Process each triangle
         for tri in this.mesh.tris
             triProjected::triangle = triangle()
-			triTransformed::triangle = triangle()
-			triViewed::Ref{triangle} = Ref(triangle())
+            triTransformed::triangle = triangle()
+            triViewed::Ref{triangle} = Ref(triangle())
 
             # Transform triangle vertices
             triTransformed.p[1] = MatrixOps.matrix_multiply_vector(this.matWorld, tri.p[1])
             triTransformed.p[2] = MatrixOps.matrix_multiply_vector(this.matWorld, tri.p[2])
             triTransformed.p[3] = MatrixOps.matrix_multiply_vector(this.matWorld, tri.p[3])
 
-            # Debug check for NaNs after world transform
-            if any(isnan.(triTransformed.p[1].x) .|| isnan.(triTransformed.p[1].y) .|| isnan.(triTransformed.p[1].z))
-                println("NaN detected after world transform")
-                println("Position: ", pos)
-                println("Scale: ", scale)
-                println("Rotation: ", rot)
-            end
-
+            # Calculate normal
             normal::vec3d = vec3d(0, 0, 0)
-            line1::vec3d  = vec3d(0, 0, 0)
-            line2::vec3d  = vec3d(0, 0, 0)
+            line1::vec3d = vec3d(0, 0, 0)
+            line2::vec3d = vec3d(0, 0, 0)
 
             # Get lines either side of the triangle
             line1 = MatrixOps.vector_sub(triTransformed.p[2], triTransformed.p[1])
             line2 = MatrixOps.vector_sub(triTransformed.p[3], triTransformed.p[1])
 
             # Take cross product of lines to get normal to triangle surface 
             normal = MatrixOps.vector_cross_product(line1, line2)
-
-            # you normally need to normalize a normal!
             normal = MatrixOps.vector_normalize(normal)
-            
+
+            # Calculate distance from camera to triangle center
+            triCenter = MatrixOps.vector_div(
+                MatrixOps.vector_add(
+                    MatrixOps.vector_add(triTransformed.p[1], triTransformed.p[2]),
+                    triTransformed.p[3]
+                ),
+                3.0
+            )
+            distanceToCamera = MatrixOps.vector_length(
+                MatrixOps.vector_sub(cameraPos, triCenter)
+            )
+
+            # Skip triangles that are too far away
+            if distanceToCamera > this.fFar
+                continue
+            end
+
             # Get Ray from triangle to camera 
             vCameraRay::vec3d = MatrixOps.vector_sub(cameraPos, triTransformed.p[1])
             if MatrixOps.vector_dot_product(normal, vCameraRay) > 0.0
-                # Combine camera-based lighting with fixed light direction
-                camera_light = MatrixOps.vector_normalize(vCameraRay)
-                fixed_light = MatrixOps.vector_normalize(vec3d(-0.707, -0.707, -1.0))
-                
-                # Calculate dot products for both light sources
-                dp_camera = MatrixOps.vector_dot_product(normal, camera_light)
-                dp_fixed = MatrixOps.vector_dot_product(normal, fixed_light)
-                
-                # Combine the lighting (weighted average)
-                dp = 0.3 * dp_camera + 0.7 * dp_fixed
-
-                # Add some ambient light to prevent completely dark faces
-                ambient = 0.2
-                dp = max(ambient, dp)
-
                 # Convert to view space
                 triViewed[].p[1] = MatrixOps.matrix_multiply_vector(matView, triTransformed.p[1])
                 triViewed[].p[2] = MatrixOps.matrix_multiply_vector(matView, triTransformed.p[2])
                 triViewed[].p[3] = MatrixOps.matrix_multiply_vector(matView, triTransformed.p[3])
 
-                # Debug check for NaNs after view transform
-                if any(isnan.(triViewed[].p[1].x) .|| isnan.(triViewed[].p[1].y) .|| isnan.(triViewed[].p[1].z))
-                    println("NaN detected after view transform")
-                    println("Camera position: ", cameraPos)
-                    println("Camera yaw: ", main.scene.camera.yaw)
-                    println("Camera pitch: ", main.scene.camera.pitch)
-                end
-
                 # Clip against near plane
                 clipped = Ref([triangle([vec3d(0.0, 0.0, 0.0), vec3d(0.0, 0.0, 0.0), vec3d(0.0, 0.0, 0.0)]), triangle([vec3d(0.0, 0.0, 0.0), vec3d(0.0, 0.0, 0.0), vec3d(0.0, 0.0, 0.0)])])
                 nClippedTriangles = triangle_clip_against_plane(vec3d(0.0, 0.0, this.fNear), vec3d(0.0, 0.0, 1.0), triViewed, clipped)
@@ -704,19 +689,16 @@ module Mesh3DModule
                         triProjected.p[2] = MatrixOps.matrix_multiply_vector(this.matProj, clipped[][i].p[2])
                         triProjected.p[3] = MatrixOps.matrix_multiply_vector(this.matProj, clipped[][i].p[3])
 
-                        # Debug check for NaNs after projection
-                        if any(isnan.(triProjected.p[1].x) .|| isnan.(triProjected.p[1].y) .|| isnan.(triProjected.p[1].z))
-                            println("NaN detected after projection")
-                            println("Near plane: ", this.fNear)
-                            println("Far plane: ", this.fFar)
-                            println("FOV: ", this.fFov)
-                        end
-
                         # Scale into view
                         triProjected.p[1] = MatrixOps.vector_div(triProjected.p[1], triProjected.p[1].w)
                         triProjected.p[2] = MatrixOps.vector_div(triProjected.p[2], triProjected.p[2].w)
                         triProjected.p[3] = MatrixOps.vector_div(triProjected.p[3], triProjected.p[3].w)
 
+                        # Store the original z values for depth testing
+                        triProjected.p[1].z = triViewed[].p[1].z
+                        triProjected.p[2].z = triViewed[].p[2].z
+                        triProjected.p[3].z = triViewed[].p[3].z
+
                         # Scale to screen
                         windowSize = main.windowManager.windowSize
                         vOffsetView = vec3d(1, 1, 0)
@@ -731,10 +713,15 @@ module Mesh3DModule
                         triProjected.p[3].x *= 0.5 * windowSize.x
                         triProjected.p[3].y *= 0.5 * windowSize.y
 
+                        # Calculate lighting
+                        light_direction = vec3d(0.0, 0.0, -1.0)
+                        dp = MatrixOps.vector_dot_product(normal, light_direction)
+                        dp = max(0.1, dp)  # Add some ambient light
+
                         # Set color based on lighting
-                        r = round(Int, 255 * max(0.0, dp))
-                        g = round(Int, 255 * max(0.0, dp))
-                        b = round(Int, 255 * max(0.0, dp))
+                        r = round(Int, 255 * dp)
+                        g = round(Int, 255 * dp)
+                        b = round(Int, 255 * dp)
                         triProjected.color = SDL_Color(r, g, b, 255)
 
                         push!(this.vecTrianglesToRaster, triProjected)
@@ -743,7 +730,7 @@ module Mesh3DModule
             end
         end
 
-        # Sort triangles by Z depth
+        # Sort triangles by average z depth (back to front)
         sort!(this.vecTrianglesToRaster, by = avg_z, rev = true)
 
         # Render triangles

src/engine/SceneManagement/SceneReader.jl

@@ -96,9 +96,9 @@ module SceneReaderModule
                 end
             end
             uiElements = deserialize_ui_elements(json.UIElements)
-            camera = Camera(Vector2(500,500), Vector2f(),Vector2f(), C_NULL)
+            camera = Camera(Vector2(500,500), Vector3f(),Vector2f(), C_NULL)
             if haskey(json, "Camera")
-                camera = Camera(Vector2(json.Camera.size.x, json.Camera.size.y), Vector2f(json.Camera.position.x, json.Camera.position.y), Vector2f(json.Camera.offset.x, json.Camera.offset.y), C_NULL)
+                camera = Camera(Vector2(json.Camera.size.x, json.Camera.size.y), Vector3f(json.Camera.position.x, json.Camera.position.y, 0.0), Vector2f(json.Camera.offset.x, json.Camera.offset.y), C_NULL)
                 camera.backgroundColor = (json.Camera.backgroundColor.r, json.Camera.backgroundColor.g, json.Camera.backgroundColor.b, json.Camera.backgroundColor.a)
             end