Skip to content

Commit 9937dd2

Browse files
committed
- python fix
1 parent 48011bc commit 9937dd2

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

pySPlisHSPlasH/scripts/simulator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def main():
1717
else:
1818
base.init(sys.argv, "[Python] SPlisHSPlasH")
1919

20-
gui = sph.GUI.Simulator_GUI_TweakBar(base)
20+
gui = sph.GUI.Simulator_GUI_imgui(base)
2121
base.setGui(gui)
2222

2323
base.run()

setup.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,14 @@ def build_extension(self, ext):
101101
Scenes = [os.path.join('data/Scenes/', file) for file in os.listdir('data/Scenes/')]
102102
shaders = [os.path.join('data/shaders/', file) for file in os.listdir('data/shaders/')]
103103
emitter_boundary = [os.path.join('data/emitter_boundary/', file) for file in os.listdir('data/emitter_boundary/')]
104+
fonts = ['extern/imgui/misc/fonts/Roboto-Medium.ttf']
104105

105106
# Install paths depending on system
106107
models_dest = 'data/models' if platform.system() == "Windows" else "bin/data/models"
107108
scenes_dest = 'data/Scenes' if platform.system() == "Windows" else "bin/data/Scenes"
108109
shaders_dest = 'resources/shaders' if platform.system() == "Windows" else 'bin/resources/shaders'
109110
emitter_boundary_dest = 'resources/emitter_boundary' if platform.system() == "Windows" else 'bin/resources/emitter_boundary'
111+
fonts_dest = 'resources/fonts' if platform.system() == "Windows" else 'bin/resources/fonts'
110112

111113
# Get Readme text for long description
112114
cur_dir = os.path.abspath(os.path.dirname(__file__))
@@ -115,7 +117,7 @@ def build_extension(self, ext):
115117

116118
setup(
117119
name=name,
118-
version='2.8.0',
120+
version='2.8.1',
119121
author='Interactive Computer Graphics',
120122
author_email='',
121123
description='SPlisHSPlasH Project Python Bindings',
@@ -131,6 +133,7 @@ def build_extension(self, ext):
131133
data_files=[(models_dest, [m for m in models if os.path.isfile(m)]),
132134
(scenes_dest, [s for s in Scenes if os.path.isfile(s)]),
133135
(shaders_dest, [s for s in shaders if os.path.isfile(s)]),
134-
(emitter_boundary_dest, [s for s in emitter_boundary if os.path.isfile(s)])],
136+
(emitter_boundary_dest, [s for s in emitter_boundary if os.path.isfile(s)]),
137+
(fonts_dest, [f for f in fonts if os.path.isfile(f)])],
135138
zip_safe=False,
136139
)

0 commit comments

Comments
 (0)