Commit graph

663 commits

Author SHA1 Message Date
HarrievG
1cd57dce1d [!] dont crash when trying to load an animation from and GLB does not match last loaded model glb 2022-12-22 15:27:15 +01:00
HarrievG
0e42fbba93 [!] Root motion transfer fixes. 2022-12-22 15:27:15 +01:00
HarrievG
34d616b08c GLTF model import improvements
- Added rename node option
- Added option for root motion transferal
- Fixed re-orient option parsing
- Fixed last(?) bug in orientation frame conversion
2022-12-22 15:27:15 +01:00
HarrievG
0829898cb4 [!] Fixed loading animated file exclusive models
[!] Fixed reloading of models with a commandline (anims: todo)
2022-12-22 15:27:15 +01:00
HarrievG
8c18d58c49 [+] Added -reorient option to gltf model import 2022-12-22 15:27:14 +01:00
HarrievG
0cf9dac1ef A-Style
# Conflicts:
#	neo/d3xp/Camera.cpp
#	neo/d3xp/Camera.h
2022-12-22 15:27:14 +01:00
HarrievG
31d79dfd36 [~] idAssert -> assert
[+] addOrigin model import option

# Conflicts:
#	neo/renderer/Model_gltf.cpp
2022-12-22 15:25:01 +01:00
Robert Beckebans
f1d7f2ff9e Fixed compile errors 2022-11-11 17:34:38 +01:00
Robert Beckebans
ad78435446 Merge branch '721-gltf2-cameras' into 705-gltf2-import-options 2022-11-11 17:00:47 +01:00
Robert Beckebans
6689d60b74 Passed idImportOptions along the animations loader code 2022-11-11 16:59:36 +01:00
Robert Beckebans
0d5d947f17 Apply import options to glTF2 models 2022-11-11 16:59:36 +01:00
Robert Beckebans
6cbb205ece Hook idImportOptions into idRenderModel*::InitFromFile() 2022-11-11 16:59:36 +01:00
Robert Beckebans
81d70dc5d8 Parse idImportOptions for model declarations 2022-11-11 16:59:36 +01:00
Robert Beckebans
e499514fea Little cleanup of the glTF2 code 2022-11-11 16:59:35 +01:00
HarrievG
3d366ba386 [!] Fixed runtime reloading for gltf models
[!] Fixed timestamp check for static models
2022-11-11 13:11:21 +01:00
Robert Beckebans
822ff7d860 Astyle 2022-10-26 10:59:22 +02:00
Richard Tollerton
bc8882b8a2 Cinematic.cpp: Revert removal of void from METHODDEF(void), etc.
In fd6c589d, all instances of (void) were replaced by (). However, the libjpeg
defines `METHODDEF`, `LOCAL`, `GLOBAL`, and `EXTERN` (see `jmorecfg.h`) are
occasionally used in code as if they are functions:

```
	METHODDEF(void)
	METHODDEF void
init_source( j_decompress_ptr cinfo )
```

fd6c589d therefore breaks these builds when `USE_NEWER_JPEG` is defined, because
several function definitions are missing return types.
2022-10-23 17:49:56 -05:00
Richard Tollerton
a7322c1131 Add various move constructors
Commit 93b8564b requires move constructors for many classes which do not
presently exist; they seem simple enough to add.

