Merge pull request #2 from beersandrew/fix-bounds

feat: fixing bounds calc
beersandrew · Oct 4, 2023 · 74616e0 · 74616e0
2 parents e62e715 + 1ba85dc
commit 74616e0
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 9 deletions.
diff --git a/examples/AntiqueCamera/AntiqueCamera.usdz b/examples/AntiqueCamera/AntiqueCamera.usdz
diff --git a/examples/AntiqueCamera/AntiqueCamera_Cards.usda b/examples/AntiqueCamera/AntiqueCamera_Cards.usda
@@ -0,0 +1,28 @@
+#usda 1.0
+(
+    defaultPrim = "camera"
+    doc = "Blender v3.6.0"
+    metersPerUnit = 1
+    subLayers = [
+        @AntiqueCamera.usdz@
+    ]
+    upAxis = "Z"
+)
+
+over "camera" (
+    prepend apiSchemas = ["GeomModelAPI"]
+    kind = "component"
+)
+{
+    uniform bool model:applyDrawMode = 1
+    uniform token model:cardGeometry = "box"
+    asset model:cardTextureXNeg = @renders/XNeg.png@
+    asset model:cardTextureXPos = @renders/XPos.png@
+    asset model:cardTextureYNeg = @renders/YNeg.png@
+    asset model:cardTextureYPos = @renders/YPos.png@
+    asset model:cardTextureZNeg = @renders/ZNeg.png@
+    asset model:cardTextureZPos = @renders/ZPos.png@
+    uniform token model:drawMode = "cards"
+    uniform float3 model:drawModeColor = (1, 0, 0)
+}
+
diff --git a/examples/AntiqueCamera/renders/XNeg.png b/examples/AntiqueCamera/renders/XNeg.png
diff --git a/examples/AntiqueCamera/renders/XPos.png b/examples/AntiqueCamera/renders/XPos.png
diff --git a/examples/AntiqueCamera/renders/YNeg.png b/examples/AntiqueCamera/renders/YNeg.png
diff --git a/examples/AntiqueCamera/renders/YPos.png b/examples/AntiqueCamera/renders/YPos.png
diff --git a/examples/AntiqueCamera/renders/ZNeg.png b/examples/AntiqueCamera/renders/ZNeg.png
diff --git a/examples/AntiqueCamera/renders/ZPos.png b/examples/AntiqueCamera/renders/ZPos.png
diff --git a/src/camera/cameraGenerator.py b/src/camera/cameraGenerator.py
@@ -4,12 +4,12 @@
 from camera.utils.distanceCalculator import get_distance_to_frame_subject
 from camera.globals import APERTURE, FOCAL_LENGTH, FOCUS_DISTANCE
 
-def create_camera_for_card(card, camera_stage, subject_center, bounding_box):
+def create_camera_for_card(card, camera_stage, center_of_card_face, bounding_box):
     camera_prim = create_camera_with_defaults(camera_stage, card.name)
 
     distance = get_distance_to_frame_subject(bounding_box, APERTURE, FOCAL_LENGTH)
 
-    position_camera(camera_prim, card, subject_center, distance)
+    position_camera(camera_prim, card, center_of_card_face, distance)
 
     calculate_apertures(camera_prim, bounding_box, distance, card)
 
@@ -26,12 +26,12 @@ def create_camera_with_defaults(camera_stage, name):
 
     return camera_prim
 
-def position_camera(camera_prim, card, subject_center, distance):
-    camera_translation = create_camera_translation(card, subject_center, distance)
+def position_camera(camera_prim, card, center_of_card_face, distance):
+    camera_translation = create_camera_translation(card, center_of_card_face, distance)
     apply_camera_translation(camera_prim, camera_translation)
 
-def create_camera_translation(card, subject_center, distance):
-    return subject_center + create_translate_vector(distance * card.sign, card.translationIndex)
+def create_camera_translation(card, center_of_card_face, distance):
+    return center_of_card_face + create_translate_vector(distance * card.sign, card.translationIndex)
 
 def calculate_apertures(camera_prim, bounding_box, distance, card):
     flip_aperatures = False

diff --git a/src/camera/cameraManager.py b/src/camera/cameraManager.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from pxr import Usd, UsdGeom, UsdLux
+from pxr import Usd, UsdGeom, UsdLux, Gf
 from collections import namedtuple
 from camera.cameraGenerator import create_camera_for_card
 
@@ -32,8 +32,12 @@ def create_cameras(camera_stage, subject_stage, cards):
         card_width = (max_bound[card.horizontalIndex] - min_bound[card.horizontalIndex]) * 10
         card_height = (max_bound[card.verticalIndex] - min_bound[card.verticalIndex]) * 10
         card_bounding_box = BoundingBox(card_width, card_height)
+
+        faceTranslationValue = max_bound[card.translationIndex] if card.sign > 0 else min_bound[card.translationIndex]
+        center_of_card_face = Gf.Vec3d(subject_center[0], subject_center[1], subject_center[2])
+        center_of_card_face[card.translationIndex] = faceTranslationValue
 
-        create_camera_for_card(card, camera_stage, subject_center, card_bounding_box)
+        create_camera_for_card(card, camera_stage, center_of_card_face, card_bounding_box)
 
 def get_bounding_box(subject_stage):
     bboxCache = UsdGeom.BBoxCache(Usd.TimeCode.Default(), [UsdGeom.Tokens.default_])

diff --git a/src/utils/arg_parser.py b/src/utils/arg_parser.py
@@ -28,7 +28,7 @@ def parse_args():
 
     is_usdz = ".usdz" in args.usd_file
     usdz_wrapper_name = args.usd_file.split('.')[0] + '_Cards.usda'
-    file_to_sublayer = args.usdz_wrapper_name if is_usdz else args.usd_file
+    file_to_sublayer = usdz_wrapper_name if is_usdz else args.usd_file
 
     return Args(args.usd_file, 
                 args.create_usdz_result,