griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
81,470 Commits 1 Branch 0 Tags
ca003d0f5cfc1f2cd511f33e045eac122c8aa4da
Commit Graph

49 Commits

Author SHA1 Message Date
Campbell Barton
ae57383648 Cleanup: comment blocks 2018-09-02 18:28:27 +10:00
Bastien Montagne
a59d7374ea Nuke DM out of collada code. 
Also, now use out-of-main temp copy of mesh for export, and fixed a
potential memleak (return without freeing temp copy of mesh, tsst).
 2018-06-24 18:40:52 +02:00
Bastien Montagne
87b2444270 Merge branch 'master' into blender2.8 
Conflicts:
	source/blender/collada/AnimationExporter.cpp
	source/blender/collada/AnimationExporter.h
	source/blender/collada/ArmatureImporter.cpp
	source/blender/collada/ArmatureImporter.h
	source/blender/collada/ControllerExporter.cpp
	source/blender/collada/ControllerExporter.h
	source/blender/collada/DocumentExporter.cpp
	source/blender/collada/DocumentImporter.cpp
	source/blender/collada/GeometryExporter.cpp
	source/blender/collada/GeometryExporter.h
	source/blender/collada/MeshImporter.cpp
	source/blender/collada/MeshImporter.h
	source/blender/collada/SkinInfo.cpp
	source/blender/collada/SkinInfo.h
	source/blender/collada/collada_utils.cpp
	source/blender/collada/collada_utils.h
 2018-06-14 15:55:51 +02:00
Bastien Montagne
fd19069999 Cleanup: remove last G.main's from Collada code. 2018-06-14 15:15:51 +02:00
Campbell Barton
908b6960c0 Merge branch 'master' into blender2.8 2018-06-08 08:10:35 +02:00
Campbell Barton
a25c11fd8d Cleanup: trailing space 
Remove from blender/nodes, collada, blenfont & render.
 2018-06-08 08:07:48 +02:00
Brecht Van Lommel
34ab90f546 Depsgraph: remove EvaluationContext, pass Depsgraph instead. 
The depsgraph was always created within a fixed evaluation context. Passing
both risks the depsgraph and evaluation context not matching, and it
complicates the Python API where we'd have to expose both which is not so
easy to understand.

This also removes the global evaluation context in main, which assumed there
to be a single active scene and view layer.

Differential Revision: https://developer.blender.org/D3152
 2018-04-16 19:55:33 +02:00
Sergey Sharybin
5a1a63a858 Merge branch 'master' into blender2.8 2018-02-27 11:16:43 +01:00
Sergey Sharybin
2026179bb2 Collada: Use floating point version of abs() 
Avoids implicit cast of float to int.
 2018-02-27 11:14:17 +01:00
Gaia Clary
f228a08d02 merge from master 2018-02-26 22:49:30 +01:00
Gaia Clary
a024da55af Adding support for Matrix Transformation export 
The exporter does export matrix data (4*4 Transformation matrix) only for Skeletal animation. For object animation only exporting to trans/rot/loc is implemented.

This task implements Matrix export also for simple Object animation.

Differential Revision: https://developer.blender.org/D3082
 2018-02-26 17:16:56 +01:00
Gaia Clary
2b158861a3 merged collada rework from master into blender 2.8 2018-02-25 00:06:41 +01:00
Gaia Clary
dd7b9a362d T45687: Rework the Export/Import of Animations 
This started with a fix for an animated Object Hierarchy. Then i decided to cleanup and optimize a bit. But at the end this has become a more or less full rewrite of the Animation Exporter. All of this happened in a separate local branch and i have retained all my local commits to better see what i have done.

Brief description:

* I fixed a few issues with exporting keyframed animations of object hierarchies where the objects have parent inverse matrices which differ from the Identity matrix.
* I added the option to export sampled animations with a user defined sampling rate (new user interface option)
* I briefly tested Object Animations and Rig Animations.

What is still needed:

* Cleanup the code
* Optimize the user interface
* Do the Documentation

Reviewers: mont29

Reviewed By: mont29

Differential Revision: https://developer.blender.org/D3070
 2018-02-24 15:55:27 +01:00
Brecht Van Lommel
f2453ecdcd Merge branch 'master' into blender2.8 2018-02-17 01:39:29 +01:00
Gaia Clary
e1a686e444 fix: limit precision also for animation matrixes if the limit option is set (gives nicer output for inspection) 2018-02-16 16:55:20 +01:00
Gaia Clary
7fdf720fb1 Fix rotation issues due to matrix to quaternion ambiguities 
Reviewers: mont29

Reviewed By: mont29

Subscribers: mont29

Differential Revision: https://developer.blender.org/D3066
 2018-02-16 15:19:35 +01:00
Gaia Clary
376fc19b24 fix:T53271 now using the context scene layer as requested 2018-01-26 13:37:45 +01:00
Gaia Clary
e59cf13b8c fix T53230: avoid Nullpointer problems in Collada Exporter 2018-01-01 15:02:26 +01:00
Campbell Barton
1b462e5a51 Pass EvaluationContext instead of bContext 
2.8x branch added bContext arg in many places,
pass eval-context instead since its not simple to reason about what
what nested functions do when they can access and change almost anything.

