maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
21576 commits 10 branches 35 tags 1.1 GiB
Commit graph

251 commits

Author SHA1 Message Date
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
Juan Linietsky 5eeb06ffd1 -Remove harcoded opengl extension testing from OS, ask rasterizer instead. 
-Fixed a bug where etc textures were imported broken
 2019-02-26 11:58:47 -03:00
Juan Linietsky 74d0ed2236 Many separate fixes to ensure non power of 2 textures work on GLES2, closes #25897 and many others 2019-02-24 22:36:53 -03:00
marxin 8d51618949 Add -Wshadow=local to warnings and fix reported issues. 
Fixes #25316.
 2019-02-20 19:44:12 +01:00
Rémi Verschelde c5dcbeb160 Scene: Ensure classes match their header filename 
Also drop some unused files.

Renamed:
- `scene/2d/navigation2d.h` -> `navigation_2d.h`
- `scene/2d/screen_button.h` -> `touch_screen_button.h`
- `scene/3d/scenario_fx.h` -> `world_environment.h`
- `scene/audio/audio_player.h` -> `audio_stream_player.h`
- `scene/resources/bit_mask.h` -> `bit_map.h`
- `scene/resources/color_ramp.h` -> `gradient.h`
- `scene/resources/shape_line_2d.h` -> `line_shape_2d.h`
- `scene/resources/scene_format_text.h` -> `resource_format_text.h`
- `scene/resources/sky_box.h` -> `sky.h`

Dropped:
- `scene/resources/bounds.h`
 2019-02-12 17:21:48 +01:00
Rémi Verschelde b7cc2bb1e2 Core: Ensure classes match their header filename 
Also drop some unused files.

Renamed:
- `core/dvector.h` -> `pool_vector.h`
- `core/io/resource_import.h` -> `resource_importer.h`
- `core/sort.h` -> `sort_array.h`
- `core/string_db.h` -> `string_name.h`

Dropped:
- `core/allocators.h`
- `core/os/shell.h`
- `core/variant_construct_string.cpp`
 2019-02-12 13:34:25 +01:00
Windy Darian c478f30321 Support script global class (class_name) when importing a scene 
We could already choose a script global class for root_type at scene import config. However, it would fall back to default Spatial if a script global class is chosen. This will make sure the base type for the script class is used, and the script to root node is attached upon import.
 2019-01-29 23:25:57 -05:00
Rémi Verschelde 70689ebffd Remove unused iostream includes 2019-01-28 12:16:22 +01:00
Juan Linietsky ed1b9c1f15 Avoid crash in import (though model still does not work well), fixes #19346 2019-01-26 16:32:05 -03:00
Rémi Verschelde d54894ffae
Merge pull request #24647 from WindyDarian/gltf_morph_fix 
Fix for blend shape incorrectly scaling skinned gltf mesh
 2019-01-04 15:21:38 +01:00
Rémi Verschelde b16c309f82 Update copyright statements to 2019 
Happy new year to the wonderful Godot community!
 2019-01-01 12:58:10 +01:00
Rémi Verschelde d1f3b622f0 Fix missing/malformed license headers 2019-01-01 12:46:36 +01:00
Windy Darian d9d6119b6e Partial fix for blend shape with gltf 
This fixes https://github.com/godotengine/godot/issues/20377 , where blend shape scales the mesh if the mesh is also skinned.
The issue was that the blend shape was trying to blend using BLEND_SHAPE_MODE_RELATIVE (directly adding everything in morph shape as displacement), while bone weights were copied in the morph shape, which resulted in 2x bone weights causing mesh to become bigger when blended.
Setting the blend mode to BLEND_SHAPE_MODE_NORMALIZED while guaranteeing the data is correct fixes the issue (previously treating gltf2's morph displacement data as blend target data).  Ideally we still want to use BLEND_SHAPE_MODE_RELATIVE since it may need much less data, but that seems to require a larger refactor?
 2018-12-29 01:13:35 -05:00
Rémi Verschelde 2e39e38c10 doc: Sync classref with current source 
Fix various code formatting issues and argument names.
 2018-12-27 11:10:18 +01:00
Rémi Verschelde 9c7ca687b2 Make error more explicit when OBJ/MTL files are missing 
Fixes #24595.
 2018-12-27 10:39:43 +01:00
Rémi Verschelde c8a5400654
Merge pull request #24241 from Rubonnek/move-to-initializer-list 
Moved member variables to initializer list
 2018-12-12 09:25:34 +01:00
Wilson E. Alvarez 08f22f1cf0
Moved member variables to initializer list 2018-12-11 18:33:01 -05:00
Rémi Verschelde 5ff403b3b0
Merge pull request #23361 from mrcdk/wav_loop_backward 
Add backward looping support to AudioStreamSample (wav files)
 2018-12-11 18:43:18 +01:00