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

461 commits

Author SHA1 Message Date
Moritz Brückner 89fa3e8314 Reimplement clouds 2020-06-28 22:45:54 +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 42393e34a8 Cleanup world export 2020-06-18 15:36:34 +02:00
Moritz Brückner dd72b2dd18 Fix multi-usage of particle systems 2020-06-04 22:15:41 +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
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 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 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
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 9f99f05db4 Smaller improvements and more type annotations 2020-04-12 20:03:27 +02: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
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
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 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
Moritz Brückner 829aa20f08 Fix camera export when multiple scenes are exported 2020-04-08 23:24:43 +02: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
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
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
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 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
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 141e7e71df Export asset name for object trait properties 2020-01-27 17:13:43 +01:00
Moritz Brückner e7d631f9da Support object prop type 2020-01-07 21:09:39 +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 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 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
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
QuantumCoderQC 8c80b94b4a Moved kinematic and static flags from Bt.hx to RigidBody.hx 2019-12-07 21:41:08 +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 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
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
Yannik Boettcher 25fe284f75 change the exporter to use blenders triangle loops 2019-09-23 12:11:48 +02:00
marketgarden c9911ad25f add collision-filter-mask feature 2019-09-10 23:09:44 +02:00
luboslenco 24867658f1 Deprecated cleanup 2019-08-24 11:50:27 +02:00
MoritzBrueckner d2c83e47f2 Remove not longer required variables 2019-07-19 22:44:22 +02:00
MoritzBrueckner 455151d102 Simplify animation export and support for baked FCurves & modifiers 2019-07-19 22:28:11 +02:00
MoritzBrueckner 85c0d2ca28 Correct Python syntax 2019-07-18 21:51:25 +02:00
MoritzBrueckner f040ac18eb Simplify keyframe export methods 2019-06-25 14:08:42 +02:00
MoritzBrueckner ddd9eaf88a Reorder imports and remove unused ones 2019-06-25 13:54:30 +02:00
MoritzBrueckner e176ad7320 Python docstring for module 2019-06-25 13:53:57 +02:00
MoritzBrueckner 6a29442ceb Fix classify_animation_curve() in blender\arm\exporter.py 2019-06-24 11:30:24 +02:00
MoritzBrueckner 15660ab5f3 Cleanup whitespace 2019-06-23 22:52:41 +02:00