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
9486762693
Merge branch 'main' into SP3-22-AnimationController
2023-02-27 15:54:48 +08:00
4c7d06452e
viewport changed
2023-02-27 15:25:01 +08:00
f6db65ddf4
Particles WIP
2023-02-27 15:14:32 +08:00
0eae325b5f
Merge pull request #369 from SHADE-DP/SP3-20-UI-System
...
Added Sliders. Added Level Select, How To Play,. Credits Options Canvases layout for in main menu. Added Tweening Manager(Script)
2023-02-27 12:00:24 +08:00
29f1edb9e8
Merge pull request #368 from SHADE-DP/SP3-4-Editor
...
Added display of editor camera position
2023-02-27 11:59:58 +08:00
90763ded71
Change Canvas Button Script
2023-02-27 08:08:04 +08:00
eb3d8b6b8b
Slider done, Slider Shader bugged
2023-02-27 05:42:54 +08:00
55953e0f08
Merge branch 'main' into PlayerController
2023-02-27 00:41:35 +08:00
dabc94a845
editor cam pos display as requested
2023-02-26 23:26:24 +08:00
7c21544d69
Merge branch 'main' into SP3-4-Editor
2023-02-26 23:22:36 +08:00
31491d06ef
Merge branch 'main' into SP3-8-serialization
2023-02-26 22:44:57 +08:00
ff2b9b4af3
Rudimentary Prefab (no resolution)
...
Warning Fixes
2023-02-26 22:44:39 +08:00
234da235b5
Merge branch 'main' into SP3-141-Camera-System
2023-02-26 02:21:30 +08:00
c8baff878e
Added offset calculation to camera get position
2023-02-26 02:20:57 +08:00
2878c840c5
Merge remote-tracking branch 'origin/SP3-4-Editor' into SP3-4-Editor
2023-02-25 23:37:22 +08:00
027a2c490b
Added elapsedTime and shiny Highlight along with Level 3 asset and scene
2023-02-25 21:56:49 +08:00
fe27f8752b
Particle system WIP
2023-02-24 21:46:01 +08:00
a27b3fb80e
fix vulkan red line
2023-02-24 21:10:45 +08:00
acc548678e
Merge branch 'main' into PlayerController
2023-02-24 21:10:10 +08:00
38c6cb6fed
Prefab WIP
...
Added component status
2023-02-24 20:34:49 +08:00
42f4c1c75e
Aspect Ratio WIP
2023-02-24 20:21:09 +08:00
dfbd1d027c
Merge branch 'main' into PlayerController
2023-02-24 18:04:26 +08:00
d85382a06d
Merge pull request #363 from SHADE-DP/SP3-1-Rendering
...
Implemented scanline and silhouette effect
2023-02-24 17:20:45 +08:00
18f6720055
Merge branch 'main' into SP3-1-Rendering
2023-02-24 17:18:40 +08:00
b017618373
Merge branch 'main' into SP3-141-Camera-System
2023-02-24 16:32:01 +08:00
4690fa5f91
GetMainCamera exposed to scripts.
2023-02-24 16:31:53 +08:00
6045214b13
Camera width to resize with view port
2023-02-24 15:35:02 +08:00
bbc21670c3
Merge pull request #361 from SHADE-DP/SP3-141-Camera-System
...
Change AR to be shared and stored in camera system
2023-02-24 15:12:17 +08:00
c774071b35
Merge branch 'main' into SP3-141-Camera-System
2023-02-24 15:05:40 +08:00
546ac9bb00
Gets the resource manager to pre-Load the textures when we set button texture asset ids
2023-02-24 15:02:41 +08:00
7eac238226
Accounted for subpass input descriptors
...
Silhouette shader is working
2023-02-24 11:47:58 +08:00
6faa4e676b
Updated shader for scanline (needs refining)
...
Shader hot reloading is working
2023-02-24 08:27:04 +08:00
86b662c7dc
Merge branch 'main' into PlayerController
2023-02-23 19:45:38 +08:00
79433bcba2
Merge pull request #359 from SHADE-DP/SP3-20-UI-System
...
Moved UIRoutines call order. Call FinalizeChanges. Fixed UI Button Events.
2023-02-23 14:00:50 +08:00
5d3e755b9b
Reload of recompiled data
2023-02-23 13:49:21 +08:00
c4db16bb95
Merge branch 'main' into SP3-20-UI-System
2023-02-23 13:44:12 +08:00
69f2e678df
re-enabled scene change and disabled debug logs
2023-02-23 13:42:22 +08:00
64be53bad3
Fixed button events only working once
2023-02-23 13:39:09 +08:00
a391d9373e
WIP
2023-02-23 13:35:46 +08:00
d7846082a3
Fixed incorrect managed functions being called for new button events
2023-02-23 13:32:00 +08:00
1b865b129b
Added finalizeChanges call and debug logs for hover enter
2023-02-23 12:50:42 +08:00
dbe9b4d133
Controller, Bindings and Mouse Centre via C#
2023-02-22 23:50:39 +08:00
ecc88dc142
Fleshed out SHAnimationController more
2023-02-22 23:45:42 +08:00
913241c73a
Merge branch 'main' into SP3-22-AnimationController
2023-02-22 21:49:45 +08:00
bea179fb0f
Added script mappings for new button events
2023-02-22 21:49:10 +08:00
4dd496a6e8
Auto stash before merge of "SP3-1-Rendering" and "origin/SP3-1-Rendering"
...
WIP Hot reload
2023-02-22 19:51:50 +08:00
ff76704a86
New internal function in asset manager to get asset ID from name of compiled asset
2023-02-22 19:48:49 +08:00
8e9854a130
Check for existing asset meta in browser file before sendin asset id
2023-02-22 16:49:21 +08:00
5623115e29
Added asset id into compile function to facilitate event sending
2023-02-22 16:43:49 +08:00
f7bb8606be
Shader, text, asset manager events and generic data desc sets
...
- Made shader for shiniy effect (half done)
- Text objects in scene now use a UI component for better scaling
- Asset manager now creates an event for compilation of assets
- Descriptor for generic data is implemented
2023-02-22 16:39:21 +08:00
bc87fa3ae0
Merge branch 'main' into SP3-10-input-management
2023-02-22 15:16:05 +08:00
0e572d7f89
progress
2023-02-22 15:15:38 +08:00
fbd0035ade
Merge branch 'main' into SP3-4-Editor
2023-02-21 22:17:20 +08:00
8d10c48645
Bug fixes and WIP for alpha
2023-02-21 19:31:50 +08:00
269d5ffc15
Merge pull request #356 from SHADE-DP/SP3-20-UI-System
...
Added 3 button event. Changed hovered and clicked boolean to be stored in UIComponent instead. Fixed Canvas Scaling matrix.
2023-02-21 15:49:27 +08:00
6b6bbc6ac5
Camera AR now stored in system instead of camera component.
2023-02-21 11:37:09 +08:00
49692e5c37
Text Rendering now checks for UI Component
2023-02-21 11:16:44 +08:00
a3112f9c60
Fixed Canvas Scaler to keep AR of the UI Elements
2023-02-21 10:48:07 +08:00
51909071e6
Change isHovered and isClicked to be stored in UIComponent instead and made a helper function to check for clicks and hovered
2023-02-21 10:09:58 +08:00
9cc318cf27
Merge branch 'main' into SP3-10-input-management
2023-02-21 09:55:28 +08:00
fe64844c4e
Mouse Centering
2023-02-21 09:55:14 +08:00
febe22e487
Added new button events
2023-02-21 09:52:23 +08:00
09d88b5a70
small bug fixes for text and serialization and added game pause
2023-02-20 19:53:22 +08:00
f2e9d3b349
Merge branch 'main' into PlayerController
2023-02-20 19:07:56 +08:00
c85298db88
Added initial stubs for SHAnimationController
2023-02-20 16:55:08 +08:00
c9e9a30c3f
Exposed FOV to editor. Adjust AR for game camera
2023-02-20 14:52:01 +08:00
33a6fac7c9
Merge branch 'main' into SP3-141-Camera-System
2023-02-20 14:39:14 +08:00
debdba183e
removed some debug code
2023-02-20 14:39:10 +08:00
7b500d0cac
Merge branch 'main' into SP3-1-Rendering
2023-02-20 14:28:54 +08:00
15df08ef67
Implemented events for screen resize
2023-02-20 14:28:23 +08:00
d754a0b5c3
added targetOffSet to camera position
2023-02-18 23:43:43 +08:00
916a7315da
Merge branch 'main' into SP3-6-CSharpStaticReset
2023-02-18 12:24:17 +08:00
19d81b80f6
Base files for particles
2023-02-17 18:29:44 +08:00
f1217cc20b
Trajectory Rendering WIP
...
- Trajectory rendering system is all in place. Just requires testing through the component.
- Component needs to be reflected in editor
- Shaders for trajectory rendering is also in place
2023-02-17 13:48:14 +08:00
cee45863fa
Trajectory rendering WIP
2023-02-17 00:53:45 +08:00
5acca02363
Implemented different shadow mapping technique
2023-02-15 21:34:22 +08:00
c0249531d3
Potential fix to physics collision states being incorrect
2023-02-04 15:18:15 +08:00
385b34fea4
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2023-02-04 14:20:25 +08:00
Xiao Qi