diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..a9f1d8c --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,10 @@ +{ + "git.enabled": true, + "git.decorations.enabled": true, + "scm.diffDecorations": "all", + "scm.diffDecorationsGutterVisibility": "always", + "files.decorations.enabled": true, + "explorer.decorations.badges": true, + "explorer.decorations.colors": true +} + diff --git a/nuke_CAM_exporter/FIXES_AND_IMPROVEMENTS.md b/nuke_CAM_exporter/FIXES_AND_IMPROVEMENTS.md index 177f620..a51c1c3 100644 --- a/nuke_CAM_exporter/FIXES_AND_IMPROVEMENTS.md +++ b/nuke_CAM_exporter/FIXES_AND_IMPROVEMENTS.md @@ -205,3 +205,4 @@ If you encounter issues: 3. Verify `unit_scale` calculation 4. Ensure lens parameters match Nuke camera settings + diff --git a/nuke_CAM_exporter/README_TESTING.md b/nuke_CAM_exporter/README_TESTING.md index 5a23a9d..54e0ed1 100644 --- a/nuke_CAM_exporter/README_TESTING.md +++ b/nuke_CAM_exporter/README_TESTING.md @@ -146,3 +146,4 @@ If motion still doesn't match: - Check that ComfyUI render resolution matches pose file resolution - Consider using camera projection in Nuke to validate the converted poses + diff --git a/nuke_CAM_exporter/configs/camera_config_v01.json b/nuke_CAM_exporter/configs/camera_config_v01.json index 790f8cf..81a92bd 100644 --- a/nuke_CAM_exporter/configs/camera_config_v01.json +++ b/nuke_CAM_exporter/configs/camera_config_v01.json @@ -1,6 +1,6 @@ { "input": "../inputs/camTrack_1.7m_v02.asci", - "output": "../outputs/camTrack_1.7m_v02_converted.txt", + "output": "../outputs/camTrack_1.7m_v04_converted.txt", "fps": 25.0, "unit_scale": 0.1, "lens": { diff --git a/nuke_CAM_exporter/test_nuke_scene.py b/nuke_CAM_exporter/test_nuke_scene.py index ab444cf..4e6a42f 100644 --- a/nuke_CAM_exporter/test_nuke_scene.py +++ b/nuke_CAM_exporter/test_nuke_scene.py @@ -73,8 +73,6 @@ def generate_nuke_script(output_path: Path, num_frames: int = 50) -> None: " xpos 0", " ypos -200", "}", - "", - "end_group", ] output_path.write_text("\n".join(script_lines)) diff --git a/nuke_CAM_exporter/test_pipeline.sh b/nuke_CAM_exporter/test_pipeline.sh index f32fefe..6946d47 100644 --- a/nuke_CAM_exporter/test_pipeline.sh +++ b/nuke_CAM_exporter/test_pipeline.sh @@ -54,3 +54,4 @@ python3 validate_conversion.py \ echo "" echo "=== Pipeline test complete! ===" + diff --git a/nuke_CAM_exporter/validate_conversion.py b/nuke_CAM_exporter/validate_conversion.py index 47eefe6..5dbfbef 100644 --- a/nuke_CAM_exporter/validate_conversion.py +++ b/nuke_CAM_exporter/validate_conversion.py @@ -123,8 +123,8 @@ def compare_poses(asci_path: Path, pose_path: Path, unit_scale: float = 1.0) -> R_asci = euler_zxy_to_matrix(rx, ry, rz) R_asci_np = np.array(R_asci) - # Get pose data - timestamp, intrinsics, R_pose_row = parse_pose_line(pose_data[i]) + # Get pose data (already parsed on line 97) + timestamp, intrinsics, R_pose_row = pose_data[i] R_pose = [row[:3] for row in R_pose_row] # Extract rotation part t_pose = [row[3] for row in R_pose_row] # Extract translation part R_pose_np = np.array(R_pose)