maxmustermann
/
armory
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix html5 publish

This commit is contained in:
Lubos Lenco 2017-11-27 15:10:09 +01:00
parent c67ff89361
commit 550eaba1d3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
blender/arm/write_data.py
View File

@ -224,6 +224,7 @@ def write_main(scene_name, resx, resy, is_play, in_viewport, is_publish):
rpdat = arm.utils.get_rp() rpdat = arm.utils.get_rp()
scene_ext = '.zip' if (bpy.data.scenes[scene_name].arm_compress and is_publish) else '' scene_ext = '.zip' if (bpy.data.scenes[scene_name].arm_compress and is_publish) else ''
winmode = str(wrd.arm_winmode) winmode = str(wrd.arm_winmode)
asset_references = list(set(assets.assets))
# TODO: expose Krom.displayWidth() in barmory # TODO: expose Krom.displayWidth() in barmory
if in_viewport: if in_viewport:
winmode = 'Window' winmode = 'Window'
@ -236,7 +237,7 @@ class Main {
public static inline var projectName = '""" + arm.utils.safestr(wrd.arm_project_name) + """'; public static inline var projectName = '""" + arm.utils.safestr(wrd.arm_project_name) + """';
public static inline var projectPackage = '""" + arm.utils.safestr(wrd.arm_project_package) + """'; public static inline var projectPackage = '""" + arm.utils.safestr(wrd.arm_project_package) + """';
public static inline var projectPath = '""" + arm.utils.get_fp().replace('\\', '\\\\') + """'; public static inline var projectPath = '""" + arm.utils.get_fp().replace('\\', '\\\\') + """';
public static inline var projectAssets = """ + str(len(assets.assets)) + """; public static inline var projectAssets = """ + str(len(asset_references)) + """;
public static var projectWindowMode = kha.WindowMode.""" + winmode + """; public static var projectWindowMode = kha.WindowMode.""" + winmode + """;
public static inline var projectWindowResize = """ + ('true' if wrd.arm_winresize else 'false') + """; public static inline var projectWindowResize = """ + ('true' if wrd.arm_winresize else 'false') + """;
public static inline var projectWindowMaximize = """ + ('true' if wrd.arm_winmaximize else 'false') + """; public static inline var projectWindowMaximize = """ + ('true' if wrd.arm_winmaximize else 'false') + """;
@ -294,7 +295,8 @@ class Main {
iron.App.init(function() { iron.App.init(function() {
""") """)
if is_publish and wrd.arm_loadbar: if is_publish and wrd.arm_loadbar:
f.write("""iron.App.notifyOnRender2D(armory.trait.internal.LoadBar.render); f.write("""
iron.App.notifyOnRender2D(armory.trait.internal.LoadBar.render);
""") """)
f.write(""" f.write("""
@ -306,7 +308,7 @@ class Main {
object.addTrait(new armory.trait.internal.SpaceArmory()); object.addTrait(new armory.trait.internal.SpaceArmory());
""") """)
f.write(""" f.write("""
iron.RenderPath.setActive(armory.renderpath.RenderPathCreator.get()); iron.RenderPath.setActive(armory.renderpath.RenderPathCreator.get());
""") """)