asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
31645 commits 1 branch 0 tags 2.2 GiB
Commit graph

369 commits

Author SHA1 Message Date
K. S. Ernest (iFire) Lee
460ab353b4
Use the vertex colors by default in gltf. 
(cherry picked from commit 43424e1321)
 2020-09-29 13:57:57 +02:00
Adrien
e90467ef66 Fix #42043, mismatched compress options in ResourceImporterLayeredTexture 2020-09-14 15:36:46 +08:00
K. S. Ernest (iFire) Lee
f189d0e1f3 Allow gltf2 morph targets with no default values. Changes for bug 38751 
(cherry picked from commit 71ae0ff46d)
 2020-07-24 09:37:43 +02:00
lordkettune
c68ef4d754 Fix issues with custom tracks on reimport 
(cherry picked from commit 4313a7bdc8)
 2020-07-03 13:17:57 +02:00
Sl3dge78
d99f6c4d5c Fix #20467. The "Anim imported" warning gets displayed properly when working on imported anims. 
(cherry picked from commit 95cd74fc4b)
 2020-06-21 21:36:12 +02:00
Aaron Franke
e3cf64a7d8
[3.2] Add GLTF light import 
Co-authored-by: K.S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
 2020-06-10 23:51:34 -04:00
Rémi Verschelde
7bf9787921 SCons: Format buildsystem files with psf/black 
Configured for a max line length of 120 characters.

psf/black is very opinionated and purposely doesn't leave much room for
configuration. The output is mostly OK so that should be fine for us,
but some things worth noting:

- Manually wrapped strings will be reflowed, so by using a line length
  of 120 for the sake of preserving readability for our long command
  calls, it also means that some manually wrapped strings are back on
  the same line and should be manually merged again.

- Code generators using string concatenation extensively look awful,
  since black puts each operand on a single line. We need to refactor
  these generators to use more pythonic string formatting, for which
  many options are available (`%`, `format` or f-strings).

- CI checks and a pre-commit hook will be added to ensure that future
  buildsystem changes are well-formatted.

(cherry picked from commit cd4e46ee65)
 2020-06-10 15:30:52 +02:00
Rémi Verschelde
e891fae52b
Merge pull request #39134 from abustin/fbx_mesh_compression_fix 
Respect 'mesh compression' editor import option in Assimp and glTF importers
 2020-06-08 13:16:39 +02:00
Hugo Locurcio
b0fe8cab14 Tweak the import compression property hint for clarity 
(cherry picked from commit 1439447071)
 2020-06-04 12:16:39 +02:00
Pedro J. Estébanez
b2a64b144f Fix excessive bottom cropping in atlas generation 
(cherry picked from commit fb7ae73045)
 2020-06-04 12:16:39 +02:00
Alex Bustin
8a024ca294 Respect 'mesh compression' editor import option in Assimp (ie. FBX) and glTF importers 2020-05-28 15:28:47 -07:00
Hugo Locurcio
6692681618 Tweak the error message displayd when a post-import script fails 
See #38662.

(cherry picked from commit 0d7b627936)
 2020-05-13 16:12:03 +02:00
Rémi Verschelde
5f5ef98832 glTF: Fix tangent generation for non-blend shapes 
PR #30877 was bogus as it made a blend shape-specific code block apply
to everything but blend shapes (as it seemed not to work properly *for*
blend shapes).

The proper fix should thus be to simply remove the problematic
block (and thus cleanup unnecessary logic).

Fixes #32712.

(cherry picked from commit 0034c88c57)
 2020-05-01 10:56:58 +02:00
Maurizio Petrarota
53b4689979 Fixed TextureAtlas import. 
(cherry picked from commit 744c1fafff)
 2020-03-04 12:40:14 +01:00
Juan Linietsky
03c8e12d54 Add support for named binds in Skin. 
Helps better reutilization of skeletons from Maya exported files.

(cherry picked from commit 9a34f39d32)
 2020-03-04 12:40:14 +01:00
