From f739f4569234a8e9fb913fdeaa038d30074b4c54 Mon Sep 17 00:00:00 2001 From: luboslenco Date: Sun, 30 Jun 2024 21:25:23 +0200 Subject: [PATCH] Update readme --- README.md | 2 +- armorlab/README.md | 11 ++++------- armorpaint/README.md | 31 +++++++------------------------ 3 files changed, 12 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index a1abb793..0b9e84fe 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,6 @@ git submodule update --init --recursive **Generating a locale file** ```bash export ARM_LOCALE= -./armorcore/Kinc/make --from base/Tools --kfile extract_locales.js +./armorcore/make --from base/Tools --kfile extract_locales.js # Generates a `base/Assets/locale/.json` file ``` diff --git a/armorlab/README.md b/armorlab/README.md index f6d33061..bc5e5dcd 100644 --- a/armorlab/README.md +++ b/armorlab/README.md @@ -3,7 +3,7 @@ armorlab ============== -[ArmorLab](https://armorlab.org) is a software for AI-powered texture authoring - check out the [manual](https://armorlab.org/manual). +[ArmorLab](https://armorlab.org) is a software for PBR texture authoring - check out the [manual](https://armorlab.org/manual). *Note 1: This repository is aimed at developers and may not be stable. Distributed binaries are [paid](https://armorlab.org/download) to help with the project funding. All of the development is happening here in order to make it accessible to everyone. Thank you for support!* @@ -18,7 +18,7 @@ git clone https://github.com/armory3d/onnx_bin onnx **Windows** ```bash -..\armorcore\Kinc\make --from ..\armorcore -g direct3d11 +..\armorcore\make --graphics direct3d11 # Open generated Visual Studio project at `build\ArmorLab.sln` # Build and run for x64 & release # Copy build\x64\Release\ArmorLab.exe to build\krom to run ArmorLab.exe directly @@ -26,7 +26,7 @@ git clone https://github.com/armory3d/onnx_bin onnx **Linux** *wip - cpu only* ```bash -../armorcore/Kinc/make --from ../armorcore -g opengl --compiler clang --compile +../armorcore/make --graphics opengl --compile cd ../armorcore/Deployment strip ArmorLab ./ArmorLab ../../armorlab/build/krom @@ -34,10 +34,7 @@ strip ArmorLab **macOS** *wip - apple silicon only* ```bash -cd ../armorcore -git apply Patches/metal_raytrace.diff --directory=Kinc -cd ../armorlab -../armorcore/Kinc/make --from ../armorcore -g metal +../armorcore/make --graphics metal cp -a build/krom/ ../armorcore/Deployment # Open generated Xcode project at `build/ArmorLab.xcodeproj` # Set macOS Deployment Target to 13.0 diff --git a/armorpaint/README.md b/armorpaint/README.md index f6efd5c8..141671cd 100644 --- a/armorpaint/README.md +++ b/armorpaint/README.md @@ -16,7 +16,7 @@ cd armortools/armorpaint **Windows** ```bash -..\armorcore\Kinc\make --from ..\armorcore -g direct3d11 +..\armorcore\make --graphics direct3d11 # Open generated Visual Studio project at `build\ArmorPaint.sln` # Build and run for x64 & release # Copy build\x64\Release\ArmorPaint.exe to build\krom to run ArmorPaint.exe directly @@ -24,7 +24,7 @@ cd armortools/armorpaint **Linux** ```bash -../armorcore/Kinc/make --from ../armorcore -g opengl --compiler clang --compile +../armorcore/make --graphics opengl --compile cd ../armorcore/Deployment strip ArmorPaint ./ArmorPaint ../../armorpaint/build/krom @@ -32,10 +32,7 @@ strip ArmorPaint **macOS** ```bash -cd ../armorcore -git apply Patches/metal_raytrace.diff --directory=Kinc -cd ../armorpaint -../armorcore/Kinc/make --from ../armorcore -g metal +../armorcore/make --graphics metal cp -a build/krom/ ../armorcore/Deployment # Open generated Xcode project at `build/ArmorPaint.xcodeproj` # Set macOS Deployment Target to 13.0 @@ -44,10 +41,7 @@ cp -a build/krom/ ../armorcore/Deployment **Android** *wip* ```bash -cd ../armorcore -git apply Patches/android_document_picker.diff --directory=Kinc -cd ../armorpaint -../armorcore/Kinc/make --from ../armorcore -g opengl android +../armorcore/make --graphics opengl --target android cp -r build/krom/* build/ArmorPaint/app/src/main/assets/ # Manual tweaking is required for now: # https://github.com/armory3d/armorcore/blob/master/kfile.js#L136 @@ -57,12 +51,7 @@ cp -r build/krom/* build/ArmorPaint/app/src/main/assets/ **iOS** *wip* ```bash -cd ../armorcore -git apply Patches/metal_raytrace.diff --directory=Kinc -git apply Patches/ios_document_picker.diff --directory=Kinc -git apply Patches/ios_pencil_hover.diff --directory=Kinc -cd ../armorpaint -../armorcore/Kinc/make --from ../armorcore -g metal ios +../armorcore/make --graphics metal --target ios cp -a build/krom/ ../armorcore/Deployment # Open generated Xcode project `build/ArmorPaint.xcodeproj` # Set iOS Deployment Target to 16.0 @@ -71,10 +60,7 @@ cp -a build/krom/ ../armorcore/Deployment **Windows DXR** *wip* ```bash -cd ..\armorcore -git apply Patches/d3d12_raytrace.diff --directory=Kinc -cd ..\armorpaint -..\armorcore\Kinc\make --from ..\armorcore -g direct3d12 +..\armorcore\make --graphics direct3d12 # Open generated Visual Studio project at `build\ArmorPaint.sln` # Build and run for x64 & release # Copy build\x64\Release\ArmorPaint.exe to build\krom to run ArmorPaint.exe directly @@ -83,10 +69,7 @@ cd ..\armorpaint **Linux VKRT** *wip* ```bash git clone --recursive https://github.com/armory3d/glsl_to_spirv -cd ../armorcore -git apply Patches/vulkan_raytrace.diff --directory=Kinc -cd ../armorpaint -../armorcore/Kinc/make --from ../armorcore -g vulkan --compiler clang --compile +../armorcore/make --graphics vulkan --compile cd ../armorcore/Deployment strip ArmorPaint ./ArmorPaint ../../armorpaint/build/krom