Commit graph

183 commits

Author SHA1 Message Date
QuantumCoderQC 03090cafa2 remove shape key textures on clean 2021-11-02 15:56:46 +01:00
Lubos Lenco 5b4d24f067
Merge pull request #2332 from MoritzBrueckner/fix-realtime-postprocess
Fix realtime postprocess & cleanup arm.lib.make_datas
2021-09-12 08:05:29 +02:00
Moritz Brückner ecc4317919 Fix realtime postprocess: use compositor defines also for non-compositor pass shaders 2021-09-07 22:19:12 +02:00
tong 667e73c867 Do not open build directory in background mode 2021-09-07 10:15:11 +02:00
Moritz Brückner c56a0c3a72 Fix accidental module reloading caused by name conflicts of global vars 2021-08-11 14:32:21 +02:00
Moritz Brückner ea8c13686c Implement basic addon reloading 2021-08-04 22:56:11 +02:00
Moritz Brückner cca82a69bf
Merge branch 'master' into live-patch 2021-07-25 16:47:32 +02:00
Moritz Brückner 0456d5f080 Remove legacy code stub 2021-07-24 18:21:06 +02:00
Moritz Brückner 441f42383e Correctly stop live patching after player terminates 2021-06-27 22:35:37 +02:00
Moritz Brückner fce97a5ddf Cleanup 2021-06-24 15:03:30 +02:00
Moritz Brückner d18aede964 run_proc: no thread in background mode and call done in main thread 2021-06-24 14:59:32 +02:00
Moritz Brückner 07ffe06c1d Live patch: move to dedicated module and use msgbus 2021-05-18 21:24:45 +02:00
Moritz Brückner f64419dd06 Merge branch 'master' into blender2.9
# Conflicts:
#	blender/arm/material/shader.py
#	blender/arm/props_collision_filter_mask.py
#	blender/arm/props_ui.py
2021-04-03 14:12:54 +02:00
N8n5h 7851abc491 Clear error count after building again 2021-03-20 21:26:05 -03:00
N8n5h 5f8b92f9c3 Applied flip workaround for point light too for html5 and atlas
The same concept for spot lights was applied for point lights;
the difference is that because point lights require to do the projection in the shader, the first inversion was applied in sampleCube() when returning the uv coordinates.
"_FlipY" was added to replace "_InvY" in "PCFFakeCube()" because the inversion is only necessary for shaders and not anything else, otherwise it would break rendering of other parts.
2021-03-01 18:39:32 -03:00
tong a1fce84f59 Use f string to format console messages 2021-02-20 09:36:42 +01:00
tong 325f7471c0 Fix printing build flags 2021-02-19 17:01:09 +01:00
tong b7c4a8bb3f Improve console build messages 2021-02-19 16:57:12 +01:00
Moritz Brückner e3f992b1f3 Whitespace cleanup 2021-01-25 16:48:03 +01:00
Moritz Brückner 05307817ee Fix grammar in warnings report 2021-01-25 16:47:51 +01:00
tong 8619006757 Print rounded build time to console 2021-01-24 18:36:58 +01:00
E1e5en d084a8297e Windows Settings – Publish and action after
Windows Settings:
Visual Studio Version - select the studio version for which the project will be exported. Options: 2010, 2012, 2013, 2015, 2017, 2019. Default: 2019.
Update - checks the installed versions of Visual Studio on the PC and adds (installed) to the version in the list if available (for information). Example:
sample_vs_2
Action After Publishing - select an action after a successful publication. Options:
Nothing - do nothing. Default value;
Open In Visual Studio - open the project in the corresponding studio version;
Compile - compilation of the project;
Compile and Run - compile and run the project. Then the executable file will be copied to the windows-hl folder (where the resources are located).
Mode - compilation mode. Options: Debug, Release. Default: Debug.
Architecture - the architecture for which the application will be built. Options: x86, x64. Default: version of the user’s PC architecture.
Compile Log Parameter - setting the output of messages during compilation:
Summary - show the error and warning summary at the end. Default value;
No Summary - don \ 't show the error and warning summary at the end;
Warnings and Errors Only - show only warnings and errors;
Warnings Only - show only warnings;
Errors Only - show only errors.
More details can be found here - MSBuild command-line reference (I took only part of the settings).
Count CPU - specifies the maximum number of concurrent processes to use when building. More details can be found here - MSBuild command-line reference. The default is 1. Maximum value: the number of CPUs in the system (function multiprocessing.cpu_count()).
Open Build Directory - open the folder with the application after a successful build. If the Compile and Run option is selected, then the executable file will be copied to the windows-hl folder (where the resources are located) and this folder will open. Otherwise, the folder where the given Visual Studio file is going will open.
The user will also receive a message if the studio version selected for export and for opening in the studio or compilation is not on the PC. And a list of installed ones will be issued. Example:

