minor fixes

haosulab · Nov 3, 2023 · e4c1bc3 · e4c1bc3
1 parent 50f8a2c
commit e4c1bc3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 51 deletions.
diff --git a/3rd_party/sapien-vulkan-2 b/3rd_party/sapien-vulkan-2
diff --git a/python/CMakeLists.txt.old b/python/CMakeLists.txt.old
diff --git a/python/py_package/__init__.pyi b/python/py_package/__init__.pyi
@@ -61,5 +61,5 @@ __all__ = [
 
 def set_log_level(level: str) -> None:
     pass
-__version__ = '3.0.0.dev20231102'
+__version__ = '3.0.0.dev20231103'
 SceneConfig = sapien.pysapien.physx.PhysxSceneConfig
diff --git a/setup.py b/setup.py
@@ -160,8 +160,8 @@ def build_pinocchio(self, ext):
         extdir = os.path.abspath(os.path.dirname(original_full_path))
         extdir = os.path.join(extdir, self.distribution.get_name())
         cmake_args = [
-            "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=" + extdir,
-            "-DPYTHON_EXECUTABLE=" + sys.executable,
+            f"-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$<1:{extdir}>",
+            f"-DPYTHON_EXECUTABLE={sys.executable}",
         ]
         if args.debug:
             cfg = "Debug"
@@ -191,8 +191,8 @@ def build_pybind(self, ext):
         extdir = os.path.abspath(os.path.dirname(original_full_path))
         extdir = os.path.join(extdir, self.distribution.get_name())
         cmake_args = [
-            "-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=" + extdir,
-            "-DPYTHON_EXECUTABLE=" + sys.executable,
+            f"-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=$<1:{extdir}>",
+            f"-DPYTHON_EXECUTABLE={sys.executable}",
         ]
         if args.debug:
             cfg = "Debug"
+23 −43		include/svulkan2/common/format.h
+3 −176		include/svulkan2/common/layout.h
+0 −20		src/common/format.cpp
+4 −4		src/common/layout.cpp
+5 −5		src/renderer/renderer.cpp
+11 −11		src/renderer/rt_renderer.cpp
+13 −13		src/scene/object.cpp
+49 −49		src/shader/base_parser.cpp
+3 −3		src/shader/gbuffer.cpp
+3 −3		src/shader/primitive.cpp
+18 −18		src/shader/reflect.cpp
+25 −25		src/shader/rt.cpp