LeenkxTeam/LNXSDK
3
3
Fork 1
Code Issues 14 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'HashLeenkx' (#43) from Onek8/LNXSDK:main into main

Browse Source 
Reviewed-on: #43
This commit is contained in:
LeenkxTeam 2025-04-09 22:15:26 +00:00
commit 33f6fcaaaf
8 changed files with 151 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Kha/Backends/Kinc-HL/kfile.js
View File

@ -9,6 +9,7 @@ if (platform == Platform.OSX) project.addDefine('KORE_DEBUGDIR="osx-hl"');
if (platform == Platform.iOS) project.addDefine('KORE_DEBUGDIR="ios-hl"');
if (platform !== Platform.Windows || audio !== AudioApi.DirectSound) {
project.addDefine('KORE_MULTITHREADED_AUDIO');
project.addDefine('KINC_MULTITHREADED_AUDIO');
}
project.addDefine('KORE');

16
Kha/Backends/Kinc-HL/kinc-bridge/compute.c.h
View File

@ -3,36 +3,36 @@
#include <hl.h>
vbyte *hl_kinc_g4_compute_create_shader(vbyte *data, int length) {
vbyte *hl_kinc_compute_create_shader(vbyte *data, int length) {
kinc_g4_compute_shader *shader = (kinc_g4_compute_shader *)malloc(sizeof(kinc_g4_compute_shader));
kinc_g4_compute_shader_init(shader, data, length);
return (vbyte *)shader;
}
void hl_kinc_g4_compute_delete_shader(vbyte *shader) {
void hl_kinc_compute_delete_shader(vbyte *shader) {
kinc_g4_compute_shader *sh = (kinc_g4_compute_shader *)shader;
kinc_g4_compute_shader_destroy(sh);
free(sh);
}
vbyte *hl_kinc_g4_compute_get_constantlocation(vbyte *shader, vbyte *name) {
vbyte *hl_kinc_compute_get_constantlocation(vbyte *shader, vbyte *name) {
kinc_g4_compute_shader *sh = (kinc_g4_compute_shader *)shader;
kinc_g4_constant_location_t *location = (kinc_g4_constant_location_t *)malloc(sizeof(kinc_g4_constant_location_t));
*location = kinc_g4_compute_shader_get_constant_location(sh, (char *)name), sizeof(kinc_g4_constant_location_t);
*location = kinc_g4_compute_shader_get_constant_location(sh, (char *)name);
return (vbyte *)location;
}
vbyte *hl_kinc_g4_compute_get_textureunit(vbyte *shader, vbyte *name) {
vbyte *hl_kinc_compute_get_textureunit(vbyte *shader, vbyte *name) {
kinc_g4_compute_shader *sh = (kinc_g4_compute_shader *)shader;
kinc_g4_texture_unit_t *unit = (kinc_g4_texture_unit_t *)malloc(sizeof(kinc_g4_texture_unit_t));
*unit = kinc_g4_compute_shader_get_texture_unit(sh, (char *)name), sizeof(kinc_g4_texture_unit_t);
*unit = kinc_g4_compute_shader_get_texture_unit(sh, (char *)name);
return (vbyte *)unit;
}
void hl_kinc_g4_set_compute_shader(vbyte *shader) {
void hl_kinc_set_compute_shader(vbyte *shader) {
kinc_g4_set_compute_shader((kinc_g4_compute_shader *)shader);
}
void hl_kinc_g4_compute(int x, int y, int z) {
void hl_kinc_compute(int x, int y, int z) {
kinc_g4_compute(x, y, z);
}

2
Kha/Backends/Kinc-HL/kinc-bridge/kinc.c.h
View File

@ -94,8 +94,8 @@ void hl_init_kore(vbyte *title, int width, int height, int samplesPerPixel, bool
void hl_kinc_init_audio(vclosure *callCallback, vclosure *readSample, int *outSamplesPerSecond) {
audioCallCallback = *((FN_AUDIO_CALL_CALLBACK *)(&callCallback->fun));
audioReadSample = *((FN_AUDIO_READ_SAMPLE *)(&readSample->fun));
kinc_a2_set_callback(mix, NULL);
kinc_a2_init();
kinc_a2_set_callback(mix, NULL);
*outSamplesPerSecond = kinc_a2_samples_per_second();
}

1
leenkx/Sources/iron/system/LnxPack.hx
View File

@ -160,6 +160,7 @@ class LnxPack {
case "anim": TAnimation;
case "tracks": TTrack;
case "morph_target": TMorphTarget;
case "vertex_groups": TVertex_groups;
case _: TSceneFormat;
}
}

113
leenkx/blender/lnx/make.py
View File

@ -427,6 +427,19 @@ def build(target, is_play=False, is_publish=False, is_export=False):
global profile_time
profile_time = time.time()
wrd = bpy.data.worlds['Lnx']
if is_play and wrd.lnx_runtime == 'Hashlink':
current_os = lnx.utils.get_os()
if current_os == 'win':
target = 'windows-hl'
elif current_os == 'linux':
target = 'linux-hl'
elif current_os == 'macos':
target = 'macos-hl'
else:
log.error(f"Unsupported OS '{current_os}' for Hashlink runtime.")
state.target = target
state.is_play = is_play
state.is_publish = is_publish
@ -680,6 +693,106 @@ def build_success():
cmd.append(str(pid))
if wrd.lnx_audio == 'Disabled':
cmd.append('--nosound')
elif state.target.startswith(('windows-hl', 'linux-hl', 'macos-hl', 'Hashlink')):
log.info(f"Attempting to run Hashlink/C target: {state.target}")
hl_build_dir, _, _ = lnx.utils.hashlink_paths(state.target)
if not hl_build_dir:
log.error(f"Could not find build directory for target {state.target}. Playback aborted.")
return
if state.target == 'windows-hl':
vs_version_major = wrd.lnx_project_win_list_vs
build_mode = wrd.lnx_project_win_build_mode # Debug or Release
build_arch = wrd.lnx_project_win_build_arch # x64 or x86 (maps to Win32 for MSBuild)
platform = 'x64' if build_arch == 'x64' else 'Win32' # MSBuild uses Win32 for x86
installation = lnx.utils_vs.get_installed_version(vs_version_major, re_fetch=True)
if installation is None:
vs_info = lnx.utils_vs.get_supported_version(vs_version_major)
log.error(f'Visual Studio {vs_info["name"]} not found. Cannot compile {state.target}.')
return
msbuild_path = os.path.join(installation['path'], 'MSBuild', 'Current', 'Bin', 'MSBuild.exe')
if not os.path.isfile(msbuild_path):
msbuild_path = os.path.join(installation['path'], 'MSBuild', '15.0', 'Bin', 'MSBuild.exe') # VS 2017 fallback
if not os.path.isfile(msbuild_path):
log.error(f'MSBuild.exe not found for {installation["name"]}. Cannot compile {state.target}.')
return
proj_name = lnx.utils.blend_name()
vcxproj_path = os.path.join(hl_build_dir, proj_name + '.vcxproj')
if not os.path.isfile(vcxproj_path):
found_vcxproj = None
for file in os.listdir(hl_build_dir):
if file.endswith(".vcxproj"):
found_vcxproj = os.path.join(hl_build_dir, file)
log.warn(f"Could not find '{proj_name}.vcxproj', using found '{file}' instead.")
break
if not found_vcxproj:
log.error(f'.vcxproj file not found in {hl_build_dir}. Cannot compile.')
return
vcxproj_path = found_vcxproj
proj_name = os.path.splitext(os.path.basename(vcxproj_path))[0]
msbuild_cmd = [
msbuild_path,
vcxproj_path,
f'/p:Configuration={build_mode}',
f'/p:Platform={platform}',
'/m'
]
log.info(f"Compiling {state.target} project with MSBuild...")
log.info(f"Command: {' '.join(msbuild_cmd)}")
compile_success = False
try:
compile_result = subprocess.run(msbuild_cmd, cwd=hl_build_dir, check=False, capture_output=True, text=True)
if compile_result.returncode == 0:
log.info(f"MSBuild compilation successful.")
compile_success = True
else:
log.error(f"MSBuild compilation failed (Exit Code: {compile_result.returncode}).")
log.error(f"MSBuild Output:\n{compile_result.stdout}")
log.error(f"MSBuild Errors:\n{compile_result.stderr}")
except Exception as e:
log.error(f"Error running MSBuild: {e}")
traceback.print_exc()
if not compile_success:
return
# Path is typically: <build_dir>/<Platform>/<Configuration>/<ProjectName>.exe
exe_path = os.path.join(hl_build_dir, platform, build_mode, proj_name + '.exe')
if not os.path.isfile(exe_path):
exe_path = os.path.join(hl_build_dir, build_mode, proj_name + '.exe')
if not os.path.isfile(exe_path):
log.error(f'Compiled executable not found at expected location: {exe_path} (or variants). Cannot run.')
return
log.info(f"Found compiled executable: {exe_path}")
cmd = [exe_path]
exe_dir = os.path.dirname(exe_path)
log.info(f"Changing CWD to: {exe_dir}")
os.chdir(exe_dir)
elif state.target in ('linux-hl', 'macos-hl'):
log.error(f"Compilation for {state.target} is not yet implemented in build_success.")
return
else:
log.error(f"Running logic for target {state.target} is not defined (expected Krom or Hashlink/C).")
return
if cmd:
log.info(f"Executing final command: {' '.join(cmd)}")
try:
state.proc_play = run_proc(cmd, play_done)
except Exception:
traceback.print_exc()
else:
log.error("No command generated to run.")
try:
state.proc_play = run_proc(cmd, play_done)
except Exception:

3
leenkx/blender/lnx/props.py
View File

@ -307,7 +307,8 @@ def init_properties():
bpy.types.World.lnx_verbose_output = BoolProperty(name="Verbose Output", description="Print additional information to the console during compilation", default=False)
bpy.types.World.lnx_runtime = EnumProperty(
items=[('Krom', 'Krom', 'Krom'),
('Browser', 'Browser', 'Browser')],
('Browser', 'Browser', 'Browser'),
('Hashlink', 'Hashlink', 'Hashlink')],
name="Runtime", description="Runtime to use when launching the game", default='Krom', update=assets.invalidate_shader_cache)
bpy.types.World.lnx_loadscreen = BoolProperty(name="Loading Screen", description="Show asset loading progress on published builds", default=True)
bpy.types.World.lnx_vsync = BoolProperty(name="VSync", description="Vertical Synchronization", default=True, update=assets.invalidate_compiler_cache)

19
leenkx/blender/lnx/utils.py
View File

@ -363,6 +363,25 @@ def krom_paths():
krom_path = krom_location + '/Krom'
return krom_location, krom_path
def hashlink_paths(target):
"""Returns path for Hashlink runtime target."""
sdk_path = get_sdk_path()
proj_name = blend_name()
build_base_dir = get_fp_build()
if target in ('windows-hl', 'linux-hl', 'macos-hl'):
hl_build_dir = os.path.join(build_base_dir, target + '-build')
log.info(f"Identified Hashlink/C build directory: {hl_build_dir}")
return hl_build_dir, None, None # Return build_dir, no file, no interpreter
else:
return '', None, None
def fetch_bundled_script_names():
wrd = bpy.data.worlds['Lnx']
wrd.lnx_bundled_scripts_list.clear()

7
lib/aura/Sources/aura/Aura.hx
View File

@ -63,7 +63,12 @@ class Aura {
listener = new Listener();
BufferCache.init();
// Sample buffer to prevent allocation
final initialBufferSize = 4096;
if (!BufferCache.getBuffer(TFloat32Array, p_samplesBuffer, 1, initialBufferSize)) {
trace('CRITICAL: Failed to allocate initial sample buffer during Aura.init()!');
}
// Create a few preconfigured mix channels
masterChannel = createMixChannel("master");
createMixChannel("music").setMixChannel(masterChannel);