Also use const to prevent unexpected modifications.

This fixes crash loading files with shadows,
since off-screen buffers use a NULL context for rendering.
 2017-08-16 12:46:04 +10:00
Sergey Sharybin
ac0da72a60 Fix compilation error with Collada enabled 2017-07-21 17:44:11 +02:00
Gaia Clary
0d2b1da3a6 Collada: added new functions for improved material exporter (not used yet) 2017-06-24 22:16:47 +02:00
Gaia Clary
3bf0026bec fix: T50412 - collada: Replaced precision local limit function by blender's own implementation 2017-04-01 15:29:50 +02:00
Gaia Clary
7c094f6079 Collada - Added some helper functions into collada_utils, for common usage in the collada module 2017-03-23 14:14:22 +01:00
Gaia Clary
4b891b40c2 Fix: Collada Importer did not import the Blender Profile information correctly when multiple objects are bound to same armature. This caused Bone tails to be placed wrong. 2016-09-24 01:06:32 +02:00
Gaia Clary
38410e6e25 changed use_connect from bool to a 3 state value (-1,0,1) 2016-06-03 18:31:51 +02:00
Gaia Clary
cd4d80fac6 added missing include 2016-05-29 01:38:14 +02:00
Gaia Clary
5366900ace Added support for non numeric bone layer labels (could happen when importing from other tools) 
Differential Revision: https://developer.blender.org/D2037
 2016-05-29 00:37:46 +02:00
Gaia Clary
8e26111020 Collada: Adding support for bone roll and bone layers 
Differential Revision: https://developer.blender.org/D2034
 2016-05-28 19:22:06 +02:00
Gaia Clary
1346482d23 moved is_leaf_bone() to collada utils for reuse in exporter and importer 2016-05-26 18:22:36 +02:00
Gaia Clary
1a3a252e06 Collada: Import now always rotates input to match blender's Z_UP axis 2013-07-29 21:51:53 +00:00
Gaia Clary
4774357b59 Collada: exported normals now based on MPoly instead of MFace 2013-03-03 13:53:32 +00:00
Gaia Clary
be701b6278 Collada: Added support for ngon export/import and added triangulate option to export 2013-03-02 15:58:13 +00:00
Gaia Clary
22dbb675c1 Fix #33437 Collada: Added scale matching for Scene imports. 2013-02-10 22:14:56 +00:00
Gaia Clary
e3488af838 fixed: [#34080] import of COLLADA breaks on '#' in filepath 2013-02-09 00:23:59 +00:00
Campbell Barton
a0f01ef8d8 remove BLI_utildefines from BKE_DerivedMesh.h header 2012-11-01 15:34:38 +00:00
Gaia Clary
10004d4a42 fixed: [#32240] Collada import when nodes share geometry but not material 2012-08-12 17:13:07 +00:00
Gaia Clary
adf3a5e332 Collada: (Export) Added export of surface textures, and control over exported uv layers 2012-06-22 16:16:58 +00:00
Gaia Clary
0df30d1063 Collada: (Exporter) add 'mesh type selection(view|render)' for Apply modifiers option 2012-06-16 23:35:53 +00:00
Campbell Barton
664c95d1eb code cleanup: collada 
- when bubble sorting names - dont convert to str::string just to compare strings
- use BLI_linklist_index() to check if an item is in the list
- quiet some warnings
 2012-06-16 09:16:24 +00:00
Gaia Clary
9f6a66d5f9 Collada: (Exporter) Add new option 'deform bones only' 2012-06-15 22:00:25 +00:00
Gaia Clary
05a1a31693 Collada: Added export Option 'sort by object name' to fix an issue with Second Life import 2012-06-14 10:38:39 +00:00
Gaia Clary
36ed4818e5 patch #31794 Collada: make exporter more robust, now uses BKE_object_relational_superset() 2012-06-12 21:25:29 +00:00
Gaia Clary
49a5141cde [#31739] Collada: New Export selections 'Include Armatures' 2012-06-07 17:55:26 +00:00
Brecht Van Lommel
b075765edd Fix #31258: collada now selects newly added objects after import. 2012-05-03 21:32:49 +00:00
Campbell Barton
2b7ca2304a unify include guard defines, __$FILENAME__ 
without the underscores these clogged up the namespace for autocompleation which was annoying.
 2012-02-17 18:59:41 +00:00
Campbell Barton
4a04f72069 remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n 2011-10-23 17:52:20 +00:00
Nathan Letwory
bcec824299 doxygen: COLLADA entry 2011-02-21 08:38:53 +00:00
Guillermo S. Romero
9f3d203acb SVN maintenance. 2010-10-05 00:49:39 +00:00
Nathan Letwory
82209cdc86 Reorganisation of COLLADA import code. Classes have been split into their own files. 
No functional changes.

Where necessary extern "C" {} blocks have been added.
 2010-10-05 00:05:14 +00:00