ab2f3e395b
Animation clips now load the correct raw animation
2023-03-09 14:47:48 +08:00
ac971f0945
Fixed infinite loop and incorrect playback setting for Animator
2023-03-09 14:46:06 +08:00
3d6bfaa119
Write raw anim asset id into anim clips
2023-03-09 13:46:39 +08:00
07a2eb2f64
Fixed not opening the correct Visual Studio version for scripts
2023-03-09 13:18:09 +08:00
e816df28a8
Clips can now be dragged and dropped into the animation controller editor
2023-03-09 12:07:16 +08:00
e3a552f983
Wrote scripting interface for trajectory rendering
2023-03-09 10:45:57 +08:00
2c8eca4125
Added facility to create new animation clip container asset.
...
Changed raw anim editor to open when double clicking anim container asset/after creating new anim container asset
Changed new clip fields from slider to unsigned int input
2023-03-09 01:51:54 +08:00
7df9897598
Fixed bug in binary loader where result from load was always nullptr, changed pointer to pointer reference
2023-03-09 01:50:26 +08:00
2692db1ed3
Changed function to return pointer type instead of std::optional
2023-03-09 01:49:43 +08:00
8670fe5fa9
Added text RawAnimInspector for when no animations are selected
2023-03-08 22:03:08 +08:00
4012eb97ba
Auto stash before merge of "SP3-1-Rendering" and "origin/main"
...
Solved shadow bugs and WIP trajectory
2023-03-08 21:23:03 +08:00
57a8e385e4
Added editor field for Animation Controller of the Animator component in the inspector
2023-03-08 20:58:21 +08:00
69ac4d1219
Merge branch 'main' into SP3-22-AnimationController
2023-03-08 20:00:58 +08:00
35b60a24e4
Added variable to control number of simulation steps for the SimulateBody method
2023-03-08 19:06:57 +08:00
79fe9ec43d
Merge branch 'main' into SP3-22-AnimationController
...
# Conflicts:
# SHADE_Engine/src/Animation/SHAnimationClip.cpp
# SHADE_Engine/src/Animation/SHAnimationClip.h
# SHADE_Engine/src/Animation/SHAnimatorComponent.cpp
# SHADE_Engine/src/Animation/SHAnimatorComponent.h
# SHADE_Engine/src/Assets/Asset Types/Models/SHAnimationAsset.h
# SHADE_Engine/src/Assets/SHAssetMacros.h
# SHADE_Engine/src/Assets/SHAssetManager.cpp
2023-03-08 15:54:32 +08:00
1c12a05837
Added C# interface for animator, animation clip and animation controller
2023-03-08 15:29:29 +08:00
441d2fe7a4
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-08 14:15:12 +08:00
6f8387a5ea
Fixed bug where gravity scales were initialised to NaN
2023-03-08 12:59:51 +08:00
2bba48b09f
Accounted for deletion of lights
...
- Not entirely urgent, but removal of resources from render graph fails. Need a valid check of handles.
2023-03-08 10:02:51 +08:00
64e60a5114
Added editor functionality for lights to enable shadows
2023-03-08 09:38:07 +08:00
6383e7d559
Merge branch 'SP3-22-AnimationController' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-22-AnimationController
2023-03-08 00:24:45 +08:00
ea3b851ed0
Merge branch 'main' into SP3-13-Assets-Manager
2023-03-07 23:01:21 +08:00
615a5796f0
Added line to add subasset meta to parent asset
...
Rewrote loading of all animation clips into resource manager
2023-03-07 22:51:40 +08:00
73af61d2cb
Merge branch 'SP3-22-AnimationController' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-22-AnimationController
2023-03-07 22:34:36 +08:00
e285d5e6b2
Added functions for setting animation parameters
2023-03-07 22:34:32 +08:00
4d64dd34d8
Merge pull request #403 from SHADE-DP/AnimationClipAsset
...
Reimplemented animation clip container assets
2023-03-07 22:10:34 +08:00
3cc949bb7e
Animation container redefinition
2023-03-07 22:07:38 +08:00
07100de950
Added recognition for animation clip container as a file
...
Added functions to create new sub asset for animation clips
Added recognition for animation clip containers when creating new assets
2023-03-07 22:06:42 +08:00
eae6f6399b
Changed implementation of binary loader to load animation clip containers instead of individual animation clips
2023-03-07 22:05:33 +08:00
4144fe0d4a
Merge branch 'main' into SP3-22-AnimationController
...
# Conflicts:
# SHADE_Application/src/Application/SBApplication.cpp
# SHADE_Engine/src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.cpp
2023-03-07 20:30:47 +08:00
dc32c5c9aa
Implemented saving of animation controller from editor
2023-03-07 20:29:57 +08:00
259fca6443
Merge pull request #402 from SHADE-DP/SP3-2-Physics
...
Added Capsule Collider, AABB Query & SimulateBody for Trajectory path prediction
2023-03-07 20:11:21 +08:00
ff27925f2d
Added ability to reset state, delete links and nodes
2023-03-07 20:05:37 +08:00
6d01bd0b78
Added ability to set starting node
2023-03-07 19:00:10 +08:00
e3fb14d698
Merge branch 'main' into SP3-2-Physics
2023-03-07 18:48:31 +08:00
c36345c60c
Added a simulate body method
...
Raycast effectiveness is untested, but simulation logic matches standard 3D rigid body simulation methods
2023-03-07 18:48:06 +08:00
50dafa555a
Fixed conversion warnings
2023-03-07 18:46:36 +08:00
ff4c294313
Added dynamic flags for render graph nodes and light comp shadow flags
2023-03-07 18:43:59 +08:00
e1fa843511
Merge branch 'main' into SP3-129-AudioSystem
2023-03-07 18:10:52 +08:00
5ba50cfbcc
Fix for 3d audio (listener up vec was wrong)
2023-03-07 17:57:48 +08:00
b6b2c75fc3
Implemented Shadows (f0kin finally)
2023-03-07 17:39:51 +08:00
493f2c3cfe
Fixed parameters panel for animation controller editor and added menu bar
2023-03-07 16:38:00 +08:00
cc2afbcf9f
Fixed duplicate collision calls
2023-03-07 14:13:06 +08:00
87d9158f75
Added 3d right handed flag for core init.
...
Added profile flags for debug configuration.
Added handling of software format and output type (TO BE TESTED)
2023-03-07 10:35:45 +08:00
e42a5c68f3
Settings
2023-03-07 10:08:30 +08:00
2147c2c34b
Fixed capsule debug draw
...
Height is distance between centers
2023-03-07 05:00:43 +08:00
2197a3bcb9
Added capsule collider
...
Debug draw is a bit wonky. Further polish needed,
2023-03-07 04:51:58 +08:00
33ccdccd8a
Expanded Physics Settings
...
Editor Menu needs to be resized...idgi...
2023-03-07 03:23:40 +08:00
6911ad0d2b
Fixed bug with extensions count, resulting in regeneration of bank metas every time
2023-03-07 01:31:23 +08:00
9855d7e245
Total time and tickers per second is now auto calculated in SHAnimationClip
2023-03-06 19:42:40 +08:00
43fd04dd5e
Modified SHAnimationClip and SHAnimatorComponent to use frame timestamps instead of indices
2023-03-06 18:59:04 +08:00
e89f5df35f
Added physics constants
2023-03-06 18:17:13 +08:00
8506298fd3
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2023-03-06 17:56:52 +08:00
78a3bf4575
Added function to test an AABB against the physics world
...
Update React Dependency
2023-03-06 17:44:58 +08:00
550b99b3d7
Added a generic AABB class
2023-03-06 17:44:40 +08:00
f861304f5e
Testing in progress for skinning test
2023-03-06 17:34:38 +08:00
9a8114f5dd
Added work in progress animation parameter panel
2023-03-06 16:44:34 +08:00
d16f807a8a
Added links properties panel
2023-03-06 16:17:05 +08:00
becff4824f
Camera without editor compile fix
2023-03-06 15:38:42 +08:00
0b803d0bd1
Merge branch 'main' into SP3-2-Physics
2023-03-06 13:31:48 +08:00
f8cc1fe2dc
Size of animation controller editor is now adjustable
2023-03-06 11:47:30 +08:00
826df94c96
Shadows WIP
2023-03-06 00:02:06 +08:00
8d6ef16625
Hot fix
...
Pause menu fix
Offing gameplay UI on preview level
clipping of mouse
change some keydown to keyup
2023-03-05 23:48:25 +08:00
d59f4e88c2
Added gravity scale
...
Update react dependency
2023-03-05 23:39:33 +08:00
9866c6e307
Handle mouse center/visible when editor play/pause/stop
2023-03-05 21:33:05 +08:00
77e3fe376b
Handle mouse center/visible when editor play/pause/stop
2023-03-05 21:24:16 +08:00
0e2b767263
Fix for button w wrong textures (remove reflection of currentTexture)
2023-03-05 20:23:52 +08:00
bf5472e2c6
stuff dont ask me
2023-03-05 15:35:57 +08:00
8b24d7e32b
re-added the button texture check before setting texture
2023-03-05 13:58:07 +08:00
76e794a543
Merge branch 'main' into SP3-20-UI-System
2023-03-05 13:56:29 +08:00
4bc568899d
Fix Button click state not resetting if the release event happen when button is inactive
2023-03-05 13:55:51 +08:00
cedd10c188
Merge branch 'main' into SP3-6-c-scripting
2023-03-05 12:17:31 +08:00
24f09ab537
Fixed issue with ImGui corrupting strings passed to managed data.
2023-03-05 12:17:19 +08:00
ef0ff801e4
Camera arm target offset rotation fix
2023-03-05 10:55:39 +08:00
816c16324c
WIP Commit, Node and Joint indexing
2023-03-05 04:25:30 +08:00
066d060b29
Split main animation controller panel into 3 segments
2023-03-05 01:45:26 +08:00
32adb0c540
Reworked how AnimationControllerEditor works
2023-03-05 01:08:39 +08:00
13f28d6bdb
Fixed shiny highlight shaders
2023-03-04 15:55:04 +08:00
d4081a7e09
Tranpose Inverse Bind Matrix
...
WIP, building transform matrix not working
2023-03-04 03:20:01 +08:00
17bb7a08eb
Fixed render to swapchain errors
2023-03-04 01:01:26 +08:00
ce41e975d0
Merge branch 'main' into SP3-1-Rendering
2023-03-04 00:52:05 +08:00
b93a08fa90
Fixed ImGui crash with SHRawAnimationInspector
2023-03-04 00:48:10 +08:00
56693565f4
WIP Load and test animations
2023-03-04 00:43:31 +08:00
166e13a339
Shadows WIP
...
- Light direction in 2nd level changed
2023-03-03 22:01:34 +08:00
97605cc8fe
Added preliminary implementation of animation controller connection attributes
2023-03-03 22:00:56 +08:00
41784d4c04
Fixed animation clips list for Raw Animation Inspector
2023-03-03 21:28:28 +08:00
96d73ca626
added ifdef check for editor
2023-03-03 20:06:58 +08:00
beeeae99ca
SHRawAnimInspector can now generate incomplete animation clips
2023-03-03 18:53:59 +08:00
421016f4fc
Merge pull request #385 from SHADE-DP/SP3-129-AudioSystem
...
Add Set audio param with label functionality
2023-03-03 18:30:17 +08:00
dfc2a68dde
Add Set audio param with label functionality
2023-03-03 18:13:35 +08:00
0741163774
Merge remote-tracking branch 'origin/SP3-22-AnimationController' into SP3-22-AnimationController
2023-03-03 17:23:18 +08:00
184fd4f459
[NOT TESTED] Animation Clip asset reading/writing as asset file into binary implemented
2023-03-03 17:16:23 +08:00
f9ae0c10ce
Modified SHAnimator and SHRig to use new model formats
2023-03-03 17:11:33 +08:00
9eb40d5928
Fix showcursor
2023-03-03 16:52:43 +08:00
c736967d1c
Merge branch 'main' into SP3-22-AnimationController
2023-03-02 19:08:20 +08:00
69fa0d4da0
Fixed SHRawAnimInspector warnings
2023-03-02 17:44:28 +08:00
97db3b1021
Merge branch 'main' into PlayerController
2023-03-02 17:33:42 +08:00
6779f48b5a
Fixed typo
2023-03-02 17:33:02 +08:00
8c74ec85d3
Done with level preview
2023-03-02 17:33:02 +08:00
65d57e96b3
Merge branch 'main' into SP3-22-AnimationController
...
# Conflicts:
# SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
2023-03-02 16:55:13 +08:00
3a14f0a887
Added SHRawAnimInspector
2023-03-02 16:54:34 +08:00
f083147806
WIP Retrofit new data into existing structure
2023-03-02 16:35:30 +08:00
61a877cee1
Fixed bug texture loading
...
- During mipmap transfer to GPU, height would sometimes be 0. Fixed it using std::max
2023-03-02 16:04:22 +08:00
6b42d78f16
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-02 15:49:36 +08:00
e05e21ec5a
Added text size for text renderable component
2023-03-02 15:49:28 +08:00
e2ef32f130
Fixed Trajectory Rendering
2023-03-02 15:29:24 +08:00
62fa2ba41a
Merge branch 'main' into SP3-22-AnimationController
2023-03-02 13:03:33 +08:00
4124c74306
Merge pull request #381 from SHADE-DP/SP3-1-Rendering
...
Implemented serialization for text color and trajectory rendering
2023-03-02 12:47:35 +08:00
38afe39447
Merge pull request #380 from SHADE-DP/SP3-20-UI-System
...
Added TweenThreadVec3. Updated UI elements to use new textures and fonts. Gameplay UI WIP
2023-03-02 12:46:11 +08:00
848123c138
Bug fix
2023-03-02 11:53:52 +08:00
1e59b6436c
Merge branch 'main' into SP3-1-Rendering
2023-03-02 11:36:35 +08:00
30923389ae
Merge branch 'main' into SP3-20-UI-System
2023-03-02 10:23:09 +08:00
87c04436b3
Added scripting interface and serialization for Trajectory comp
2023-03-02 09:08:20 +08:00
9dd01f5fa1
Replaced How to play screen and credits placeholder
2023-03-02 03:01:24 +08:00
5cc2e26de6
Rotates target offset based on camera arm's rotation
2023-03-02 02:06:25 +08:00
dfb53bf290
Added WIP AnimationControllerEditor
2023-03-01 23:49:30 +08:00
af944b3083
UNTESTED: Loading of new format for animations and rigs
2023-03-01 23:13:02 +08:00
d21f9d6c4b
Added functions for adding transitions and parameters to an AnimationController
2023-03-01 22:10:09 +08:00
e878b7b65a
Added implementation of SHAnimationController Transition logic
2023-03-01 21:55:26 +08:00
f118c1c2ca
WIP Load new model asset structure
2023-03-01 17:56:37 +08:00
98140aa797
Added scripting interface for cursor visible.
...
Fixed collider offset undo/redo
Double click object to look at object
Display editor cam pitch/yaw/roll
2023-03-01 17:06:53 +08:00
bc17479284
Merge branch 'main' into SP3-13-Assets-Manager
2023-03-01 16:33:30 +08:00
4b37be6075
Made text color serialized
2023-03-01 16:02:44 +08:00
2679d12afb
Merge branch 'main' into SP3-22-AnimationController
2023-03-01 14:02:28 +08:00
e44e961e14
Particles WIP
2023-03-01 10:06:09 +08:00
77722aa560
renamed some files
2023-03-01 08:58:16 +08:00
2e7bfd8b28
Merge branch 'main' into SP3-1-Rendering
2023-03-01 08:56:45 +08:00
e97f5747cb
Modified SHAnimatorComponent to support manual and animation controller modes. Fleshed out SHAnimationController. Added SHAnimControllerAsset stub.
2023-03-01 01:30:34 +08:00
bd9349eae7
FRC fix, stealfood popup almost done and reset dt when load
2023-02-28 21:42:05 +08:00
0da61aa842
Fixed text rendering rendering last
2023-02-28 21:30:09 +08:00
7f13462db7
GetGraphicsPipeline now takes in a subpass (thanks KW)
...
- Fixed blending issues in pipeline
2023-02-28 19:47:52 +08:00
36af939c67
Added reworked AnimationClip and SHAnimClipAsset
2023-02-28 19:19:06 +08:00
04c19fb586
Merge branch 'main' into PlayerController
2023-02-28 19:13:11 +08:00
ef268bc9e5
Drag drop prefab onto entity (NON UNDO/REDO ACTION for now)
2023-02-28 16:01:52 +08:00
52ba54a82a
Fix ShinyHighlight issue and updated level 3
2023-02-28 15:42:28 +08:00
7e34edecdd
safety check for scroll to after paste entity
2023-02-28 15:36:45 +08:00
5b5a9342c3
Merge branch 'main' into SP3-4-Editor
2023-02-28 15:12:31 +08:00
e75826436f
Fix editor config working scene, fix entities being copy/pasted when using copy paste in a field. Fix filtered display for asset browser
2023-02-28 15:12:17 +08:00
2ab4981a43
renamed cutscene to cutsceneIntro and adjusted level 2
2023-02-28 15:06:19 +08:00
3141902e3d
Merge branch 'main' into SP3-129-AudioSystem
2023-02-28 13:11:36 +08:00
a6659f7cbc
Remove some redundant lines
2023-02-28 13:11:21 +08:00
417f086dfa
Clean up and verified VCA Volume editing is working fine
2023-02-28 09:36:28 +08:00
50d7ad80a2
Added Spatial Audio
2023-02-27 22:02:48 +08:00
79cb0f12ae
WIP for Alpha, added material name in editor WIP for cutscene
2023-02-27 18:09:05 +08:00
33b5b84fd4
add anim clip
2023-02-27 17:04:16 +08:00
f061e8ed43
Updated comments to use SHRawAnimation instead of SHAnimationData
2023-02-27 16:52:41 +08:00
7839bd21f2
Renamed SHAnimationData to SHRawAnimation
2023-02-27 16:51:02 +08:00
cbb334d48e
Slider Text Default Value fix
2023-02-27 16:39:31 +08:00
ba22638520
Renamed SHAnimationClip to SHAnimationData
2023-02-27 16:17:36 +08:00
75295b5d6e
Merge branch 'main' into PlayerController
2023-02-27 15:58:37 +08:00
Kah Wei