Hugo Locurcio
a002b93d86
Add explanations for errors related to Vector/Quat normalization 2020-01-24 14:19:23 +01:00
Rémi Verschelde
4faaf6089a Remove unused #if 0'ed code 2020-01-21 21:41:54 +01:00
Haoyu Qiu
92b36d4706 Adds NULL check before using image loader 2020-01-16 21:49:23 +08:00
Bastiaan Olij
ad6d06dc21 Add option to apply an offset to obj mesh import 2020-01-11 19:27:00 +11:00
K. S. Ernest (iFire) Lee
0172a7f932 Use cycle and loop hint flags in glTF2. 2020-01-10 08:02:16 -08:00
K. S. Ernest (iFire) Lee
f028b8b0e4 Support GLTF2 alpha scissors. 2020-01-02 11:52:08 -08:00
Rémi Verschelde
bde52cc688
Merge pull request #34618 from qarmin/vector_please_dont_crash 
Don't use constant reference in Vector push_back, insert and append_array
 2020-01-02 15:44:41 +01:00
Rémi Verschelde
a7f49ac9a1 Update copyright statements to 2020 
Happy new year to the wonderful Godot community!

We're starting a new decade with a well-established, non-profit, free
and open source game engine, and tons of further improvements in the
pipeline from hundreds of contributors.

Godot will keep getting better, and we're looking forward to all the
games that the community will keep developing and releasing with it.
 2020-01-01 11:16:22 +01:00
Rafał Mikrut
1ac701cc37 Don't use constant reference in Vector push_back, insert and append_array 2019-12-26 17:38:08 +01:00
Marios Staikopoulos
d3cf8cfb7d Fix Hard Crash on glTF Color Accessor Import 2019-12-24 15:03:24 -08:00
Rafał Mikrut
ed1c4bc77d Removed unused variables, add some constants numbers 2019-12-10 05:13:02 +01:00
Marios Staikopoulos
4b28fd4f23 Bugfix: Sanitize glTF importer Animation Names and do not set bone_pose 2019-11-27 12:20:38 -08:00
K. S. Ernest (iFire) Lee
80b1604fa9 33714 glTF2 handle undefined load-time scene. 2019-11-22 08:48:23 -08:00
Rémi Verschelde
ab3bccdb78 Fix typos with codespell 
Using codespell 1.16.0.

Method:
```
$ cat > ../godot-word-whitelist.txt << EOF
ang
curvelinear
dof
doubleclick
leapyear
lod
merchantibility
nd
numer
ois
ony
que
seeked
synching
te
uint
unselect
webp
EOF

$ codespell -w -q 3 -I ../godot-word-whitelist.txt --skip="./thirdparty,*.po"
$ git diff // undo unwanted changes
```
 2019-11-22 08:35:03 +01:00
Rémi Verschelde
28613ab8c9
Merge pull request #33794 from nekomatata/gltf-morph-shapes-crash2 
Error instead of crash in gltf import with more than one morph target
 2019-11-21 22:09:08 +01:00
PouleyKetchoupp
e949665489 Error instead of crash in gltf import with more than one morph target 
Redone from PR #33782 to fix the crash without adding compatibility with Blender 2.8
Helps with #16124, while Blender 2.81 has the proper export fix.
 2019-11-21 17:25:01 +01:00
K. S. Ernest (iFire) Lee
d0de373884 33756 gltf2 importer should use zfar 2019-11-21 07:52:18 -08:00
K. S. Ernest (iFire) Lee
3b44866bf2 33714 If the gltf2 asset has no scene, it is corrupt. 2019-11-20 10:49:24 -08:00
qarmin
616ab4fac2 Small fixes to redundand code, copy paste bugs 2019-10-14 11:40:55 +02:00
Marcel Admiraal
a8836ba28d Remove dependency on the editor directory being in the build's include path. 
- Add or remove the necessary subdirectorires to the includes to remove
dependency on the editor directory being in the build's include path.
- Ensure includes in modified files conform to style guideline.
- Remove editor from the build include path.
 2019-10-10 08:57:00 +02:00
homer666
9d98ed1d86 Restore import animation storage checkbox behavior 2019-09-28 12:33:00 +10:00
gladmin
7f3e37fead Fix import hints being ignored by glTF importer 
This fixes a regression introduced in commit 72d2468
due to hyphens being removed from nodes names.
 2019-09-25 16:58:05 +02:00
Rémi Verschelde
dec10dd776
Merge pull request #32051 from qarmin/some_error_explanation 
Added some obvious errors explanations
 2019-09-25 11:51:54 +02:00
qarmin
17732fe698 Added some obvious errors explanations 2019-09-25 10:28:50 +02:00
Rémi Verschelde
8c0595b722
Merge pull request #32306 from hbina/unused_variable 
Fixed incorrect usage of variables in querying values.
 2019-09-25 08:49:31 +02:00
