Merge pull request #8 from HudHud-Maps/fix_depth_buffer

fix depth buffer

.github/actions/get-pr-number/action.yml

@@ -1,5 +1,9 @@
 name: 'get-pr-number'
 description: 'Gets the PR number from an artifact'
+inputs:
+  platform-name:
+    description: "Name of the target platform"
+    required: true
 outputs:
   pr-number:
     description: "PR number or empty string"
@@ -9,7 +13,7 @@ runs:
   steps:
     - uses: ./.github/actions/download-workflow-run-artifact
       with:
-        artifact-name: pr-number
+        artifact-name: pr-number-${{ inputs.platform-name }}
 
     - run: touch ./pr_number
       shell: bash

.github/actions/save-pr-number/action.yml

@@ -1,5 +1,9 @@
 name: 'save-pr-number'
 description: 'Saves the current PR number as artifact'
+inputs:
+  platform-name:
+    description: "Name of the target platform"
+    required: true
 runs:
   using: "composite"
   steps:
@@ -12,5 +16,5 @@ runs:
       - name: Upload pr_number
         uses: actions/upload-artifact@v4
         with:
-          name: pr-number
+          name: pr-number-${{ inputs.platform-name }}
           path: ./pr_number

.github/workflows/android-ci.yml

@@ -184,6 +184,8 @@ jobs:
 
       - if: github.event_name == 'pull_request'
         uses: ./.github/actions/save-pr-number
+        with:
+          platform-name: "android"
 
       - name: Build Instrumentation Tests, copy to platform/android
         run: |

.github/workflows/android-device-test.yml

@@ -84,6 +84,8 @@ jobs:
 
       - uses: ./.github/actions/get-pr-number
         id: get-pr-number
+        with:
+          platform-name: "android"
 
       - name: Generate token
         id: generate_token

.github/workflows/ios-ci.yml

@@ -193,6 +193,8 @@ jobs:
 
       - if: github.event_name == 'pull_request'
         uses: ./.github/actions/save-pr-number
+        with:
+          platform-name: "ios"
 
       - name: Build DocC documentation
         working-directory: .

.github/workflows/linux-ci.yml

@@ -177,6 +177,8 @@ jobs:
 
       - if: github.event_name == 'pull_request'
         uses: ./.github/actions/save-pr-number
+        with:
+          platform-name: "linux-${{ matrix.renderer }}"
 
   linux-coverage:
     runs-on: ubuntu-22.04

.github/workflows/pr-bloaty-ios.yml

@@ -63,6 +63,8 @@ jobs:
 
       - uses: ./.github/actions/get-pr-number
         id: get-pr-number
+        with:
+          platform-name: "ios"
 
       - uses: ./.github/actions/download-workflow-run-artifact
         with:

.github/workflows/pr-linux-tests.yml

@@ -37,6 +37,8 @@ jobs:
 
       - uses: ./.github/actions/get-pr-number
         id: get-pr-number
+        with:
+          platform-name: "linux-vulkan"
 
       - uses: ./.github/actions/download-workflow-run-artifact
         with:
@@ -134,6 +136,8 @@ jobs:
 
       - uses: ./.github/actions/get-pr-number
         id: get-pr-number
+        with:
+          platform-name: "linux-vulkan"
 
       - uses: ./.github/actions/download-workflow-run-artifact
         with:

include/mbgl/style/layers/custom_layer_render_parameters.hpp

@@ -23,6 +23,7 @@ struct CustomLayerRenderParameters {
     double pitch;
     double fieldOfView;
     std::array<double, 16> projectionMatrix;
+    std::array<double, 16> nearClippedProjMatrix;
 
     CustomLayerRenderParameters(const PaintParameters&);
 };

platform/darwin/src/MLNCustomStyleLayer.h

@@ -24,6 +24,7 @@ typedef struct MLNStyleLayerDrawingContext {
   CGFloat pitch;
   CGFloat fieldOfView;
   MLNMatrix4 projectionMatrix;
+  MLNMatrix4 nearClippedProjMatrix;
 } MLNStyleLayerDrawingContext;
 
 MLN_EXPORT

platform/darwin/src/MLNCustomStyleLayer.mm

