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

1500 commits

Author SHA1 Message Date
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
Moritz Brückner 2d8c86ac98 Improved warnings 2020-01-08 17:17:18 +01:00
Moritz Brückner 2c13f0c78c Fix unused @prop recognition 2020-01-08 17:06:32 +01:00
Moritz Brückner 23eea495f9 Improve UI 2020-01-08 16:37:48 +01:00
Moritz Brückner 7245c83313 Better vector recognition 2020-01-08 16:37:33 +01:00
Moritz Brückner c4b3d82fbb Add warning for static properties 2020-01-07 22:06:32 +01:00
Moritz Brückner 05baf7b39f Support for different object types 2020-01-07 22:00:45 +01:00
Moritz Brückner 0ccd336a4b Less scrolling 2020-01-07 21:38:23 +01:00
Moritz Brückner e7d631f9da Support object prop type 2020-01-07 21:09:39 +01:00
Moritz Brückner f76c903614 Improved vector recognition 2020-01-07 20:45:45 +01:00
Moritz Brückner ab76f31346 Add support for vector properties 2020-01-07 20:26:12 +01:00
Moritz Brückner da16b0e0ac Show warnings caused by invalid trait props 2020-01-07 13:15:21 +01:00
Moritz Brückner 5b60533251 Fix property type change 2020-01-07 13:12:35 +01:00
Moritz Brückner 60914da401 Fix String recognition 2020-01-07 13:06:18 +01:00
Moritz Brückner 891d099c8a Small UI tweaks 2020-01-07 12:35:53 +01:00
Moritz Brückner 049911504c Refactor trait prop system and support different prop types 2020-01-07 12:35:38 +01:00
Moritz Brückner 71ba39f653 Reorganize (PEP8) and remove unused imports 2020-01-07 11:44:33 +01:00
luboslenco dfda5f9dbb Bump version 2020-01-02 14:00:30 +01:00
luboslenco 31161e7242 Fix Object Info material node 2020-01-02 13:53:54 +01:00
Moritz Brückner 3615566b0e Export collection instance offset and move coll. export into own method 2019-12-27 15:40:40 +01:00
Moritz Brückner a17384e318 exporter.py: Some style improvements and added some docstrings 2019-12-27 15:39:20 +01:00
Lubos Lenco 2d61a06f78
Merge pull request #1525 from MoritzBrueckner/gen-tex-export 
Add support for generated image textures
 2019-12-22 12:44:17 +01:00
Moritz Brückner 1f9a4eaa0a Save generated images as jpg 2019-12-21 20:51:16 +01:00
Moritz Brückner 8c28019f36 Add support for generated image textures 2019-12-21 20:30:49 +01:00
Moritz Brückner 99d7e12375 cycles.py: cleanup and use os.path.join() instead of string operations 2019-12-21 20:28:41 +01:00
Moritz Brückner c035f15896 Small utils.py improvements 2019-12-21 20:25:58 +01:00
Moritz Brückner 2f1cf3f53e utils convert_image(): get image quality from UI setting 2019-12-21 20:23:30 +01:00
Moritz Brückner 71287e442f Allow @prop for final keyword too 2019-12-21 14:21:19 +01:00
Sandy 4d54f6d2dc
https://github.com/armory3d/armory/issues/1500 2019-12-18 22:19:14 +09:00
Lubos Lenco 7d58f27550
Merge pull request #1514 from N8n5h/fix-alpha 
Attempt to fix noise in opacity map
 2019-12-17 13:54:41 +01:00
luboslenco 1f8aed23bf Print output from armory2d into console 2019-12-15 15:33:37 +01:00
Lubos Lenco d6f32d1bc5
Merge pull request #1513 from MoritzBrueckner/themes 
Load themes from canvas
 2019-12-14 13:33:13 +01:00
Moritz Brückner 3d59e6b4d6 Fix export error when no canvas is used at all 2019-12-13 19:21:59 +01:00
N8n5h 35274c8673 fix alpha 2019-12-13 11:27:10 -03:00
Alexander e72c997a11 Add blackbody node functionality 2019-12-12 18:13:39 +01:00
Lubos Lenco 24ec5cf79b
Merge pull request #1507 from QuantumCoderQC/master 
Moved kinematic and static flags from Bt.hx to RigidBody.hx
 2019-12-08 10:04:49 +01:00
