From c928f2c13e1f382b9388bf5c1a089da140878014 Mon Sep 17 00:00:00 2001 From: Lubos Lenco Date: Thu, 7 May 2020 13:56:28 +0200 Subject: [PATCH] Prepare libraries --- Libraries/formatlib/LICENSE.md | 7 +++++++ Libraries/formatlib/README.md | 3 +++ .../formatlib/Sources}/arm/format/BlendParser.hx | 0 .../formatlib/Sources}/arm/format/ExrWriter.hx | 0 .../Sources}/arm/format/FbxBinaryParser.hx | 0 .../formatlib/Sources}/arm/format/FbxLibrary.hx | 0 .../formatlib/Sources}/arm/format/FbxParser.hx | 0 .../formatlib/Sources}/arm/format/JpgData.hx | 0 .../formatlib/Sources}/arm/format/JpgWriter.hx | 0 .../formatlib/Sources}/arm/format/Lz4.hx | 0 .../formatlib/Sources}/arm/format/ObjParser.hx | 0 .../formatlib/Sources}/arm/format/PngData.hx | 0 .../formatlib/Sources}/arm/format/PngTools.hx | 0 .../formatlib/Sources}/arm/format/PngWriter.hx | 0 .../formatlib/Sources}/arm/format/pako/Deflate.hx | 0 .../formatlib/Sources}/arm/format/pako/Inflate.hx | 0 .../formatlib/Sources}/arm/format/pako/LICENSE | 0 .../formatlib/Sources}/arm/format/pako/Pako.hx | 0 .../formatlib/Sources}/arm/format/pako/README.md | 0 .../Sources}/arm/format/pako/utils/Common.hx | 0 .../Sources}/arm/format/pako/zlib/Adler32.hx | 0 .../Sources}/arm/format/pako/zlib/CRC32.hx | 0 .../Sources}/arm/format/pako/zlib/Constants.hx | 0 .../Sources}/arm/format/pako/zlib/Deflate.hx | 0 .../Sources}/arm/format/pako/zlib/GZHeader.hx | 0 .../Sources}/arm/format/pako/zlib/InfFast.hx | 0 .../Sources}/arm/format/pako/zlib/InfTrees.hx | 0 .../Sources}/arm/format/pako/zlib/Inflate.hx | 0 .../Sources}/arm/format/pako/zlib/Messages.hx | 0 .../Sources}/arm/format/pako/zlib/Trees.hx | 0 .../Sources}/arm/format/pako/zlib/ZStream.hx | 0 Libraries/formatlib/Sources/import.hx | 8 ++++++++ Libraries/geomlib/LICENSE.md | 7 +++++++ Libraries/geomlib/README.md | 3 +++ .../geomlib/Sources}/arm/format/proc/Plane.hx | 0 .../geomlib/Sources}/arm/format/proc/Sphere.hx | 0 Libraries/geomlib/Sources/import.hx | 8 ++++++++ Libraries/nodelib/LICENSE.md | 7 +++++++ Libraries/nodelib/README.md | 3 +++ .../nodelib/Sources}/arm/node/Material.hx | 0 .../nodelib/Sources}/arm/node/MaterialFunctions.hx | 0 .../nodelib/Sources}/arm/node/NodesMaterial.hx | 0 Libraries/nodelib/Sources/import.hx | 8 ++++++++ Libraries/shaderlib/LICENSE.md | 7 +++++++ Libraries/shaderlib/README.md | 3 +++ .../shaderlib/Sources}/arm/node/MaterialShader.hx | 0 Libraries/shaderlib/Sources/import.hx | 8 ++++++++ Libraries/syslib/LICENSE.md | 7 +++++++ Libraries/syslib/README.md | 3 +++ .../syslib/Sources}/arm/sys/File.hx | 0 .../syslib/Sources}/arm/sys/Path.hx | 0 Libraries/syslib/Sources/import.hx | 8 ++++++++ .../xenon/Assets}/bnoise_rank.png | Bin .../xenon/Assets}/bnoise_scramble.png | Bin .../xenon/Assets}/bnoise_sobol.png | Bin Libraries/xenon/LICENSE.md | 7 +++++++ Libraries/xenon/README.md | 3 +++ .../xenon/Shaders}/raytrace_bake_ao.cso | Bin .../xenon/Shaders}/raytrace_bake_bent.cso | Bin .../xenon/Shaders}/raytrace_bake_light.cso | Bin .../xenon/Shaders}/raytrace_bake_thick.cso | Bin .../xenon/Shaders}/raytrace_brute.cso | Bin .../xenon/Shaders}/src/build.bat | 0 .../xenon/Shaders}/src/dxc.exe | Bin .../xenon/Shaders}/src/dxcompiler.dll | Bin .../xenon/Shaders}/src/dxil.dll | Bin .../xenon/Shaders}/src/raytrace_bake_ao.hlsl | 0 .../xenon/Shaders}/src/raytrace_bake_bent.hlsl | 0 .../xenon/Shaders}/src/raytrace_bake_light.hlsl | 0 .../xenon/Shaders}/src/raytrace_bake_thick.hlsl | 0 .../xenon/Shaders}/src/raytrace_brute.hlsl | 0 .../xenon/Shaders}/src/std/attrib.hlsl | 0 .../xenon/Shaders}/src/std/dof.hlsl | 0 .../xenon/Shaders}/src/std/math.hlsl | 0 .../xenon/Shaders}/src/std/rand.hlsl | 0 .../xenon/Sources}/arm/render/RenderPathRaytrace.hx | 0 Libraries/xenon/Sources/import.hx | 8 ++++++++ README.md | 2 +- Sources/arm/Context.hx | 2 +- khafile.js | 8 +++++++- 80 files changed, 117 insertions(+), 3 deletions(-) create mode 100644 Libraries/formatlib/LICENSE.md create mode 100644 Libraries/formatlib/README.md rename {Sources => Libraries/formatlib/Sources}/arm/format/BlendParser.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/ExrWriter.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/FbxBinaryParser.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/FbxLibrary.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/FbxParser.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/JpgData.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/JpgWriter.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/Lz4.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/ObjParser.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/PngData.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/PngTools.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/PngWriter.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/pako/Deflate.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/pako/Inflate.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/pako/LICENSE (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/pako/Pako.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/pako/README.md (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/pako/utils/Common.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/pako/zlib/Adler32.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/pako/zlib/CRC32.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/pako/zlib/Constants.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/pako/zlib/Deflate.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/pako/zlib/GZHeader.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/pako/zlib/InfFast.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/pako/zlib/InfTrees.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/pako/zlib/Inflate.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/pako/zlib/Messages.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/pako/zlib/Trees.hx (100%) rename {Sources => Libraries/formatlib/Sources}/arm/format/pako/zlib/ZStream.hx (100%) create mode 100644 Libraries/formatlib/Sources/import.hx create mode 100644 Libraries/geomlib/LICENSE.md create mode 100644 Libraries/geomlib/README.md rename {Sources => Libraries/geomlib/Sources}/arm/format/proc/Plane.hx (100%) rename {Sources => Libraries/geomlib/Sources}/arm/format/proc/Sphere.hx (100%) create mode 100644 Libraries/geomlib/Sources/import.hx create mode 100644 Libraries/nodelib/LICENSE.md create mode 100644 Libraries/nodelib/README.md rename {Sources => Libraries/nodelib/Sources}/arm/node/Material.hx (100%) rename {Sources => Libraries/nodelib/Sources}/arm/node/MaterialFunctions.hx (100%) rename {Sources => Libraries/nodelib/Sources}/arm/node/NodesMaterial.hx (100%) create mode 100644 Libraries/nodelib/Sources/import.hx create mode 100644 Libraries/shaderlib/LICENSE.md create mode 100644 Libraries/shaderlib/README.md rename {Sources => Libraries/shaderlib/Sources}/arm/node/MaterialShader.hx (100%) create mode 100644 Libraries/shaderlib/Sources/import.hx create mode 100644 Libraries/syslib/LICENSE.md create mode 100644 Libraries/syslib/README.md rename {Sources => Libraries/syslib/Sources}/arm/sys/File.hx (100%) rename {Sources => Libraries/syslib/Sources}/arm/sys/Path.hx (100%) create mode 100644 Libraries/syslib/Sources/import.hx rename {Assets/raytrace => Libraries/xenon/Assets}/bnoise_rank.png (100%) rename {Assets/raytrace => Libraries/xenon/Assets}/bnoise_scramble.png (100%) rename {Assets/raytrace => Libraries/xenon/Assets}/bnoise_sobol.png (100%) create mode 100644 Libraries/xenon/LICENSE.md create mode 100644 Libraries/xenon/README.md rename {Shaders/raytrace => Libraries/xenon/Shaders}/raytrace_bake_ao.cso (100%) rename {Shaders/raytrace => Libraries/xenon/Shaders}/raytrace_bake_bent.cso (100%) rename {Shaders/raytrace => Libraries/xenon/Shaders}/raytrace_bake_light.cso (100%) rename {Shaders/raytrace => Libraries/xenon/Shaders}/raytrace_bake_thick.cso (100%) rename {Shaders/raytrace => Libraries/xenon/Shaders}/raytrace_brute.cso (100%) rename {Shaders/raytrace => Libraries/xenon/Shaders}/src/build.bat (100%) rename {Shaders/raytrace => Libraries/xenon/Shaders}/src/dxc.exe (100%) rename {Shaders/raytrace => Libraries/xenon/Shaders}/src/dxcompiler.dll (100%) rename {Shaders/raytrace => Libraries/xenon/Shaders}/src/dxil.dll (100%) rename {Shaders/raytrace => Libraries/xenon/Shaders}/src/raytrace_bake_ao.hlsl (100%) rename {Shaders/raytrace => Libraries/xenon/Shaders}/src/raytrace_bake_bent.hlsl (100%) rename {Shaders/raytrace => Libraries/xenon/Shaders}/src/raytrace_bake_light.hlsl (100%) rename {Shaders/raytrace => Libraries/xenon/Shaders}/src/raytrace_bake_thick.hlsl (100%) rename {Shaders/raytrace => Libraries/xenon/Shaders}/src/raytrace_brute.hlsl (100%) rename {Shaders/raytrace => Libraries/xenon/Shaders}/src/std/attrib.hlsl (100%) rename {Shaders/raytrace => Libraries/xenon/Shaders}/src/std/dof.hlsl (100%) rename {Shaders/raytrace => Libraries/xenon/Shaders}/src/std/math.hlsl (100%) rename {Shaders/raytrace => Libraries/xenon/Shaders}/src/std/rand.hlsl (100%) rename {Sources => Libraries/xenon/Sources}/arm/render/RenderPathRaytrace.hx (100%) create mode 100644 Libraries/xenon/Sources/import.hx diff --git a/Libraries/formatlib/LICENSE.md b/Libraries/formatlib/LICENSE.md new file mode 100644 index 00000000..4b308e96 --- /dev/null +++ b/Libraries/formatlib/LICENSE.md @@ -0,0 +1,7 @@ +# The zlib/libpng License + +This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: +The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +This notice may not be removed or altered from any source distribution. diff --git a/Libraries/formatlib/README.md b/Libraries/formatlib/README.md new file mode 100644 index 00000000..504face3 --- /dev/null +++ b/Libraries/formatlib/README.md @@ -0,0 +1,3 @@ +# formatlib + +File format import and export. diff --git a/Sources/arm/format/BlendParser.hx b/Libraries/formatlib/Sources/arm/format/BlendParser.hx similarity index 100% rename from Sources/arm/format/BlendParser.hx rename to Libraries/formatlib/Sources/arm/format/BlendParser.hx diff --git a/Sources/arm/format/ExrWriter.hx b/Libraries/formatlib/Sources/arm/format/ExrWriter.hx similarity index 100% rename from Sources/arm/format/ExrWriter.hx rename to Libraries/formatlib/Sources/arm/format/ExrWriter.hx diff --git a/Sources/arm/format/FbxBinaryParser.hx b/Libraries/formatlib/Sources/arm/format/FbxBinaryParser.hx similarity index 100% rename from Sources/arm/format/FbxBinaryParser.hx rename to Libraries/formatlib/Sources/arm/format/FbxBinaryParser.hx diff --git a/Sources/arm/format/FbxLibrary.hx b/Libraries/formatlib/Sources/arm/format/FbxLibrary.hx similarity index 100% rename from Sources/arm/format/FbxLibrary.hx rename to Libraries/formatlib/Sources/arm/format/FbxLibrary.hx diff --git a/Sources/arm/format/FbxParser.hx b/Libraries/formatlib/Sources/arm/format/FbxParser.hx similarity index 100% rename from Sources/arm/format/FbxParser.hx rename to Libraries/formatlib/Sources/arm/format/FbxParser.hx diff --git a/Sources/arm/format/JpgData.hx b/Libraries/formatlib/Sources/arm/format/JpgData.hx similarity index 100% rename from Sources/arm/format/JpgData.hx rename to Libraries/formatlib/Sources/arm/format/JpgData.hx diff --git a/Sources/arm/format/JpgWriter.hx b/Libraries/formatlib/Sources/arm/format/JpgWriter.hx similarity index 100% rename from Sources/arm/format/JpgWriter.hx rename to Libraries/formatlib/Sources/arm/format/JpgWriter.hx diff --git a/Sources/arm/format/Lz4.hx b/Libraries/formatlib/Sources/arm/format/Lz4.hx similarity index 100% rename from Sources/arm/format/Lz4.hx rename to Libraries/formatlib/Sources/arm/format/Lz4.hx diff --git a/Sources/arm/format/ObjParser.hx b/Libraries/formatlib/Sources/arm/format/ObjParser.hx similarity index 100% rename from Sources/arm/format/ObjParser.hx rename to Libraries/formatlib/Sources/arm/format/ObjParser.hx diff --git a/Sources/arm/format/PngData.hx b/Libraries/formatlib/Sources/arm/format/PngData.hx similarity index 100% rename from Sources/arm/format/PngData.hx rename to Libraries/formatlib/Sources/arm/format/PngData.hx diff --git a/Sources/arm/format/PngTools.hx b/Libraries/formatlib/Sources/arm/format/PngTools.hx similarity index 100% rename from Sources/arm/format/PngTools.hx rename to Libraries/formatlib/Sources/arm/format/PngTools.hx diff --git a/Sources/arm/format/PngWriter.hx b/Libraries/formatlib/Sources/arm/format/PngWriter.hx similarity index 100% rename from Sources/arm/format/PngWriter.hx rename to Libraries/formatlib/Sources/arm/format/PngWriter.hx diff --git a/Sources/arm/format/pako/Deflate.hx b/Libraries/formatlib/Sources/arm/format/pako/Deflate.hx similarity index 100% rename from Sources/arm/format/pako/Deflate.hx rename to Libraries/formatlib/Sources/arm/format/pako/Deflate.hx diff --git a/Sources/arm/format/pako/Inflate.hx b/Libraries/formatlib/Sources/arm/format/pako/Inflate.hx similarity index 100% rename from Sources/arm/format/pako/Inflate.hx rename to Libraries/formatlib/Sources/arm/format/pako/Inflate.hx diff --git a/Sources/arm/format/pako/LICENSE b/Libraries/formatlib/Sources/arm/format/pako/LICENSE similarity index 100% rename from Sources/arm/format/pako/LICENSE rename to Libraries/formatlib/Sources/arm/format/pako/LICENSE diff --git a/Sources/arm/format/pako/Pako.hx b/Libraries/formatlib/Sources/arm/format/pako/Pako.hx similarity index 100% rename from Sources/arm/format/pako/Pako.hx rename to Libraries/formatlib/Sources/arm/format/pako/Pako.hx diff --git a/Sources/arm/format/pako/README.md b/Libraries/formatlib/Sources/arm/format/pako/README.md similarity index 100% rename from Sources/arm/format/pako/README.md rename to Libraries/formatlib/Sources/arm/format/pako/README.md diff --git a/Sources/arm/format/pako/utils/Common.hx b/Libraries/formatlib/Sources/arm/format/pako/utils/Common.hx similarity index 100% rename from Sources/arm/format/pako/utils/Common.hx rename to Libraries/formatlib/Sources/arm/format/pako/utils/Common.hx diff --git a/Sources/arm/format/pako/zlib/Adler32.hx b/Libraries/formatlib/Sources/arm/format/pako/zlib/Adler32.hx similarity index 100% rename from Sources/arm/format/pako/zlib/Adler32.hx rename to Libraries/formatlib/Sources/arm/format/pako/zlib/Adler32.hx diff --git a/Sources/arm/format/pako/zlib/CRC32.hx b/Libraries/formatlib/Sources/arm/format/pako/zlib/CRC32.hx similarity index 100% rename from Sources/arm/format/pako/zlib/CRC32.hx rename to Libraries/formatlib/Sources/arm/format/pako/zlib/CRC32.hx diff --git a/Sources/arm/format/pako/zlib/Constants.hx b/Libraries/formatlib/Sources/arm/format/pako/zlib/Constants.hx similarity index 100% rename from Sources/arm/format/pako/zlib/Constants.hx rename to Libraries/formatlib/Sources/arm/format/pako/zlib/Constants.hx diff --git a/Sources/arm/format/pako/zlib/Deflate.hx b/Libraries/formatlib/Sources/arm/format/pako/zlib/Deflate.hx similarity index 100% rename from Sources/arm/format/pako/zlib/Deflate.hx rename to Libraries/formatlib/Sources/arm/format/pako/zlib/Deflate.hx diff --git a/Sources/arm/format/pako/zlib/GZHeader.hx b/Libraries/formatlib/Sources/arm/format/pako/zlib/GZHeader.hx similarity index 100% rename from Sources/arm/format/pako/zlib/GZHeader.hx rename to Libraries/formatlib/Sources/arm/format/pako/zlib/GZHeader.hx diff --git a/Sources/arm/format/pako/zlib/InfFast.hx b/Libraries/formatlib/Sources/arm/format/pako/zlib/InfFast.hx similarity index 100% rename from Sources/arm/format/pako/zlib/InfFast.hx rename to Libraries/formatlib/Sources/arm/format/pako/zlib/InfFast.hx diff --git a/Sources/arm/format/pako/zlib/InfTrees.hx b/Libraries/formatlib/Sources/arm/format/pako/zlib/InfTrees.hx similarity index 100% rename from Sources/arm/format/pako/zlib/InfTrees.hx rename to Libraries/formatlib/Sources/arm/format/pako/zlib/InfTrees.hx diff --git a/Sources/arm/format/pako/zlib/Inflate.hx b/Libraries/formatlib/Sources/arm/format/pako/zlib/Inflate.hx similarity index 100% rename from Sources/arm/format/pako/zlib/Inflate.hx rename to Libraries/formatlib/Sources/arm/format/pako/zlib/Inflate.hx diff --git a/Sources/arm/format/pako/zlib/Messages.hx b/Libraries/formatlib/Sources/arm/format/pako/zlib/Messages.hx similarity index 100% rename from Sources/arm/format/pako/zlib/Messages.hx rename to Libraries/formatlib/Sources/arm/format/pako/zlib/Messages.hx diff --git a/Sources/arm/format/pako/zlib/Trees.hx b/Libraries/formatlib/Sources/arm/format/pako/zlib/Trees.hx similarity index 100% rename from Sources/arm/format/pako/zlib/Trees.hx rename to Libraries/formatlib/Sources/arm/format/pako/zlib/Trees.hx diff --git a/Sources/arm/format/pako/zlib/ZStream.hx b/Libraries/formatlib/Sources/arm/format/pako/zlib/ZStream.hx similarity index 100% rename from Sources/arm/format/pako/zlib/ZStream.hx rename to Libraries/formatlib/Sources/arm/format/pako/zlib/ZStream.hx diff --git a/Libraries/formatlib/Sources/import.hx b/Libraries/formatlib/Sources/import.hx new file mode 100644 index 00000000..bf5e345f --- /dev/null +++ b/Libraries/formatlib/Sources/import.hx @@ -0,0 +1,8 @@ +// Global imports + +#if (!macro) + +import arm.Translator.tr; +using StringTools; + +#end diff --git a/Libraries/geomlib/LICENSE.md b/Libraries/geomlib/LICENSE.md new file mode 100644 index 00000000..4b308e96 --- /dev/null +++ b/Libraries/geomlib/LICENSE.md @@ -0,0 +1,7 @@ +# The zlib/libpng License + +This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: +The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +This notice may not be removed or altered from any source distribution. diff --git a/Libraries/geomlib/README.md b/Libraries/geomlib/README.md new file mode 100644 index 00000000..3a5eaee0 --- /dev/null +++ b/Libraries/geomlib/README.md @@ -0,0 +1,3 @@ +# geomlib + +Procedural geometry generator. diff --git a/Sources/arm/format/proc/Plane.hx b/Libraries/geomlib/Sources/arm/format/proc/Plane.hx similarity index 100% rename from Sources/arm/format/proc/Plane.hx rename to Libraries/geomlib/Sources/arm/format/proc/Plane.hx diff --git a/Sources/arm/format/proc/Sphere.hx b/Libraries/geomlib/Sources/arm/format/proc/Sphere.hx similarity index 100% rename from Sources/arm/format/proc/Sphere.hx rename to Libraries/geomlib/Sources/arm/format/proc/Sphere.hx diff --git a/Libraries/geomlib/Sources/import.hx b/Libraries/geomlib/Sources/import.hx new file mode 100644 index 00000000..bf5e345f --- /dev/null +++ b/Libraries/geomlib/Sources/import.hx @@ -0,0 +1,8 @@ +// Global imports + +#if (!macro) + +import arm.Translator.tr; +using StringTools; + +#end diff --git a/Libraries/nodelib/LICENSE.md b/Libraries/nodelib/LICENSE.md new file mode 100644 index 00000000..4b308e96 --- /dev/null +++ b/Libraries/nodelib/LICENSE.md @@ -0,0 +1,7 @@ +# The zlib/libpng License + +This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: +The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +This notice may not be removed or altered from any source distribution. diff --git a/Libraries/nodelib/README.md b/Libraries/nodelib/README.md new file mode 100644 index 00000000..474237dd --- /dev/null +++ b/Libraries/nodelib/README.md @@ -0,0 +1,3 @@ +# nodelib + +Nodes to shader compiler. diff --git a/Sources/arm/node/Material.hx b/Libraries/nodelib/Sources/arm/node/Material.hx similarity index 100% rename from Sources/arm/node/Material.hx rename to Libraries/nodelib/Sources/arm/node/Material.hx diff --git a/Sources/arm/node/MaterialFunctions.hx b/Libraries/nodelib/Sources/arm/node/MaterialFunctions.hx similarity index 100% rename from Sources/arm/node/MaterialFunctions.hx rename to Libraries/nodelib/Sources/arm/node/MaterialFunctions.hx diff --git a/Sources/arm/node/NodesMaterial.hx b/Libraries/nodelib/Sources/arm/node/NodesMaterial.hx similarity index 100% rename from Sources/arm/node/NodesMaterial.hx rename to Libraries/nodelib/Sources/arm/node/NodesMaterial.hx diff --git a/Libraries/nodelib/Sources/import.hx b/Libraries/nodelib/Sources/import.hx new file mode 100644 index 00000000..bf5e345f --- /dev/null +++ b/Libraries/nodelib/Sources/import.hx @@ -0,0 +1,8 @@ +// Global imports + +#if (!macro) + +import arm.Translator.tr; +using StringTools; + +#end diff --git a/Libraries/shaderlib/LICENSE.md b/Libraries/shaderlib/LICENSE.md new file mode 100644 index 00000000..4b308e96 --- /dev/null +++ b/Libraries/shaderlib/LICENSE.md @@ -0,0 +1,7 @@ +# The zlib/libpng License + +This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: +The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +This notice may not be removed or altered from any source distribution. diff --git a/Libraries/shaderlib/README.md b/Libraries/shaderlib/README.md new file mode 100644 index 00000000..4d1d8f28 --- /dev/null +++ b/Libraries/shaderlib/README.md @@ -0,0 +1,3 @@ +# shaderlib + +Run-time shader cross-compiler, trading features for speed. diff --git a/Sources/arm/node/MaterialShader.hx b/Libraries/shaderlib/Sources/arm/node/MaterialShader.hx similarity index 100% rename from Sources/arm/node/MaterialShader.hx rename to Libraries/shaderlib/Sources/arm/node/MaterialShader.hx diff --git a/Libraries/shaderlib/Sources/import.hx b/Libraries/shaderlib/Sources/import.hx new file mode 100644 index 00000000..bf5e345f --- /dev/null +++ b/Libraries/shaderlib/Sources/import.hx @@ -0,0 +1,8 @@ +// Global imports + +#if (!macro) + +import arm.Translator.tr; +using StringTools; + +#end diff --git a/Libraries/syslib/LICENSE.md b/Libraries/syslib/LICENSE.md new file mode 100644 index 00000000..4b308e96 --- /dev/null +++ b/Libraries/syslib/LICENSE.md @@ -0,0 +1,7 @@ +# The zlib/libpng License + +This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: +The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +This notice may not be removed or altered from any source distribution. diff --git a/Libraries/syslib/README.md b/Libraries/syslib/README.md new file mode 100644 index 00000000..96f65836 --- /dev/null +++ b/Libraries/syslib/README.md @@ -0,0 +1,3 @@ +# syslib + +System library for Kromx. diff --git a/Sources/arm/sys/File.hx b/Libraries/syslib/Sources/arm/sys/File.hx similarity index 100% rename from Sources/arm/sys/File.hx rename to Libraries/syslib/Sources/arm/sys/File.hx diff --git a/Sources/arm/sys/Path.hx b/Libraries/syslib/Sources/arm/sys/Path.hx similarity index 100% rename from Sources/arm/sys/Path.hx rename to Libraries/syslib/Sources/arm/sys/Path.hx diff --git a/Libraries/syslib/Sources/import.hx b/Libraries/syslib/Sources/import.hx new file mode 100644 index 00000000..bf5e345f --- /dev/null +++ b/Libraries/syslib/Sources/import.hx @@ -0,0 +1,8 @@ +// Global imports + +#if (!macro) + +import arm.Translator.tr; +using StringTools; + +#end diff --git a/Assets/raytrace/bnoise_rank.png b/Libraries/xenon/Assets/bnoise_rank.png similarity index 100% rename from Assets/raytrace/bnoise_rank.png rename to Libraries/xenon/Assets/bnoise_rank.png diff --git a/Assets/raytrace/bnoise_scramble.png b/Libraries/xenon/Assets/bnoise_scramble.png similarity index 100% rename from Assets/raytrace/bnoise_scramble.png rename to Libraries/xenon/Assets/bnoise_scramble.png diff --git a/Assets/raytrace/bnoise_sobol.png b/Libraries/xenon/Assets/bnoise_sobol.png similarity index 100% rename from Assets/raytrace/bnoise_sobol.png rename to Libraries/xenon/Assets/bnoise_sobol.png diff --git a/Libraries/xenon/LICENSE.md b/Libraries/xenon/LICENSE.md new file mode 100644 index 00000000..4b308e96 --- /dev/null +++ b/Libraries/xenon/LICENSE.md @@ -0,0 +1,7 @@ +# The zlib/libpng License + +This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. +Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: +The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. +This notice may not be removed or altered from any source distribution. diff --git a/Libraries/xenon/README.md b/Libraries/xenon/README.md new file mode 100644 index 00000000..e2600f9e --- /dev/null +++ b/Libraries/xenon/README.md @@ -0,0 +1,3 @@ +# xenon + +Real-time path-tracing renderer, trading accuracy for speed. diff --git a/Shaders/raytrace/raytrace_bake_ao.cso b/Libraries/xenon/Shaders/raytrace_bake_ao.cso similarity index 100% rename from Shaders/raytrace/raytrace_bake_ao.cso rename to Libraries/xenon/Shaders/raytrace_bake_ao.cso diff --git a/Shaders/raytrace/raytrace_bake_bent.cso b/Libraries/xenon/Shaders/raytrace_bake_bent.cso similarity index 100% rename from Shaders/raytrace/raytrace_bake_bent.cso rename to Libraries/xenon/Shaders/raytrace_bake_bent.cso diff --git a/Shaders/raytrace/raytrace_bake_light.cso b/Libraries/xenon/Shaders/raytrace_bake_light.cso similarity index 100% rename from Shaders/raytrace/raytrace_bake_light.cso rename to Libraries/xenon/Shaders/raytrace_bake_light.cso diff --git a/Shaders/raytrace/raytrace_bake_thick.cso b/Libraries/xenon/Shaders/raytrace_bake_thick.cso similarity index 100% rename from Shaders/raytrace/raytrace_bake_thick.cso rename to Libraries/xenon/Shaders/raytrace_bake_thick.cso diff --git a/Shaders/raytrace/raytrace_brute.cso b/Libraries/xenon/Shaders/raytrace_brute.cso similarity index 100% rename from Shaders/raytrace/raytrace_brute.cso rename to Libraries/xenon/Shaders/raytrace_brute.cso diff --git a/Shaders/raytrace/src/build.bat b/Libraries/xenon/Shaders/src/build.bat similarity index 100% rename from Shaders/raytrace/src/build.bat rename to Libraries/xenon/Shaders/src/build.bat diff --git a/Shaders/raytrace/src/dxc.exe b/Libraries/xenon/Shaders/src/dxc.exe similarity index 100% rename from Shaders/raytrace/src/dxc.exe rename to Libraries/xenon/Shaders/src/dxc.exe diff --git a/Shaders/raytrace/src/dxcompiler.dll b/Libraries/xenon/Shaders/src/dxcompiler.dll similarity index 100% rename from Shaders/raytrace/src/dxcompiler.dll rename to Libraries/xenon/Shaders/src/dxcompiler.dll diff --git a/Shaders/raytrace/src/dxil.dll b/Libraries/xenon/Shaders/src/dxil.dll similarity index 100% rename from Shaders/raytrace/src/dxil.dll rename to Libraries/xenon/Shaders/src/dxil.dll diff --git a/Shaders/raytrace/src/raytrace_bake_ao.hlsl b/Libraries/xenon/Shaders/src/raytrace_bake_ao.hlsl similarity index 100% rename from Shaders/raytrace/src/raytrace_bake_ao.hlsl rename to Libraries/xenon/Shaders/src/raytrace_bake_ao.hlsl diff --git a/Shaders/raytrace/src/raytrace_bake_bent.hlsl b/Libraries/xenon/Shaders/src/raytrace_bake_bent.hlsl similarity index 100% rename from Shaders/raytrace/src/raytrace_bake_bent.hlsl rename to Libraries/xenon/Shaders/src/raytrace_bake_bent.hlsl diff --git a/Shaders/raytrace/src/raytrace_bake_light.hlsl b/Libraries/xenon/Shaders/src/raytrace_bake_light.hlsl similarity index 100% rename from Shaders/raytrace/src/raytrace_bake_light.hlsl rename to Libraries/xenon/Shaders/src/raytrace_bake_light.hlsl diff --git a/Shaders/raytrace/src/raytrace_bake_thick.hlsl b/Libraries/xenon/Shaders/src/raytrace_bake_thick.hlsl similarity index 100% rename from Shaders/raytrace/src/raytrace_bake_thick.hlsl rename to Libraries/xenon/Shaders/src/raytrace_bake_thick.hlsl diff --git a/Shaders/raytrace/src/raytrace_brute.hlsl b/Libraries/xenon/Shaders/src/raytrace_brute.hlsl similarity index 100% rename from Shaders/raytrace/src/raytrace_brute.hlsl rename to Libraries/xenon/Shaders/src/raytrace_brute.hlsl diff --git a/Shaders/raytrace/src/std/attrib.hlsl b/Libraries/xenon/Shaders/src/std/attrib.hlsl similarity index 100% rename from Shaders/raytrace/src/std/attrib.hlsl rename to Libraries/xenon/Shaders/src/std/attrib.hlsl diff --git a/Shaders/raytrace/src/std/dof.hlsl b/Libraries/xenon/Shaders/src/std/dof.hlsl similarity index 100% rename from Shaders/raytrace/src/std/dof.hlsl rename to Libraries/xenon/Shaders/src/std/dof.hlsl diff --git a/Shaders/raytrace/src/std/math.hlsl b/Libraries/xenon/Shaders/src/std/math.hlsl similarity index 100% rename from Shaders/raytrace/src/std/math.hlsl rename to Libraries/xenon/Shaders/src/std/math.hlsl diff --git a/Shaders/raytrace/src/std/rand.hlsl b/Libraries/xenon/Shaders/src/std/rand.hlsl similarity index 100% rename from Shaders/raytrace/src/std/rand.hlsl rename to Libraries/xenon/Shaders/src/std/rand.hlsl diff --git a/Sources/arm/render/RenderPathRaytrace.hx b/Libraries/xenon/Sources/arm/render/RenderPathRaytrace.hx similarity index 100% rename from Sources/arm/render/RenderPathRaytrace.hx rename to Libraries/xenon/Sources/arm/render/RenderPathRaytrace.hx diff --git a/Libraries/xenon/Sources/import.hx b/Libraries/xenon/Sources/import.hx new file mode 100644 index 00000000..bf5e345f --- /dev/null +++ b/Libraries/xenon/Sources/import.hx @@ -0,0 +1,8 @@ +// Global imports + +#if (!macro) + +import arm.Translator.tr; +using StringTools; + +#end diff --git a/README.md b/README.md index 31e74695..c61ceb1f 100644 --- a/README.md +++ b/README.md @@ -36,8 +36,8 @@ strip Krom node Kromx/make -g opengl cd Kromx node Kinc/make -g opengl -# Open generated Xcode project # Copy contents of `path/to/armorpaint/build/krom` to `path/to/armorpaint/Kromx/Deployment` +# Open generated Xcode project # Add `path/to/armorpaint/Kromx/v8/libraries/macos/release` into `Project - Krom - Build Settings - Search Paths - Library Search Paths` # Build ``` diff --git a/Sources/arm/Context.hx b/Sources/arm/Context.hx index 5aac7a0b..bd3a5291 100644 --- a/Sources/arm/Context.hx +++ b/Sources/arm/Context.hx @@ -101,7 +101,7 @@ class Context { public static var decalImage: Image = null; public static var decalPreview = false; public static var viewportMode = ViewLit; - #if (krom_android || krom_ios) + #if (krom_android || krom_ios || krom_darwin) public static var renderMode = RenderForward; #else public static var renderMode = RenderDeferred; diff --git a/khafile.js b/khafile.js index dc50d5b7..91b0a9dc 100644 --- a/khafile.js +++ b/khafile.js @@ -10,6 +10,11 @@ let project = new Project("ArmorPaint"); project.addSources("Sources"); project.addLibrary("iron"); project.addLibrary("zui"); +project.addLibrary("syslib"); +project.addLibrary("formatlib"); +project.addLibrary("geomlib"); +project.addLibrary("nodelib"); +project.addLibrary("shaderlib"); project.addShaders("Shaders/common/*.glsl", { noembed: false}); project.addAssets("Assets/common/*", { notinlist: true, destination: "data/{name}" }); project.addAssets("Assets/fonts/*", { notinlist: true, destination: "data/{name}" }); @@ -59,7 +64,8 @@ else { project.addAssets("Assets/readme/readme.txt", { notinlist: true, destination: "{name}" }); if (raytrace) { - project.addAssets("Assets/raytrace/*", { notinlist: true, destination: "data/{name}" }); + project.addLibrary("xenon"); + project.addAssets("Libraries/xenon/Assets/*", { notinlist: true, destination: "data/{name}" }); project.addAssets("Shaders/raytrace/*.cso", { notinlist: true, destination: "data/{name}" }); project.addAssets("Assets/readme/readme_dxr.txt", { notinlist: true, destination: "{name}" }); }