Fixes #708.
2022-10-23 17:49:54 -05:00
Robert Beckebans
0119d754b9
Merge pull request #659 from SRSaunders/vulkan211-fixes
Enable VK_KHR_portability_enumeration for macOS on Vulkan SDK 1.3.211.0 or later
2022-10-19 18:17:30 +02:00
HarrievG
67022836c4 ~ Fixed pose root root matrix correction.
- Removed single bone orientation hack
- removed unused code.
2022-10-11 20:48:03 +02:00
HarrievG
28730655a1 Fixed boneless TRS animations 2022-09-26 12:05:50 +02:00
HarrievG
d8f7b72d74 Fixed multiplication order for idRenderModelGLTF::ProcessNode_r 2022-09-26 11:52:49 +02:00
Robert Beckebans
02941624f9 Repaired glTF2 animations for the Y-Up case 2022-09-26 00:31:47 +02:00
Robert Beckebans
868fd1dce3 .glb models require the +Y-Up option to be turned off 2022-09-25 14:16:29 +02:00
Robert Beckebans
5d5de028ea Improved Quake .map converter to get Makkon's samplemaps working 2022-09-11 15:34:29 +02:00
Robert Beckebans
de6ab9d31f Removed #define JPEG_INTERNALS from Cinematic.cpp. Closes #684 2022-09-05 22:29:53 +02:00
Robert Beckebans
30b394bd3f Fixed inconsistent override warnings 2022-09-05 21:57:17 +02:00
Robert Beckebans
3c1bcc2153 Fixed Linux compile issues caused by glTF2 code 2022-09-05 19:29:11 +02:00
Robert Beckebans
b775de0e99 Merge branch 'master' into 679-gltf-map-support2 2022-09-04 13:41:47 +02:00
Robert Beckebans
4258367037 Fixed glTF2 bounding box calculation if GPU skinning is used 2022-08-16 20:35:52 +02:00
Robert Beckebans
88b02efd6d Fixed camera clipping with static glTF2 models 2022-08-16 10:41:00 +02:00
Robert Beckebans
5f43800b02 Merge remote-tracking branch 'HarrievG/679-gltf-map-support2' into 679-gltf-map-support2 2022-08-16 09:21:12 +02:00
HarrievG
1d354e995f - fix for file exclusive gltf models 2022-08-15 16:13:04 +02:00
Robert Beckebans
c52e4c345d ( ) -> () 2022-08-15 12:23:38 +02:00
Robert Beckebans
e243072f56 Merge remote-tracking branch 'origin/679-gltf-map-support2' into 679-gltf-map-support2 2022-08-15 11:16:02 +02:00
HarrievG
457e0e143b - Fixed missing surfaces in multi surface/texture gltf models. 2022-08-14 20:02:06 +02:00
HarrievG
486315c7e7 - removed global gltfParser so it cannot be used as an singleton anymore.
- fixed destruction and cleanup of gltfData and gltfParser
- gltfParser always fixes up skeletonID's for skins that do not have it set.
- fixed gltfData::GetAnimation to also check for duplicates taking multple targets for the same animation into account.
- several boneless animation fixes
[!] [ BUG WARNING ] Be aware -> for some reason models/meshes that use multple textures are not drawn correctly; ATM onlt single texure users are correct.
2022-08-14 13:43:12 +02:00
HarrievG
ecaf297ef6 Allow for multple GLTF/GLB to be loaded at the same time. 2022-08-07 15:56:46 +02:00
HarrievG
d0ff0a7f64 Dont load GLTF data when loading bglb/bgltf 2022-08-07 15:05:14 +02:00
HarrievG
8e889c1804 Fixed non Simdpath for idRenderModelGLTF::UpdateSurface 2022-08-06 20:43:25 +02:00
HarrievG
2ef1fe3ce2 idRenderModelGLTF::NearestJoint 2022-08-04 01:40:59 +02:00
HarrievG
b41411f8d0 Fixed axis conversion for gltfModels with animated translations 2022-08-03 21:44:42 +02:00
HarrievG
b6bccf19d0 Fixed gltf animation bounds. 2022-08-01 22:05:13 +02:00
HarrievG
c5f8af3b66 corrected sw skinning bounds 2022-07-31 21:37:42 +02:00
HarrievG
e56f696c9c - Skinned / animated GLTF models 2022-07-31 12:13:07 +02:00
HarrievG
edf657f50d - Initial GLTF Animation Implementation. For now only supports boneless TRS animations without scale.
![only works with r_UseGpuSkinning 0]!
- Writes bmd5anim for each animation. its not perfect yet but, rot + trans looks good.
- Model tag supports gltf Animations. Indexed the same way as meshes.
- Enabled weights and bone index in ConvertFromMeshGltf
2022-07-10 21:09:25 +02:00
GoGo de Sica
c2b2598ced
Fix include in OpenGL RenderBackend 2022-07-04 00:55:57 +02:00
Robert Beckebans
ffd18bf9d4 Fixed duplication of glTF models 2022-06-26 13:24:55 +02:00
Robert Beckebans
5446ae31e4 Fixed binaryzation of .glb models that don't have 'models' as main scene 2022-06-26 12:23:21 +02:00
HarrievG
833f112f4e - gltfMesh support for mesh tag in idDeclModelDef 2022-06-25 15:05:59 +02:00