Finished Viewport
This commit is contained in:
@ -804,41 +804,71 @@ def viewport_build_done():
|
||||
_viewport_pending_launches.clear()
|
||||
log.error('Viewport build failed, check console')
|
||||
|
||||
def play_viewport(viewport_id, width=1920, height=1080):
|
||||
"""Launch Krom in a viewport"""
|
||||
global _viewport_build_in_progress, _viewport_pending_launches, _viewport_proc_build
|
||||
def play(viewport_id=None, width=1920, height=1080):
|
||||
"""Launch player external or embedded when viewport_id is passed"""
|
||||
global _viewport_build_in_progress, _viewport_pending_launches, _viewport_proc_build, scripts_mtime
|
||||
|
||||
if not viewport_id:
|
||||
log.error('No viewport_id: play_viewport requires an id')
|
||||
return
|
||||
|
||||
if 'Lnx' not in bpy.data.worlds:
|
||||
if viewport_id and 'Lnx' not in bpy.data.worlds:
|
||||
log.error('No Lnx world found - cannot start viewport server')
|
||||
return
|
||||
|
||||
wrd = bpy.data.worlds['Lnx']
|
||||
target = 'krom' if viewport_id else runtime_to_target()
|
||||
|
||||
krom_js_path = lnx.utils.get_fp_build() + '/debug/krom/krom.js'
|
||||
if os.path.exists(krom_js_path) and not wrd.lnx_recompile:
|
||||
run_viewport_runtime(viewport_id, width, height)
|
||||
return
|
||||
khajs_path = get_khajs_path(target)
|
||||
if not wrd.lnx_cache_build or \
|
||||
not os.path.isfile(khajs_path) or \
|
||||
assets.khafile_defs_last != assets.khafile_defs or \
|
||||
state.last_target != state.target:
|
||||
wrd.lnx_recompile = True
|
||||
|
||||
pending_entry = (viewport_id, width, height)
|
||||
if pending_entry not in _viewport_pending_launches:
|
||||
_viewport_pending_launches.append(pending_entry)
|
||||
state.last_target = state.target
|
||||
|
||||
if _viewport_build_in_progress:
|
||||
if _viewport_proc_build is not None and _viewport_proc_build.poll() is None:
|
||||
log.info(f'Build in progress, viewport {viewport_id} will launch when ready')
|
||||
state.mod_scripts = []
|
||||
script_path = lnx.utils.get_fp() + '/Sources/' + lnx.utils.safestr(wrd.lnx_project_package)
|
||||
if os.path.isdir(script_path):
|
||||
new_mtime = scripts_mtime
|
||||
for fn in glob.iglob(os.path.join(script_path, '**', '*.hx'), recursive=True):
|
||||
mtime = os.path.getmtime(fn)
|
||||
if scripts_mtime < mtime:
|
||||
lnx.utils.fetch_script_props(fn)
|
||||
fn = fn.split('Sources/')[1]
|
||||
fn = fn[:-3]
|
||||
fn = fn.replace('/', '.')
|
||||
state.mod_scripts.append(fn)
|
||||
wrd.lnx_recompile = True
|
||||
if new_mtime < mtime:
|
||||
new_mtime = mtime
|
||||
scripts_mtime = new_mtime
|
||||
if len(state.mod_scripts) > 0:
|
||||
lnx.utils.fetch_trait_props()
|
||||
|
||||
if viewport_id:
|
||||
krom_js_path = lnx.utils.get_fp_build() + '/debug/krom/krom.js'
|
||||
if os.path.exists(krom_js_path) and not wrd.lnx_recompile:
|
||||
run_viewport_runtime(viewport_id, width, height)
|
||||
return
|
||||
else:
|
||||
_viewport_build_in_progress = False
|
||||
|
||||
_viewport_build_in_progress = True
|
||||
pending_entry = (viewport_id, width, height)
|
||||
if pending_entry not in _viewport_pending_launches:
|
||||
_viewport_pending_launches.append(pending_entry)
|
||||
|
||||
build(target='krom', is_viewport=True, viewport_width=width, viewport_height=height)
|
||||
if _viewport_build_in_progress:
|
||||
if _viewport_proc_build is not None and _viewport_proc_build.poll() is None:
|
||||
log.info(f'Build in progress, viewport {viewport_id} will launch when ready')
|
||||
return
|
||||
else:
|
||||
_viewport_build_in_progress = False
|
||||
|
||||
compile_viewport(assets_only=(not wrd.lnx_recompile))
|
||||
_viewport_build_in_progress = True
|
||||
|
||||
assets.invalidate_enabled = False
|
||||
build(target='krom', is_viewport=True, viewport_width=width, viewport_height=height)
|
||||
compile_viewport(assets_only=(not wrd.lnx_recompile))
|
||||
assets.invalidate_enabled = True
|
||||
else:
|
||||
build(target=target, is_play=True)
|
||||
compile(assets_only=(not wrd.lnx_recompile))
|
||||
|
||||
|
||||
def stop_viewport(viewport_id=None):
|
||||
@ -905,43 +935,6 @@ def get_khajs_path(target):
|
||||
return lnx.utils.build_dir() + '/debug/krom/krom.js'
|
||||
return lnx.utils.build_dir() + '/debug/html5/kha.js'
|
||||
|
||||
def play():
|
||||
global scripts_mtime
|
||||
wrd = bpy.data.worlds['Lnx']
|
||||
|
||||
build(target=runtime_to_target(), is_play=True)
|
||||
|
||||
khajs_path = get_khajs_path(state.target)
|
||||
if not wrd.lnx_cache_build or \
|
||||
not os.path.isfile(khajs_path) or \
|
||||
assets.khafile_defs_last != assets.khafile_defs or \
|
||||
state.last_target != state.target:
|
||||
wrd.lnx_recompile = True
|
||||
|
||||
state.last_target = state.target
|
||||
|
||||
# Trait sources modified
|
||||
state.mod_scripts = []
|
||||
script_path = lnx.utils.get_fp() + '/Sources/' + lnx.utils.safestr(wrd.lnx_project_package)
|
||||
if os.path.isdir(script_path):
|
||||
new_mtime = scripts_mtime
|
||||
for fn in glob.iglob(os.path.join(script_path, '**', '*.hx'), recursive=True):
|
||||
mtime = os.path.getmtime(fn)
|
||||
if scripts_mtime < mtime:
|
||||
lnx.utils.fetch_script_props(fn) # Trait props
|
||||
fn = fn.split('Sources/')[1]
|
||||
fn = fn[:-3] #.hx
|
||||
fn = fn.replace('/', '.')
|
||||
state.mod_scripts.append(fn)
|
||||
wrd.lnx_recompile = True
|
||||
if new_mtime < mtime:
|
||||
new_mtime = mtime
|
||||
scripts_mtime = new_mtime
|
||||
if len(state.mod_scripts) > 0: # Trait props
|
||||
lnx.utils.fetch_trait_props()
|
||||
|
||||
compile(assets_only=(not wrd.lnx_recompile))
|
||||
|
||||
def build_success():
|
||||
log.clear()
|
||||
wrd = bpy.data.worlds['Lnx']
|
||||
|
||||
Reference in New Issue
Block a user