Commit Graph

11892 Commits (074af85734965b33dbfe6b6e6b4af65a1ad39058)

Author SHA1 Message Date
Kim Kulling 074af85734
Merge pull request #5043 from tellypresence/create-local-textures
Replace relative paths with local assets/textures
2023-04-17 21:25:15 +02:00
Kim Kulling 133f730c11
Merge branch 'master' into create-local-textures 2023-04-17 20:47:54 +02:00
Kim Kulling 0023f9b09a
Merge pull request #5067 from assimp/kimkulling/fix_memory_leak_in_fbx_scope_issue-3421
Fix: Fix leak in Scope class, FBX
2023-04-17 20:40:46 +02:00
Kim Kulling ca937788ee
Fix: Fix leak in Scope class, FBX
- closes https://github.com/assimp/assimp/issues/3421
2023-04-17 20:08:58 +02:00
Kim Kulling 333f7d5ee0
Merge pull request #5066 from assimp/kimkulling/fix_possible_invalid_dereferencing_of-issue-4918
Fix possible dereferencing of invalid pointer.
2023-04-17 15:59:07 +02:00
Kim Kulling aee4df9be8
Fix possible dereferencing of invalid pointer.
- closes https://github.com/assimp/assimp/issues/4918
2023-04-17 15:40:29 +02:00
Kim Kulling 13c9db2310
Merge pull request #5064 from assimp/kimkulling/remove_empty_file_issue-4957
Delete License.txt
2023-04-15 13:03:02 +02:00
Kim Kulling 8bc64ec147
Delete License.txt
- closes https://github.com/assimp/assimp/issues/4957
2023-04-15 11:53:19 +02:00
Kim Kulling 8cf74c7663
Merge branch 'master' into create-local-textures 2023-04-15 11:52:00 +02:00
Kim Kulling 7e8aabcbb4
Merge pull request #5057 from sutajo/master
ConvertToLHProcess now inverts viewing direction
2023-04-15 11:51:15 +02:00
Suhajda Tamás 3dd08cdd60 Added note 2023-04-05 13:01:38 +02:00
Suhajda Tamás 74509ef8bd Revert "FBXConverter : import FbxCamera correctly"
This reverts commit cdfdd75a66.
2023-04-05 12:19:39 +02:00
Steve M 5b2f78ac20
Merge branch 'master' into create-local-textures 2023-04-04 16:01:20 -07:00
Suhajda Tamás 23a3e8cf2d ConvertToLHProcess noew inverts viewing direction 2023-04-04 19:39:32 +02:00
Kim Kulling 679eb972e6
Merge pull request #5056 from sutajo/fix_pretransform_vertices_with_cameras
Fix pretransform vertices with cameras
2023-04-04 17:35:50 +02:00
Kim Kulling 89ccc89298
Merge branch 'master' into fix_pretransform_vertices_with_cameras 2023-04-04 17:21:05 +02:00
Kim Kulling 8705940801
Merge pull request #5042 from Jackie9527/msvc-clang-unreachable-code
Fix warning related to unreachable-code.
2023-04-04 17:18:55 +02:00
Kim Kulling 1733d9f795
Merge branch 'master' into msvc-clang-unreachable-code 2023-04-04 17:02:22 +02:00
Kim Kulling 17d8e991cc
Merge pull request #5041 from Jackie9527/msvc-clang-format-non-iso
Fix warning related to format-non-iso.
2023-04-04 17:01:27 +02:00
Kim Kulling 17bdd5f9b5
Merge branch 'master' into msvc-clang-format-non-iso 2023-04-04 15:59:27 +02:00
Kim Kulling 414091ab11
Merge pull request #5039 from liedtkeInTUM/fix_getenv_uwp
std::getenv is not supported using uwp
2023-04-04 13:49:15 +02:00
Kim Kulling e6f26fc52e
Remove dead code. 2023-04-04 12:54:26 +02:00
Kim Kulling ccbcf15a21
Merge branch 'master' into fix_getenv_uwp 2023-04-04 12:53:29 +02:00
Kim Kulling 4e34e77226
Merge pull request #5025 from inhosens/master
FBX import: Fix camera rotation
2023-04-04 12:51:08 +02:00
Steve M f68f1f6bf2
Merge branch 'master' into create-local-textures 2023-04-03 16:50:43 -07:00
Suhajda Tamás 9d76493ad8 Fix mLookAt with pretransformed vertices
mLookAt is a position vector inside the nodes reference frame, not a direction vector, so translation should be applied to it.
2023-04-04 00:06:09 +02:00
Kim Kulling a259277498
Merge branch 'master' into master 2023-04-03 23:54:28 +02:00
Kim Kulling f2efcd77bc
Merge pull request #5003 from FlorianBorn71/MemoryOptimizationForGLTFWithSharedAttr
GLTF Importer: Build a list of the actual vertices so it works well with shared attribute lists
2023-04-03 23:39:21 +02:00
Suhajda Tamás 9915e875bf glTF2: Fix incorrect camera position 2023-04-03 23:35:04 +02:00
Kim Kulling 8aa959fa19
Merge branch 'master' into MemoryOptimizationForGLTFWithSharedAttr 2023-04-03 20:48:51 +02:00
Kim Kulling ca79916048
Merge pull request #5040 from Jackie9527/msvc-clang-nested-anon-types
Fix warning related to nested-anon-types.
2023-04-03 20:16:14 +02:00
Kim Kulling d6885d4025
Merge branch 'master' into msvc-clang-nested-anon-types 2023-04-03 19:59:59 +02:00
Kim Kulling 19ff57a6c3
Merge branch 'master' into MemoryOptimizationForGLTFWithSharedAttr 2023-04-03 11:28:10 +02:00
Kim Kulling df21b6799f
Merge pull request #5053 from aniongithub/fix-loadfbxasserterror
Fix Issue #4486 using the fix described by @jianliang79
2023-04-03 09:14:31 +02:00
Ani ae121bfbb0
Merge branch 'master' into fix-loadfbxasserterror 2023-04-02 22:13:33 -07:00
Steve M 70aceb203a
Merge branch 'master' into create-local-textures 2023-04-02 19:31:57 -07:00
liedtkeInTUM 97e31a895e
Merge branch 'master' into fix_getenv_uwp 2023-04-01 23:38:48 +02:00
Kim Kulling acdb6684ba
Merge pull request #5052 from Jackie9527/msvc-clang-shadow-field-in-constructor
Remove unused -Wno-shadow-field-in-constructor.
2023-04-01 20:45:43 +02:00
Steve M 9c5ab67b64 Replace provisional image with original historical image 2023-04-01 09:20:36 -07:00
Jackie9527 dacaebc078 Remove unused -Wno-shadow-field-in-constructor.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 23:49:22 +08:00
Steve M 6d668382ec Fix model broken in commit a8a1ca9
Restored broken binary from 4bbc033 (5 Mar 2009)
2023-03-31 23:20:24 -07:00
Steve M e1678f11e6 Replace relative paths with local assets/textures
Relative paths can easily contain typos, lower/upper case errors, and in general are brittle
2023-03-31 22:17:50 -07:00
Jackie9527 20b2f857c5 Remove -Wno-unreachable-code
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 13:07:30 +08:00
Jackie9527 4d2512dcae Fix warning related to unreachable-code.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 13:03:02 +08:00
Jackie9527 04066ece8e Fix warning related to unreachable-code.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 13:02:04 +08:00
Jackie9527 1dcb5da1cd Fix warning related to unreachable-code.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 13:01:22 +08:00
Jackie9527 94067994cc Fix warning related to format-non-iso.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 12:29:42 +08:00
Jackie9527 6b54761310 Fix warning related to nested-anon-types.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 10:30:10 +08:00
Sven Liedtke 5cf9d3abf7 std::getenv is not supported using uwp 2023-04-01 01:02:21 +02:00
Kim Kulling 7c64b6c599
Merge pull request #4993 from Jackie9527/clang-cl-15.0.1-support
Add build options to fix issues with clang 15.
2023-03-31 18:28:12 +02:00