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

1588 commits

Author SHA1 Message Date
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