@@ -204,7 +204,8 @@ void render(const mbgl::style::CustomLayerRenderParameters& parameters) {
             .direction = mbgl::util::wrap(parameters.bearing, 0., 360.),
             .pitch = static_cast<CGFloat>(parameters.pitch),
             .fieldOfView = static_cast<CGFloat>(parameters.fieldOfView),
-            .projectionMatrix = MLNMatrix4Make(parameters.projectionMatrix)
+            .projectionMatrix = MLNMatrix4Make(parameters.projectionMatrix),
+            .nearClippedProjMatrix = MLNMatrix4Make(parameters.nearClippedProjMatrix)
         };
         if (layer.mapView) {
             [layer drawInMapView:layer.mapView withContext:drawingContext];

platform/darwin/src/gltf/GLTFManagerRenderingEnvironmentMetal.hpp

@@ -30,8 +30,8 @@ namespace maplibre { namespace gltf {
         // TBD: These are placeholders as we noodle how to integrate with ML
         // Depth descriptor: If this is null, then use an internal depth
         id<MTLTexture> _depthStencilTexture = nullptr;
-                
-                
+
+        id<MTLTexture> _colorTexture = nullptr;      
     };
 
 }}

platform/darwin/src/gltf/GLTFModelLayer.mm

@@ -300,38 +300,38 @@ - (void)drawInMapView:(MLNMapView *)mapView withContext:(MLNStyleLayerDrawingCon
         _manager->setProjectionCallback(^Cartesian3D(const Coordinate2D & coordinate){
             Cartesian3D tempResult;
 
-            tempResult._x = 0;
-            tempResult._y = 0;
+            tempResult._x = 5198170.102753558;
+            tempResult._y = 2832006.4886368043;
             tempResult._z = 0;
-
+            
             tempResult._x = coordinate._lon * DEG_RAD;
             double lat = coordinate._lat * DEG_RAD;
-//            if (lat < -PoleLimit) lat = -PoleLimit;
-//            if (lat > PoleLimit) lat = PoleLimit;
             tempResult._y = log((1.0f+sin(lat))/cos(lat));
 
             double metersScale = 20037508.34;
             tempResult._x = tempResult._x * metersScale / M_PI;
             tempResult._y = tempResult._y * metersScale / M_PI;
             return tempResult;
-
         });
 
         loadModels = true;
     }
 
     _metalEnvironment->_currentFOVDEG = context.fieldOfView * RAD_DEG;
-    _metalEnvironment->_currentProjectionMatrix = toSimdMatrix4D(context.projectionMatrix);
+    _metalEnvironment->_currentProjectionMatrix = toSimdMatrix4D(context.nearClippedProjMatrix);
     _metalEnvironment->_currentZoomLevel = context.zoomLevel;
     _metalEnvironment->_currentCommandEncoder = self.renderEncoder;
     _metalEnvironment->_currentCommandBuffer = resource.commandBuffer;
     _metalEnvironment->_metalDevice = resource.mtkView.device;
     _metalEnvironment->_currentDrawable = resource.mtkView.currentDrawable;
     _metalEnvironment->_currentRenderPassDescriptor = resource.mtkView.currentRenderPassDescriptor;
+    _metalEnvironment->_depthStencilTexture = resource.mtkView.currentRenderPassDescriptor.depthAttachment.texture;
+    _metalEnvironment->_colorTexture = resource.mtkView.currentRenderPassDescriptor.colorAttachments[0].texture;
+
     if (self.lightSet) {
         _metalEnvironment->_lightDirection = simd_make_float3(_lightX, _lightY, _lightZ);
     }
-
+    
     // TODO: Remove this..  This is legacy
     _manager->setRenderingEnvironmentVariables(_metalEnvironment);
 
@@ -354,7 +354,6 @@ - (void)drawInMapView:(MLNMapView *)mapView withContext:(MLNStyleLayerDrawingCon
 
     // Render the image
     _manager->render();
-
 }
 
 - (void)willMoveFromMapView:(MLNMapView *)mapView {

platform/darwin/src/gltf/GLTFRenderer.cpp

@@ -25,7 +25,7 @@ void GLTFRenderer::update(float timeSinceLastDraw) {
 }
 
 // Render
-void GLTFRenderer::render() {
+ void GLTFRenderer::render() {
     // Base class does nothing
 }