Marios Staikopoulos
4631b0ca62 glTF: Fixed mistake with root node calculation in skin_verify 
Was not actually grabbing the computed roots for comparison, but instead
was grabbing the disjoint_set representatives.
 2019-09-24 21:49:25 -07:00
Hanif Bin Ariffin
d1e069ea23 Fixed incorrect use of variables 
The previous committer mistakenly used the wrong variable to query some values.
This commit simply changes it so that it queries the right Dict.
 2019-09-24 16:45:34 -04:00
Rémi Verschelde
159470df08
Merge pull request #32275 from godotengine/skin_support 
Added skin support and simplified APIs to override bone position + glTF 2.0 import fixes
 2019-09-23 15:02:15 +02:00
Marios Staikopoulos
77e223ff94 GLTF: Fixed some issues with skin groups joining incorrectly and removed unused code 
- Skin groups now merge more cleanly together
- Skins whose highest nodes are siblings of another skin now get merged also
- Skin nodes who have children of another skin now also fuse together
- Removed the re-rooting of IBM code, as it is no longer needed with the Skin system
 2019-09-22 17:45:36 -07:00
qarmin
50be65bf43 Changed some code found by Clang Tidy and Coverity 2019-09-22 18:45:08 +02:00
Marios Staikopoulos
72d2468d68 More GLTF Fixes 
1: Depth draw mode set for transparent materials (iFire)
2: Skeletons
  - Bone names now unique and seperate from scene names
  - Due to mixture of fake joints and joints, new bone sanitizing for names added
  - Fixed an issue where some disjoint skins were not being joined due to a logic error
  - Deterministic and Depth-first bone creation order
3: Skins
  - Removed duplicate skins when possible
4: Animations
  - Fixed invalid morph target names
 2019-09-21 21:45:38 -07:00
Marios Staikopoulos
6fc5647bc3 GLTF Importer - Add more Index types and const-ed up the code 2019-09-21 15:21:02 -07:00
Marios Staikopoulos
11e09e59d1 GLTF2 Import Fixes - Skin(s) to Skeleton - Skin Support 2019-09-20 23:08:58 -07:00
Juan Linietsky
d81ddaf33e Added skin support and simplified APIs to override bone position. 2019-09-18 19:46:32 -03:00
willnationsdev
7ac0239afa Add CSV import without translation. 2019-09-03 19:37:20 -05:00
Rasmus Ketelsen
c653a020d6 Disabled trim and normalize as default for wav import 2019-08-30 11:46:50 +02:00
Rasmus Ketelsen
8dfe83406f Added the ability to import scene resources as .tres files 2019-08-27 15:21:20 +02:00
Fabio Alessandrelli
c19871af6d Move CryptoCore to it's own folder. 
Crypto classes will be placed in core/crypto.
 2019-08-19 16:31:05 +02:00
Rémi Verschelde
d3153c28f0 Replace last occurrences of 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' 
The last remaining ERR_EXPLAIN call is in FreeType code and makes sense as is
(conditionally defines the error message).

There are a few ERR_EXPLAINC calls for C-strings where String is not included
which can stay as is to avoid adding additional _MSGC macros just for that.

Part of #31244.
 2019-08-17 13:31:22 +02:00
Braden Bodily
71d71d55b5 Replace 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' in 'core/' and 'editor/' 
Condensed some if and ERR statements. Added dots to end of error messages

Couldn't figure out EXPLAINC. These files gave me trouble: core/error_macros.h, core/io/file_access_buffered_fa.h (where is it?),
core/os/memory.cpp,
drivers/png/png_driver_common.cpp,
drivers/xaudio2/audio_driver_xaudio2.cpp (where is it?)
 2019-08-17 12:33:15 +02:00
Joseph Catrambone
c2e91005ef Bugfix in GLTF import: Flipping boolean check. Reindexing should _NOT_ happen when blend shapes are present. 2019-07-27 14:34:54 -07:00
Rémi Verschelde
4c943cca2c
Merge pull request #30716 from qarmin/fixed_static_analiser_code 
Fix some code found by Coverity Scan and PVS Studio
 2019-07-23 15:08:44 +02:00
qarmin
aab8da25ad Fix some code found by Coverity Scan and PVS Studio 2019-07-23 09:14:31 +02:00
Rémi Verschelde
a1b4568ba9
Revert "Tweak SpatialMaterial's default metallic and roughness texture channels" 2019-07-22 11:56:41 +02:00
qarmin
6cbaf7662f Changed some code showed in LGTM and Coverage 2019-07-20 08:09:57 +02:00
Hugo Locurcio
c9445632e1
Hide "Max Rate Hz" if "Max Rate" is unchecked when importing WAV sample 2019-07-07 18:53:21 +02:00
Fabio Alessandrelli
564d93ff10 CryptoCore class to access to base crypto utils. 
Godot core needs MD5/SHA256/AES/Base64 which used to be provided by
separate libraries.
Since we bundle mbedtls in most cases, and we can easily only include
the needed sources if we so desire, let's use it.