Visual Studio 2017 (version 15) not found.
The following are installed on the PC:
- Visual Studio Community 2019 (version 16.8.30711.63)
To obtain information about the installed versions of Visual Studio, use the vswhere.exe utility (open source) included in Kha (located in the …\ArmorySDK\Kha\Kinc\Tools\kincmake\Data\windows).
2020-11-24 20:41:50 +03:00
E1e5en 4b3aea0513
Merge branch 'master' into html5-settings 2020-11-14 15:12:20 +03:00
Lubos Lenco 3fae5c04bd
Merge pull request #2007 from E1e5en/exporter-panel-project-settings
Exporter Panel - Project Settings
2020-11-14 12:42:40 +01:00
Lubos Lenco f499bfc8ca
Merge pull request #2003 from MoritzBrueckner/khamake-debug
Add option to compile with khamake --debug flag
2020-11-14 12:41:35 +01:00
E1e5en 2bd08722a1 HTML5 Settings
Added Armory Exporter - HTML5 Settings panel:
- Copy Files To Specified Folder - copy files to the folder specified in the settings after publish. The name of the folder where the result will be copied is formed based on the name of the project and version. Sample, test-1.0.5.
- Run Browser After Copy - run browser after copy. The url is formed from the one specified in the settings and the directory with the project where it was copied. Sample, http: //localhost/test-1.0.5.

Added settings in Render: Armory:
- HTML5 Copy Path - path to copy project after successfully publish (directory on local web-server).
- Url To Web Server - url that runs the local server.
2020-11-13 21:45:31 +03:00
E1e5en 65dd6b701f Exporter Panel - Project Settings
1. Processing data entry into fields:
- Name - the field must not be empty. If the user tries to set an empty value, then this field specifies the name of the blend file (this is how it is implemented during assembly). The default is the name of the blend file.
- Package - the field must not be empty, it must not consist only of numbers and start with a number. The . symbol is replaced with _. The default is arm.
- Bundle - the field must be filled in according to the mask [string].[string]. Each part must not be empty, contain numbers, or start with a number. The default is org.armory3d. Previously, this field was blank, in which case the current default was used.
- Version.
Input in the Version field is processed and only allows input by masks:
- 0.0
- 0.0.0
- 0.0.0.0
In any case, the value is ignored and the previous value remains.

If the (Auto-increment Build Number) checkbox is checked and when performing the operation, Build and Publish will be automatically incremented by one after the version value.
Examples:
it was 1.0 - it is 1.1,
it was 1.9 - it is 1.10,
it was 1.0.1 - it is 1.0.2,
it was 0.1.1.2 - it is 0.1.1.3.

Defaults:
- Version - 1.0.0
- Auto-increment Build Number - enabled.

