Remove policy_registry from new camera_trajectories file, pass in string mode instead, disabled POI-following by default for all scenes

Author: araistrick

docs/ConfiguringCameras.md

@@ -34,11 +34,11 @@ Indoor video, dynamic & interesting camera motion:
 
 ```bash
 python -m infinigen.datagen.manage_jobs --output_folder outputs/video_dynamic_indoor --num_scenes 30 \
--configs singleroom rrt_cam_indoors.gin \
--pipeline_configs local_256GB.gin indoor_background_configs.gin monocular_video \
--overrides compute_base_views.min_candidates_ratio=2 compose_indoors.terrain_enabled=False compose_indoors.restrict_single_supported_roomtype=True \
--pipeline_overrides get_cmd.driver_script='infinigen_examples.generate_indoors' iterate_scene_tasks.frame_range=[1,300] \
--warmup_sec 2000 --cleanup big_files --overwrite
+--configs singleroom.gin rrt_cam_indoors.gin \
+--pipeline_configs local_256GB.gin indoor_background_configs.gin monocular_video \
+--overrides compute_base_views.min_candidates_ratio=2 compose_indoors.terrain_enabled=False compose_indoors.restrict_single_supported_roomtype=True \
+--pipeline_overrides get_cmd.driver_script='infinigen_examples.generate_indoors' iterate_scene_tasks.frame_range=[1,200] \
+--warmup_sec 2000 --cleanup big_files --overwrite
 ```
 
 In order to create dynamic and varied camera motion, use the `rrt_cam_indoors.gin` and `rrt_cam_nature.gin` configuration files for indoor scenes and nature scenes respectively. This will animate cameras using the animation policy found in [rrt.py](../infinigen/core/util/rrt.py/.py). There are three customizable components used to create such a motion:

infinigen/core/placement/camera_trajectories.py

@@ -2,7 +2,8 @@
 # This source code is licensed under the BSD 3-Clause license found in the LICENSE file in the root directory of this source tree.
 
 # Authors:
-# - Dylan Li: primary author
+# - Alexander Raistrick: original placement/camera.py: camera pose proposal, camera random walk animations
+# - Dylan Li: refactored to camera_trajectories.py to support RRT option
 # - Sumanth Maddirala: base view selection
 
 import logging
@@ -12,7 +13,6 @@
 import bpy
 import gin
 import numpy as np
-from numpy.random import uniform as U
 from tqdm import tqdm
 
 from infinigen.core.placement.camera import configure_cameras, terrain_camera_query
@@ -31,7 +31,7 @@ def compute_poses(
     scene_preprocessed: dict,
     init_bounding_box: tuple[np.array, np.array] = None,
     init_surfaces: list[bpy.types.Object] = None,
-    terrain_mesh = None,
+    terrain_mesh=None,
     min_candidates_ratio=5,
     min_base_views_ratio=10,
 ):
@@ -78,8 +78,7 @@ def compute_trajectories(
     camera_selection_ratio=None,
     min_candidates_ratio=5,
     pois=None,
-    follow_poi_chance=0.0,
-    policy_registry=None,
+    animation_mode: str = "random_walk",
     validate_pose_func=None,
 ):
     n_cams = len(cam_rigs)
@@ -123,19 +122,22 @@ def compute_trajectories(
             if not anim_valid_pose_func(cam):
                 continue
 
-            if policy_registry is None:
-                if U() < follow_poi_chance and pois is not None and len(pois):
+            match animation_mode:
+                case "random_walk":
+                    with gin.config_scope("cam"):
+                        policy = animation_policy.AnimPolicyRandomWalkLookaround()
+                case "random_walk_forward":
+                    with gin.config_scope("cam"):
+                        policy = animation_policy.AnimPolicyRandomForwardWalk()
+                case "follow_poi":
                     policy = animation_policy.AnimPolicyFollowObject(
                         target_obj=cam, pois=pois, bvh=scene_preprocessed["scene_bvh"]
                     )
-                else:
-                    with gin.config_scope("cam"):
-                        policy = animation_policy.AnimPolicyRandomWalkLookaround()
-            else:
-                match policy_registry:
-                    case "rrt":
-                        with gin.config_scope("rrt"):
-                            policy = AnimPolicyRRT(obj_groups=obj_groups)
+                case "rrt":
+                    with gin.config_scope("rrt"):
+                        policy = AnimPolicyRRT(obj_groups=obj_groups)
+                case _:
+                    raise ValueError(f"Invalid animation mode: {animation_mode}")
 
             logger.info(f"Computing trajectory using {policy=}")
 
@@ -215,12 +217,12 @@ def animate_trajectories(
     obj_groups=None,
     follow_poi_chance=0.0,
     pois=None,
-    policy_registry=None,
+    animation_mode="random_walk",
     validate_pose_func=None,
     fatal=True,
 ):
     bpy.context.view_layer.update()
-    # generate potential trajectories
+
     try:
         trajectories = compute_trajectories(
             cam_rigs=cam_rigs,
@@ -229,7 +231,7 @@ def animate_trajectories(
             obj_groups=obj_groups,
             follow_poi_chance=follow_poi_chance,
             pois=pois,
-            policy_registry=policy_registry,
+            animation_mode=animation_mode,
             validate_pose_func=validate_pose_func,
         )
     except ValueError as err:

infinigen_examples/configs_indoor/rrt_cam_indoors.gin

@@ -1,6 +1,6 @@
 compose_indoors.animate_cameras_enabled = True
 
-animate_trajectories.policy_registry = "rrt"
+animate_trajectories.animation_mode = "rrt"
 animate_trajectories.validate_pose_func = @rrt/validate_cam_pose_rrt
 compute_trajectories.min_candidates_ratio = 2
 compute_poses.min_base_views_ratio = 4

infinigen_examples/configs_nature/extras/rrt_cam_nature.gin

@@ -1,4 +1,4 @@
-animate_trajectories.policy_registry = "rrt"
+animate_trajectories.animation_mode = "rrt"
 animate_trajectories.validate_pose_func = @rrt/validate_cam_pose_rrt
 compute_trajectories.min_candidates_ratio = 2
 compute_poses.min_base_views_ratio = 4

infinigen_examples/configs_nature/scene_types_fluidsim/simulated_river.gin

@@ -1,7 +1,7 @@
 include 'infinigen_examples/configs_nature/scene_types/river.gin'
 
 UniformMesher.enclosed=1
-animate_cameras.policy_registry = @cam/AnimPolicyRandomForwardWalk
+animate_cameras.animation_mode = "random_forward_walk"
 cam/AnimPolicyRandomForwardWalk.forward_vec = (0,0,-1)
 cam/AnimPolicyRandomForwardWalk.speed = 1
 cam/AnimPolicyRandomForwardWalk.step_range = (5, 10)

infinigen_examples/configs_nature/scene_types_fluidsim/tilted_river.gin

@@ -1,7 +1,7 @@
 include 'infinigen_examples/configs_nature/scene_types/river.gin'
 
 UniformMesher.enclosed=1
-animate_cameras.policy_registry = @cam/AnimPolicyRandomForwardWalk
+animate_cameras.animation_mode = "random_forward_walk"
 cam/AnimPolicyRandomForwardWalk.forward_vec = (0,0,-1)
 cam/AnimPolicyRandomForwardWalk.speed = 1
 cam/AnimPolicyRandomForwardWalk.step_range = (5, 10)