Add support for consuming sceneform sdk as a dynamic module (#450)

Co-authored-by: Mrunal Upadhyay <[email protected]>

Author: mrunal-upadhyay

core/src/main/java/com/google/ar/sceneform/rendering/CameraStream.java

@@ -178,7 +178,7 @@ void setupStandardCameraMaterial(Renderer renderer) {
                 Material.builder()
                         .setSource(
                                 renderer.getContext(),
-                                RenderingResources.GetSceneformResource(
+                                RenderingResources.GetSceneformSourceResourceUri(
                                         renderer.getContext(),
                                         RenderingResources.Resource.CAMERA_MATERIAL))
                         .build();
@@ -212,7 +212,7 @@ void setupOcclusionCameraMaterial(Renderer renderer) {
                 Material.builder()
                         .setSource(
                                 renderer.getContext(),
-                                RenderingResources.GetSceneformResource(
+                                RenderingResources.GetSceneformSourceResourceUri(
                                         renderer.getContext(),
                                         RenderingResources.Resource.OCCLUSION_CAMERA_MATERIAL))
                         .build();

core/src/main/java/com/google/ar/sceneform/rendering/MaterialFactory.java

@@ -83,7 +83,7 @@ public static CompletableFuture<Material> makeOpaqueWithColor(Context context, C
         Material.builder()
             .setSource(
                 context,
-                RenderingResources.GetSceneformResource(
+                RenderingResources.GetSceneformSourceResourceUri(
                     context, RenderingResources.Resource.OPAQUE_COLORED_MATERIAL))
             .build();
 
@@ -115,7 +115,7 @@ public static CompletableFuture<Material> makeTransparentWithColor(Context conte
         Material.builder()
             .setSource(
                 context,
-                RenderingResources.GetSceneformResource(
+                RenderingResources.GetSceneformSourceResourceUri(
                     context, RenderingResources.Resource.TRANSPARENT_COLORED_MATERIAL))
             .build();
 
@@ -148,7 +148,7 @@ public static CompletableFuture<Material> makeOpaqueWithTexture(
         Material.builder()
             .setSource(
                 context,
-                RenderingResources.GetSceneformResource(
+                RenderingResources.GetSceneformSourceResourceUri(
                     context, RenderingResources.Resource.OPAQUE_TEXTURED_MATERIAL))
             .build();
 
@@ -181,7 +181,7 @@ public static CompletableFuture<Material> makeTransparentWithTexture(
         Material.builder()
             .setSource(
                 context,
-                RenderingResources.GetSceneformResource(
+                RenderingResources.GetSceneformSourceResourceUri(
                     context, RenderingResources.Resource.TRANSPARENT_TEXTURED_MATERIAL))
             .build();
 

core/src/main/java/com/google/ar/sceneform/rendering/PlaneRenderer.java

@@ -309,7 +309,7 @@ private void loadShadowMaterial() {
         Material.builder()
                 .setSource(
                         renderer.getContext(),
-                        RenderingResources.GetSceneformResource(
+                        RenderingResources.GetSceneformSourceResourceUri(
                                 renderer.getContext(), RenderingResources.Resource.PLANE_SHADOW_MATERIAL))
                 .build()
                 .thenAccept(
@@ -338,7 +338,7 @@ private void loadPlaneMaterial() {
                 Texture.builder()
                         .setSource(
                                 renderer.getContext(),
-                                RenderingResources.GetSceneformResource(
+                                RenderingResources.GetSceneformSourceResourceUri(
                                         renderer.getContext(), RenderingResources.Resource.PLANE))
                         .setSampler(sampler)
                         .build();
@@ -347,7 +347,7 @@ private void loadPlaneMaterial() {
                 Material.builder()
                         .setSource(
                                 renderer.getContext(),
-                                RenderingResources.GetSceneformResource(
+                                RenderingResources.GetSceneformSourceResourceUri(
                                         renderer.getContext(), RenderingResources.Resource.PLANE_MATERIAL))
                         .build()
                         .thenCombine(

core/src/main/java/com/google/ar/sceneform/rendering/RenderingResources.java

@@ -1,7 +1,9 @@
 package com.google.ar.sceneform.rendering;
 
 import android.content.Context;
+import android.net.Uri;
 
+import com.google.ar.sceneform.R;
 import com.google.ar.sceneform.utilities.LoadHelper;
 
 final class RenderingResources {
@@ -50,6 +52,31 @@ private static int GetSceneformSourceResource(Context context, Resource resource
     return 0;
   }
 
+  static Uri GetSceneformSourceResourceUri(Context context, Resource resource) {
+    switch (resource) {
+      case CAMERA_MATERIAL:
+        return LoadHelper.resourceToUri(context, R.raw.ar_environment_material_flat);
+      case OCCLUSION_CAMERA_MATERIAL:
+        return LoadHelper.resourceToUri(context, R.raw.ar_environment_material_depth);
+      case OPAQUE_COLORED_MATERIAL:
+        return LoadHelper.resourceToUri(context, R.raw.sceneform_opaque_colored_material);
+      case TRANSPARENT_COLORED_MATERIAL:
+        return LoadHelper.resourceToUri(context, R.raw.sceneform_transparent_colored_material);
+      case OPAQUE_TEXTURED_MATERIAL:
+        return LoadHelper.resourceToUri(context, R.raw.sceneform_opaque_textured_material);
+      case TRANSPARENT_TEXTURED_MATERIAL:
+        return LoadHelper.resourceToUri(context, R.raw.sceneform_transparent_textured_material);
+      case PLANE_SHADOW_MATERIAL:
+        return LoadHelper.resourceToUri(context, R.raw.sceneform_plane_shadow_material);
+      case PLANE_MATERIAL:
+        return LoadHelper.resourceToUri(context, R.raw.sceneform_plane_material);
+      case PLANE:
+        return LoadHelper.resourceToUri(context, R.drawable.sceneform_plane);
+      case VIEW_RENDERABLE_MATERIAL:
+        return LoadHelper.resourceToUri(context, R.raw.sceneform_view_material);
+    }
+    return null;
+  }
 
   private static int GetMaterialFactoryBlazeResource(Resource resource) {return 0;}
 

core/src/main/java/com/google/ar/sceneform/rendering/ViewRenderable.java

@@ -442,7 +442,7 @@ public CompletableFuture<ViewRenderable> build() {
         CompletableFuture<Void> setSourceFuture = Material.builder()
                 .setSource(
                         context,
-                        RenderingResources.GetSceneformResource(
+                        RenderingResources.GetSceneformSourceResourceUri(
                                 context, RenderingResources.Resource.VIEW_RENDERABLE_MATERIAL))
                 .build()
                 .thenAccept(

core/src/main/java/com/google/ar/sceneform/utilities/LoadHelper.java

@@ -142,9 +142,12 @@ public static Uri resourceToUri(Context context, int resID) {
     Resources resources = context.getResources();
     return new Uri.Builder()
         .scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
-        .authority(resources.getResourcePackageName(resID))
+        .authority(context.getPackageName()) // Look up the resources in the application with its splits loaded
         .appendPath(resources.getResourceTypeName(resID))
-        .appendPath(resources.getResourceEntryName(resID))
+        .appendPath(String.format("%s:%s",
+                resources.getResourcePackageName(resID), // Look up the dynamic resource in the split namespace.
+                resources.getResourceEntryName(resID)
+        ))
         .build();
   }