For all fields, special characters ([] / \ ;,> <& *:% = + @! # ^ () |? ^) Are also replaced with _.

2. Fixed display of Android Settings panel.
2020-11-13 20:36:27 +03:00
E1e5en b741bd752d Fix and clear
- Fixed build error when there are problems in the project name
- Code cleanup
2020-11-13 09:06:51 +03:00
E1e5en ab3d64d651 Android Settings More
Panel Armory Exporter - Android Settings - Build APK:
1. Rename APK To Project Name
Renames the APK file from app-debug.apk to [project-name]-[version] .apk. Example, for the project example_ball.blend, the result will be the name example-ball-1.0.apk.
2. Copy APK To Specified Folder
Copies the final file to the folder specified in Preferences.

Preferences Render: Armory:
1. Copy APK To Folder
The path to the folder where the final APK file will be copied.
2. Open Directory After Copy
Open this folder after copying.

Console messages:
Rename APK to example-ball-1.0.5.apk
Copy APK to C:\IDE\Test

Use-case:
These settings will allow you to have unique names for files, as well as copy them to the required folder for uploading to the device or to the cloud.
2020-11-12 22:09:55 +03:00
Moritz Brückner 27857c2648 Add option to compile with khamake --debug flag 2020-11-11 20:34:10 +01:00
N8n5h fde5760a29 Show commands that launch build and play for debugging
This is so you can easily copy and paste it for testing purposes instead of having to build the whole project again.
Alternatively a button to play without build could be added to the blender UI.
2020-11-07 09:38:11 -03:00
David Bruce a559a0b28d
Revert/fix for traits updating
Changes compilation_server_done() back to before my change.  Updates the path it checks to krom/krom.js.temp, this should prevent it from deleting existing krom.js files on first project launch.
2020-11-02 10:15:26 -05:00
David Bruce 561daa34fd Forces a build before compilation server to generate first krom.js.
Fixes bug where compilation server will delete krom.js if it exists
during first launch.
2020-10-30 11:39:25 -04:00
E1e5en 5451b3e7e2 Added settings for building APK
Added a panel with settings:
- Building APK After Publish - to start the build after the project has been successfully published (False by default). Disabled if SDK path is not specified;
- Emulator - list of installed emulators in Android Studio (AVD Manager). At the start of Blender, the list is always empty, to fill and update it, you must click the Refresh button. To start the emulator, if you wish, you need to press the "Start" button (the list of emulators is obtained with the emulator -list-avds command, the launch is performed with the emulator -avd [name] command). The "Start" button is disabled if the name of the emulator is not selected from the list;
- Run Emulator After Building APK - launch the emulator after successfully building the APK file. Disabled if no APK build is installed or no emulator name selected.

To perform these operations, you need to specify the ANDROID_SDK_ROOT environment variable, if it is not specified in the OS, then the "Android SDK Path" setting is read and set as the environment variable os.environ ['ANDROID_SDK_ROOT'] to perform operations.
If no value is specified, then the user receives a corresponding message to the console. If the specified value is incorrect, then the user will receive messages from the corresponding programs.
2020-10-22 19:19:03 +03:00
Moritz Brückner 597bb9aca5 Open correct folder after successful Android build 2020-10-18 21:57:49 +02:00
Moritz Brückner 4bafe8130c Add option to open build directory after successfully publishing 2020-10-17 15:09:21 +02:00
Moritz Brückner 29a0b5632b Print compositor flags on export 2020-07-07 17:03:07 +02:00
Moritz Brückner 70b0219a05 Reorganize imports and remove unused ones 2020-07-01 21:06:02 +02:00
Moritz Brückner d2a2023480 Make world shader data export working 2020-06-26 22:27:46 +02:00
tong 107c61ad3e Colored terminal output 2020-06-08 12:26:17 +02:00
Moritz Brückner caee1a87a2 Small performance improvement 2020-04-10 01:09:34 +02:00
Moritz Brückner f5b37f99aa Transform exporter into class (one instance per scene)
This has two big advantages:
- One place for variable initialization (and less warnings from pylint etc.)
- No errors due to forgotten cleanups because every scene export now has its own class instance
2020-04-10 00:56:16 +02:00
Moritz Brückner 1da4b02cef Count compilation warnings and show them in the UI and console 2020-03-06 23:49:14 +01:00
Moritz Brückner 6e9dfd8504 Change khamake silent switch to quiet to still print error messages 2020-03-06 23:47:42 +01:00
Moritz Brückner 086810849e De-clutter console output (new "Verbose Output" switch) 2020-03-04 00:14:14 +01:00
blackno666 9517f805de Fixed adding objects to collection 'export_coll' more than once 2020-02-14 22:12:56 +01:00
N8n5h b1a25548a9 fix export with a 'zoo collection'
Add a temporary collection to the scene that links all the foreign objects meshes and collections with meshes to the current scene, have the dependency graph see it and then destroy it.
2019-12-02 09:01:46 -03:00
luboslenco 01920b99c7 Fix android target name 2019-09-08 19:08:47 +02:00
luboslenco 75c6121deb Audio fun 2019-09-01 11:59:32 +02:00
luboslenco 09ed719b91 No serialize till kromx handles it 2019-09-01 10:41:10 +02:00