diff --git a/.github/workflows/linux_opengl.yml b/.github/workflows/linux_opengl.yml deleted file mode 100644 index e0ace158..00000000 --- a/.github/workflows/linux_opengl.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Linux (OpenGL) - -on: - push: - branches: - - main - pull_request: - branches: - - main - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Apt Update - run: sudo apt-get update - - name: Apt Install - run: sudo apt-get install libasound2-dev libxrandr-dev libxinerama-dev libgl1-mesa-dev libxi-dev libxcursor-dev libudev-dev libgtk-3-dev --yes --quiet - - name: Get Submodules - run: git submodule update --init --recursive - - name: Compile - run: | - cd armorpaint - ../armorcore/Kinc/make --from ../armorcore -g opengl --compiler clang diff --git a/.github/workflows/windows_direct3d11.yml b/.github/workflows/windows_direct3d11.yml deleted file mode 100644 index 4baddee7..00000000 --- a/.github/workflows/windows_direct3d11.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Windows (Direct3D11) - -on: - push: - branches: - - main - pull_request: - branches: - - main - -jobs: - build: - - runs-on: windows-latest - - steps: - - uses: actions/checkout@v2 - - name: Get Submodules - run: git submodule update --init --recursive - - name: Compile - run: | - cd armorpaint - ../armorcore/Kinc/make --from ../armorcore -g direct3d11 diff --git a/armorforge/Sources/import.hx b/armorforge/Sources/import.hx index e157b31d..9ce6b5a4 100644 --- a/armorforge/Sources/import.hx +++ b/armorforge/Sources/import.hx @@ -1,9 +1,5 @@ // Global imports -#if (!macro) - import arm.Translator.tr; import arm.Enums; using StringTools; - -#end diff --git a/armorlab/Sources/import.hx b/armorlab/Sources/import.hx index e157b31d..9ce6b5a4 100644 --- a/armorlab/Sources/import.hx +++ b/armorlab/Sources/import.hx @@ -1,9 +1,5 @@ // Global imports -#if (!macro) - import arm.Translator.tr; import arm.Enums; using StringTools; - -#end diff --git a/armorpaint/Sources/import.hx b/armorpaint/Sources/import.hx index e157b31d..9ce6b5a4 100644 --- a/armorpaint/Sources/import.hx +++ b/armorpaint/Sources/import.hx @@ -1,9 +1,5 @@ // Global imports -#if (!macro) - import arm.Translator.tr; import arm.Enums; using StringTools; - -#end diff --git a/armorsculpt/Sources/arm/io/ImportMesh.hx b/armorsculpt/Sources/arm/io/ImportMesh.hx index e7abdf5b..cbf679ad 100644 --- a/armorsculpt/Sources/arm/io/ImportMesh.hx +++ b/armorsculpt/Sources/arm/io/ImportMesh.hx @@ -26,10 +26,6 @@ class ImportMesh { clearLayers = _clearLayers; Context.raw.layerFilter = 0; - #if arm_debug - var timer = iron.system.Time.realTime(); - #end - var p = path.toLowerCase(); if (p.endsWith(".obj")) ImportObj.run(path, replaceExisting); else if (p.endsWith(".fbx")) ImportFbx.run(path, replaceExisting); @@ -44,12 +40,6 @@ class ImportMesh { Project.meshAssets = [path]; - #if arm_debug - var ar = path.split(Path.sep); - var name = ar[ar.length - 1]; - Console.info(tr("Mesh imported:") + " " + name); - #end - #if (krom_android || krom_ios) kha.Window.get(0).title = path.substring(path.lastIndexOf(Path.sep) + 1, path.lastIndexOf(".")); #end @@ -87,10 +77,6 @@ class ImportMesh { UIView2D.inst.hwnd.redraws = 2; - #if arm_debug - trace("Mesh imported in " + (iron.system.Time.realTime() - timer)); - #end - #if arm_physics Context.raw.paintBody = null; #end diff --git a/base/Sources/arm/Plugin.hx b/base/Sources/arm/Plugin.hx index 68764799..c48306e0 100644 --- a/base/Sources/arm/Plugin.hx +++ b/base/Sources/arm/Plugin.hx @@ -39,10 +39,8 @@ class Plugin { try { iron.data.Data.getBlob("plugins/" + plugin, function(blob: kha.Blob) { pluginName = plugin; - #if js // js.Syntax.code("(1, eval)({0})", blob.toString()); // Global scope js.Syntax.code("eval({0})", blob.toString()); // Local scope - #end iron.data.Data.deleteBlob("plugins/" + plugin); }); } diff --git a/base/Sources/arm/io/ImportMesh.hx b/base/Sources/arm/io/ImportMesh.hx index 24d1f5a1..99f1b41f 100644 --- a/base/Sources/arm/io/ImportMesh.hx +++ b/base/Sources/arm/io/ImportMesh.hx @@ -58,12 +58,6 @@ class ImportMesh { Project.meshAssets = [path]; - #if arm_debug - var ar = path.split(Path.sep); - var name = ar[ar.length - 1]; - Console.info(tr("Mesh imported:") + " " + name); - #end - #if (krom_android || krom_ios) kha.Window.get(0).title = path.substring(path.lastIndexOf(Path.sep) + 1, path.lastIndexOf(".")); #end diff --git a/base/Sources/arm/render/RenderPathForwardVR.hx b/base/Sources/arm/render/RenderPathForwardVR.hx deleted file mode 100644 index 429b80bc..00000000 --- a/base/Sources/arm/render/RenderPathForwardVR.hx +++ /dev/null @@ -1,190 +0,0 @@ -package arm.render; - -#if arm_vr - -import kha.System; -import iron.RenderPath; -import iron.Scene; - -class RenderPathForwardVR { - - public static var path: RenderPath; - static var m = iron.math.Mat4.identity(); - static var m0 = iron.math.Mat4.identity(); - static var q = new iron.math.Quat(); - - public static function init(_path: RenderPath) { - path = _path; - - { - var t = new RenderTargetRaw(); - t.name = "eye0"; - t.width = 1440; - t.height = 1600; - t.format = "RGBA32"; - t.scale = RenderPathBase.getSuperSampling(); - path.createRenderTarget(t); - } - { - var t = new RenderTargetRaw(); - t.name = "eye1"; - t.width = 1440; - t.height = 1600; - t.format = "RGBA32"; - t.scale = RenderPathBase.getSuperSampling(); - path.createRenderTarget(t); - } - - path.createDepthBuffer("main_eye", "DEPTH24"); - - { - var t = new RenderTargetRaw(); - t.name = "gbuffer0_eye"; - t.width = 1440; - t.height = 1600; - t.format = "RGBA64"; - t.scale = RenderPathBase.getSuperSampling(); - t.depth_buffer = "main_eye"; - path.createRenderTarget(t); - } - { - var t = new RenderTargetRaw(); - t.name = "gbuffer1_eye"; - t.width = 1440; - t.height = 1600; - t.format = "RGBA64"; - t.scale = RenderPathBase.getSuperSampling(); - path.createRenderTarget(t); - } - { - var t = new RenderTargetRaw(); - t.name = "gbuffer2_eye"; - t.width = 1440; - t.height = 1600; - t.format = "RGBA64"; - t.scale = RenderPathBase.getSuperSampling(); - path.createRenderTarget(t); - } - { - var t = new RenderTargetRaw(); - t.name = "buf_eye"; - t.width = 1440; - t.height = 1600; - #if (kha_direct3d12 || kha_vulkan) - t.format = "RGBA64"; // Match raytrace_target format - #else - t.format = "RGBA32"; - #end - t.scale = RenderPathBase.getSuperSampling(); - path.createRenderTarget(t); - } - { - var t = new RenderTargetRaw(); - t.name = "buf2_eye"; - t.width = 1440; - t.height = 1600; - t.format = "RGBA32"; - t.scale = RenderPathBase.getSuperSampling(); - path.createRenderTarget(t); - } - { - var t = new RenderTargetRaw(); - t.name = "taa_eye"; - t.width = 1440; - t.height = 1600; - t.format = "RGBA32"; - t.scale = RenderPathBase.getSuperSampling(); - path.createRenderTarget(t); - } - { - var t = new RenderTargetRaw(); - t.name = "taa2_eye"; - t.width = 1440; - t.height = 1600; - t.format = "RGBA32"; - t.scale = RenderPathBase.getSuperSampling(); - path.createRenderTarget(t); - } - } - - public static function commands() { - if (System.windowWidth() == 0 || System.windowHeight() == 0) return; - - if (Krom.vrGetSensorStateHmdMounted()) { - var current = RenderPathBase.taaFrame % 2 == 0 ? "buf2" : "taa2"; - var output = RenderPathBase.taaFrame % 2 == 0 ? current : "taa"; - - m.setFrom(Scene.active.camera.transform.world); - - for (eye in 0...2) { - var view = Krom.vrGetSensorStateView(eye); - var proj = Krom.vrGetSensorStateProjection(eye); - // Convert up axis - q.fromAxisAngle(new iron.math.Vec4(1, 0, 0), -Math.PI / 2); - Scene.active.camera.V.fromQuat(q); - Scene.active.camera.V.translate(0, 1, -1); - m0._00 = view._00; - m0._01 = view._01; - m0._02 = view._02; - m0._03 = view._03; - m0._10 = view._10; - m0._11 = view._11; - m0._12 = view._12; - m0._13 = view._13; - m0._20 = view._20; - m0._21 = view._21; - m0._22 = view._22; - m0._23 = view._23; - m0._30 = view._30; - m0._31 = view._31; - m0._32 = view._32; - m0._33 = view._33; - Scene.active.camera.V.multmat(m0); - Scene.active.camera.P._00 = proj._00; - Scene.active.camera.P._01 = proj._01; - Scene.active.camera.P._02 = proj._02; - Scene.active.camera.P._03 = proj._03; - Scene.active.camera.P._10 = proj._10; - Scene.active.camera.P._11 = proj._11; - Scene.active.camera.P._12 = proj._12; - Scene.active.camera.P._13 = proj._13; - Scene.active.camera.P._20 = proj._20; - Scene.active.camera.P._21 = proj._21; - Scene.active.camera.P._22 = proj._22; - Scene.active.camera.P._23 = proj._23; - Scene.active.camera.P._30 = proj._30; - Scene.active.camera.P._31 = proj._31; - Scene.active.camera.P._32 = proj._32; - Scene.active.camera.P._33 = proj._33; - Scene.active.camera.VP.multmats(Scene.active.camera.P, Scene.active.camera.V); - Scene.active.camera.transform.world.getInverse(Scene.active.camera.V); - // RenderPathBase.drawGbuffer("gbuffer0_eye", "gbuffer1_eye", "gbuffer2_eye"); - // RenderPathForward.drawForward(true, "eye" + eye, "gbuffer0_eye", "gbuffer1_eye", "gbuffer2_eye", "buf_eye", "buf2_eye", "taa_eye", "taa2_eye"); - } - - Scene.active.camera.transform.world.setFrom(m); - Scene.active.camera.buildProjection(); - - Krom.vrBegin(); - - path.drawStereo(function(eye: Int) { - path.currentG = path.frameG; - path.bindTarget("eye" + eye, "tex"); - path.drawShader("shader_datas/copy_pass/copy_pass"); - }); - - Krom.vrWarpSwap(); - } - - Scene.active.camera.buildMatrix(); - - RenderPathPaint.begin(); - RenderPathBase.drawGbuffer(); - RenderPathForward.drawForward(); - RenderPathPaint.draw(); - RenderPathPaint.end(); - RenderPathBase.taaFrame++; - } -} - -#end