To simplify library changes in the future, and better isolate header
dependencies all functions have been wrapped around inside a class in
`core/math/crypto_base.h`.

If the mbedtls module is disabled, we only bundle the needed source
files independently of the `builtin_mbedtls` option.
If the module is enabled, the `builtin_mbedtls` option works as usual.

Also remove some unused headers from StreamPeerMbedTLS which were
causing build issues.
 2019-07-02 12:36:27 +02:00
qarmin
4e5310cc60 Some code changed with Clang-Tidy 2019-06-26 15:08:25 +02:00
Rémi Verschelde
5c66771e3e
Merge pull request #29283 from qarmin/fix_some_always_same_values 
Remove always true/false values
 2019-06-20 21:10:10 +02:00
qarmin
072e40368e Fix always true/false values 2019-06-20 16:59:48 +02:00
Rémi Verschelde
b9f8e072ce
Merge pull request #26205 from Calinou/spatialmaterial-use-packed-channels 
Tweak SpatialMaterial's default metallic and roughness texture channels
 2019-06-20 11:46:01 +02:00
JohnJLight
38d3bfe971 Made use of semicolons more consitent, fixed formatting 2019-06-19 15:24:31 +02:00
Rémi Verschelde
b486f5dde0 glTF: Fix import of animations with INTERPOLATION_LINEAR 
Bug found thanks to GCC 8's -Wduplicated-branches.
Slight refactor for readability.
 2019-06-15 15:20:13 +02:00
Rémi Verschelde
30e8b53c38
Merge pull request #29680 from akien-mga/fix-headers 
Add missing license headers
 2019-06-11 19:01:40 +02:00
Rémi Verschelde
f18121824c Add missing license headers 
Make `fix_headers.py` script compatible with Python 3.
 2019-06-11 15:33:32 +02:00
Rémi Verschelde
6d16f2f053 Fix error macro calls not ending with semicolon 
It's not necessary, but the vast majority of calls of error macros
do have an ending semicolon, so it's best to be consistent.
Most WARN_DEPRECATED calls did *not* have a semicolon, but there's
no reason for them to be treated differently.
 2019-06-11 14:49:34 +02:00
Rémi Verschelde
c957e56741
Merge pull request #24286 from glaforte/bugfix/20878 
Fixes the support of the 'keep on reimport' flag - Issue #20878.
 2019-05-30 16:42:50 +02:00
Rémi Verschelde
c51d2ed55c
Merge pull request #25480 from WindyDarian/scene_import_root_type_script_global_class_support 
Support script global class (class_name) as root_type when importing a scene
 2019-05-29 17:31:15 +02:00
Rémi Verschelde
e0574e1d98 Fix typos with codespell 
Using codespell 1.15.0.

Method:
```
$ cat > ../godot-word-whitelist.txt << EOF
ang
curvelinear
doubleclick
leapyear
lod
merchantibility
nd
numer
ois
ony
que
seeked
synching
te
uint
unselect
webp
EOF

$ codespell -w -q 3 -I ../godot-word-whitelist.txt --skip="./thirdparty,*.po"
$ git diff // undo unwanted changes
```
 2019-05-19 13:10:35 +02:00
Rémi Verschelde
7013607ef9
Merge pull request #28365 from fire/split_clip_blend_shapes 
Modify ResourceImporterScene to split animations with blendshapes.
 2019-05-06 16:58:29 +02:00
Rémi Verschelde
6ee5f7c881
Merge pull request #27453 from KoBeWi/glhf_scene_root 
Use filename for scene root of imported models
 2019-04-30 11:38:32 +02:00
Rémi Verschelde
ceebd748b9
Merge pull request #27927 from theisegeberg/#27925_trimHalvesAudio 
Fixes WAV import being cut in half with new trim code
 2019-04-30 10:46:56 +02:00
homer666
106d1f3c3c Refresh import dock on change "animation/storage" 2019-04-29 11:38:45 +10:00
K. S. Ernest (iFire) Lee
342266d782 Modify ResourceImporterScene to split animations with blendshapes. 
# Conflicts:
#	editor/import/resource_importer_scene.cpp
 2019-04-23 17:25:44 -07:00
