maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
3343 commits 4 branches 46 tags 65 MiB
Commit graph

2392 commits

Author SHA1 Message Date
Moritz Brückner 533c81e2cf Merge branch 'master' into new-nodes 
# Conflicts:
#	blender/arm/logicnode/object/LN_get_visible.py
#	blender/arm/logicnode/object/LN_set_visible.py
 2020-09-14 01:08:59 +02:00
Moritz Brückner e634fbf629 Fix export of String and Object sockets 2020-09-14 01:03:13 +02:00
knowledgenude 7d419481f2
Update .py files 2020-09-13 15:59:48 -03:00
knowledgenude e3c7731b63
Update object nodes .py 2020-09-13 15:43:27 -03:00
knowledgenude d2ecc78712
Improved nodes + LN_get_object_offscreen.py 2020-09-13 14:11:57 -03:00
knowledgenude 8d7c139375
Add LN_get_rigid_body_data.py 2020-09-13 14:09:42 -03:00
niacdoial 19064c60b5 populated a previously empty error message 2020-09-13 15:40:35 +02:00
niacdoial 28722ee866 Fixed one bug/exploit waiting to happen 
(and removed a debug print)
 2020-09-13 15:32:39 +02:00
niacdoial c8a6743819 Merge branch 'logic-nodes' into master 
(additions: node versioning system, slight rework of the NodeSockets)
 2020-09-13 11:36:41 +02:00
niacdoial bdc33cb419 added node versioning information to all node classes 2020-09-13 11:27:58 +02:00
Lubos Lenco b2c00f3dfa
Merge pull request #1858 from MoritzBrueckner/arm-flag 
Add "armory" flag on export to differ between Armory and Kha
 2020-09-13 10:47:14 +02:00
Lubos Lenco b89a757bc4
Merge pull request #1857 from E1e5en/master 
Blender UI – Armory Trait – Logic Node
 2020-09-13 10:27:14 +02:00
niacdoial cd730249af Merge branch 'node-versioning' into logic-nodes 2020-09-12 18:29:28 +02:00
niacdoial 3a2952ced8 Added node versioning 
- changed the way custom node sockets are handled at several places
 - updated the `replaceAll` and `replace` functions used to perform node replacements
 - renamed and improved the NodeReplacement [new name] class, which represents a replacement task
 - added an arm_version property to all logic nodes, as well as a `get_replacement_node` method (to be overridden for each node)
 - added an option to declare a node as obselete in add_node()  (useful in order to have the node defined, but out of the menu)
 - added classes for UI popups linked to node updates, as well as an operator dedicated to said node update

Thanks to MoritzBrueckner for part of the ground work!
 2020-09-12 18:15:53 +02:00
Moritz Brückner e8b1859e8b Add "armory" flag on export so libraries can differ between Armory and Kha 2020-09-11 14:43:59 +02:00
E1e5en 4304be7a0a Blender UI – Armory Trait – Logic Node 
Add buttons:
- New Node Tree – creates and sets a new Node Tree in the list;
- Edit Node Tree – loads the Node Tree selected from the list into all Logic Node Editor;
- From Node Tree – loops through all the working Logic Node Editor and from the last in the list sets the value to the list.
 2020-09-11 12:18:31 +03:00
Moritz Brückner 2d33398f9f Merge remote-tracking branch 'upstream/master' into logic-nodes 
# Conflicts:
#	blender/arm/logicnode/action_set_visible.py
#	blender/arm/logicnode/physics_get_gravity.py
 2020-09-09 21:11:49 +02:00
Moritz Brückner fccd83bf14 Rename MODULE_AS_CATEGORY -> PKG_AS_CATEGORY 2020-09-09 20:48:35 +02:00
Moritz Brückner 1bde147a23 AddCollectionnode -> CreateCollectionNode 2020-09-09 20:34:23 +02:00
Moritz Brückner 3ea181fc37 Fix operator call 2020-09-09 20:30:49 +02:00
Moritz Brückner e6de489451 Better names for array remove nodes 2020-09-09 20:27:54 +02:00
Moritz Brückner d0f3c1e946 Ensure correct node section order 2020-09-09 15:18:48 +02:00
knowledgenude 9c8b6d3b98
Update action_set_visible.py 2020-09-08 21:05:51 -03:00
knowledgenude 546f8824d0
value_get_mouse_lock.py , value_get_mouse_visible.py 2020-09-08 20:12:45 -03:00
knowledgenude bdb18496a3
canvas_get_visible.py 2020-09-08 19:34:45 -03:00
Moritz Brückner cfd6b01f0a Remove alternative category icons 2020-09-09 00:32:38 +02:00
Moritz Brückner 83fe52b281 Put categories from logic node extension packs to the end of the menu 2020-09-09 00:31:50 +02:00
Moritz Brückner e48f682cdf Remove obsolete bl_icon='NONE' from node definitions 2020-09-09 00:28:41 +02:00
Moritz Brückner 179fdcf17c Show bl_description or docstring when hovering over nodes in the menu 2020-09-09 00:25:10 +02:00
Moritz Brückner 1c6444b511 Rename ray cast socket 2020-09-08 23:44:15 +02:00
Moritz Brückner dc00b6abd5 Fix ParseFloatNode label and add it to its own section 2020-09-08 23:31:09 +02:00
Moritz Brückner 7f2bbd8d49 CastPhysicsRayNode -> RayCastNode 2020-09-08 23:30:50 +02:00
Moritz Brückner ce3a4dd1a0 SelfNode -> SelfObjectNode 2020-09-08 23:30:37 +02:00
Moritz Brückner 8559505d2f InArrayNode -> ArrayContainsNode 2020-09-08 23:29:50 +02:00
Moritz Brückner 39fc1f3cad Remove unused imports 2020-09-08 23:21:41 +02:00
Moritz Brückner 4681149a90 Fix docstring format 2020-09-08 23:14:51 +02:00
Moritz Brückner 45ce65513b Make the mask node a variable node 2020-09-08 22:11:25 +02:00
Moritz Brückner 8e6c8031b0 Use new sockets for variable nodes 2020-09-08 22:08:29 +02:00
Moritz Brückner bec4e2e8ac Use new socket functions 2020-09-08 21:49:02 +02:00
Moritz Brückner d83cdc4f33 Add custom add input/output functions and denote variable socket functionality 2020-09-08 21:34:05 +02:00
Moritz Brückner 727c2d9f35 Make ArmLogicTreeNode a subclass of bpy.types.Node 2020-09-08 21:16:20 +02:00
Lubos Lenco 00cad1832a
Merge pull request #1848 from QuantumCoderQC/patch2 
Support for displacement in instanced objects
 2020-09-08 20:26:10 +02:00
