fixing conflicts

TAU-VAILab · Mar 5, 2024 · 47267a0 · 47267a0
2 parents 5f31f09 + 6270862
commit 47267a0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/setup.py b/setup.py
@@ -44,6 +44,7 @@
         "trimesh",
         "pandas",
         "clip @ git+https://github.com/openai/CLIP.git",
+        "plyfile",
     ],
     author="OpenAI",
 )
diff --git a/shap_e/util/notebooks.py b/shap_e/util/notebooks.py
@@ -18,7 +18,7 @@ def create_pan_cameras(size: int, device: torch.device, num_frames: int=20) -> D
     xs = []
     ys = []
     zs = []
-    for theta in np.linspace(0, 2 * np.pi, num=num_frames):
+    for theta in np.linspace(-np.pi, np.pi, num=num_frames):
         z = np.array([np.sin(theta), np.cos(theta), -0.5])
         z /= np.sqrt(np.sum(z**2))
         origin = -z * 4