Rémi Verschelde
a342131eba
Merge pull request #27673 from qarmin/small_fixes 
Small fixes, mostly duplicated code
 2019-04-22 12:00:34 +02:00
Juan Linietsky
04847ef5f9 Added ability for multiple images to be imported as an atlas 
This adds support for groups in the import system, which point to a single file.
Add property hint for saving files in file field
 2019-04-19 15:56:34 -03:00
Theis Egeberg
e630591aea Removed extra division by format channels causing sounds to get halved. 2019-04-11 17:17:33 +02:00
Juan Linietsky
5823b5d77d Bundled VHACD library for convex decomposition. 
Modified both MeshInstance tools as well as importer to use it instead of QuickHull.
 2019-04-10 17:47:28 -03:00
Rémi Verschelde
c8994b56f9 Style: Apply new changes from clang-format 8.0 
It seems to stay compatible with formatting done by clang-format 6.0 and 7.0,
so contributors can keep using those versions for now (they will not undo those
changes).
 2019-04-09 17:09:48 +02:00
Tomasz Chabora
82fadde680 Use filename for scene root of imported models 2019-04-08 18:43:55 +02:00
qarmin
856a8226a5 Small fixes, mostly dupicated code 2019-04-08 11:03:37 +02:00
Rémi Verschelde
9984ebba17
Merge pull request #27645 from theisegeberg/fix-wav-import-trim 
Fix end pops when trimming wav files
 2019-04-07 12:49:23 +02:00
Rémi Verschelde
e6979adb1b
Merge pull request #26918 from aqnuep/skeleton_reparenting_fix 
Fix skeleton reparenting to also work when the skeleton node is not a bone
 2019-04-05 16:48:42 +02:00
Theis Egeberg
26cc521d55 -Added trim limit constant at top of file, defining at which db trimming should occur (moved from being in the code itself) 
-Added fade out frames constant at top of file, defining how many frames should have fade out applied (to avoid pops at the end of trim)
-Rewrote parts of the trimming logic to use an average of volume across all channels instead of any particular channel
-Added fade-out to trimming
 2019-04-04 16:37:58 +02:00
Angeloss
40acc3ecdc Fix: Keep custom tracks option now keeps animation loop property and value track update mode. 
(cherry picked from commit 589c5698a0)
 2019-04-03 16:59:34 +02:00
Vivatchai Kaveeta
32dd9c67c6 Fix order of transformation in GLTF import 
From the gltf 2 spec, the order is R  * S. Previously we did S * R, which broke some mesh with non-uniform scale.

Fix #23356, Fix #14725
 2019-03-18 03:08:46 +07:00
Daniel Rakos
1cf7ca87ce Fix skeleton reparenting to also work when the skeleton node is not a bone 
Existing code only did the reparenting when the parent node was a bone. This
change fixes that, plus the reparenting code itself, which used the index of
the skin instead of the skin index itself to address the skeleton array.
 2019-03-11 16:26:45 +01:00
Juan Linietsky
6cb841edcb Ensure ETC2 textures are ALSO compressed to Po2 when have mipmaps. Fixes #26733 2019-03-07 12:16:20 -03:00
Rémi Verschelde
9efbddfee1
Merge pull request #26607 from ptrojahn/translationescape 
Unescape translations in CSV importer
 2019-03-04 21:54:29 +01:00
Paul Trojahn
aa465f076f Unescape translations in CSV importer 
Fixes #25361
 2019-03-04 21:07:58 +01:00
Juan Linietsky
2f32a75d2e Skeletons can now choose between using local or world coords for processing, fixes #26468 2019-03-03 12:24:00 -03:00
Rémi Verschelde
86f4fabd46
Merge pull request #26446 from QbieShay/root_node_from_escn 
Importer for scenes only overrides the base Node if differently specified by the user
 2019-03-03 13:51:09 +01:00
Ilaria Cislaghi
b6fe7a794d Importer for scenes only overrides the base Node if differently specified by the user 2019-03-02 13:31:11 +01:00
Juan Linietsky
3f681b0681 Clean up blend shape support in GLES2 and GLES3. 2019-03-01 16:01:44 -03:00
Juan Linietsky
f669ebeeaf -Properly handle missing ETC support on export 
-Added ability for resource importers to save metadata
-Added ability for resource importers to validate depending on project settings
 2019-02-26 18:45:06 -03:00