Lubos Lenco dc16740360
Merge pull request #1847 from QuantumCoderQC/master 
Add getGravity method. Fix getGravity logic node.
 2020-09-08 20:20:43 +02:00
Moritz Brückner abf495bf2f Fix usage of custom socket types 2020-09-08 17:04:13 +02:00
Moritz Brückner bfa23a9d6a Don't register internal nodes again 2020-09-08 17:03:56 +02:00
Moritz Brückner c98f593459 Reassign node categories + rename files 2020-09-08 17:03:24 +02:00
Moritz Brückner 6168f68dd0 Don't hardcode the position of the 'default' node section 2020-09-08 01:26:41 +02:00
QuantumCoderQC 14a8d8698f Spoort for displacement in instanced objects 2020-09-08 00:26:44 +02:00
QuantumCoderQC cc35b01684 Add getGravity method. Fix getGravity logic node. 2020-09-07 22:11:03 +02:00
Moritz Brückner 2babf2f97b Alphabeticallysort nodes in node sections 2020-09-07 20:36:30 +02:00
Moritz Brückner b31c151cf3 Add possibility to use the module name as the node category 2020-09-07 19:15:39 +02:00
Moritz Brückner 430053bfb2 Remove unused debug print 2020-09-07 19:15:07 +02:00
Moritz Brückner a5a15e472b Fix unregistering of categories 2020-09-07 01:26:31 +02:00
Moritz Brückner 14bd60d3f4 Fix docstring format 2020-09-07 01:15:12 +02:00
Moritz Brückner b248f2c8e8 Move socket classes to own module and remove now obsolete eye drop operator 2020-09-07 01:13:00 +02:00
Moritz Brückner dfb0c566c7 Fix missing add node menu registering 2020-09-07 01:10:43 +02:00
Moritz Brückner 74efd5df80 Add custom node search operator 2020-09-07 00:54:52 +02:00
Moritz Brückner 16d8df73b2 Implement custom node menu 2020-09-07 00:40:54 +02:00
Moritz Brückner 05c0a201ad Fix missing import 2020-09-07 00:33:46 +02:00
Moritz Brückner f8376e877f Fix register_node() for internal nodes 2020-09-07 00:33:31 +02:00
Moritz Brückner 153594985b Rename node_class -> node_type 2020-09-07 00:33:16 +02:00
Moritz Brückner 6c43fb9289 Whitespace and other small cleanups 2020-09-07 00:08:51 +02:00
Moritz Brückner 07817fed54 Add new node/category API 2020-09-07 00:06:41 +02:00
knowledgenude 193c712bf4
Improve Set Activation Node 2020-09-06 15:10:51 -03:00
knowledgenude 37bd828784
Delete physics_sync_transform.py 2020-09-06 15:10:22 -03:00
knowledgenude 72ee4da37d
physics_remove_physics.py 2020-09-06 10:50:03 -03:00
knowledgenude 0622b89c61
Delete physics_remove_from_world.py 2020-09-06 10:44:59 -03:00
knowledgenude 6e824580b9
Set Friction node .py 2020-09-05 18:05:35 -03:00
knowledgenude 042be35f06
+3 physics nodes 2020-09-05 10:31:28 -03:00
Lubos Lenco 86ebf8ef05
Merge pull request #1834 from MoritzBrueckner/spawn-collection 
Add SpawnCollection node
 2020-09-04 10:08:38 +02:00
Moritz Brückner a344209a79 Small format improvement 2020-09-03 22:50:35 +02:00
Moritz Brückner 720967c5d5 Remove duplicate naming from camera nodes 2020-09-03 22:50:02 +02:00
Moritz Brückner 1dbbc05557 Add SpawnCollection node 2020-09-03 18:53:19 +02:00
Moritz Brückner 5429a56e7a Fix logic node export of None type properties 2020-09-03 18:49:23 +02:00
Alexander ea5219e67d Fix for OpenCV installation 2020-09-01 18:06:35 +02:00
luboslenco 03077030f0 Bump version 2020-09-01 10:46:54 +02:00
Lubos Lenco 1bf56ba960
Merge pull request #1827 from armory3d/lightmapper 
Lightmapper
 2020-09-01 10:41:49 +02:00