Lubos Lenco 8a6ad653e6
Merge pull request #1503 from N8n5h/fix-export-uv 
Fix for faulty "missing uv maps"
 2019-12-08 10:01:16 +01:00
QuantumCoderQC 8c80b94b4a Moved kinematic and static flags from Bt.hx to RigidBody.hx 2019-12-07 21:41:08 +01:00
Sandy 99f5d4c756
Calculate transform data directly 2019-12-07 22:08:31 +09:00
Moritz Brückner be43f35ee2 Don't show _themes.json in trait list 2019-12-06 22:10:25 +01:00
Moritz Brückner b4bca6f364 Export themes for canvas 2019-12-06 21:41:19 +01:00
N8n5h 4216d327a3 Fix for faulty "missing uv maps" 
Ask for export_uvs to the original object instead of the evaluated copy. Reason is, it seems the dependency graph fails to update
whenever custom properties are set. So for that I think asking the original object in this case could be sufficient to fix it.

The same could be applied to the other functions that are in that chunk of code.
 2019-12-05 17:17:51 -03: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
QuantumCoderQC 5099580885 Implemented Kinematic and Static flags for better control. Mass of Animated(Kinematic) and Static objects will be set to zero. Implemented btMotionState for kinematic rigid bodies. And btSetWorldTransform for Dynamic and static rigid bodies. Kinematic rigid bodies can now be fully contolled through animation timeline inside blender. 2019-12-01 00:59:16 +01:00
luboslenco ad8ce6d16d Merge branch 'master' of https://github.com/armory3d/armory 2019-11-29 13:41:25 +01:00
luboslenco 2cf0ac3c58 Bump version 2019-11-29 13:41:10 +01:00
N8n5h 2b572db3d1
add initial support to Mapping dynamic inputs 
This is to help transition to Blender 2.81.
I tried to tackle obtaining the input value if something was connected but it turned more complicated than I thought, so for starters I added support to the dynamic inputs default values so it compiles with no errors when a mapping node is present.

Please point out any ugly code.
 2019-11-22 11:53:07 -03:00
luboslenco f310776985 Use webassembly for ammo+krom 2019-11-16 14:11:32 +01:00
Sandy 47f5b4b78e
Fixed issue reported in Armory Forum 
http://forums.armory3d.org/t/helper-text-in-logic-nodes/3673
 2019-11-05 21:59:51 +09:00
luboslenco 8091193058 Fix comma and period keys 2019-11-04 21:35:18 +01:00
luboslenco d87d4a7b58 Bump version 2019-11-01 13:47:01 +01:00
luboslenco b17fe028b6 Re-apply ced8cd8 2019-10-30 15:33:14 +01:00
QuantumCoderQC 8beb8ef061 Implemented Physics constraints: Generic, Generic-Spring, Slider, Piston and Hinge. Point constraint now uses Bullet Physics btPoint2Point constraint. Hinge constraint now obeys orientation inputs. Generic constraint can now be fully configured within Blender. Constraint behaviour matches that of Blender physics constraints. 2019-10-29 23:12:40 +01:00
luboslenco ced8cd845f Fix Principled BSDF node lookup for empty material 2019-10-25 14:20:22 +02:00
Sandy 488031e7d8
Correct socket position 2019-10-18 21:35:08 +09:00
Sandy 39114e9fd2
Correct socket position 2019-10-18 21:33:26 +09:00
Sandy a138baea67
fix https://github.com/armory3d/armory/issues/1438 2019-10-17 22:03:06 +09:00
N8n5h 5184794a0e nav update 3 
added support for modifiers for navigation meshes, removed the need to restart blender when creating visualization
 2019-10-13 19:46:22 -03:00
Lubos Lenco c70478c11e
Merge pull request #1406 from zeeshan595/master 
Added support for angle axies rotation nodes
 2019-10-08 21:46:12 +02:00
N8n5h 93f5b1dace
save the file when creating the dir 
For some reason if you don't save the file the path check doesn't work even if the folder is there.
 2019-10-04 20:23:25 -03:00
N8n5h bcf3f5d2e2
Add a restart check in navmesh vis generation 
This is to prevent the "vertical generation" issue, that happens when failing to generate a vis the first time because of #1377, not liking the "require a restart" thing as a solution but I didn't find a solution that is not a workaround , so for now...
 2019-10-04 19:53:55 -03:00