@aguacerowx/react-native 0.0.17 → 0.0.20

package/ios/GridRenderLayer.swift

@@ -783,99 +783,120 @@ public class GridRenderLayer: NSObject {
     
     // MARK: - Internal methods for CustomLayerHost (called by wrapper)
     
-    internal func internalRenderingWillStart(_ metalDevice: MTLDevice, colorPixelFormat: UInt, depthStencilPixelFormat: UInt) {
-        print("🟢 [GridRenderLayer] renderingWillStart called")
-        self.device = metalDevice
-        self.commandQueue = metalDevice.makeCommandQueue()
-        
-        let bundle = Bundle(for: GridRenderLayer.self)
-        guard let shadersUrl = bundle.url(forResource: "AguaceroMetalShaders", withExtension: "bundle") else {
-            print("❌ [GridRenderLayer] Could not find shader bundle")
-            return
-        }
-        guard let metalBundle = Bundle(url: shadersUrl) else {
-            print("❌ [GridRenderLayer] Could not load shader bundle")
-            return
-        }
-        guard let defaultLibrary = try? metalDevice.makeDefaultLibrary(bundle: metalBundle) else {
-            print("❌ [GridRenderLayer] Could not create Metal library")
-            return
-        }
-        
-        let vertexFunction = defaultLibrary.makeFunction(name: "vertex_main")
-        let fragmentFunction = defaultLibrary.makeFunction(name: "fragment_main")
-
-        // Set up vertex descriptor
-        let vertexDescriptor = MTLVertexDescriptor()
-        vertexDescriptor.attributes[0].format = .float2  // position (x, y)
-        vertexDescriptor.attributes[0].offset = 0
-        vertexDescriptor.attributes[0].bufferIndex = 0
-
-        vertexDescriptor.attributes[1].format = .float2  // texCoord (u, v)
-        vertexDescriptor.attributes[1].offset = MemoryLayout<Float>.size * 2
-        vertexDescriptor.attributes[1].bufferIndex = 0
-
-        vertexDescriptor.layouts[0].stride = MemoryLayout<Float>.size * 4  // 2 floats for pos + 2 for texCoord
-        vertexDescriptor.layouts[0].stepFunction = .perVertex
-
-        let pipelineDescriptor = MTLRenderPipelineDescriptor()
-        pipelineDescriptor.vertexDescriptor = vertexDescriptor  // ADD THIS LINE
-        pipelineDescriptor.vertexFunction = vertexFunction
-        pipelineDescriptor.fragmentFunction = fragmentFunction
-        
-        pipelineDescriptor.colorAttachments[0].pixelFormat = MTLPixelFormat(rawValue: colorPixelFormat) ?? .bgra8Unorm
-        pipelineDescriptor.depthAttachmentPixelFormat = MTLPixelFormat(rawValue: depthStencilPixelFormat) ?? .depth32Float_stencil8
-        pipelineDescriptor.stencilAttachmentPixelFormat = MTLPixelFormat(rawValue: depthStencilPixelFormat) ?? .depth32Float_stencil8
-
-        pipelineDescriptor.colorAttachments[0].isBlendingEnabled = true
-        pipelineDescriptor.colorAttachments[0].rgbBlendOperation = .add
-        pipelineDescriptor.colorAttachments[0].alphaBlendOperation = .add
-        pipelineDescriptor.colorAttachments[0].sourceRGBBlendFactor = .sourceAlpha
-        pipelineDescriptor.colorAttachments[0].sourceAlphaBlendFactor = .sourceAlpha
-        pipelineDescriptor.colorAttachments[0].destinationRGBBlendFactor = .oneMinusSourceAlpha
-        pipelineDescriptor.colorAttachments[0].destinationAlphaBlendFactor = .oneMinusSourceAlpha
-
-        do {
-            self.pipelineState = try metalDevice.makeRenderPipelineState(descriptor: pipelineDescriptor)
-        } catch {
-            print("❌ [GridRenderLayer] Failed to create pipeline state: \(error)")
-            return
-        }
-        
-        let dataSamplerDesc = MTLSamplerDescriptor()
-        dataSamplerDesc.minFilter = .nearest
-        dataSamplerDesc.magFilter = .nearest
-        self.dataSamplerState = metalDevice.makeSamplerState(descriptor: dataSamplerDesc)
-
-        let colormapSamplerDesc = MTLSamplerDescriptor()
-        colormapSamplerDesc.minFilter = .nearest
-        colormapSamplerDesc.magFilter = .nearest
-        colormapSamplerDesc.sAddressMode = .clampToEdge
-        self.colormapSamplerState = metalDevice.makeSamplerState(descriptor: colormapSamplerDesc)
-        
-        print("🟢 [GridRenderLayer] Metal setup complete")
-        
-        // Process any pending updates that came in before Metal was ready
-        if let pendingGeometry = pendingGeometryUpdate {
-            print("🟡 [GridRenderLayer] Processing pending geometry update")
-            updateGeometry(corners: pendingGeometry.corners, gridDef: pendingGeometry.gridDef)
-            pendingGeometryUpdate = nil
-        }
-        
-        if let pendingColormap = pendingColormapUpdate {
-            print("🟡 [GridRenderLayer] Processing pending colormap update")
-            updateColormapTexture(colormapAsBase64: pendingColormap)
-            pendingColormapUpdate = nil
-        }
-        
-        if let pendingData = pendingDataUpdate {
-            print("🟡 [GridRenderLayer] Processing pending data update")
-            updateDataTexture(data: pendingData.data, nx: pendingData.nx, ny: pendingData.ny, 
-                            scale: pendingData.scale, offset: pendingData.offset, 
-                            missing: pendingData.missing, scaleType: pendingData.scaleType)
-            pendingDataUpdate = nil
-        }
+internal func internalRenderingWillStart(_ metalDevice: MTLDevice, colorPixelFormat: UInt, depthStencilPixelFormat: UInt) {
+    print("🟢 [GridRenderLayer] renderingWillStart called")
+    self.device = metalDevice
+    self.commandQueue = metalDevice.makeCommandQueue()
+    
+    let bundle = Bundle(for: GridRenderLayer.self)
+
+    // Determine if we're running on simulator or device
+    #if targetEnvironment(simulator)
+    let metallibName = "Shaders-simulator"
+    #else
+    let metallibName = "Shaders-device"
+    #endif
+
+    // Try to load pre-compiled metallib for the current platform
+    let defaultLibrary: MTLLibrary?
+    if let metallibUrl = bundle.url(forResource: metallibName, withExtension: "metallib"),
+    let library = try? metalDevice.makeLibrary(URL: metallibUrl) {
+        print("✅ [GridRenderLayer] Loaded pre-compiled metallib (\(metallibName))")
+        defaultLibrary = library
+    }
+    // Fall back to compiling from .metal source (for development with npm link)
+    else if let metalUrl = bundle.url(forResource: "Shaders", withExtension: "metal"),
+            let source = try? String(contentsOf: metalUrl),
+            let library = try? metalDevice.makeLibrary(source: source, options: nil) {
+        print("✅ [GridRenderLayer] Compiled Metal shader from source")
+        defaultLibrary = library
+    }
+    // Neither worked
+    else {
+        print("❌ [GridRenderLayer] Could not find or compile Metal shaders")
+        print("   Bundle path: \(bundle.bundlePath)")
+        return
+    }
+
+    guard let library = defaultLibrary else {
+        print("❌ [GridRenderLayer] Failed to create Metal library")
+        return
+    }
+    
+    let vertexFunction = library.makeFunction(name: "vertex_main")
+    let fragmentFunction = library.makeFunction(name: "fragment_main")
+
+    // Set up vertex descriptor
+    let vertexDescriptor = MTLVertexDescriptor()
+    vertexDescriptor.attributes[0].format = .float2  // position (x, y)
+    vertexDescriptor.attributes[0].offset = 0
+    vertexDescriptor.attributes[0].bufferIndex = 0
+
+    vertexDescriptor.attributes[1].format = .float2  // texCoord (u, v)
+    vertexDescriptor.attributes[1].offset = MemoryLayout<Float>.size * 2
+    vertexDescriptor.attributes[1].bufferIndex = 0
+
+    vertexDescriptor.layouts[0].stride = MemoryLayout<Float>.size * 4  // 2 floats for pos + 2 for texCoord
+    vertexDescriptor.layouts[0].stepFunction = .perVertex
+
+    let pipelineDescriptor = MTLRenderPipelineDescriptor()
+    pipelineDescriptor.vertexDescriptor = vertexDescriptor
+    pipelineDescriptor.vertexFunction = vertexFunction
+    pipelineDescriptor.fragmentFunction = fragmentFunction
+    
+    pipelineDescriptor.colorAttachments[0].pixelFormat = MTLPixelFormat(rawValue: colorPixelFormat) ?? .bgra8Unorm
+    pipelineDescriptor.depthAttachmentPixelFormat = MTLPixelFormat(rawValue: depthStencilPixelFormat) ?? .depth32Float_stencil8
+    pipelineDescriptor.stencilAttachmentPixelFormat = MTLPixelFormat(rawValue: depthStencilPixelFormat) ?? .depth32Float_stencil8
+
+    pipelineDescriptor.colorAttachments[0].isBlendingEnabled = true
+    pipelineDescriptor.colorAttachments[0].rgbBlendOperation = .add
+    pipelineDescriptor.colorAttachments[0].alphaBlendOperation = .add
+    pipelineDescriptor.colorAttachments[0].sourceRGBBlendFactor = .sourceAlpha
+    pipelineDescriptor.colorAttachments[0].sourceAlphaBlendFactor = .sourceAlpha
+    pipelineDescriptor.colorAttachments[0].destinationRGBBlendFactor = .oneMinusSourceAlpha
+    pipelineDescriptor.colorAttachments[0].destinationAlphaBlendFactor = .oneMinusSourceAlpha
+
+    do {
+        self.pipelineState = try metalDevice.makeRenderPipelineState(descriptor: pipelineDescriptor)
+    } catch {
+        print("❌ [GridRenderLayer] Failed to create pipeline state: \(error)")
+        return
     }
+    
+    let dataSamplerDesc = MTLSamplerDescriptor()
+    dataSamplerDesc.minFilter = .nearest
+    dataSamplerDesc.magFilter = .nearest
+    self.dataSamplerState = metalDevice.makeSamplerState(descriptor: dataSamplerDesc)
+
+    let colormapSamplerDesc = MTLSamplerDescriptor()
+    colormapSamplerDesc.minFilter = .nearest
+    colormapSamplerDesc.magFilter = .nearest
+    colormapSamplerDesc.sAddressMode = .clampToEdge
+    self.colormapSamplerState = metalDevice.makeSamplerState(descriptor: colormapSamplerDesc)
+    
+    print("🟢 [GridRenderLayer] Metal setup complete")
+    
+    // Process any pending updates that came in before Metal was ready
+    if let pendingGeometry = pendingGeometryUpdate {
+        print("🟡 [GridRenderLayer] Processing pending geometry update")
+        updateGeometry(corners: pendingGeometry.corners, gridDef: pendingGeometry.gridDef)
+        pendingGeometryUpdate = nil
+    }
+    
+    if let pendingColormap = pendingColormapUpdate {
+        print("🟡 [GridRenderLayer] Processing pending colormap update")
+        updateColormapTexture(colormapAsBase64: pendingColormap)
+        pendingColormapUpdate = nil
+    }
+    
+    if let pendingData = pendingDataUpdate {
+        print("🟡 [GridRenderLayer] Processing pending data update")
+        updateDataTexture(data: pendingData.data, nx: pendingData.nx, ny: pendingData.ny, 
+                        scale: pendingData.scale, offset: pendingData.offset, 
+                        missing: pendingData.missing, scaleType: pendingData.scaleType)
+        pendingDataUpdate = nil
+    }
+}
     internal func internalRender(_ parameters: CustomLayerRenderParameters, mtlCommandBuffer: MTLCommandBuffer, mtlRenderPassDescriptor: MTLRenderPassDescriptor) {
         guard isVisible,
             let pipeline = pipelineState,

package/lib/commonjs/README.md

@@ -25,6 +25,72 @@ $RNMapboxMapsVersion = '~> 11.0' # This enforces Mapbox SDK v11
 use_mapbox_maps!
 ```
 
+### Enable Modular Headers (Required for New Architecture)
+
+If you're using React Native's new architecture (`newArchEnabled: true`), you **must** enable modular headers.
+
+#### For Expo Projects (Recommended)
+
+If you're using Expo, add the `expo-build-properties` plugin to your `app.config.js` or `app.config.ts`:
+```bash
+npm install expo-build-properties
+```
+
+Then add it to your Expo config:
+```typescript
+// app.config.ts
+export default {
+  // ... other config
+  plugins: [
+    // ... other plugins
+    [
+      'expo-build-properties',
+      {
+        ios: {
+          useFrameworks: 'static',
+          useModularHeaders: true,  // Add this line
+        },
+      },
+    ],
+  ],
+};
+```
+
+Then run:
+```bash
+npx expo prebuild --clean
+```
+
+#### For Non-Expo React Native Projects
+
+**Option 1: Enable modular headers globally (Recommended)**
+
+Add this line after the `platform :ios` line in your `ios/Podfile`:
+```ruby
+platform :ios, '13.4'
+use_modular_headers!  # Add this line
+
+prepare_react_native_project!
+```
+
+**Option 2: Enable modular headers in post_install hook**
+
+Add this code inside your `post_install do |installer|` block:
+```ruby
+post_install do |installer|
+  # Enable modular headers for libzstd
+  installer.pods_project.targets.each do |target|
+    if target.name == 'libzstd'
+      target.build_configurations.each do |config|
+        config.build_settings['DEFINES_MODULE'] = 'YES'
+      end
+    end
+  end
+  
+  # ... rest of your existing post_install code
+end
+```
+
 ### Install Pods
 
 After saving the Podfile, navigate to your `ios` directory in the terminal and run a fresh pod installation.

package/lib/commonjs/aguacerowx-react-native.podspec

@@ -10,27 +10,45 @@ Pod::Spec.new do |s|
   s.authors      = { package["author"] => "support@aguacerowx.com" }
   s.platforms    = { :ios => "13.4" }
   s.source       = { :git => "https://github.com/AguaceroWx/aguacero-sdks.git", :tag => "v#{s.version}" }
-
   s.swift_version = "5.0"
-
+  s.static_framework = false
+  
   s.pod_target_xcconfig = {
     'DEFINES_MODULE' => 'YES',
     'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES',
     'SWIFT_COMPILATION_MODE' => 'wholemodule',
     'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) ZSTD_DISABLE_ASM=1'
   }
-
+  
   s.user_target_xcconfig = {
     'DEFINES_MODULE' => 'YES'
   }
+  
+  s.resources = ['ios/compiled-shaders/*.metallib', 'ios/*.metal']
+  
+  s.script_phases = [
+    {
+      :name => 'Copy Metal Shaders',
+      :script => 'echo "🔨 Copying Metal shaders..."
+SHADER_DIR="${PODS_TARGET_SRCROOT}/ios/compiled-shaders"
+METAL_SOURCE="${PODS_TARGET_SRCROOT}/ios/Shaders.metal"
 
-  s.resource_bundles = {
-    'AguaceroMetalShaders' => ['ios/**/*.metal'] 
-  }
-
+if [ -f "$SHADER_DIR/Shaders.metallib" ]; then
+  cp -v "$SHADER_DIR/Shaders.metallib" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/" || true
+  echo "✅ Pre-compiled Metal shader copied"
+elif [ -f "$METAL_SOURCE" ]; then
+  echo "⚠️ No pre-compiled shader found, will compile from source"
+  cp -v "$METAL_SOURCE" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/" || true
+else
+  echo "❌ No Metal shaders found!"
+fi',
+      :execution_position => :before_compile
+    }
+  ]
+  
   s.source_files = "ios/**/*.{h,m,mm,swift}", "ios/generated/**/*.{h,m,mm,cpp}"
-
+  
   s.dependency "React-Core"
   s.dependency "MapboxMaps", "~> 11.0"
-  s.dependency "libzstd", "~> 1.5.5", :modular_headers => true
+  s.dependency "libzstd", "~> 1.5.5"
 end

package/lib/commonjs/android/build.gradle

@@ -1,5 +1,15 @@
 // @aguacerowx/react-native/android/build.gradle
 
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath("com.facebook.react:react-native-gradle-plugin")
+    }
+}
+
 repositories {
     google()
     mavenCentral()
@@ -17,6 +27,12 @@ repositories {
 
 apply plugin: 'com.android.library'
 
+def isNewArchEnabled = project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+
+if (isNewArchEnabled) {
+    apply plugin: "com.facebook.react"
+}
+
 android {
     namespace 'com.aguacerowx.reactnative'
     compileSdk 34 
@@ -44,6 +60,13 @@ android {
     }
 }
 
+if (isNewArchEnabled) {
+    react {
+        libraryName = "AguaceroWxReactNativeSpec"
+        codegenJavaPackageName = "com.aguacerowx.reactnative"
+    }
+}
+
 dependencies {
     implementation 'com.facebook.react:react-native:+'
     api 'org.locationtech.proj4j:proj4j:1.1.5'
@@ -51,7 +74,14 @@ dependencies {
 }
 
 project.afterEvaluate {
-    // 1. Resolve the Mapbox Version
+    // Fix Gradle 9 task dependency issue
+    if (isNewArchEnabled) {
+        tasks.named("generateCodegenArtifactsFromSchema").configure {
+            dependsOn("generateCodegenSchemaFromJavaScript")
+        }
+    }
+
+    // Mapbox version resolution
     def resolvedMapboxVersion
     if (project.rootProject.hasProperty('mapboxMapsVersion')) {
         resolvedMapboxVersion = project.rootProject.mapboxMapsVersion
@@ -61,23 +91,17 @@ project.afterEvaluate {
         println "[aguacerowx] WARNING: Could not find 'mapboxMapsVersion' property. Falling back to ${resolvedMapboxVersion}."
     }
 
-    // 2. Detect if @rnmapbox/maps is present in the user's project
-    // We check the root project to see all included modules.
     def rnMapboxIsPresent = project.rootProject.findProject(':rnmapbox_maps') != null
     def mapboxArtifact
 
-    // 3. Choose the correct Mapbox artifact based on the detection
     if (rnMapboxIsPresent) {
-        // If @rnmapbox/maps is present, we MUST use the ndk27 variant to avoid conflicts.
         mapboxArtifact = "android-ndk27"
         println "[aguacerowx] @rnmapbox/maps detected. Using Mapbox artifact: '${mapboxArtifact}' to ensure compatibility."
     } else {
-        // If it's not present, use the standard 'android' variant.
         mapboxArtifact = "android"
         println "[aguacerowx] @rnmapbox/maps not detected. Using standard Mapbox artifact: '${mapboxArtifact}'."
     }
 
-    // 4. Add the chosen Mapbox dependency using the version and artifact we just determined.
     dependencies {
         implementation "com.mapbox.maps:${mapboxArtifact}:${resolvedMapboxVersion}"
     }

package/lib/commonjs/android/src/main/java/com/aguacerowx/reactnative/GridRenderLayer.java

@@ -33,7 +33,7 @@ public class GridRenderLayer implements CustomLayerHost {
     // Uniform and Attribute locations
     private int uMatrix, uDataTexture, uColormapTexture, uOpacity, uDataRange, 
                 uScale, uOffset, uMissingQuantized, uTextureSize, uConversionType, uSmoothing,
-                uScaleType;  
+                uScaleType, uIsPtype;
     private int aPosition, aTexCoord;
 
     // GPU-side resource IDs
@@ -54,6 +54,8 @@ public class GridRenderLayer implements CustomLayerHost {
     private int conversionType = 0;
     private boolean smoothingEnabled = true;
     private int scaleType = 0;
+    private boolean isPtype = false; // ADDED
+    private String currentVariable = "";
     private boolean textureParametersDirty = true; 
     private volatile boolean isVisible = true;
 
@@ -120,9 +122,22 @@ public class GridRenderLayer implements CustomLayerHost {
         uConversionType = GLES20.glGetUniformLocation(program, "u_conversion_type");
         uSmoothing = GLES20.glGetUniformLocation(program, "u_smoothing"); 
         uScaleType = GLES20.glGetUniformLocation(program, "u_scale_type");
+        uIsPtype = GLES20.glGetUniformLocation(program, "u_is_ptype");
         aPosition = GLES20.glGetAttribLocation(program, "a_position");
         aTexCoord = GLES20.glGetAttribLocation(program, "a_texCoord");
     }
+    
+    public void setVariable(String variable) {
+        if (variable == null) {
+            this.currentVariable = "";
+        } else {
+            this.currentVariable = variable;
+        }
+        // MODIFICATION: Add detailed logging here
+        this.isPtype = "ptypeRefl".equals(this.currentVariable) || "ptypeRate".equals(this.currentVariable);
+        Log.d(TAG, "setVariable called. Variable: '" + this.currentVariable + "', isPtype set to: " + this.isPtype);
+    }
+
 
     public void clearData() {
         this.isVisible = false;
@@ -243,6 +258,7 @@ public class GridRenderLayer implements CustomLayerHost {
         GLES20.glUniform1i(uConversionType, conversionType);
         GLES20.glUniform1i(uSmoothing, smoothingEnabled ? 1 : 0); 
         GLES20.glUniform1i(uScaleType, this.scaleType);
+        GLES20.glUniform1i(uIsPtype, this.isPtype ? 1 : 0); 
 
         GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
         GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, dataTextureId);

package/lib/commonjs/android/src/main/java/com/aguacerowx/reactnative/GridRenderLayerView.java

@@ -297,4 +297,9 @@ public class GridRenderLayerView extends FrameLayout {
         gridLayerImplementation.clearData();
         triggerRepaint();
     }
+
+    public void setVariable(String variable) {
+        gridLayerImplementation.setVariable(variable);
+        triggerRepaint();
+    }
 }

package/lib/commonjs/android/src/main/java/com/aguacerowx/reactnative/GridRenderManager.java

@@ -21,6 +21,7 @@ public class GridRenderManager extends SimpleViewManager<GridRenderLayerView> {
     private static final int COMMAND_UPDATE_GEOMETRY = 3;
     private static final int COMMAND_UPDATE_DATA_PARAMETERS = 4;
     private static final int COMMAND_CLEAR = 5;
+    private static final int COMMAND_SET_VARIABLE = 6;
 
     @NonNull
     @Override
@@ -68,6 +69,7 @@ public class GridRenderManager extends SimpleViewManager<GridRenderLayerView> {
         commands.put("updateGeometry", COMMAND_UPDATE_GEOMETRY);
         commands.put("updateDataParameters", COMMAND_UPDATE_DATA_PARAMETERS);
         commands.put("clear", COMMAND_CLEAR);
+        commands.put("setVariable", COMMAND_SET_VARIABLE);
         return commands;
     }
 
@@ -113,6 +115,12 @@ public class GridRenderManager extends SimpleViewManager<GridRenderLayerView> {
             case COMMAND_CLEAR:
                 view.clearData();
                 break;
+
+            case COMMAND_SET_VARIABLE:
+                if (args != null && args.size() > 0) {
+                    view.setVariable(args.getString(0));
+                }
+                break;
         }
     }
 }