Moritz Brückner 12b7885821 Small format improvements 2020-08-31 00:14:24 +02:00
Moritz Brückner 3066d5f98c Lz4: Fix bug with unsigned right-shifting 2020-08-30 22:53:21 +02:00
Alexander 607f4e7b33 Update to 0.3.2.0 2020-08-30 18:34:59 +02:00
niacdoial 17daabeb29 Improved quaternion and angle handling in logic nodes (+2bugfixes) 
- Made so all nodes outputting a quaternion object also output it as a XYZ (vector) + W (float) combination
- Modernized the interface of the "Action/Rotate Object" node, to align on the newer "Action/Set Rotation" node interface  ("Action/Rotate Object Along Axis" is now depreciated, but still usable)
- Fixed a blender-side-only bug with the "Logic/Switch" node (...which technically could have lead to a compile-time problem if exploited the right way)
- Fixed a bug on the "Action/Set Rotation" node: now, quaternion input is automatically normalized in order to avoid accidental scaling
- Added a "Value/Separate Quaternion" node
- Made so the names of some sockets change in the "Set Rotation" and "Rotate Object" nodes, so they adapt to those nodes' input types.
  (Same thing with "Value/Vector From Transform"'s output type)
 2020-08-30 15:50:06 +02:00
Lubos Lenco a4f7030ef8
Merge pull request #1817 from MoritzBrueckner/shaderdata-sampler2d 
Add sampler2D access to ShaderData node
 2020-08-28 17:38:47 +02:00
Lubos Lenco b5292f34c8
Merge pull request #1819 from MoritzBrueckner/android_native 
Fix android target options
 2020-08-28 16:37:34 +02:00
Moritz Brückner f6cf1e4731 Rename f to khafile for better readability 2020-08-28 13:25:54 +02:00
Moritz Brückner b458438c70 Fix android target options 2020-08-28 13:09:23 +02:00
QuantumCoderQC c54a5d2bed Upgrade Apply Force at location and Apply Impulse at location to include object rotation 2020-08-28 03:14:49 +02:00
Moritz Brückner 3bbceda485 Add sampler2D access to ShaderData node 2020-08-27 23:22:24 +02:00
Alexander 495d485f39 Add lightmapping props to object, register lightmapper 2020-08-24 22:12:31 +02:00
Alexander 5d914b3bf5 Merge lightmapper 0.3.1.2 2020-08-23 23:13:26 +02:00
Moritz Brückner e785ee020c Better lz4 error handling 2020-08-20 22:58:10 +02:00
Moritz Brückner 3c6f853605 Port lz4 compression from Armorpaint 2020-08-20 22:34:52 +02:00
Lubos Lenco 0d6422f77a
Merge pull request #1809 from Sanva/master 
Fixes wrong `rsplit` usages trying to discard file extensions
 2020-08-19 19:04:22 +02:00
Moritz Brückner df5e35663a Add ShaderData node 2020-08-19 17:20:41 +02:00
Moritz Brückner e2e0fd74bf Remove uniform support from attribute node 2020-08-19 17:14:30 +02:00
Moritz Brückner 8d8526a389 Shader export: don't add duplicate ins/out/includes 2020-08-19 17:12:58 +02:00
Valentín Barros 61b2d008e3 Fixes wrong rsplit usages trying to discard file extensions [fixes #1805] 
Otherwise would fail if path contained any other dot.
 2020-08-19 09:28:07 +02:00
Moritz Brückner 7c13f74454 Add shader uniform support for the attribute node 2020-08-18 20:28:12 +02:00
Moritz Brückner baddcfaacc Add missing draw_view3d_object_menu 2020-08-10 14:42:42 +02:00
Moritz Brückner e8c67fcb46 Remove unused format string 2020-08-10 14:39:21 +02:00
Moritz Brückner eeb1d9e3ab Add CopyTraitsFromActive operator 2020-08-10 00:23:26 +02:00
Moritz Brückner 56f6d44651 props_traits.py: clean up imports 2020-08-10 00:19:15 +02:00
Moritz Brückner c373f53599 Fix update_trait_group() when object is already in trait collection 2020-08-10 00:18:27 +02:00
Moritz Brückner e193b3dae2 Proxy: fix sync_collection() for multiple same entries + add clear_dst option 2020-08-10 00:14:57 +02:00
Moritz Brückner e8e07f4e41 on_operator_post: add warning to docstring 2020-08-09 02:22:13 +02:00
Moritz Brückner 11f3f6da62 Copy Armory rigid body settings on Copy from Active 2020-08-09 02:08:11 +02:00
knowledgenude a89c2fbe44
Set logic nodes icons to none (5) 2020-08-07 14:07:51 -03:00
knowledgenude 6d9a766db6
Set logic nodes icons to none (4) 2020-08-07 14:05:48 -03:00
knowledgenude feb9598bd1
Set logic nodes icons to none (3) 2020-08-07 14:03:29 -03:00
knowledgenude f7c8b2212e
Set logic nodes icons to none (2) 2020-08-07 14:00:46 -03:00
knowledgenude d75238e95f
Set logic nodes icons to none (1) 2020-08-07 13:58:19 -03:00
Moritz Brückner e746941874 Add annotation 2020-08-04 14:30:05 +02:00
Moritz Brückner 2cde35b6ef Remove some operators from op search menu + code cleanup 2020-08-04 14:19:09 +02:00
luboslenco 286e7b7b4b Bump version 2020-08-02 18:23:20 +02:00
Simonrazer fc0cce489b
remove unnecessary property 2020-07-25 20:49:41 +02:00
Simonrazer 06a6324002
typos 2020-07-25 15:13:44 +02:00
Simonrazer 66d7b1c954
Update nodes_logic.py 2020-07-25 15:09:22 +02:00
Moritz Brückner 9a47d77594 Implement receive shadow setting for mobile path + all light types 2020-07-13 23:20:58 +02:00
Moritz Brückner d18a9917aa Fix sub-package export 2020-07-12 16:08:52 +02:00
Moritz Brückner 26bdba9092 Fix fetching scripts from sub-packages 2020-07-12 15:36:18 +02:00
Lubos Lenco 18f685deb0
Merge pull request #1764 from MoritzBrueckner/fix-log 
log.py fixes
 2020-07-10 09:33:22 +02:00
Moritz Brückner c666b965b9 Fix write_probes() on Windows 
Thanks to @Simonrazer for reporting this
 2020-07-09 18:46:42 +02:00
Moritz Brückner e7d28ba1c6 log.py: don't override user console settings 2020-07-08 13:48:19 +02:00
Moritz Brückner 4ca340024a Fix logger usage 2020-07-07 22:43:51 +02:00
Moritz Brückner a3223ee455 Cleanup log.py 2020-07-07 22:43:20 +02:00
Moritz Brückner 0c9752a89a Fix logging colors on Windows 
See:
- https://docs.microsoft.com/en-us/windows/console/setconsolemode
- https://docs.microsoft.com/en-us/windows/console/getstdhandle
 2020-07-07 22:42:54 +02:00
Moritz Brückner 29a0b5632b Print compositor flags on export 2020-07-07 17:03:07 +02:00
Lubos Lenco 78aec97c95
Merge pull request #1744 from MoritzBrueckner/world-export 
Multi-world support
 2020-07-07 11:07:25 +02:00
Moritz Brückner 22371ec37e Remove unused import 2020-07-06 18:16:58 +02:00
Moritz Brückner b994b1d575 Remove cloud constants from compiled.inc 2020-07-06 18:14:15 +02:00
Moritz Brückner 01e3395d18 Implement irradiance for static background images 2020-07-06 18:04:35 +02:00
Moritz Brückner 60b4f5b42d Cleanup probe export 2020-07-06 18:04:18 +02:00
Moritz Brückner 8afc3c43e3 Fix world export when another blend file was opened before 2020-07-06 16:58:52 +02:00
Moritz Brückner 5be18db472 Reset wrd.world_defs for each export 2020-07-05 18:13:17 +02:00
tong 9389c5f44d Fix unset object prop 2020-07-04 23:02:33 +02:00
Moritz Brückner 128622c96d Remove unused argument 2020-07-03 01:08:50 +02:00
tong 8d07d6290e Fix param name 2020-07-02 18:37:29 +02:00
Moritz Brückner 0bb4bfd11a Reimplement _EnvTransp 2020-07-01 21:36:15 +02:00
Moritz Brückner 73bbc3cf20 Cleanup world shader generation 2020-07-01 21:36:03 +02:00
Moritz Brückner fb5ac23f7e Revert "Remove not used world generation callback" 
This reverts commit d9231f6f9a.
 2020-07-01 21:13:40 +02:00
Moritz Brückner d9231f6f9a Remove not used world generation callback 2020-07-01 21:11:25 +02:00
Moritz Brückner 70b0219a05 Reorganize imports and remove unused ones 2020-07-01 21:06:02 +02:00
Moritz Brückner d0e9369947 Revert water/fog UI and remove now unused properties 2020-07-01 20:57:01 +02:00
Moritz Brückner 2ff0496908 Per world environment maps + LDR support 2020-07-01 20:19:07 +02:00
Moritz Brückner 8e66ade354 Fix and reimplement static background images 2020-07-01 20:09:49 +02:00
luboslenco 7f4a2788cc Bump version 2020-06-30 22:49:15 +02:00
tong 7dec8e004c CMFT: add --silent param if not arm_verbose_output 2020-06-30 17:02:57 +02:00
Moritz Brückner 89fa3e8314 Reimplement clouds 2020-06-28 22:45:54 +02:00
Moritz Brückner 1d0c96db11 Code cleanup and other small improvements 2020-06-28 20:47:40 +02:00
tong 702588b0c4 CMFT use available cpus 2020-06-28 20:32:08 +02:00
Moritz Brückner 1aef57581a Reimplement hosek wilkie sky generation 2020-06-28 20:27:09 +02:00
Moritz Brückner 32613312b3 Add newline after shader functions 2020-06-28 20:26:05 +02:00
Moritz Brückner e6cca30b53 Get background colors working 2020-06-28 20:08:05 +02:00
Moritz Brückner 180c6065a6 Fix shader names 2020-06-28 20:07:48 +02:00
Moritz Brückner 620cb1f26e Custom shader names in shader make functions 2020-06-28 20:06:38 +02:00
Moritz Brückner 0f99b4a627 Fix world shader export so that drawing finally works 2020-06-28 19:36:14 +02:00
Moritz Brückner d2a2023480 Make world shader data export working 2020-06-26 22:27:46 +02:00
tong c89a40da85 Add haxe --times flag on verbose not debug_console 2020-06-25 13:02:56 +02:00
tong a91cf665e7 Add missing import 2020-06-25 12:14:57 +02:00
Moritz Brückner 1a12ee280a Export world shader data file 2020-06-24 00:18:39 +02:00
Moritz Brückner 729c2ddc13 Begin with world shader generation 2020-06-22 22:37:21 +02:00
Moritz Brückner 569d139e4e Replace some wrd defs by individual word defs 2020-06-22 22:03:02 +02:00
Moritz Brückner 1152b99e10 Fix non-material shader export by swapping evaluation order 2020-06-22 21:56:21 +02:00
Moritz Brückner e691e8b5f2 Cleanup make_world.py 2020-06-18 15:38:14 +02:00
Moritz Brückner 42393e34a8 Cleanup world export 2020-06-18 15:36:34 +02:00
Moritz Brückner 85a9340764 Add reroutes and frames to add node menu 2020-06-18 14:15:34 +02:00
tong a7f9acd606 Use regexp to validate haxe module name 2020-06-14 23:04:49 +02:00
tong 5ff56e6464 Filter haxe modules with invalid names 2020-06-14 21:08:06 +02:00
Moritz Brückner 4f5d8a83d3 Fix boolean node sockets 2020-06-11 22:51:38 +02:00
Moritz Brückner 740b84db41 Cleanup build_default_node() 2020-06-10 14:39:21 +02:00
Moritz Brückner 85411312d7 Implement custom default values for custom node sockets 2020-06-10 14:25:01 +02:00
tong b75e19e88a Disable terminal colors on windows < 10 2020-06-08 13:32:06 +02:00
tong 107c61ad3e Colored terminal output 2020-06-08 12:26:17 +02:00
Moritz Brückner 1dfc777f2b Add CustomSocket node socket type 2020-06-08 08:49:21 +02:00
Moritz Brückner 3cd6ab1331 Escape '"' in logic node strings 2020-06-07 20:02:07 +02:00
Lubos Lenco e82c9250cd
Merge pull request #1723 from MoritzBrueckner/vector-reflect 
Implement "reflect" operation for VectorMathNode
 2020-06-05 10:45:03 +02:00
Moritz Brückner 2e398c96ba Implement "reflect" operation for VectorMathNode 2020-06-04 22:19:02 +02:00
Moritz Brückner dd72b2dd18 Fix multi-usage of particle systems 2020-06-04 22:15:41 +02:00
luboslenco 12cdd57748 Bump version 2020-05-30 22:50:41 +02:00
tong bba3b924c0 Allow to set custom play scene 2020-05-23 12:18:07 +02:00
Moritz Brückner 2b5ca912fb Fix for running blender in background mode 2020-05-21 12:01:21 +02:00
Moritz Brückner 5382399b70 Add retrigger option to Play Sound node 2020-05-16 00:28:52 +02:00
Moritz Brückner 18ebd3444f PlaySoundRawNode: add pause/stop functionality 2020-05-16 00:21:10 +02:00
Moritz Brückner 49c5b1b129 Change PlaySoundRawNode icon 
Does this even show up in the UI?
 2020-05-15 23:37:18 +02:00
Moritz Brückner 55ce26c02f PlaySoundRawNode: add loop option 2020-05-15 23:32:48 +02:00
Moritz Brückner 4fa9d8b980 Add optional sample rate setting to PlaySoundRawNode 2020-05-15 23:22:41 +02:00
Moritz Brückner 9f4a0344fe Fix boolean type node properties 2020-05-15 23:22:04 +02:00
Moritz Brückner 1d82747fbc onCanvasElementNodes can now listen to hover events 2020-05-14 17:34:39 +02:00
Moritz Brückner 133dfe1510 Cleanup particle system export 2020-05-11 17:35:21 +02:00
Moritz Brückner 0d55749f1f Fix linked particle instances 2020-05-11 17:30:00 +02:00
Moritz Brückner 5aede77e23 Implement render emitter option 2020-05-11 17:29:46 +02:00
Lubos Lenco e30a8c7f46 Metal fixes 2020-05-11 09:03:13 +02:00
tong 413406f3d3 Generate Main.projectVersion 2020-05-10 21:25:01 +02:00
Lubos Lenco c970c5db6c Pass irradiance uniform as argument 2020-05-10 19:43:02 +02:00
luboslenco b0cd02d68e Allow multiple color attachment formats 2020-05-10 10:46:12 +02:00
Lubos Lenco df6346c1d1 Color attachment format 2020-05-06 21:30:59 +02:00
Lubos Lenco 967f69b24a Color attachment format 2020-05-06 18:11:02 +02:00
Lubos Lenco ede8a0f2d3 Improve metal gapi detect 2020-05-05 09:54:24 +02:00
Lubos Lenco 66e9572554 Add clear pass for metal 2020-05-04 23:08:47 +02:00
Lubos Lenco 61ff96786f Metal fixes 2020-05-04 00:19:11 +02:00
Kenny Lerma 0cb0720b2a Corrected missing 'tex' and 'tex1' for custom materials/shaders 2020-05-02 08:23:15 -05:00
luboslenco 8cb8722546 Bump version 2020-05-02 14:35:43 +02:00
Moritz Brückner 3aaf792871 Whitespace cleanup 2020-04-28 21:45:02 +02:00
Moritz Brückner 89c2290c15 Fix irradiance export when arm_minimize is false 2020-04-28 21:44:48 +02:00
Moritz Brückner fbf3ce813b Fix compilation for multiple mapping nodes 2020-04-27 09:23:02 +02:00
Moritz Brückner b58fab598c Fix value node when used with material params 2020-04-23 11:43:01 +02:00
Moritz Brückner 1e4d94a77e Fix docstring 2020-04-18 22:18:38 +02:00
Moritz Brückner e3d4854546 Some code cleanup 2020-04-18 21:52:56 +02:00
Moritz Brückner c4b6d835f7 Fix and refactor colorramp node 2020-04-18 21:52:38 +02:00
Moritz Brückner 546eea9f27 Automatically convert color/vector inputs to BW when connected to a float input 2020-04-18 21:50:07 +02:00
Moritz Brückner 4859034375 Fix uncommited import 2020-04-18 21:46:56 +02:00
Moritz Brückner 34d23dc42e Store Value node outputs as const 2020-04-18 21:39:06 +02:00
Moritz Brückner ce245d3ec8 PEP8 + type annotations for write_result() and res_var_name() 2020-04-18 21:38:35 +02:00
Moritz Brückner 146c890349 New Shader.add_const() method to add global constants 2020-04-18 21:26:45 +02:00
Moritz Brückner be8a1b49b1 Fix missing import 2020-04-17 00:58:26 +02:00
Moritz Brückner 930e371419 Fix animation export 2020-04-17 00:37:25 +02:00
Moritz Brückner f848ec4ffc Fix scene trait export 2020-04-17 00:32:39 +02:00
Moritz Brückner ce96f19be1
Merge branch 'master' into refactor-exporter 2020-04-16 23:48:32 +02:00
Moritz Brückner e288f328e7 More type annotations 2020-04-16 23:14:49 +02:00
Moritz Brückner 94efb17b15 Cleanup softbody/hook export 2020-04-16 23:09:48 +02:00
Moritz Brückner fcf1928002 Cleanup scene trait export 2020-04-16 22:51:22 +02:00
Moritz Brückner fac393bed8 Refactor/Cleanup animation export 2020-04-16 22:35:29 +02:00
Moritz Brückner 3d1513d09d Remove unused method 2020-04-16 22:28:41 +02:00
Moritz Brückner 70f1d992de Performance improvement by direct list initialization 2020-04-16 00:50:03 +02:00
Moritz Brückner f50feb5042 Cleanup export_traits() 2020-04-16 00:39:28 +02:00
Moritz Brückner c6bfad710c utils.py: add docstring + annotations to safestr() 2020-04-16 00:34:03 +02:00
Moritz Brückner 2e8250263a Smaller improvements 2020-04-16 00:11:09 +02:00
Moritz Brückner 3d27723ab8 Cleanup create_default_camera() 2020-04-16 00:10:44 +02:00
Moritz Brückner a51c508e84 Better output data variable names 2020-04-16 00:01:46 +02:00
Moritz Brückner 995d1595e5 Refactor export_light() 2020-04-15 23:53:19 +02:00
Moritz Brückner 182c076001 Cleanup export_skin() 2020-04-15 23:46:34 +02:00
Moritz Brückner 5cf8792871 Cleanup mesh export 2020-04-15 23:40:05 +02:00
Moritz Brückner 849b29a644 Cleanup export_object() 2020-04-15 23:34:30 +02:00
Moritz Brückner 2e0af4bd4f More type annotations 2020-04-15 23:18:40 +02:00
Lubos Lenco e4102c9c50
Merge pull request #1654 from MoritzBrueckner/misc 
A bunch of really small improvements
 2020-04-13 16:08:30 +02:00
Moritz Brückner 42a458bbac Cleanup terrain export 2020-04-12 21:46:21 +02:00
Moritz Brückner eba49ef2f7 Refactor material variant generation 2020-04-12 21:36:10 +02:00
Moritz Brückner c7ea971ffb Fix find_bone annotations 2020-04-12 21:27:01 +02:00
Moritz Brückner deba93d3da Refactor bone processing 2020-04-12 21:16:16 +02:00
Moritz Brückner c631676dcd Fix exporter again 2020-04-12 20:59:52 +02:00
Moritz Brückner a5b6a2308e Refactor process_bobject(), process_bone() and parts of execute() 2020-04-12 20:44:49 +02:00
Moritz Brückner 2d309c042e Fix exporter (editor mistake) 2020-04-12 20:09:15 +02:00
Moritz Brückner 22faa147b2 Fix possible error with sublime text project generation 2020-04-12 20:05:03 +02:00
Moritz Brückner da07e72127 Add icon for "Open Editor" operator 2020-04-12 20:04:28 +02:00
Moritz Brückner 9f99f05db4 Smaller improvements and more type annotations 2020-04-12 20:03:27 +02:00
Moritz Brückner 247e0b4c3b Refactor ArrayAddNode + combine it with ArrayAddUnique 2020-04-12 17:33:27 +02:00
Lubos Lenco 290493a4f7
Merge pull request #1649 from MoritzBrueckner/mapping-node 
Refactor and fix mapping node
 2020-04-12 11:34:10 +02:00
Lubos Lenco f446c0a009
Merge pull request #1650 from MoritzBrueckner/array-loop 
Fix ArrayLoopNode socket (dynamic value) + add "Index" output
 2020-04-12 11:33:19 +02:00
Lubos Lenco 6abaacd907
Merge pull request #1651 from QuantumCoderQC/master 
Added set checkbox and OnCanvasElement Node
 2020-04-12 11:30:36 +02:00
Lubos Lenco 26aa9956a2
Merge pull request #1652 from RLP9GHR60I/iss1256 
Add "Has contact (Array)" node
 2020-04-12 11:29:17 +02:00
Daniel B. Bruno 4a3d3a58d6 Add "Has contact (Array)" node 
This node was requested on issue #1256.
 2020-04-11 17:57:21 -03:00
Moritz Brückner f5c624895a Cherry Pick "Add "fake user" setting for traits" 
# Resolved Conflicts:
#	blender/arm/exporter.py
 2020-04-11 21:01:39 +02:00
QuantumCoderQC dda2396313 Added set checkbox and OnCanvasElement Node 2020-04-11 18:33:53 +02:00
Moritz Brückner a9d2a10d0b Fix ArrayLoopNode socket (dynamic value) + add "Index" output 2020-04-11 17:49:17 +02:00
Moritz Brückner 6a16cebadf Refactor mapping node 2020-04-11 16:44:06 +02:00
Lubos Lenco 0ac46b3bb5
Merge pull request #1648 from MoritzBrueckner/proxy-traits 
Proxy: Add option to keep local trait properties when syncing
 2020-04-11 16:21:15 +02:00
Lubos Lenco 736ec92592
Merge pull request #1647 from MoritzBrueckner/lod 
Fix lod deletion
 2020-04-11 16:19:08 +02:00
Moritz Brückner c3eac025b3 Small improvements + fix for multiple traits per object 2020-04-11 14:22:22 +02:00
Moritz Brückner df30e9b681 Set arm_proxy_sync_trait_props to False by default 2020-04-10 23:10:01 +02:00
Moritz Brückner b1572e316e Proxy: Add option to keep local trait properties when syncing 2020-04-10 23:06:37 +02:00
Moritz Brückner af8a7615b3 Fix lod deletion 2020-04-10 21:46:28 +02:00
Moritz Brückner c9b89e6036 Reorder trait UI 2020-04-10 20:44:35 +02:00
Moritz Brückner 403e52109c Add "fake user" setting for traits 2020-04-10 20:43:59 +02:00
Moritz Brückner eefcefbf91 Static initialization for some variables 2020-04-10 19:38:28 +02:00
Moritz Brückner 3882c56fc4 Replace "==/!= None" with "is/is not None" 2020-04-10 19:25:34 +02:00
Moritz Brückner b5b8c4f993 Fix last commit 2020-04-10 19:22:56 +02:00
Moritz Brückner 3593092c59 Remove "== True" and replace "== False" with "not" 2020-04-10 19:21:52 +02:00
Sandy 7541ca86a2
fix https://github.com/armory3d/armory/issues/1576 2020-04-10 21:22:04 +09:00
Moritz Brückner d4974d1340 Change methods to staticmethods or classmethods if possible 
+ some small style improvements
 2020-04-10 01:56:12 +02:00
Moritz Brückner 3d1f65071c Fix type hint (again) 2020-04-10 01:26:54 +02:00
Moritz Brückner 7e5342ef8d Replace Python 3.5 annotations with Python 3.6 annotations 2020-04-10 01:20:08 +02:00
Moritz Brückner 754cb501ca snake_case for ArmoryExporter member variables 
Also removed some unused variables
 2020-04-10 01:18:10 +02:00
Moritz Brückner caee1a87a2 Small performance improvement 2020-04-10 01:09:34 +02:00
Moritz Brückner 0e4c9f9f18 Improve docstring 2020-04-10 01:03:41 +02:00
Moritz Brückner 5859b11c2e Fix type annotation 2020-04-10 00:57:54 +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 d7e6ec1a79 Fix write_matrix() 2020-04-10 00:48:49 +02:00
Moritz Brückner 6e3f3dca98 More type annotations 2020-04-10 00:30:16 +02:00
Moritz Brückner a18c87c392 Make write_matrix static 2020-04-10 00:23:03 +02:00
Moritz Brückner 37e4bc9f85 Some smaller style improvements 2020-04-09 23:53:03 +02:00
Moritz Brückner 4a2ed852b5 Rename struct_identifier + change it to tuple to make it clear it is a constant 2020-04-09 23:52:29 +02:00
Moritz Brückner 6daf501eeb Move get_bobject_type() into NodeTyp enum 2020-04-09 23:51:33 +02:00
Moritz Brückner 0a23241735 Remove unused constants 2020-04-09 23:50:36 +02:00
Moritz Brückner 8d23458f92 Fix process_bone() 2020-04-09 23:42:52 +02:00
Moritz Brückner eae4747bce Replace NodeType[...] with enum 2020-04-09 23:40:18 +02:00
Moritz Brückner f836e9a1a4 export_object(): pep8 cleanup 2020-04-09 23:25:26 +02:00
Moritz Brückner 6deedd7b35 Add type annotations to export_object() 2020-04-09 23:19:07 +02:00
Lubos Lenco 177f1f59a7
Merge pull request #1642 from MoritzBrueckner/fix-camera 
Fix camera export when multiple scenes are exported
 2020-04-09 15:30:45 +02:00
Moritz Brückner 2f3bcbf8c6 Better asset name conflict detection + use log.warn() for warnings 2020-04-09 00:03:22 +02:00
Moritz Brückner 829aa20f08 Fix camera export when multiple scenes are exported 2020-04-08 23:24:43 +02:00
luboslenco 4bd1d40a9c Bump version 2020-04-01 10:44:47 +02:00
Lubos Lenco 0e77094a71
Merge pull request #1623 from Sanva/master 
Fixed memory problem in `ArmoryExporter.execute` [fixes #1604]
 2020-03-21 23:49:26 +01:00
Simonrazer 8f04e18e07
Fix for Fragment 2020-03-21 13:02:12 +01:00
Simonrazer 8b5d000748
Optimise some more 2020-03-21 12:59:02 +01:00
Simonrazer 648d2b1bda
Optimize Voronoi 2020-03-21 11:30:56 +01:00
Valentín Barros 64ed9d8d9e Fixed memory problem in ArmoryExporter.execute [fixes #1604] 
The Blender crash referenced in the issue happened always
when starting 2nd iteration of the loop in line 2041. I'm not
really sure, but I bet it had to do with
`export_object` modifying `bpy.context.collection.objects`
(line 818), wich in turn could invalidate the reference
obtained in line 1926, if I understand a bit of Blender
internals — wich I didn't some days ago, so this could be
completely wrong.

It no longer happens with this change.
 2020-03-21 11:07:58 +01:00
Simonrazer 08b86e7eb9
Fix typo 2020-03-20 15:44:17 +01:00
Simonrazer d9d6c3e1d9
Update cycles_functions.py 2020-03-20 15:19:08 +01:00
Simonrazer b2946ec87d
Update cycles.py 2020-03-20 15:16:08 +01:00
Simonrazer 97896c9fb2
Fix for other dimensions as well 2020-03-19 12:08:56 +01:00
Simonrazer a0ad5061d0
Back to using 3d textures 2020-03-19 11:29:04 +01:00
Simonrazer 222ccd50d1
Fix div by 0 when mesh is flat 2020-03-19 11:24:17 +01:00
Simonrazer a544194d4a
Separate procedural functions 2020-03-18 09:38:18 +01:00
Simonrazer e1ecccf69f
Update cycles.py 2020-03-18 09:35:23 +01:00
Simonrazer 93492ea692
Upgrade noise texture 2020-03-17 09:53:21 +01:00
Simonrazer c33d886caa
Update cycles.py 2020-03-17 09:51:34 +01:00
Lubos Lenco 3991ec7d47
Merge pull request #1617 from Simonrazer/master 
Upgrade Wave Texture node + Fix noise texture Value output
 2020-03-16 19:48:06 +01:00
Sandy 7d90101448
Delete Distance Node 
Remove this because the same can be achieved with "Vector Math"
 2020-03-16 22:24:42 +09:00
Simonrazer 2df762e3db
Upgrade Wave texture shader 2020-03-16 11:53:12 +01:00
Simonrazer 2e529deb19
Upgrade Wave texture node + Fix noise Value output 2020-03-16 11:51:41 +01:00
Lubos Lenco 252e0dc7f3
Merge pull request #1613 from N8n5h/box-projection 
Fix support for box/triplanar mapping
 2020-03-15 09:10:28 +01:00
N8n5h decf89305c Fix support for box/triplanar mapping 
I modified the shader parser so that triplanar mapping of textures is supported.
Normals are supported.
Currently tested with Armory PBR and Principled BSDF.
 2020-03-14 23:44:15 -03:00
QuantumCoderQC 1770aeb002 Added nodes to start animation from a partivular frame index 2020-03-14 23:30:09 +01:00
Sandy 30d22a264b
Add new 
Input of "Get Distance" is Object, but input of "Distance" is Vector.
 2020-03-14 21:04:51 +09:00
Lubos Lenco 71796f4fab
Merge pull request #1610 from N8n5h/fix-geom-export 
Fix geometry not working in published projects
 2020-03-14 10:32:55 +01:00
Simonrazer 3aaba5fe62
Don't use the Z coordinate in the shader 2020-03-13 16:30:42 +01:00
Simonrazer d1765ab206
Update cycles.py 2020-03-13 16:28:55 +01:00
N8n5h e40ae5ac4e Fix geometry in published projects 
Updated the opt_exporter to fit new vertex format
 2020-03-12 20:02:37 -03:00
luboslenco 620e15db8e Fix wrd access 2020-03-07 15:00:51 +01:00
Moritz Brückner fe367518cc
Merge branch 'master' into console-output 2020-03-07 00:04:30 +01: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
Lubos Lenco baa329e0a7
Merge pull request #1600 from philipmduarte/autobake_instanced 
Support for collection instance with autobaking armatures
 2020-03-05 19:38:03 +01:00
Lubos Lenco 963b6ed980
Merge pull request #1598 from Naxela/master 
Merge PPM
 2020-03-05 19:36:10 +01:00
Philip Michel Duarte 4adbc3cbb0 instanced autobake done 2020-03-05 13:40:15 -03:00
Philip Michel Duarte 4e633c736a pending stuff 2020-03-04 19:42:38 -03:00
philip 57a052b25d towards instanced autobake 2020-03-04 17:34:21 -03:00
Alexander 60f72e7e0e Merge in PPM 
Redone and ready to be merged with Armory
 2020-03-04 17:45:19 +01:00
luboslenco ac60af17eb Bump version 2020-03-04 13:30:36 +01:00
Philip Michel Duarte 02bc76f9d5 same-file collection instance bug fixed 2020-03-03 23:38:37 -03:00
Moritz Brückner 086810849e De-clutter console output (new "Verbose Output" switch) 2020-03-04 00:14:14 +01:00
Lubos Lenco fe5be464c2
Merge pull request #1596 from MoritzBrueckner/fix-project-folder 
Fix ResourceWarning for open_folder()
 2020-03-03 22:23:54 +01:00
Moritz Brückner 0cac8fa987 Fix ResourceWarning for open_folder() 2020-03-03 22:13:44 +01:00
Lubos Lenco f3bffa27e5
Merge pull request #1595 from MoritzBrueckner/fix-object-names 
Exporter: better handling of duplicate object names
 2020-03-03 22:10:33 +01:00
Moritz Brückner 6f906c5863 Exporter: better handling of duplicate object names 2020-03-03 21:34:19 +01:00
N8n5h 06af6d30d4 Update exporter to fit expected vertex array data 2020-03-03 03:07:56 -03:00
Lubos Lenco 75ca3aa44b
Merge pull request #1592 from philipmduarte/autobake 
Action autobaking
 2020-03-02 19:20:24 +01:00
Lubos Lenco 0713585f28
Merge pull request #1590 from N8n5h/fix-vcol 
Fix Vertex Color and Tangent not exporting sometimes
 2020-03-02 16:30:54 +01:00
Philip Michel Duarte 8921afd155 autobake done 2020-03-02 11:03:42 -03:00
N8n5h c04dbe4993 Fix Vertex Color and Tangent not exporting 
Applied the same fix that is used for uvs, since it seems to solve the issue of not updating correctly for exporting of materials too.
Also added support for the Vertex Color node.
 2020-03-02 02:04:54 -03:00
Moritz Brückner 7b9fb161fe Deactivate "Debug Console" checkbox when Zui is not enabled 2020-03-02 00:00:56 +01:00
Moritz Brückner d6275b8a07 More future-proof navmesh generation 2020-02-22 17:57:29 +01:00
Moritz Brückner 7566b53340 Fix Navmesh generation + few code style improvements (pep8) 2020-02-22 17:41:51 +01:00
blackno666 9517f805de Fixed adding objects to collection 'export_coll' more than once 2020-02-14 22:12:56 +01:00
Moritz Brückner 351f908178 Print warning if logic node tree and generated trait names differ 2020-02-12 13:51:31 +01:00
Sandy 6fab32b613
Handling issues posted on the Armory forum 2020-02-09 23:45:04 +09:00
Moritz Brückner ac544889ab Fix bool type trait properties 2020-02-07 19:29:55 +01:00
luboslenco 2c4172dabe Merge branch 'master' of https://github.com/armory3d/armory 2020-02-03 12:44:34 +01:00
luboslenco a81338fa7f Bump version 2020-02-03 12:44:18 +01:00
Moritz Brückner 141e7e71df Export asset name for object trait properties 2020-01-27 17:13:43 +01:00
Moritz Brückner f5a40efec4 Fix annoying error message at first Armory2D start from Blender 2020-01-13 11:04:39 +01:00