Sri Sham Haran
0f7d86543f
Fix adaptive bgm not changing on alert
2023-04-02 18:16:25 +08:00
Glence
8ffca03f16
AI fix
2023-04-02 13:32:21 +08:00
XiaoQiDigipen
724f8ae2cf
Merge pull request #456 from SHADE-DP/Navigation
...
adjusted hitbox timing
2023-04-02 12:48:39 +08:00
maverickdgg
f495dfe4fd
adjusted hitbox timing
2023-04-02 12:34:47 +08:00
Glence
e5c8f4c380
fix camera jittering
2023-04-01 21:30:18 +08:00
Glence
f114a7f59a
Scene changes for level preview
2023-04-01 21:06:12 +08:00
XiaoQiDigipen
273bdfcdcc
Merge pull request #455 from SHADE-DP/PlayerController
...
bug fixes
2023-04-01 19:18:29 +08:00
Glence
9b55d69f9a
Merge branch 'main' into PlayerController
2023-04-01 19:14:38 +08:00
Glence
716087d15c
small bug fixes
2023-04-01 19:14:30 +08:00
Xiao Qi
5c79bb7f9f
Recompiled all shaders
2023-04-01 18:55:25 +08:00
XiaoQiDigipen
f54448b5eb
Merge pull request #454 from SHADE-DP/PlayerController
...
Credits and Transition done
2023-04-01 18:09:04 +08:00
Glence
51f426868e
credits and transition done
2023-04-01 18:07:22 +08:00
Glence
51867f0c5e
Merge branch 'main' into PlayerController
2023-04-01 17:23:04 +08:00
Glence
96fd8295aa
audio
2023-04-01 17:22:51 +08:00
XiaoQiDigipen
a3c1993576
Merge pull request #453 from SHADE-DP/PlayerController
...
Level changes and bug fix
2023-04-01 16:43:19 +08:00
maverickdgg
483d8c7066
Added AI Humming
2023-04-01 16:41:38 +08:00
maverickdgg
c643bd64f3
Added a space to skip
2023-04-01 16:32:56 +08:00
maverickdgg
d5240b420d
Credits scene
2023-04-01 16:31:23 +08:00
Glence
cc9b7c20c4
Merge branch 'main' into PlayerController
2023-04-01 16:30:43 +08:00
Glence
ce6288880a
other stuff
2023-04-01 16:30:33 +08:00
Glence
b2e38df969
Merge branch 'main' into PlayerController
2023-04-01 16:11:09 +08:00
XiaoQiDigipen
0dad2e9e9f
Merge pull request #451 from SHADE-DP/PlayerController
...
Scene changes
2023-04-01 16:11:08 +08:00
XiaoQiDigipen
e9d0b01972
Merge pull request #452 from SHADE-DP/Navigation
...
Added HomeOwner VO and Raccoon Caught effect
2023-04-01 16:09:44 +08:00
Glence
f70a41a9dc
transition for level is done along with bug fix
2023-04-01 16:08:32 +08:00
maverickdgg
43c6a62186
Added UI changes to other scenes
2023-04-01 15:37:12 +08:00
maverickdgg
2e20b295b5
Added Homeowner VO and small UI changes
2023-04-01 15:36:02 +08:00
Glence
3e4794cebc
Merge branch 'main' into PlayerController
2023-04-01 00:51:27 +08:00
Glence
191ed7de43
scene changes
2023-04-01 00:51:15 +08:00
XiaoQiDigipen
fada41174d
Merge pull request #450 from SHADE-DP/PlayerController
...
New features done
2023-04-01 00:42:19 +08:00
Glence
a76f2eca87
level clear done
2023-04-01 00:35:16 +08:00
Glence
5ed0219a0b
WIP for level clear
2023-03-31 18:37:28 +08:00
XiaoQiDigipen
1c6def8e70
Merge pull request #449 from SHADE-DP/Navigation
...
Added CaughtRaccoon state to AI FSM
2023-03-31 17:05:28 +08:00
maverickdgg
9d8b94a5ab
Merge branch 'main' into Navigation
2023-03-31 16:51:12 +08:00
XiaoQiDigipen
1838209ec2
Merge pull request #448 from SHADE-DP/SP3-20-UI-System
...
Gameplay and Main Menu UI Update
2023-03-31 15:07:19 +08:00
maverickdgg
c335f58702
Updated Gameplay UI
2023-03-31 15:02:31 +08:00
maverickdgg
af9e523da9
Gameplay UI Update
2023-03-31 14:50:25 +08:00
maverickdgg
6ee619d26e
Added Slider SFX
2023-03-31 14:18:09 +08:00
maverickdgg
b123cd83f8
Updated Main menu with correct slider scale and added fx for buttons
2023-03-31 14:14:44 +08:00
maverickdgg
fdc261749e
Merge branch 'main' into SP3-20-UI-System
2023-03-31 14:06:33 +08:00
XiaoQiDigipen
125f88bcac
Merge pull request #447 from SHADE-DP/SP3-1-Rendering
...
Implemented color decay, color range emission and custom VS and FS for particles
2023-03-30 19:37:33 +08:00
Brandon Mak
83955e4618
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-30 19:15:12 +08:00
Brandon Mak
4d145bbc43
Added support for custom VS and FS for particles
2023-03-30 19:15:03 +08:00
maverickdgg
c2a8c86483
Slider textures updated
2023-03-30 17:09:18 +08:00
maverickdgg
12bbce33e8
Slider WIP
2023-03-30 16:56:41 +08:00
XiaoQiDigipen
3fc69890e4
Revert "Merge pull request #446 from SHADE-DP/Fix-ResourceHubCrashOnExit"
...
This reverts commit 5ab7cbe5f3
.
2023-03-30 16:25:05 +08:00
maverickdgg
3fef57f88a
Merge branch 'Navigation' of https://github.com/SHADE-DP/SHADE_Y3 into Navigation
2023-03-30 15:37:46 +08:00
maverickdgg
3f7522d76f
Revert "Merge pull request #446 from SHADE-DP/Fix-ResourceHubCrashOnExit"
...
This reverts commit 5ab7cbe5f3
, reversing
changes made to ffc638e14b
.
2023-03-30 15:37:42 +08:00
maverickdgg
c6faeeb282
Added CaughtRaccoon State.
2023-03-30 15:26:15 +08:00
Brandon Mak
9c19d178db
Implemented color decay and color tint range support for particles
2023-03-30 15:19:54 +08:00
maverickdgg
8c5bf82aa5
Added CaughtRaccoon State.
2023-03-30 15:16:18 +08:00
XiaoQiDigipen
5ab7cbe5f3
Merge pull request #446 from SHADE-DP/Fix-ResourceHubCrashOnExit
...
"Fixed" crash from ResourceHub on engine exit
2023-03-30 14:24:21 +08:00
Brandon Mak
8aa5c681e3
Merge branch 'main' into SP3-1-Rendering
2023-03-30 14:03:36 +08:00
Kah Wei
6cf20d414e
"Fixed" crash from ResourceHub on engine exit
2023-03-29 22:20:20 +08:00
Glence
ffc638e14b
using waypoint to store startpos
2023-03-26 20:50:49 +08:00
Glence
2abb1ce697
safety checks
2023-03-26 20:38:03 +08:00
Sri Sham Haran
0f9afc2a18
Merge remote-tracking branch 'origin/main' into main
2023-03-26 20:29:41 +08:00
Sri Sham Haran
0890bd8d3f
safety checks
2023-03-26 20:29:38 +08:00
Brandon Mak
fed76708bd
Particle bug fix
2023-03-26 20:28:04 +08:00
Glence
2fd4e51cd0
added food particles and small bug fix
2023-03-26 18:10:58 +08:00
Glence
2da73f12d0
ai fix along wit new music
2023-03-26 13:27:42 +08:00
Sri Sham Haran
44bbdf5f82
Merge remote-tracking branch 'origin/main' into main
2023-03-26 10:19:29 +08:00
Sri Sham Haran
c6172be3ad
Set detected parameters in AI states
...
Increase size of score zone in level 1
2023-03-26 10:19:22 +08:00
Brandon Mak
e685f8ebaf
Quick fix for Silhouette
2023-03-26 10:18:19 +08:00
Glence
92de505af4
made egg heavier so they dont fly so far
2023-03-25 21:46:33 +08:00
maverickdgg
cf41fe245e
AI added for Level 1
2023-03-25 19:41:40 +08:00
XiaoQiDigipen
bc1167267c
Merge pull request #445 from SHADE-DP/Navigation
...
Navigation and AI merge for level 3
2023-03-25 18:49:20 +08:00
maverickdgg
e7ec24c15a
fixed AI not resetting
2023-03-25 18:47:42 +08:00
maverickdgg
89bfbf3100
WIP
2023-03-25 18:18:29 +08:00
maverickdgg
72bbc72531
Merge branch 'main' into Navigation
2023-03-25 17:29:13 +08:00
maverickdgg
6c1f0162e9
Attack hitbox change
2023-03-25 17:29:03 +08:00
Glence
270cab64e2
raccoon new tag
2023-03-25 17:28:42 +08:00
maverickdgg
2d9b7f3a5d
Merge branch 'main' into Navigation
2023-03-25 17:20:49 +08:00
maverickdgg
4a149508c9
Level 3 generated
2023-03-25 17:20:42 +08:00
Glence
ce24a1efb0
player caught bug fix
2023-03-25 17:20:35 +08:00
XiaoQiDigipen
4f84736599
Merge pull request #444 from SHADE-DP/Navigation
...
Added Attack animation, Fix Edge case for path finding. Added footsteps. Level 2 merge
2023-03-25 16:54:30 +08:00
maverickdgg
75f38f4e36
Merge branch 'main' into Navigation
2023-03-25 16:52:34 +08:00
maverickdgg
485d8cc38b
AI Level 2 merge
2023-03-25 16:52:26 +08:00
XiaoQiDigipen
3affd446f3
Merge pull request #443 from SHADE-DP/ShaderCompilerMigrate
...
Removed shader compiler to external executable
2023-03-25 16:52:02 +08:00
Xiao Qi
47a78de609
Added dependencies pull for shader compiler
2023-03-25 16:41:49 +08:00
maverickdgg
749cedfae2
Merge branch 'main' into Navigation
2023-03-25 16:13:03 +08:00
maverickdgg
c1544b0b51
Merge branch 'main' into Navigation
2023-03-25 16:12:42 +08:00
XiaoQiDigipen
cd04a93df9
Merge pull request #442 from SHADE-DP/PlayerController
...
Bug fixes
2023-03-25 16:11:55 +08:00
Glence
429674c16e
Merge branch 'main' into PlayerController
2023-03-25 16:10:01 +08:00
Glence
9b6a0d112e
remove density
2023-03-25 16:09:40 +08:00
maverickdgg
291c9d044e
Added footsteps. Fix path forward to not get stuck as much
2023-03-25 16:09:20 +08:00
Xiao Qi
f21f235980
Moved out all native shader compiler code
...
Replaced call to internal classes with system calls to external executable
2023-03-25 15:58:06 +08:00
XiaoQiDigipen
a40c59872c
Merge pull request #441 from SHADE-DP/SP3-6-c-scripting
...
Fixed issues where scripts cannot be loaded if another instance of the engine is using it
2023-03-25 15:52:51 +08:00
Glence
82fd4e2149
dont ask me
2023-03-25 15:52:22 +08:00
Kah Wei
52d27ae6bd
Fixed issues where scripts cannot be loaded if another instance of the engine is using it
2023-03-25 14:59:42 +08:00
maverickdgg
47f195e998
HomeOwner attack and animations
2023-03-25 14:51:28 +08:00
maverickdgg
ab4493822a
Fix edge case of starting node being a wall
2023-03-25 10:52:50 +08:00
XiaoQiDigipen
c28e874626
Merge pull request #440 from SHADE-DP/PlayerController
...
Scene changes and bug fixes
2023-03-25 02:44:16 +08:00
Glence
98d9683995
dont ask me
2023-03-25 02:38:56 +08:00
Glence
4f44435823
Merge branch 'main' into PlayerController
2023-03-25 00:17:10 +08:00
Glence
6ce807b878
added upwards force on jumpPad
2023-03-24 21:28:33 +08:00
Glence
33ba73c298
particle bug fix
2023-03-24 20:58:22 +08:00
Glence
ff6a49e0a7
dont ask me
2023-03-24 20:30:01 +08:00
XiaoQiDigipen
0b5f602a0e
Merge pull request #439 from SHADE-DP/Navigation
...
Saved Navigation Data as Asset and load on scene load
2023-03-24 18:05:55 +08:00
maverickdgg
af77bd4812
Saved Nav Data
2023-03-24 18:04:44 +08:00
maverickdgg
38d3040a04
Merge remote-tracking branch 'origin/NavData' into Navigation
2023-03-24 16:47:09 +08:00
maverickdgg
2382f11628
Merge branch 'main' into Navigation
2023-03-24 16:34:22 +08:00
maverickdgg
86593fd602
Merge branch 'Navigation' of https://github.com/SHADE-DP/SHADE_Y3 into Navigation
2023-03-24 16:34:14 +08:00
maverickdgg
4f7d1850af
Added editor window for generating nav data
2023-03-24 16:33:45 +08:00
XiaoQiDigipen
346f2b2fac
Merge pull request #438 from SHADE-DP/Navigation
...
Added Navigation System. Added basic AI FSM
2023-03-24 16:11:13 +08:00
XiaoQiDigipen
0892322049
Merge branch 'main' into Navigation
2023-03-24 16:10:58 +08:00
XiaoQiDigipen
6d1b793831
Merge pull request #437 from SHADE-DP/PlayerController
...
Added particle and bug fixes
2023-03-24 16:09:43 +08:00
maverickdgg
78d30cb051
fix rotation
2023-03-24 16:06:35 +08:00
maverickdgg
b32dba0694
basic FSM
2023-03-24 13:26:18 +08:00
maverickdgg
9dd180c1e6
Fix for when end point is unreachable. Find closest reachable point
2023-03-24 07:41:05 +08:00
maverickdgg
a785a972e4
Navigation Fix
2023-03-24 04:22:51 +08:00
Glence
01cbba1f1f
added item score multiplier
2023-03-23 18:20:42 +08:00
Glence
64bbc4d67a
scenes update, setActive message removed, expose Emitcount
2023-03-23 16:49:41 +08:00
Glence
5cd0de1960
Merge branch 'main' into PlayerController
2023-03-23 00:38:31 +08:00
Glence
6ddc5c35cb
did left and right foot smoke
2023-03-23 00:38:25 +08:00
maverickdgg
267793e3cc
Merge branch 'main' into Navigation
2023-03-22 23:27:32 +08:00
maverickdgg
38d7e49976
WIP
2023-03-22 23:27:30 +08:00
Brandon Mak
f4d361e1e9
Particle bug fix and raccoon dust particle fix
2023-03-22 22:52:43 +08:00
XiaoQiDigipen
744e66eeb6
Merge pull request #436 from SHADE-DP/SP3-2-Physics
...
Fixed consistency of Trajectories with different time steps
2023-03-22 22:33:23 +08:00
Diren D Bharwani
2737113a84
forces are cleared after first iteration
2023-03-22 22:25:11 +08:00
Diren D Bharwani
e02e3f5faf
silly mistake
2023-03-22 22:21:39 +08:00
Glence
364da8ea85
added ceiling fan and new AI model, WIP for player particles
2023-03-22 21:31:40 +08:00
Diren D Bharwani
ae213ed05d
Merge branch 'main' into SP3-2-Physics
2023-03-22 20:48:27 +08:00
Diren D Bharwani
31dd3390c2
Fixed consistency of simulating ghost bodies
2023-03-22 20:41:40 +08:00
maverickdgg
2724c58efb
Merge branch 'main' into Navigation
2023-03-22 19:17:03 +08:00
XiaoQiDigipen
ebfe58aa0e
Merge pull request #435 from SHADE-DP/SP3-6-c-scripting
...
Scripts csproj file is now always generated on launch to fix common script build issues
2023-03-22 14:51:02 +08:00
Kah Wei
adac12a309
Scripts csproj fileis now always generated on launch to fix common script build issues
2023-03-22 00:38:02 +08:00
Diren D Bharwani
8108d92ee2
Merge branch 'main' into SP3-2-Physics
2023-03-22 00:06:50 +08:00
Glence
179740f4bf
updated scene and added traj
2023-03-21 17:55:19 +08:00
XiaoQiDigipen
43984e8861
Merge pull request #434 from SHADE-DP/SP3-1-Rendering
...
Improved particles and tested on some objects
2023-03-21 15:30:13 +08:00
Xiao Qi
e951d275f9
Homeowner clips
2023-03-21 15:29:59 +08:00
Brandon Mak
7216c1c3dd
Particles test on level 1 food
2023-03-21 15:27:42 +08:00
XiaoQiDigipen
c6eb689e60
Merge pull request #433 from SHADE-DP/SP3-20-UI-System
...
Updated MainMenu and Gameplay UI
2023-03-21 14:48:59 +08:00
maverickdgg
9886250d19
scene merge
2023-03-21 14:47:14 +08:00
maverickdgg
cb791b6390
Merge branch 'main' into SP3-20-UI-System
2023-03-21 14:41:14 +08:00
maverickdgg
bc15721c0a
Updated Main Menu UI and gameplay UI
2023-03-21 14:40:30 +08:00
Brandon Mak
e7b128d521
Merge branch 'main' into SP3-1-Rendering
2023-03-21 14:35:32 +08:00
XiaoQiDigipen
997c115043
Merge pull request #432 from SHADE-DP/SP3-13-Assets-Manager
...
Enhanced functionality of animation clip container creation
2023-03-21 14:31:16 +08:00
Xiao Qi
c73209ef62
Imported new homeowner texture
...
Replaced homeowner gltf file and recompiled
2023-03-21 14:29:13 +08:00
Xiao Qi
b97e123573
Removed test models
...
Changed new animation container list to only show models with animations
2023-03-21 14:24:49 +08:00
Brandon Mak
712c4c24b8
Color tinting and scripting support for particles
2023-03-20 20:43:50 +08:00
XiaoQiDigipen
e387c7fe6c
Merge pull request #431 from SHADE-DP/PlayerController
...
Scene Changes and bug fixes
2023-03-20 17:42:41 +08:00
Glence
66986e179b
Merge branch 'main' into PlayerController
2023-03-20 17:34:26 +08:00
Glence
ae186e7d86
new scene changes
2023-03-20 17:05:43 +08:00
XiaoQiDigipen
600013bb82
Merge pull request #430 from SHADE-DP/SP3-1-Rendering
...
Improved particles and trajectory rendering
2023-03-20 16:55:28 +08:00
maverickdgg
e88f5c9d1c
Main Menu update
2023-03-20 16:47:34 +08:00
Brandon Mak
ba732ea64c
Fixed trajectory renderable
2023-03-20 16:38:15 +08:00
Xiao Qi
6527634839
Fixed nav data load bug
2023-03-20 16:28:08 +08:00
Xiao Qi
85a92ce871
New nav data asset type recognition
...
Binary write/load for nav data
2023-03-20 16:03:47 +08:00
maverickdgg
dddc1c5542
Merge branch 'main' into SP3-20-UI-System
2023-03-20 15:55:52 +08:00
maverickdgg
221e6bde85
Textures update
2023-03-20 15:55:50 +08:00
Xiao Qi
9fdfe17e9d
WIP Multiple root structures in animation rig
2023-03-20 15:15:52 +08:00
Brandon Mak
49106683c4
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-20 15:03:27 +08:00
Brandon Mak
9ead2b6b12
Added if statement for particle texture check
2023-03-20 15:03:18 +08:00
Xiao Qi
da8c759288
Merge remote-tracking branch 'origin/SP3-22-AnimationController' into SP3-13-Assets-Manager
2023-03-20 15:02:37 +08:00
XiaoQiDigipen
f6864419be
Merge pull request #429 from SHADE-DP/SP3-2-Physics
...
Reworked Physics Simulate Body
2023-03-20 14:56:29 +08:00
Diren D Bharwani
11878d4cc2
reworked simulate body
2023-03-20 14:53:36 +08:00
Kah Wei
1476632220
Changed animation system to support multiple roots
2023-03-20 14:53:03 +08:00
Diren D Bharwani
8e7bfa465d
Merge branch 'main' into SP3-2-Physics
2023-03-20 13:44:11 +08:00
XiaoQiDigipen
be68578ba0
Merge pull request #428 from SHADE-DP/SP3-129-AudioSystem
...
Added destroy on scene exit property of AudioClipHandles
2023-03-20 12:53:21 +08:00
SHAM-DP
c9b284fe93
Destroy on scene exit property of AudioClipHandles
2023-03-20 12:23:00 +08:00
Brandon Mak
b8a2e206f7
Added rotation and size decay support for particles
2023-03-20 12:19:27 +08:00
maverickdgg
07a702c972
initial
2023-03-20 12:17:24 +08:00
Brandon Mak
aa0c9d08e0
Updated particle shaders to include rotation
...
- Fixed compute shader hot reloading
- Vertex/Fragment shader hot reloading still broken :/
2023-03-20 10:50:18 +08:00
Brandon Mak
565126c4ba
Enabled custom update shaders for particles
2023-03-20 09:33:04 +08:00
Brandon Mak
6a1ae5fac8
SSAO shader looks better on racoon now
...
It still looks a little off but its better than before
2023-03-20 00:37:46 +08:00
Brandon Mak
468a032fad
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-19 20:11:36 +08:00
Brandon Mak
f787f2b782
particles WIP
2023-03-19 20:11:29 +08:00
Glence
7510f8aa5b
bug fixes
2023-03-17 00:31:30 +08:00
Glence
77907841b1
player floating when jumping
2023-03-16 17:14:57 +08:00
Glence
132629306e
clean up scene/scripts files and updates scene
2023-03-16 14:54:18 +08:00
Brandon Mak
2eed7428d8
Fixed emitting angles for particles
2023-03-16 10:44:03 +08:00
Brandon Mak
a08e538895
Added Texture support for particles
2023-03-16 09:34:42 +08:00
Brandon Mak
32ef4d8c55
Updated particle interfaces and added more barriers
2023-03-15 21:09:55 +08:00
Glence
e53636bc4a
tweening camera arm and picking
2023-03-15 19:39:12 +08:00
Xiao Qi
e06ef624e6
WIP Loading of multiple roots in rig
2023-03-15 19:26:13 +08:00
Glence
a633bd64d8
update scene 3 to have the bird nest and rubbish bin
2023-03-15 17:14:35 +08:00
Brandon Mak
ab2710da4b
Solved particles flickering (I hope)
...
- Good reminder how strict Vulkan is with memory accesses
2023-03-15 10:28:51 +08:00
Brandon Mak
0bfe350477
Particles WIP
2023-03-14 19:37:34 +08:00
Brandon Mak
69fc997361
Particles WIP
2023-03-14 19:34:26 +08:00
Glence
cc0116ac53
Merge branch 'main' into PlayerController
2023-03-14 17:19:26 +08:00
Glence
9218b7b993
player animation completed
2023-03-14 17:18:52 +08:00
XiaoQiDigipen
c824f2c9e4
Merge pull request #427 from SHADE-DP/SP3-22-AnimationController
...
Added extra field in animation clip container for time multiplier
2023-03-14 16:50:24 +08:00
XiaoQiDigipen
3ca463aa21
Added serialisation of extra time multiplier field in animation clip asset
...
Fixed bug when creating animation clip
2023-03-14 16:47:08 +08:00
Kah Wei
d8fe6a2f11
Merge branch 'main' into SP3-22-AnimationController
2023-03-14 14:07:48 +08:00
Kah Wei
f844079eea
Added support for changing playback speed of an animation clip
2023-03-14 14:07:46 +08:00
Brandon Mak
070f01bf67
Particles WIP
2023-03-14 10:55:53 +08:00
Brandon Mak
8fac6fd911
Particles WIP
2023-03-13 22:23:15 +08:00
Brandon Mak
2f4a316a09
Particles WIP
2023-03-13 11:41:23 +08:00
Brandon Mak
eeaa642f30
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-12 17:36:28 +08:00
Glence
d0067b09c9
Minor bug fix
...
set animation dt back to default when retry or quit
2023-03-11 21:25:56 +08:00
Xiao Qi
0be385c6bd
Fixed xcopy command for csharp project
2023-03-11 21:17:28 +08:00
Sri Sham Haran
e82dcdee20
fix audio not stopping between scene for non editor builds
2023-03-11 18:39:06 +08:00
Sri Sham Haran
b81cff4638
Fixed creation of audio handler with invalid path in endscene and main menu. remove set volume for homeowner detect sound. audio system now stops all instances before they are release when scene changes
2023-03-11 13:07:25 +08:00
XiaoQiDigipen
b4d6429175
Merge pull request #426 from SHADE-DP/PlayerController
...
Animations and bug fix
2023-03-11 11:10:09 +08:00
Glence
b7520b6836
added animation for the other scenes
2023-03-11 11:07:21 +08:00
Kah Wei
831c09f67a
Merge branch 'PlayerController' of https://github.com/SHADE-DP/SHADE_Y3 into PlayerController
2023-03-11 02:31:53 +08:00
Kah Wei
6bfa0d0eca
Fixed post build command for SHADE_CSharp
2023-03-11 02:31:48 +08:00
Glence
6dcee04077
remove unnecessary script
2023-03-11 02:19:42 +08:00
maverickdgg
ed6c05dea1
Merge branch 'main' into SP3-20-UI-System
2023-03-11 01:10:59 +08:00
XiaoQiDigipen
72eedcd6cd
Merge pull request #425 from SHADE-DP/SP3-141-Camera-System
...
Change Camera Collider tags for new camera collision in scenes
2023-03-10 23:36:19 +08:00
maverickdgg
f9a3fe72ce
Merge branch 'main' into SP3-141-Camera-System
2023-03-10 23:34:06 +08:00
maverickdgg
0f8d841f89
Re-enabled ai in L3
2023-03-10 23:33:59 +08:00
maverickdgg
c31bb321ad
Camera Collision changes
2023-03-10 23:32:22 +08:00
XiaoQiDigipen
bc567f626f
Merge pull request #424 from SHADE-DP/SP3-6-c-scripting
...
Added proper handling for loaded null managed assemblies
2023-03-10 22:43:55 +08:00
XiaoQiDigipen
510ba411e9
Merge pull request #423 from SHADE-DP/SP3-10-input-management
...
Corrected Mouse Velocity Calculation when Mouse Centering is On
2023-03-10 22:43:01 +08:00
Kah Wei
47621d7436
Added extra line to log an error if a null assembly is detected
2023-03-10 22:37:27 +08:00
mushgunAX
9315c08a69
Mouse centering velocity calculation corrected
2023-03-10 21:37:54 +08:00
XiaoQiDigipen
5e4925cf23
Merge pull request #422 from SHADE-DP/PlayerController
...
Minor bug fixes and raccoon animation base
2023-03-10 20:07:48 +08:00
maverickdgg
1914270a3f
Fixed pause menu not showing
2023-03-10 20:03:05 +08:00
Glence
af5268186c
Merge branch 'main' into PlayerController
2023-03-10 20:01:07 +08:00
XiaoQiDigipen
c26429f3ef
Merge pull request #421 from SHADE-DP/SP3-20-UI-System
...
Updated ScoreText UI. Updated Button SFX
2023-03-10 19:52:38 +08:00
maverickdgg
9d15e19dca
UI Buttons Update
2023-03-10 19:50:34 +08:00
Glence
1b581aeb44
Merge branch 'main' into PlayerController
2023-03-10 19:41:06 +08:00
Glence
dc0d947dfb
WIP for animations
2023-03-10 19:40:48 +08:00
maverickdgg
184155bec1
Merge branch 'main' into SP3-20-UI-System
2023-03-10 19:40:33 +08:00
maverickdgg
8f1b1d9254
use toffset
2023-03-10 19:40:19 +08:00
XiaoQiDigipen
1ca1926bcf
Merge pull request #420 from SHADE-DP/AudioImpl
...
Added cutscene audio
2023-03-10 19:39:42 +08:00
maverickdgg
a839a0e596
UI Scene Update
2023-03-10 19:37:27 +08:00
maverickdgg
715e136b29
Merge branch 'main' into SP3-20-UI-System
2023-03-10 19:32:17 +08:00
maverickdgg
d5b50e7de3
Added a scale bounce effect for score and added offset adjustment for score
2023-03-10 19:31:23 +08:00
XiaoQiDigipen
0bc8db4c83
Merge pull request #419 from SHADE-DP/SP3-1-Rendering
...
Fixed shadows with animations
2023-03-10 19:30:51 +08:00
Kah Wei
d061b84e01
Added extra check to handle null assemblies when collecting script assemblies
2023-03-10 19:24:38 +08:00
Brandon Mak
fb3c878683
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-10 19:22:57 +08:00
Brandon Mak
1d16bd2744
Fixed more shadows
2023-03-10 19:22:50 +08:00
SHAM-DP
f32903f87d
Merge branch 'main' into AudioImpl
2023-03-10 19:15:12 +08:00
XiaoQiDigipen
062c11afa0
Merge pull request #418 from SHADE-DP/SP3-22-AnimationController
...
Added Animator events and fixed Animator pause bug
2023-03-10 19:07:36 +08:00
SHAM-DP
8602a60feb
Added cinematic audio
2023-03-10 19:07:10 +08:00
maverickdgg
56cda49ea7
Merge branch 'main' into SP3-20-UI-System
2023-03-10 19:01:20 +08:00
maverickdgg
82a20e49f7
updated buttons
2023-03-10 19:00:58 +08:00
XiaoQiDigipen
01256f6e22
Merge pull request #417 from SHADE-DP/SP3-141-Camera-System
...
Fixed Camera Collision
2023-03-10 19:00:31 +08:00
Kah Wei
b443f32388
Merge branch 'SP3-22-AnimationController' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-22-AnimationController
2023-03-10 18:57:14 +08:00
Kah Wei
d1e1a2e31c
Fixed bug where animations would revert to bind pose when paused
2023-03-10 18:57:09 +08:00
maverickdgg
6be5895ec7
Fixed Camera Collision
2023-03-10 18:56:04 +08:00
Kah Wei
e531a087f6
Added events for play, pause and finished animations
2023-03-10 18:53:40 +08:00
Brandon Mak
39bebd1db4
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-10 18:37:39 +08:00
Brandon Mak
801da75d87
Fixed shadows for animation
2023-03-10 18:37:28 +08:00
SHAM-DP
3ef6fef289
fix for options slider
2023-03-10 18:07:40 +08:00
XiaoQiDigipen
f0c827a7f2
Merge pull request #416 from SHADE-DP/AudioImpl
...
Added new audio banks, fix scaling for options sliders
2023-03-10 17:55:58 +08:00
SHAM-DP
9a39e52939
Merge branch 'main' into AudioImpl
2023-03-10 17:46:09 +08:00
Brandon Mak
683ce6146a
Merge branch 'main' into SP3-1-Rendering
2023-03-10 17:29:24 +08:00
XiaoQiDigipen
b5ad6c5a89
Merge pull request #415 from SHADE-DP/PlayerController
...
Raccoon animation and scene changes
2023-03-10 17:28:15 +08:00
Glence
3f4674e38f
minor fix
2023-03-10 17:25:41 +08:00
Glence
b9cfcdb11d
Merge branch 'main' into PlayerController
2023-03-10 17:22:05 +08:00
Glence
a3318d500d
change old audio code
2023-03-10 17:21:49 +08:00
XiaoQiDigipen
a35db70ffd
Merge pull request #414 from SHADE-DP/SP3-22-AnimationController
...
Fixed Bugs regarding animation clip edits
2023-03-10 17:12:35 +08:00
Xiao Qi
1d171710c5
Fixed bug where sub assets were not being loading properly
...
Implemented saving of parent container when cips are changed for animation
2023-03-10 17:11:09 +08:00
Brandon Mak
e9dee89b17
Accommodated animation when shadows are in the scene
2023-03-10 16:47:19 +08:00
Glence
9eb5399f7b
Merge branch 'main' into PlayerController
2023-03-10 16:28:26 +08:00
Glence
9b9cf1a1bb
WIP for animatons
2023-03-10 16:26:52 +08:00
XiaoQiDigipen
293358c41c
Merge pull request #413 from SHADE-DP/SP3-22-AnimationController
...
Fixed RawAnimInspector changing any specific animation clip's values, causing a change in all animation clips' values
2023-03-10 16:21:59 +08:00
Kah Wei
0173e7c302
Fixed RawAnimInspector changing any specific animation clip's values, causing a change in all animation clips' values
2023-03-10 16:21:18 +08:00
Glence
2cf67a1378
Merge branch 'main' into PlayerController
2023-03-10 14:59:47 +08:00
XiaoQiDigipen
6b4172e673
Merge pull request #412 from SHADE-DP/SP3-22-AnimationController
...
Added time scale for animation system
2023-03-10 14:58:03 +08:00
Kah Wei
8c0ad47921
Added timescale for animation system
2023-03-10 14:55:49 +08:00
XiaoQiDigipen
387de00ae6
Merge pull request #411 from SHADE-DP/SP3-6-c-scripting
...
Fixed bug where C# Asset implicit bool conversion operators were internal
2023-03-10 14:14:59 +08:00
Kah Wei
089eb9de26
Fixed bug where C# Asset implicit bool conversion operators were internal
2023-03-10 14:11:59 +08:00
Brandon Mak
33c2b1fd73
Merge branch 'main' into SP3-1-Rendering
2023-03-10 11:58:53 +08:00
Glence
57d1adb292
animation for raccoon WIP
2023-03-10 00:16:38 +08:00
Glence
f706bd8188
updated level 1 &3 to have tree
2023-03-09 21:19:00 +08:00
Diren D Bharwani
d4158faed1
Merge branch 'main' into SP3-2-Physics
2023-03-09 21:18:18 +08:00
Diren D Bharwani
97013ba73c
Added override for simulating gravity in SimulateBody method
2023-03-09 21:18:05 +08:00
Glence
2eee1d4ab7
camera offset rotation fix along with ai not hard hard for box collider
2023-03-09 18:47:06 +08:00
Glence
ec91bdb687
Merge branch 'main' into PlayerController
2023-03-09 18:38:08 +08:00
XiaoQiDigipen
0fb6927342
Merge pull request #410 from SHADE-DP/SP3-22-AnimationController
...
Implemented Animation Clip asset and animation controller
2023-03-09 16:19:39 +08:00
XiaoQiDigipen
d8e15fdbdd
Merge pull request #409 from SHADE-DP/SP3-2-Physics
...
Added Capsule Collider to C#
2023-03-09 16:12:21 +08:00
Diren D Bharwani
5cd6b927e6
Merge branch 'main' into SP3-2-Physics
2023-03-09 16:07:10 +08:00
XiaoQiDigipen
636bf6ec43
Merge pull request #408 from SHADE-DP/SP3-4-Editor
...
Fixed window width for physics settings drop down, fixed editor look at, fixed crash when some fields set to 0
2023-03-09 16:00:34 +08:00
Kah Wei
8a42cb4940
Merge branch 'main' into SP3-22-AnimationController
2023-03-09 15:46:31 +08:00
Kah Wei
7f170deb27
Fixed animations not playing from the correct start point
2023-03-09 15:46:15 +08:00
Diren D Bharwani
4d935b7399
Merge branch 'main' into SP3-2-Physics
2023-03-09 15:41:38 +08:00
Diren D Bharwani
621f8a5f38
Added Capsule Collider to Managed
2023-03-09 15:41:27 +08:00
SHAM-DP
65cece3e3c
Merge branch 'main' into SP3-4-Editor
2023-03-09 15:28:45 +08:00
SHAM-DP
fe41245008
Bug Fixes & Tweaks for editor
...
fixed window width for physics settings drop down
fixed double click to look at
fix crash when some fields in collider and rigidbody are set to 0.0f
2023-03-09 15:28:32 +08:00
Xiao Qi
54e186063c
Changed to correct RIG
2023-03-09 15:20:40 +08:00
Kah Wei
bfbca68d50
Added more animation tests
2023-03-09 15:14:30 +08:00
XiaoQiDigipen
f07ce5211b
Merge pull request #407 from SHADE-DP/SP3-1-Rendering
...
Fixed Shadow bugs and implemented scripting for trajectory rendering
2023-03-09 15:10:59 +08:00
Kah Wei
baed0bec0b
Fixed animator component always using manual mode playback time
2023-03-09 15:08:38 +08:00
Brandon Mak
f34cdc0f36
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-09 14:56:14 +08:00
Brandon Mak
bf08be045a
Solved bugs with shadows
...
Switching a scene causes a crash from shadows.
2023-03-09 14:56:03 +08:00
Kah Wei
ab2f3e395b
Animation clips now load the correct raw animation
2023-03-09 14:47:48 +08:00
Kah Wei
ac971f0945
Fixed infinite loop and incorrect playback setting for Animator
2023-03-09 14:46:06 +08:00
Diren D Bharwani
1304f6e591
Merge branch 'main' into SP3-2-Physics
2023-03-09 14:40:40 +08:00
SHAM-DP
6dd503daad
updated audio assets, fix scale for sfx & bgm sliders
2023-03-09 14:12:17 +08:00
Xiao Qi
bfc8b3600f
Removed stupid 10 second time limit on dependencies pull
2023-03-09 13:56:36 +08:00
Xiao Qi
3d6bfaa119
Write raw anim asset id into anim clips
2023-03-09 13:46:39 +08:00
Glence
63360a4616
Merge branch 'main' into PlayerController
2023-03-09 13:44:49 +08:00
Kah Wei
5669babc0f
Fixed animator components in scripts not being retrievable. Also added script for testing animations
2023-03-09 13:35:49 +08:00
Glence
73022cb8d6
update scene with new tween
2023-03-09 13:22:14 +08:00
Kah Wei
07a2eb2f64
Fixed not opening the correct Visual Studio version for scripts
2023-03-09 13:18:09 +08:00
Kah Wei
fc789334bd
Fixed animation assets fields for scripts not supporting the correct types
2023-03-09 13:10:06 +08:00
Kah Wei
e816df28a8
Clips can now be dragged and dropped into the animation controller editor
2023-03-09 12:07:16 +08:00
Brandon Mak
e3a552f983
Wrote scripting interface for trajectory rendering
2023-03-09 10:45:57 +08:00
Xiao Qi
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
Xiao Qi
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
Xiao Qi
2692db1ed3
Changed function to return pointer type instead of std::optional
2023-03-09 01:49:43 +08:00
Glence
66026ff926
jumppad done
2023-03-09 00:33:36 +08:00
Kah Wei
8670fe5fa9
Added text RawAnimInspector for when no animations are selected
2023-03-08 22:03:08 +08:00
Brandon Mak
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
Kah Wei
57a8e385e4
Added editor field for Animation Controller of the Animator component in the inspector
2023-03-08 20:58:21 +08:00
Kah Wei
7ab1ee6fec
Added serialization for animation assets for scripts
2023-03-08 20:34:11 +08:00
Brandon Mak
2ff28a544d
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-08 20:12:13 +08:00
Kah Wei
69ac4d1219
Merge branch 'main' into SP3-22-AnimationController
2023-03-08 20:00:58 +08:00
Diren D Bharwani
3a9ab9094f
Merge branch 'main' into SP3-2-Physics
2023-03-08 19:07:46 +08:00
Diren D Bharwani
35b60a24e4
Added variable to control number of simulation steps for the SimulateBody method
2023-03-08 19:06:57 +08:00
Glence
10555f646c
base for jumppad
2023-03-08 18:49:36 +08:00
Diren D Bharwani
90457757a3
Merge branch 'main' into SP3-2-Physics
2023-03-08 18:46:07 +08:00
Glence
87f7b42ec3
made raccoon use capsule, setting for fov done
2023-03-08 17:00:43 +08:00
Glence
6854c41614
setting up volume
2023-03-08 16:22:05 +08:00
Kah Wei
43edfeb14f
Added serialization of animation assets for scripts
2023-03-08 16:13:04 +08:00
Kah Wei
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
Kah Wei
1c12a05837
Added C# interface for animator, animation clip and animation controller
2023-03-08 15:29:29 +08:00
XiaoQiDigipen
ef7cd4c0c0
Merge pull request #406 from SHADE-DP/SP3-1-Rendering
...
Implemented shadows. Light components can enable shadows through editor.
2023-03-08 14:17:15 +08:00
Brandon Mak
441d2fe7a4
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-08 14:15:12 +08:00
XiaoQiDigipen
42decf10cb
Merge pull request #405 from SHADE-DP/SP3-2-Physics
...
Fixed a bug causing invalid gravity scales
2023-03-08 13:55:04 +08:00
Diren D Bharwani
6f8387a5ea
Fixed bug where gravity scales were initialised to NaN
2023-03-08 12:59:51 +08:00
Diren D Bharwani
70804f1c3d
Merge branch 'main' into SP3-2-Physics
2023-03-08 11:48:06 +08:00
Brandon Mak
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
Brandon Mak
64e60a5114
Added editor functionality for lights to enable shadows
2023-03-08 09:38:07 +08:00
Kah Wei
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
XiaoQiDigipen
ee64580505
Merge pull request #404 from SHADE-DP/SP3-13-Assets-Manager
...
Implmented GLTF Compile and Load Overhaul
2023-03-07 23:27:01 +08:00
Xiao Qi
ea3b851ed0
Merge branch 'main' into SP3-13-Assets-Manager
2023-03-07 23:01:21 +08:00
Xiao Qi
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
Kah Wei
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
Kah Wei
e285d5e6b2
Added functions for setting animation parameters
2023-03-07 22:34:32 +08:00
XiaoQiDigipen
4d64dd34d8
Merge pull request #403 from SHADE-DP/AnimationClipAsset
...
Reimplemented animation clip container assets
2023-03-07 22:10:34 +08:00
Xiao Qi
3cc949bb7e
Animation container redefinition
2023-03-07 22:07:38 +08:00
Xiao Qi
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
Xiao Qi
eae6f6399b
Changed implementation of binary loader to load animation clip containers instead of individual animation clips
2023-03-07 22:05:33 +08:00
Diren D Bharwani
e46dfd0b2e
Merge branch 'main' into SP3-2-Physics
2023-03-07 21:09:49 +08:00
Kah Wei
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
Kah Wei
dc32c5c9aa
Implemented saving of animation controller from editor
2023-03-07 20:29:57 +08:00
XiaoQiDigipen
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
XiaoQiDigipen
55932628b9
Merge pull request #401 from SHADE-DP/SP3-129-AudioSystem
...
Fixed 3d audio
2023-03-07 20:11:02 +08:00
Kah Wei
ff27925f2d
Added ability to reset state, delete links and nodes
2023-03-07 20:05:37 +08:00
Kah Wei
6d01bd0b78
Added ability to set starting node
2023-03-07 19:00:10 +08:00
Diren D Bharwani
e3fb14d698
Merge branch 'main' into SP3-2-Physics
2023-03-07 18:48:31 +08:00
Diren D Bharwani
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
Diren D Bharwani
50dafa555a
Fixed conversion warnings
2023-03-07 18:46:36 +08:00
Brandon Mak
ff4c294313
Added dynamic flags for render graph nodes and light comp shadow flags
2023-03-07 18:43:59 +08:00
SHAM-DP
e1fa843511
Merge branch 'main' into SP3-129-AudioSystem
2023-03-07 18:10:52 +08:00
SHAM-DP
5ba50cfbcc
Fix for 3d audio (listener up vec was wrong)
2023-03-07 17:57:48 +08:00
Brandon Mak
b6b2c75fc3
Implemented Shadows (f0kin finally)
2023-03-07 17:39:51 +08:00
Xiao Qi
d56e67248c
Removed line in bat file to pull assimp depedency
2023-03-07 17:19:24 +08:00
Kah Wei
493f2c3cfe
Fixed parameters panel for animation controller editor and added menu bar
2023-03-07 16:38:00 +08:00
XiaoQiDigipen
e62a4cd007
Merge pull request #400 from SHADE-DP/SP3-20-UI-System
...
Added static class Settings to scripts
2023-03-07 14:44:32 +08:00
Diren D Bharwani
cc2afbcf9f
Fixed duplicate collision calls
2023-03-07 14:13:06 +08:00
SHAM-DP
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
maverickdgg
e42a5c68f3
Settings
2023-03-07 10:08:30 +08:00
Diren D Bharwani
2147c2c34b
Fixed capsule debug draw
...
Height is distance between centers
2023-03-07 05:00:43 +08:00
Diren D Bharwani
2197a3bcb9
Added capsule collider
...
Debug draw is a bit wonky. Further polish needed,
2023-03-07 04:51:58 +08:00
Diren D Bharwani
33ccdccd8a
Expanded Physics Settings
...
Editor Menu needs to be resized...idgi...
2023-03-07 03:23:40 +08:00
Xiao Qi
6911ad0d2b
Fixed bug with extensions count, resulting in regeneration of bank metas every time
2023-03-07 01:31:23 +08:00
Xiao Qi
5e6b68915b
Working Animations
2023-03-07 01:25:32 +08:00
Kah Wei
9855d7e245
Total time and tickers per second is now auto calculated in SHAnimationClip
2023-03-06 19:42:40 +08:00
Kah Wei
43fd04dd5e
Modified SHAnimationClip and SHAnimatorComponent to use frame timestamps instead of indices
2023-03-06 18:59:04 +08:00
Diren D Bharwani
e89f5df35f
Added physics constants
2023-03-06 18:17:13 +08:00
Diren D Bharwani
8506298fd3
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2023-03-06 17:56:52 +08:00
Xiao Qi
99f7c3c799
Removed resource manager test lines
2023-03-06 17:47:21 +08:00
Diren D Bharwani
78a3bf4575
Added function to test an AABB against the physics world
...
Update React Dependency
2023-03-06 17:44:58 +08:00
Diren D Bharwani
550b99b3d7
Added a generic AABB class
2023-03-06 17:44:40 +08:00
Xiao Qi
f861304f5e
Testing in progress for skinning test
2023-03-06 17:34:38 +08:00
Kah Wei
9a8114f5dd
Added work in progress animation parameter panel
2023-03-06 16:44:34 +08:00
Kah Wei
d16f807a8a
Added links properties panel
2023-03-06 16:17:05 +08:00
Xiao Qi
becff4824f
Camera without editor compile fix
2023-03-06 15:38:42 +08:00
Diren D Bharwani
0b803d0bd1
Merge branch 'main' into SP3-2-Physics
2023-03-06 13:31:48 +08:00
Kah Wei
f8cc1fe2dc
Size of animation controller editor is now adjustable
2023-03-06 11:47:30 +08:00
Brandon Mak
826df94c96
Shadows WIP
2023-03-06 00:02:06 +08:00
Glence
52f61363c0
Build shiny highlight shader
2023-03-05 23:50:44 +08:00
Glence
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
Diren D Bharwani
d59f4e88c2
Added gravity scale
...
Update react dependency
2023-03-05 23:39:33 +08:00
Glence
e40346513c
Pause sfx fix
2023-03-05 22:27:35 +08:00
Glence
794f59ac48
Adjusted stair collision
2023-03-05 21:37:29 +08:00
Glence
5191eb529a
Update level 3 scene
2023-03-05 21:34:05 +08:00
Sri Sham Haran
9866c6e307
Handle mouse center/visible when editor play/pause/stop
2023-03-05 21:33:05 +08:00
Sri Sham Haran
f4f544ff53
Merge remote-tracking branch 'origin/main' into main
2023-03-05 21:24:19 +08:00
Sri Sham Haran
77e3fe376b
Handle mouse center/visible when editor play/pause/stop
2023-03-05 21:24:16 +08:00
Glence
c118ec136f
Call centering of mouse at the correct place and default DT on awake
2023-03-05 21:23:41 +08:00
Glence
9f57ed1ef1
small scene changes and reenable mouse centering and hiding
2023-03-05 21:11:24 +08:00
Glence
e27b143819
shift pic to avoid black alpha
2023-03-05 20:53:16 +08:00
Sri Sham Haran
0e2b767263
Fix for button w wrong textures (remove reflection of currentTexture)
2023-03-05 20:23:52 +08:00
Glence
808adaa5dd
level 2 go to the correct next scene now
2023-03-05 18:06:08 +08:00
XiaoQiDigipen
6472119648
Merge pull request #399 from SHADE-DP/PlayerController
...
Updates for presentation build
2023-03-05 15:41:21 +08:00
Glence
bf5472e2c6
stuff dont ask me
2023-03-05 15:35:57 +08:00
Glence
3778ded1be
Merge branch 'main' into PlayerController
2023-03-05 14:49:46 +08:00
XiaoQiDigipen
272d7afa3e
Merge pull request #398 from SHADE-DP/SP3-20-UI-System
...
Fixed button click state not resetting bug
2023-03-05 14:46:17 +08:00
Glence
7a577ecd6b
Merge branch 'main' into PlayerController
2023-03-05 14:42:31 +08:00
Sri Sham Haran
e417ebdfcc
added missing colliders for level3
2023-03-05 14:22:24 +08:00
maverickdgg
f52e5a1394
Changed pause menu to use onRelease instead of onClick
2023-03-05 14:01:30 +08:00
maverickdgg
8b24d7e32b
re-added the button texture check before setting texture
2023-03-05 13:58:07 +08:00
maverickdgg
76e794a543
Merge branch 'main' into SP3-20-UI-System
2023-03-05 13:56:29 +08:00
maverickdgg
4bc568899d
Fix Button click state not resetting if the release event happen when button is inactive
2023-03-05 13:55:51 +08:00
XiaoQiDigipen
29d33d45ad
Merge pull request #396 from SHADE-DP/SP3-6-c-scripting
...
Fixed issue with ImGui corrupting strings passed to managed data
2023-03-05 12:20:28 +08:00
Kah Wei
cedd10c188
Merge branch 'main' into SP3-6-c-scripting
2023-03-05 12:17:31 +08:00
Kah Wei
24f09ab537
Fixed issue with ImGui corrupting strings passed to managed data.
2023-03-05 12:17:19 +08:00
XiaoQiDigipen
367c1fc77e
Merge pull request #395 from SHADE-DP/SP3-141-Camera-System
...
Camera arm target offset rotation fix
2023-03-05 11:46:02 +08:00
XiaoQiDigipen
dfedaa9b4a
Merge pull request #394 from SHADE-DP/SP3-20-UI-System
...
Fixed button sounds
2023-03-05 11:45:24 +08:00
maverickdgg
ef0ff801e4
Camera arm target offset rotation fix
2023-03-05 10:55:39 +08:00
maverickdgg
f10293e2d2
Fixed button sounds
2023-03-05 10:47:16 +08:00
Xiao Qi
816c16324c
WIP Commit, Node and Joint indexing
2023-03-05 04:25:30 +08:00
Xiao Qi
6c396469d4
Recompiled files for testing
2023-03-05 04:22:27 +08:00
Glence
3f960509f1
scene changes
2023-03-05 02:51:11 +08:00
Kah Wei
066d060b29
Split main animation controller panel into 3 segments
2023-03-05 01:45:26 +08:00
Kah Wei
32adb0c540
Reworked how AnimationControllerEditor works
2023-03-05 01:08:39 +08:00
Glence
cc81eed630
Merge branch 'main' into PlayerController
2023-03-04 23:42:20 +08:00
Brandon Mak
73c5a0ff4a
Updated shadow shaders
2023-03-04 23:12:12 +08:00
XiaoQiDigipen
e75b20f36b
Merge pull request #393 from SHADE-DP/SP3-1-Rendering
...
Fixed publish rendering errors and improved shiny highlight shaders
2023-03-04 16:01:17 +08:00
Brandon Mak
13f28d6bdb
Fixed shiny highlight shaders
2023-03-04 15:55:04 +08:00
Brandon Mak
7eb4921b33
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-04 15:50:10 +08:00
XiaoQiDigipen
9ccde9fa07
Merge pull request #392 from SHADE-DP/SP3-20-UI-System
...
Updated Level 1 UI
2023-03-04 13:13:11 +08:00
maverickdgg
e7ce3263b8
Level 2 Pause menu update
2023-03-04 13:12:02 +08:00
maverickdgg
f3908d3afb
Merge branch 'main' into SP3-20-UI-System
2023-03-04 13:09:06 +08:00
maverickdgg
c3a452a1c4
Pause Canvas Updated with correct button scales and button FX
2023-03-04 12:51:19 +08:00
XiaoQiDigipen
ba78f6f7a0
Merge pull request #391 from SHADE-DP/AIFixes
...
Implemented such that AI gets sent to a waypoint of choice (in editor) after capture
2023-03-04 12:50:19 +08:00
XiaoQiDigipen
6cf8f03ff1
Merge branch 'main' into AIFixes
2023-03-04 12:50:13 +08:00
XiaoQiDigipen
6d13c5f218
Merge pull request #389 from SHADE-DP/AudioImplementation
...
Implemented New SFX and (supposedly) spatial SFX
2023-03-04 12:47:08 +08:00
XiaoQiDigipen
90c9a0a959
Merge branch 'main' into AudioImplementation
2023-03-04 12:46:59 +08:00
maverickdgg
3c8b729b4d
Merge branch 'main' into SP3-20-UI-System
2023-03-04 12:45:36 +08:00
maverickdgg
0a8f90ae80
Added Gameplay Canvas for Level 1
2023-03-04 12:44:58 +08:00
XiaoQiDigipen
e197097d7c
Merge pull request #390 from SHADE-DP/SP3-20-UI-System
...
Gameplay UI on Level 2.
2023-03-04 12:42:42 +08:00
mushgunAX
28949b29ff
Level 1 AI start waypoint
2023-03-04 05:07:39 +08:00
mushgunAX
dc54ae92a2
AI gets sent to a waypoint of choice when caught
2023-03-04 04:57:59 +08:00
Xiao Qi
d4081a7e09
Tranpose Inverse Bind Matrix
...
WIP, building transform matrix not working
2023-03-04 03:20:01 +08:00
maverickdgg
3a60eee32f
merged
2023-03-04 03:17:20 +08:00
maverickdgg
6d1e179baf
UI doine
2023-03-04 02:46:56 +08:00
Brandon Mak
17bb7a08eb
Fixed render to swapchain errors
2023-03-04 01:01:26 +08:00
Brandon Mak
ce41e975d0
Merge branch 'main' into SP3-1-Rendering
2023-03-04 00:52:05 +08:00
Kah Wei
b93a08fa90
Fixed ImGui crash with SHRawAnimationInspector
2023-03-04 00:48:10 +08:00
Xiao Qi
56693565f4
WIP Load and test animations
2023-03-04 00:43:31 +08:00
mushgunAX
a5fe4bf0a0
New SFX and (supposedly) spatial SFX
2023-03-04 00:19:35 +08:00
Brandon Mak
166e13a339
Shadows WIP
...
- Light direction in 2nd level changed
2023-03-03 22:01:34 +08:00
Kah Wei
97605cc8fe
Added preliminary implementation of animation controller connection attributes
2023-03-03 22:00:56 +08:00
Kah Wei
41784d4c04
Fixed animation clips list for Raw Animation Inspector
2023-03-03 21:28:28 +08:00
XiaoQiDigipen
d7d4e21005
Merge pull request #386 from SHADE-DP/SP3-4-Editor
...
added ifdef check for editor
2023-03-03 20:12:21 +08:00
SHAM-DP
96d73ca626
added ifdef check for editor
2023-03-03 20:06:58 +08:00
Kah Wei
beeeae99ca
SHRawAnimInspector can now generate incomplete animation clips
2023-03-03 18:53:59 +08:00
XiaoQiDigipen
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
XiaoQiDigipen
0e01332213
Merge pull request #384 from SHADE-DP/SP3-10-input-management
...
Implemented mouse centering and hiding in game
2023-03-03 18:29:54 +08:00
SHAM-DP
dfc2a68dde
Add Set audio param with label functionality
2023-03-03 18:13:35 +08:00
mushgunAX
0a224726b3
revert?
2023-03-03 17:25:09 +08:00
mushgunAX
d65af97166
Revert of a previous commit for scene files
2023-03-03 17:24:27 +08:00
Xiao Qi
0741163774
Merge remote-tracking branch 'origin/SP3-22-AnimationController' into SP3-22-AnimationController
2023-03-03 17:23:18 +08:00
Xiao Qi
184fd4f459
[NOT TESTED] Animation Clip asset reading/writing as asset file into binary implemented
2023-03-03 17:16:23 +08:00
Kah Wei
f9ae0c10ce
Modified SHAnimator and SHRig to use new model formats
2023-03-03 17:11:33 +08:00
SHAM-DP
9eb40d5928
Fix showcursor
2023-03-03 16:52:43 +08:00
Glence
46c99f31f9
Merge branch 'main' into PlayerController
2023-03-03 16:45:26 +08:00
Glence
27b00a6c4a
end cutscene done
2023-03-03 14:28:10 +08:00
mushgunAX
f7c33bc89a
Various null checks
2023-03-03 14:26:36 +08:00
Glence
81da3e501d
fix minor preview level bug
2023-03-03 00:40:16 +08:00
mushgunAX
7763a969b2
Merge branch 'main' into SP3-10-input-management
2023-03-02 22:55:29 +08:00
Kah Wei
c736967d1c
Merge branch 'main' into SP3-22-AnimationController
2023-03-02 19:08:20 +08:00
XiaoQiDigipen
46ffeada67
Merge pull request #383 from SHADE-DP/PlayerController
...
New features added
2023-03-02 18:31:38 +08:00
Kah Wei
69fa0d4da0
Fixed SHRawAnimInspector warnings
2023-03-02 17:44:28 +08:00
maverickdgg
0984eee6bb
Gameplay UI WIP
2023-03-02 17:34:11 +08:00
Glence
97db3b1021
Merge branch 'main' into PlayerController
2023-03-02 17:33:42 +08:00
Kah Wei
6779f48b5a
Fixed typo
2023-03-02 17:33:02 +08:00
Glence
8c74ec85d3
Done with level preview
2023-03-02 17:33:02 +08:00
Kah Wei
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
Kah Wei
3a14f0a887
Added SHRawAnimInspector
2023-03-02 16:54:34 +08:00
Xiao Qi
f083147806
WIP Retrofit new data into existing structure
2023-03-02 16:35:30 +08:00
XiaoQiDigipen
173529501c
Merge pull request #382 from SHADE-DP/SP3-1-Rendering
...
Fixed trajectory rendering, added text size and solved vulkan errors
2023-03-02 16:32:37 +08:00
Brandon Mak
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
Brandon Mak
6b42d78f16
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-03-02 15:49:36 +08:00
Brandon Mak
e05e21ec5a
Added text size for text renderable component
2023-03-02 15:49:28 +08:00
mushgunAX
802924141a
Scene Fade In and Out Fixes
2023-03-02 15:47:00 +08:00
Brandon Mak
e2ef32f130
Fixed Trajectory Rendering
2023-03-02 15:29:24 +08:00
mushgunAX
1e734b6006
Merge branch 'main' into SP3-10-input-management
2023-03-02 13:31:13 +08:00
Glence
2834414115
Merge branch 'main' into PlayerController
2023-03-02 13:05:28 +08:00
Kah Wei
62fa2ba41a
Merge branch 'main' into SP3-22-AnimationController
2023-03-02 13:03:33 +08:00
XiaoQiDigipen
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
XiaoQiDigipen
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
XiaoQiDigipen
dfd1f59b02
Merge pull request #379 from SHADE-DP/SP3-141-Camera-System
...
Rotates target offset based on camera arm's rotation
2023-03-02 12:45:38 +08:00
Brandon Mak
848123c138
Bug fix
2023-03-02 11:53:52 +08:00
Brandon Mak
1e59b6436c
Merge branch 'main' into SP3-1-Rendering
2023-03-02 11:36:35 +08:00
maverickdgg
381fe476be
Game UI WIP
2023-03-02 11:33:21 +08:00
maverickdgg
30923389ae
Merge branch 'main' into SP3-20-UI-System
2023-03-02 10:23:09 +08:00
SHAM-DP
4131c58c08
Modified calls to IsCursorVisible
2023-03-02 10:01:52 +08:00
maverickdgg
e0ee2a8079
Gameplay UI progress
2023-03-02 09:55:41 +08:00
Brandon Mak
87c04436b3
Added scripting interface and serialization for Trajectory comp
2023-03-02 09:08:20 +08:00
maverickdgg
9dd01f5fa1
Replaced How to play screen and credits placeholder
2023-03-02 03:01:24 +08:00
maverickdgg
e4345d4937
Changed all button textures and update win and lose screen to use buttonFX
2023-03-02 02:30:59 +08:00
maverickdgg
5cc2e26de6
Rotates target offset based on camera arm's rotation
2023-03-02 02:06:25 +08:00
Glence
2af19baccd
Added the transition back to the scene
2023-03-02 00:02:18 +08:00
Glence
b2c702c780
Merge branch 'main' into PlayerController
2023-03-02 00:01:34 +08:00
mushgunAX
a04eee0a2f
mouse centering and visibility when appropriate
2023-03-01 23:56:40 +08:00
Kah Wei
dfb53bf290
Added WIP AnimationControllerEditor
2023-03-01 23:49:30 +08:00
Xiao Qi
af944b3083
UNTESTED: Loading of new format for animations and rigs
2023-03-01 23:13:02 +08:00
Kah Wei
d21f9d6c4b
Added functions for adding transitions and parameters to an AnimationController
2023-03-01 22:10:09 +08:00
Kah Wei
e878b7b65a
Added implementation of SHAnimationController Transition logic
2023-03-01 21:55:26 +08:00
Glence
403df62a0b
cleaning up scenes and WIP for previewlevel camera
2023-03-01 18:05:42 +08:00
Xiao Qi
f118c1c2ca
WIP Load new model asset structure
2023-03-01 17:56:37 +08:00
XiaoQiDigipen
b63db13c41
Merge pull request #378 from SHADE-DP/scenetransitions
...
Implemented Fade In To and Fade Out From Black Scene Transitions
2023-03-01 17:55:27 +08:00
mushgunAX
0754eaa51a
Merge branch 'main' into scenetransitions
2023-03-01 17:36:14 +08:00
mushgunAX
1f5cfd36f7
Scene transitions done
2023-03-01 17:36:02 +08:00
XiaoQiDigipen
5c78b7ec1b
Merge pull request #377 from SHADE-DP/SP3-4-Editor
...
Added scripting interface for cursor visible.
2023-03-01 17:08:45 +08:00
SHAM-DP
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
mushgunAX
a65735e0b3
progress
2023-03-01 16:37:33 +08:00
Xiao Qi
bc17479284
Merge branch 'main' into SP3-13-Assets-Manager
2023-03-01 16:33:30 +08:00
Brandon Mak
4b37be6075
Made text color serialized
2023-03-01 16:02:44 +08:00
Kah Wei
2679d12afb
Merge branch 'main' into SP3-22-AnimationController
2023-03-01 14:02:28 +08:00
mushgunAX
17a7db8a91
Merge branch 'main' into scenetransitions
2023-03-01 12:51:43 +08:00
Brandon Mak
e44e961e14
Particles WIP
2023-03-01 10:06:09 +08:00
Brandon Mak
77722aa560
renamed some files
2023-03-01 08:58:16 +08:00
Brandon Mak
2e7bfd8b28
Merge branch 'main' into SP3-1-Rendering
2023-03-01 08:56:45 +08:00
Kah Wei
e97f5747cb
Modified SHAnimatorComponent to support manual and animation controller modes. Fleshed out SHAnimationController. Added SHAnimControllerAsset stub.
2023-03-01 01:30:34 +08:00
Glence
d5c9010661
Clean up the scenes
2023-03-01 01:16:34 +08:00
Glence
ab92d56cf0
disable movement when pop out is in place
2023-03-01 00:51:57 +08:00
XiaoQiDigipen
dd9eeac0d1
Merge pull request #376 from SHADE-DP/PlayerController
...
Bug fixes, Scene changes and new features
2023-02-28 23:10:33 +08:00
Glence
4e56061ebe
adjust text in cutscene
2023-02-28 22:53:54 +08:00
Glence
bd9349eae7
FRC fix, stealfood popup almost done and reset dt when load
2023-02-28 21:42:05 +08:00
Brandon Mak
0da61aa842
Fixed text rendering rendering last
2023-02-28 21:30:09 +08:00
Brandon Mak
7f13462db7
GetGraphicsPipeline now takes in a subpass (thanks KW)
...
- Fixed blending issues in pipeline
2023-02-28 19:47:52 +08:00
Kah Wei
36af939c67
Added reworked AnimationClip and SHAnimClipAsset
2023-02-28 19:19:06 +08:00
Glence
04c19fb586
Merge branch 'main' into PlayerController
2023-02-28 19:13:11 +08:00
Glence
0bdab3b079
WIP for steal food pop up
2023-02-28 18:35:43 +08:00
mushgunAX
d9f064994e
Merge branch 'main' into scenetransitions
2023-02-28 18:34:07 +08:00
XiaoQiDigipen
b9b9f86bad
Merge pull request #375 from SHADE-DP/SP3-4-Editor
...
Fixed editor bugs - Copy/Paste values caused entities to get pasted, filtered asset browser could not expand compilable assets, EditorConfig workingscene does not get saved sometimes
2023-02-28 16:22:17 +08:00
SHAM-DP
ef268bc9e5
Drag drop prefab onto entity (NON UNDO/REDO ACTION for now)
2023-02-28 16:01:52 +08:00
Glence
52ba54a82a
Fix ShinyHighlight issue and updated level 3
2023-02-28 15:42:28 +08:00
SHAM-DP
7e34edecdd
safety check for scroll to after paste entity
2023-02-28 15:36:45 +08:00
SHAM-DP
5b5a9342c3
Merge branch 'main' into SP3-4-Editor
2023-02-28 15:12:31 +08:00
SHAM-DP
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
Glence
2ab4981a43
renamed cutscene to cutsceneIntro and adjusted level 2
2023-02-28 15:06:19 +08:00
XiaoQiDigipen
911ecf15ed
Merge pull request #374 from SHADE-DP/SP3-129-AudioSystem
...
Added spatial audio
2023-02-28 13:17:19 +08:00
SHAM-DP
3141902e3d
Merge branch 'main' into SP3-129-AudioSystem
2023-02-28 13:11:36 +08:00
SHAM-DP
a6659f7cbc
Remove some redundant lines
2023-02-28 13:11:21 +08:00
SHAM-DP
417f086dfa
Clean up and verified VCA Volume editing is working fine
2023-02-28 09:36:28 +08:00
mushgunAX
d563247ec2
Merge branch 'main' into scenetransitions
2023-02-28 06:49:55 +08:00
mushgunAX
b3ec2fb4df
implementing in progress
2023-02-28 06:49:40 +08:00
Glence
380de28358
cutscene for intro done
2023-02-28 01:57:00 +08:00
SHAM-DP
50d7ad80a2
Added Spatial Audio
2023-02-27 22:02:48 +08:00
Glence
79cb0f12ae
WIP for Alpha, added material name in editor WIP for cutscene
2023-02-27 18:09:05 +08:00
XiaoQiDigipen
f57e9e9a91
Merge pull request #373 from SHADE-DP/SP3-6-c-scripting
...
Script list is now sorted in alphabetical order
2023-02-27 17:24:29 +08:00
Kah Wei
d8756cfcf7
Script list is now sorted in alphabetical order
2023-02-27 17:21:02 +08:00
Kah Wei
33b5b84fd4
add anim clip
2023-02-27 17:04:16 +08:00
maverickdgg
4f1ecf1b50
multiplierTextFX WIP
2023-02-27 17:01:46 +08:00
Kah Wei
f061e8ed43
Updated comments to use SHRawAnimation instead of SHAnimationData
2023-02-27 16:52:41 +08:00
Kah Wei
7839bd21f2
Renamed SHAnimationData to SHRawAnimation
2023-02-27 16:51:02 +08:00
XiaoQiDigipen
0f0542f46f
Merge pull request #372 from SHADE-DP/SP3-20-UI-System
...
Fixed Slider Text. Changed Fonts
2023-02-27 16:41:37 +08:00
maverickdgg
f4114b7844
Merge branch 'main' into SP3-20-UI-System
2023-02-27 16:39:39 +08:00
maverickdgg
cbb334d48e
Slider Text Default Value fix
2023-02-27 16:39:31 +08:00
mushgunAX
c328672286
black shader
2023-02-27 16:22:54 +08:00
Kah Wei
ba22638520
Renamed SHAnimationClip to SHAnimationData
2023-02-27 16:17:36 +08:00
Glence
75295b5d6e
Merge branch 'main' into PlayerController
2023-02-27 15:58:37 +08:00
Kah Wei
9486762693
Merge branch 'main' into SP3-22-AnimationController
2023-02-27 15:54:48 +08:00
Glence
c912dd2e4b
WIP for cutscene and added test for KW
2023-02-27 15:33:58 +08:00
mushgunAX
ba89dcea14
Merge branch 'main' into scenetransitions
2023-02-27 15:30:04 +08:00
XiaoQiDigipen
b3ed59d98a
Merge pull request #371 from SHADE-DP/SP3-20-UI-System
...
Button FX now uses the easing functions. Viewport can now be fixed at an AR.
2023-02-27 15:28:55 +08:00
mushgunAX
f9c90ece7e
Scene Transition Script
2023-02-27 15:28:05 +08:00
maverickdgg
4c7d06452e
viewport changed
2023-02-27 15:25:01 +08:00
maverickdgg
0e7ecd382f
Merge branch 'main' into SP3-20-UI-System
2023-02-27 15:17:03 +08:00
maverickdgg
08e4db134a
Tweaked main menu UI
2023-02-27 15:16:48 +08:00
Brandon Mak
f6db65ddf4
Particles WIP
2023-02-27 15:14:32 +08:00
XiaoQiDigipen
725da6254d
Merge pull request #370 from SHADE-DP/SP3-6-c-scripting
...
Fixed behaviour of script Awake() and Start() not getting called as intended (first frame that object is active)
2023-02-27 13:10:35 +08:00
Kah Wei
99c1eebe70
Fixed behaviour of script Awake() and Start() not getting called as intended (first frame that object is active)
2023-02-27 12:57:37 +08:00
XiaoQiDigipen
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
XiaoQiDigipen
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
XiaoQiDigipen
2fb5ec3fd9
Merge pull request #367 from SHADE-DP/SP3-8-serialization
...
Added rudimentary prefabs (no resolution)
2023-02-27 11:53:46 +08:00
maverickdgg
984473bdab
Slider text fixed
2023-02-27 10:28:20 +08:00
maverickdgg
db8ed27cb7
main Menu layout complete for now
2023-02-27 10:05:30 +08:00
maverickdgg
eb7c0e749e
Added a slider_textured fs
2023-02-27 09:59:58 +08:00
maverickdgg
949ade5775
Options Layout done
2023-02-27 09:55:54 +08:00
maverickdgg
90763ded71
Change Canvas Button Script
2023-02-27 08:08:04 +08:00
maverickdgg
f23853c85c
Main Menu Canvas Layout with button FX and scalebounce
2023-02-27 07:32:26 +08:00
maverickdgg
eb3d8b6b8b
Slider done, Slider Shader bugged
2023-02-27 05:42:54 +08:00
Glence
55953e0f08
Merge branch 'main' into PlayerController
2023-02-27 00:41:35 +08:00
Glence
efcca56c99
WIP foir silhouette, renamed scene files and fix breakable bug
2023-02-27 00:41:25 +08:00
Sri Sham Haran
dabc94a845
editor cam pos display as requested
2023-02-26 23:26:24 +08:00
Sri Sham Haran
7c21544d69
Merge branch 'main' into SP3-4-Editor
2023-02-26 23:22:36 +08:00
Sri Sham Haran
31491d06ef
Merge branch 'main' into SP3-8-serialization
2023-02-26 22:44:57 +08:00
Sri Sham Haran
ff2b9b4af3
Rudimentary Prefab (no resolution)
...
Warning Fixes
2023-02-26 22:44:39 +08:00
XiaoQiDigipen
b4930b63f5
Merge pull request #366 from SHADE-DP/SP3-141-Camera-System
...
Added offset calculation to camera get position
2023-02-26 15:56:46 +08:00
maverickdgg
234da235b5
Merge branch 'main' into SP3-141-Camera-System
2023-02-26 02:21:30 +08:00
maverickdgg
c8baff878e
Added offset calculation to camera get position
2023-02-26 02:20:57 +08:00
Sri Sham Haran
2878c840c5
Merge remote-tracking branch 'origin/SP3-4-Editor' into SP3-4-Editor
2023-02-25 23:37:22 +08:00
Glence
027a2c490b
Added elapsedTime and shiny Highlight along with Level 3 asset and scene
2023-02-25 21:56:49 +08:00
Brandon Mak
fe27f8752b
Particle system WIP
2023-02-24 21:46:01 +08:00
Brandon Mak
1c066f4cbd
Merge branch 'main' into SP3-1-Rendering
2023-02-24 21:32:02 +08:00
XiaoQiDigipen
54a2428b7c
Merge pull request #364 from SHADE-DP/PlayerController
...
Fix bugs and add Pause for the game in
2023-02-24 21:14:29 +08:00
Glence
a27b3fb80e
fix vulkan red line
2023-02-24 21:10:45 +08:00
Glence
acc548678e
Merge branch 'main' into PlayerController
2023-02-24 21:10:10 +08:00
SHAM-DP
38c6cb6fed
Prefab WIP
...
Added component status
2023-02-24 20:34:49 +08:00
SHAM-DP
42f4c1c75e
Aspect Ratio WIP
2023-02-24 20:21:09 +08:00
Glence
dfbd1d027c
Merge branch 'main' into PlayerController
2023-02-24 18:04:26 +08:00
XiaoQiDigipen
d85382a06d
Merge pull request #363 from SHADE-DP/SP3-1-Rendering
...
Implemented scanline and silhouette effect
2023-02-24 17:20:45 +08:00
XiaoQiDigipen
d259e31638
Merge pull request #362 from SHADE-DP/SP3-141-Camera-System
...
Camera width resize with viewport. GetMainCamera exposed to scripts
2023-02-24 17:20:13 +08:00
Brandon Mak
18f6720055
Merge branch 'main' into SP3-1-Rendering
2023-02-24 17:18:40 +08:00
maverickdgg
b017618373
Merge branch 'main' into SP3-141-Camera-System
2023-02-24 16:32:01 +08:00
maverickdgg
4690fa5f91
GetMainCamera exposed to scripts.
2023-02-24 16:31:53 +08:00
maverickdgg
6045214b13
Camera width to resize with view port
2023-02-24 15:35:02 +08:00
XiaoQiDigipen
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
XiaoQiDigipen
774147233b
Merge pull request #360 from SHADE-DP/SP3-20-UI-System
...
Pre-load button textures
2023-02-24 15:09:17 +08:00
maverickdgg
c774071b35
Merge branch 'main' into SP3-141-Camera-System
2023-02-24 15:05:40 +08:00
maverickdgg
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
Brandon Mak
7eac238226
Accounted for subpass input descriptors
...
Silhouette shader is working
2023-02-24 11:47:58 +08:00
Brandon Mak
6faa4e676b
Updated shader for scanline (needs refining)
...
Shader hot reloading is working
2023-02-24 08:27:04 +08:00
Glence
86b662c7dc
Merge branch 'main' into PlayerController
2023-02-23 19:45:38 +08:00
XiaoQiDigipen
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
XiaoQiDigipen
ae2bc8592f
Merge pull request #358 from SHADE-DP/SP3-10-input-management
...
Implemented Input Functions via C#
2023-02-23 14:00:26 +08:00
Xiao Qi
5d3e755b9b
Reload of recompiled data
2023-02-23 13:49:21 +08:00
maverickdgg
c4db16bb95
Merge branch 'main' into SP3-20-UI-System
2023-02-23 13:44:12 +08:00
maverickdgg
69f2e678df
re-enabled scene change and disabled debug logs
2023-02-23 13:42:22 +08:00
Kah Wei
64be53bad3
Fixed button events only working once
2023-02-23 13:39:09 +08:00
Brandon Mak
a391d9373e
WIP
2023-02-23 13:35:46 +08:00
Kah Wei
7292f11cdb
Fixed issue where duplicate script assemblies are loaded again
2023-02-23 13:32:23 +08:00
Kah Wei
d7846082a3
Fixed incorrect managed functions being called for new button events
2023-02-23 13:32:00 +08:00
maverickdgg
1b865b129b
Added finalizeChanges call and debug logs for hover enter
2023-02-23 12:50:42 +08:00
mushgunAX
dbe9b4d133
Controller, Bindings and Mouse Centre via C#
2023-02-22 23:50:39 +08:00
Kah Wei
ecc88dc142
Fleshed out SHAnimationController more
2023-02-22 23:45:42 +08:00
Kah Wei
913241c73a
Merge branch 'main' into SP3-22-AnimationController
2023-02-22 21:49:45 +08:00
Kah Wei
bea179fb0f
Added script mappings for new button events
2023-02-22 21:49:10 +08:00
Brandon Mak
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
Xiao Qi
ff76704a86
New internal function in asset manager to get asset ID from name of compiled asset
2023-02-22 19:48:49 +08:00
Xiao Qi
8e9854a130
Check for existing asset meta in browser file before sendin asset id
2023-02-22 16:49:21 +08:00
Xiao Qi
5623115e29
Added asset id into compile function to facilitate event sending
2023-02-22 16:43:49 +08:00
Brandon Mak
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
mushgunAX
bc87fa3ae0
Merge branch 'main' into SP3-10-input-management
2023-02-22 15:16:05 +08:00
mushgunAX
0e572d7f89
progress
2023-02-22 15:15:38 +08:00
XiaoQiDigipen
5d025b0f9e
Merge pull request #357 from SHADE-DP/SP3-6-c-scripting
...
Added SharedMaterial for Renderable
2023-02-22 14:53:47 +08:00
Sri Sham Haran
fbd0035ade
Merge branch 'main' into SP3-4-Editor
2023-02-21 22:17:20 +08:00
maverickdgg
06ad2a4c0c
moved the UI routines
2023-02-21 21:20:31 +08:00
Glence
8d10c48645
Bug fixes and WIP for alpha
2023-02-21 19:31:50 +08:00
Kah Wei
9a7c0d0bf6
Added SharedMaterial for Renderable
2023-02-21 17:30:43 +08:00
XiaoQiDigipen
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
XiaoQiDigipen
ded5a87cf4
Merge pull request #354 from SHADE-DP/PlayerController
...
Bug fixes for textrenderable and sterilization, added base for game pause
2023-02-21 15:49:09 +08:00
maverickdgg
6b6bbc6ac5
Camera AR now stored in system instead of camera component.
2023-02-21 11:37:09 +08:00
Brandon Mak
49692e5c37
Text Rendering now checks for UI Component
2023-02-21 11:16:44 +08:00
maverickdgg
a3112f9c60
Fixed Canvas Scaler to keep AR of the UI Elements
2023-02-21 10:48:07 +08:00
maverickdgg
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
mushgunAX
9cc318cf27
Merge branch 'main' into SP3-10-input-management
2023-02-21 09:55:28 +08:00
mushgunAX
fe64844c4e
Mouse Centering
2023-02-21 09:55:14 +08:00
maverickdgg
febe22e487
Added new button events
2023-02-21 09:52:23 +08:00
Glence
d7725f4e26
Pause is done
2023-02-21 00:47:20 +08:00
Glence
09d88b5a70
small bug fixes for text and serialization and added game pause
2023-02-20 19:53:22 +08:00
Glence
f2e9d3b349
Merge branch 'main' into PlayerController
2023-02-20 19:07:56 +08:00
Kah Wei
c85298db88
Added initial stubs for SHAnimationController
2023-02-20 16:55:08 +08:00
Brandon Mak
f2101243e7
Merge branch 'main' into SP3-1-Rendering
2023-02-20 15:47:13 +08:00
XiaoQiDigipen
098e373318
Merge pull request #353 from SHADE-DP/SP3-141-Camera-System
...
Adjust AR for game camera. Expose FOV to inspector
2023-02-20 14:54:04 +08:00
maverickdgg
c9e9a30c3f
Exposed FOV to editor. Adjust AR for game camera
2023-02-20 14:52:01 +08:00
maverickdgg
33a6fac7c9
Merge branch 'main' into SP3-141-Camera-System
2023-02-20 14:39:14 +08:00
maverickdgg
debdba183e
removed some debug code
2023-02-20 14:39:10 +08:00
XiaoQiDigipen
f4a6810fd9
Merge pull request #352 from SHADE-DP/SP3-1-Rendering
...
Implemented improved shadows (still abit whack), trajectory system (untested), and window resize event
2023-02-20 14:35:25 +08:00
Brandon Mak
7b500d0cac
Merge branch 'main' into SP3-1-Rendering
2023-02-20 14:28:54 +08:00
Brandon Mak
15df08ef67
Implemented events for screen resize
2023-02-20 14:28:23 +08:00
XiaoQiDigipen
17a84bb2c8
Merge pull request #351 from SHADE-DP/SP3-6-CSharpStaticReset
...
Static variables in scripts are now reset when leaving play mode
2023-02-20 11:12:09 +08:00
Glence
d754a0b5c3
added targetOffSet to camera position
2023-02-18 23:43:43 +08:00
Glence
dfe4d047e9
added a jumppad to the game
2023-02-18 22:21:23 +08:00
Kah Wei
7d7ffc56fd
Disabled script undo and redo temporarily
2023-02-18 12:35:47 +08:00
Kah Wei
916a7315da
Merge branch 'main' into SP3-6-CSharpStaticReset
2023-02-18 12:24:17 +08:00
Brandon Mak
19d81b80f6
Base files for particles
2023-02-17 18:29:44 +08:00
Brandon Mak
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
Brandon Mak
cee45863fa
Trajectory rendering WIP
2023-02-17 00:53:45 +08:00
Brandon Mak
5acca02363
Implemented different shadow mapping technique
2023-02-15 21:34:22 +08:00
Brandon Mak
3a28873496
Merge branch 'main' into SP3-1-Rendering
2023-02-15 12:56:17 +08:00
Xiao Qi
7afbc33861
Uncommented line to hide console in publish
2023-02-06 15:58:57 +08:00
Glence
670ddee65a
Added rayheight for pickandthrow
2023-02-04 16:02:59 +08:00
Glence
a97dfe7049
remove watermelon debug
2023-02-04 15:56:37 +08:00
XiaoQiDigipen
e07a741c11
Merge pull request #350 from SHADE-DP/SP3-2-Physics
...
Potential fix for incorrect collision states
2023-02-04 15:20:14 +08:00
Diren D Bharwani
ccd1d883d9
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2023-02-04 15:18:22 +08:00
Diren D Bharwani
c0249531d3
Potential fix to physics collision states being incorrect
2023-02-04 15:18:15 +08:00
Glence
a594df5a4d
added physics fix and raycast change
...
called clear container in physicsSystem
move raycast of player higher
2023-02-04 15:17:58 +08:00
Diren D Bharwani
7cf5ef4b81
Solved merge conflicts from main
2023-02-04 14:21:40 +08:00
Diren D Bharwani
385b34fea4
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2023-02-04 14:20:25 +08:00
XiaoQiDigipen
f2602207aa
Merge pull request #349 from SHADE-DP/PlayerController
...
Small changes for publish build
2023-02-04 14:12:08 +08:00
Glence
a4ceffcfad
Small changes for publish build
...
Level1 ai fix
Ai speed fix
item vel reset back when return
player hard set rotation
can go to nesxt scene correctly now
scoring now checks for trigger
2023-02-04 14:11:16 +08:00
XiaoQiDigipen
5f03ac0c4d
Merge pull request #348 from SHADE-DP/PreAlphaFixes
...
Tweaked lighting in MainGame scene a bit cuz it looked janky at one portion, Hide and clip mouse cursor for builds without editor (only when window is active)
2023-02-04 11:26:56 +08:00
Sri Sham Haran
e41c161202
Adjusted lighting a bit cuz it looked janky at one portion
...
Hide and clip mouse cursor for builds without editor (only when window is active)
2023-02-04 11:21:25 +08:00
XiaoQiDigipen
3183316f40
Merge pull request #347 from SHADE-DP/AudioImplementation
...
Done with Audio Implementation via C#
2023-02-04 10:18:26 +08:00
mushgunAX
d1bad74791
Merge branch 'main' into AudioImplementation
2023-02-04 02:45:09 +08:00
XiaoQiDigipen
32043635c5
Merge pull request #346 from SHADE-DP/SP3-141-Camera-System
...
Fix camera arm and win scene issue
2023-02-04 02:44:32 +08:00
Glence
d1ae9b3756
Fix camera arm and win scene issue
2023-02-04 02:42:30 +08:00
XiaoQiDigipen
f617a1a984
Merge pull request #345 from SHADE-DP/SP3-141-Camera-System
...
Camera Collision fix. Still have some minor bugs
2023-02-04 02:39:55 +08:00
Xiao Qi
1f7f86dd01
Merge remote-tracking branch 'origin/main' into main
2023-02-04 02:39:37 +08:00
Xiao Qi
33807de93d
Pushed scene change and animator component bug fix for models without rigs
2023-02-04 02:32:35 +08:00
maverickdgg
c5296db6f6
Camera Collision fix
2023-02-04 02:20:42 +08:00
mushgunAX
6e8b2bc460
Merge branch 'main' into AudioImplementation
2023-02-04 02:11:41 +08:00
maverickdgg
5b6217f923
Merge branch 'main' into SP3-141-Camera-System
2023-02-04 02:10:16 +08:00
maverickdgg
94fe055aa9
fixed collision
2023-02-04 02:10:08 +08:00
Sri Sham Haran
0297627599
Merge pull request #344 from SHADE-DP/PlayerController
...
Fix collisionTag and playercontroller issue
2023-02-04 02:09:12 +08:00
Glence
79c1bb229a
Merge branch 'main' into PlayerController
2023-02-04 02:05:48 +08:00
Glence
0c455c55f6
correct collision tag issue and fix player controller keypress
2023-02-04 02:05:32 +08:00
Diren D Bharwani
638286b357
Fixed missing trigger state
2023-02-04 01:57:27 +08:00
mushgunAX
1866d4ba40
SFX for item scoring
2023-02-04 01:45:34 +08:00
mushgunAX
a7238c6eba
Merge branch 'main' into AudioImplementation
2023-02-04 01:45:09 +08:00
mushgunAX
23f7812a70
Fix StopAllSounds
2023-02-04 01:44:00 +08:00
maverickdgg
44e28f0d3f
Merge branch 'main' into SP3-141-Camera-System
2023-02-04 01:20:45 +08:00
XiaoQiDigipen
b2473c0c48
Merge pull request #343 from SHADE-DP/PlayerController
...
Fix scene1 issues and fix scripts
2023-02-04 01:20:26 +08:00
maverickdgg
e5d372c94e
Merge branch 'main' into SP3-141-Camera-System
2023-02-04 01:20:22 +08:00
Sri Sham Haran
b89be05ceb
Shortcuts in hierarchy panel cannot be pressed when any widget is focused
2023-02-04 01:20:01 +08:00
Glence
9d73806573
Merge branch 'main' into PlayerController
2023-02-04 01:11:56 +08:00
Glence
436846d03c
Fix level1 and fix ontrigger calling twice
2023-02-04 01:11:47 +08:00
XiaoQiDigipen
e88447bcf0
Merge pull request #342 from SHADE-DP/SP3-2-Physics
...
Collision Tags autosave on change, fixed serialisation bug with collision tags
2023-02-04 01:02:25 +08:00
Diren D Bharwani
d517a98bab
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2023-02-04 00:54:03 +08:00
Diren D Bharwani
a520571d82
Collision Tags now serialise based on index & autosave
2023-02-04 00:52:58 +08:00
maverickdgg
81d63f9776
Merge branch 'main' into SP3-141-Camera-System
2023-02-04 00:43:41 +08:00
maverickdgg
63a546b7aa
Merge branch 'main' into SP3-141-Camera-System
2023-02-04 00:32:41 +08:00
XiaoQiDigipen
ac93269283
Merge pull request #341 from SHADE-DP/SP3-20-UI-System
...
Fixed Button texture swapping. Fixed Button scripts on scene change. Added buttons to scenes. Added SHEDITOR define for Managed
2023-02-04 00:32:29 +08:00
mushgunAX
c7b99df2f6
Merge branch 'main' into AudioImplementation
2023-02-04 00:31:23 +08:00
maverickdgg
358df0768d
Merge branch 'SP3-20-UI-System' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-20-UI-System
2023-02-04 00:25:44 +08:00
maverickdgg
4de32341e1
Merge branch 'main' into SP3-20-UI-System
2023-02-04 00:24:59 +08:00
mushgunAX
49fadfed74
Dynamic BGM
2023-02-04 00:23:05 +08:00
Kah Wei
454de9f1ac
Added SHEDITOR and _PUBLISH defines to SHADE_Managed
2023-02-04 00:22:17 +08:00
Kah Wei
4a101d97c9
CallbackEvents are now able to handle situations where a CallbackAction results in adding more CallbackActions
2023-02-04 00:19:57 +08:00
maverickdgg
c88ce23d45
WIP collision
2023-02-04 00:17:29 +08:00
Kah Wei
3cd1778d08
Fixed SHUIComponent serialization
2023-02-04 00:04:25 +08:00
XiaoQiDigipen
36db5021ac
Merge pull request #338 from SHADE-DP/SP3-2-Physics
...
Fixed crash occurring with editing collision tag file
2023-02-03 23:54:43 +08:00
Diren D Bharwani
b5b3761a6c
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2023-02-03 23:52:10 +08:00
Diren D Bharwani
ff6ee80df2
Fixed bug where collision tag file could not be editir
...
Fuck file i/o
2023-02-03 23:51:31 +08:00
Xiao Qi
0281446538
Merge remote-tracking branch 'origin/main' into main
2023-02-03 23:50:40 +08:00
Xiao Qi
1bae1c97d6
Added demo animation objects
2023-02-03 23:50:35 +08:00
Kah Wei
7ded7a0706
Merge branch 'SP3-20-UI-System' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-20-UI-System
...
# Conflicts:
# Assets/Editor/Layouts/UserLayout.ini
2023-02-03 23:33:40 +08:00
Kah Wei
940c55d665
Fixed Renderables not being removed from a batch if their modifiable material was retrieved
2023-02-03 23:33:23 +08:00
maverickdgg
21695fd4f3
Merge branch 'main' into SP3-20-UI-System
2023-02-03 23:28:17 +08:00
maverickdgg
fdacaf5036
Added reminaing buttons for win and lose screens
2023-02-03 23:28:08 +08:00
XiaoQiDigipen
2be7469762
Merge pull request #337 from SHADE-DP/SP3-2-Physics
...
Unretarded the collision tags
2023-02-03 23:23:20 +08:00
Diren D Bharwani
7a79cda729
Reworked Collision Tag Interface and Logic
2023-02-03 23:22:21 +08:00
mushgunAX
136d86dce3
Fix Item Score SFX
2023-02-03 23:19:12 +08:00
mushgunAX
d71790022f
Merge branch 'main' into AudioImplementation
2023-02-03 23:16:47 +08:00
maverickdgg
b15b5eadbc
Merge branch 'main' into SP3-20-UI-System
2023-02-03 22:59:56 +08:00
maverickdgg
ebf1ab39cf
Added some buttons to lose screen
2023-02-03 22:59:49 +08:00
Diren D Bharwani
c61be35da0
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2023-02-03 22:44:58 +08:00
maverickdgg
382a2d0f6a
Added start game button. Texture changing for buttons now only change when necessary
2023-02-03 22:44:02 +08:00
XiaoQiDigipen
0e4400fc98
Merge pull request #336 from SHADE-DP/PlayerController
...
Scene changes and Bug fixes
2023-02-03 22:08:18 +08:00
Glence
e00b891bf7
added lights to level 2
2023-02-03 22:03:55 +08:00
Glence
5284066cee
Merge branch 'main' into PlayerController
2023-02-03 21:29:02 +08:00
Glence
2ee46f33df
update collision tag to have a save button and clamp raycast draw
2023-02-03 21:28:50 +08:00
XiaoQiDigipen
0bf1fc9839
Merge pull request #335 from SHADE-DP/SP3-1-Rendering
...
Updated shadow implementation
2023-02-03 20:22:03 +08:00
XiaoQiDigipen
b705db8a8c
Merge pull request #334 from SHADE-DP/SP3-129-AudioSystem
...
Added global parameter control and VCA volume control
2023-02-03 20:21:28 +08:00
Brandon Mak
6cde511b36
Shadows update
...
Made it less dark
2023-02-03 20:16:42 +08:00
maverickdgg
a6290d9c8f
Added texture, modifiable material fix
2023-02-03 20:12:48 +08:00
Xiao Qi
50c3855476
Merge remote-tracking branch 'origin/main' into main
2023-02-03 19:38:02 +08:00
Xiao Qi
c9db8262b7
Added preprocessor checks for editor
2023-02-03 19:37:56 +08:00
mushgunAX
a6bc9ed2b4
Updates on audio
2023-02-03 19:37:18 +08:00
Brandon Mak
ca0b8aabb0
Merge branch 'main' into SP3-1-Rendering
2023-02-03 19:33:22 +08:00
Kah Wei
5bef209189
Modified ScriptAddAction to use serialization
2023-02-03 19:17:20 +08:00
SHAM-DP
98d4dd9483
Merge branch 'main' into SP3-129-AudioSystem
2023-02-03 19:16:25 +08:00
SHAM-DP
5b2f42a920
Added controls for global parameters
...
Added controls for VCA volume
2023-02-03 19:16:12 +08:00
maverickdgg
e3d616b4e1
Merge branch 'main' into SP3-20-UI-System
2023-02-03 18:42:53 +08:00
Diren D Bharwani
b02f4ac49b
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2023-02-03 18:40:51 +08:00
Diren D Bharwani
36de32447d
Fixed some bugs with serialisation
2023-02-03 18:40:45 +08:00
XiaoQiDigipen
ffb0a6e20c
Merge pull request #332 from SHADE-DP/SP3-6-c-scripting
...
Fixed bug where shmeta files in folders would still appear in SHADE_Scripting.csproj's solution explorer
2023-02-03 18:06:32 +08:00
Kah Wei
929bfa8a54
Merge branch 'SP3-6-c-scripting' into SP3-6-CSharpStaticReset
2023-02-03 17:05:56 +08:00
mushgunAX
60fa4335a0
Merge branch 'main' into AudioImplementation
2023-02-03 17:01:11 +08:00
Kah Wei
4cf17c16b5
Fixed bug where shmeta files in folders would still appear in SHADE_Scripting.csproj's solution explorer
2023-02-03 16:54:35 +08:00
Glence
6b5bd43110
Merge branch 'main' into PlayerController
2023-02-03 16:48:51 +08:00
XiaoQiDigipen
7818c6f2d2
Merge pull request #331 from SHADE-DP/SP3-2-Physics
...
Refactored Raycasting, Added Layers for Raycasting to C#, Fixed Collision Tag Panel
2023-02-03 16:26:06 +08:00
Diren D Bharwani
c73275f2d3
Added temporary use of collision layers to C# and fixed raycast drawing
2023-02-03 16:11:30 +08:00
maverickdgg
bb00889553
Merge branch 'main' into SP3-20-UI-System
2023-02-03 15:53:26 +08:00
Diren D Bharwani
b81e71ed08
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2023-02-03 02:03:12 +08:00
Diren D Bharwani
b6d91d5492
Fixed bug with collision tags not behaving as intended
...
Why the damn hell must react's system be so confusing??
2023-02-03 01:37:45 +08:00
mushgunAX
d1a3214d41
Change banks
2023-02-03 00:40:22 +08:00
Glence
5bf3af2ed2
corrected transition to diff scenes
2023-02-03 00:03:05 +08:00
Glence
4af3440db7
added gameplay for level1 and multiplier combo is done
2023-02-02 22:44:48 +08:00
Diren D Bharwani
931f6fe5e2
Fixed almost everything. Ray debug drawing has a small bug
2023-02-02 20:56:55 +08:00
Diren D Bharwani
d5c731dd20
Fixed collision shape debug drawing and more serialisation bugs
2023-02-02 20:48:32 +08:00
Diren D Bharwani
931ed58287
Added individual collider debug drawing
2023-02-02 20:19:21 +08:00
mushgunAX
e28c6ce1a7
new banks
2023-02-02 20:16:12 +08:00
Diren D Bharwani
3593df3ada
Fixed collider shape serialisation
2023-02-02 20:15:59 +08:00
Diren D Bharwani
71f4cdd29e
Fixed rigidbody serialisation
2023-02-02 19:23:42 +08:00
Diren D Bharwani
6a57be2e60
Refactored old physics to match new interface
...
Compiles but still buggy, need a bit of time to clear up all the bugs
2023-02-02 19:06:56 +08:00
mushgunAX
1d0522e334
Audio Implementation for AI
2023-02-02 16:58:40 +08:00
XiaoQiDigipen
e5479c31c5
Merge pull request #330 from SHADE-DP/PlayerController
...
Scripting changes for item and added level 1 scene
2023-02-02 11:20:20 +08:00
Glence
5b628baedf
changes breakable to only minus count on items
2023-02-02 11:16:56 +08:00
Glence
aaf4919c27
Merge branch 'main' into PlayerController
2023-02-02 11:05:06 +08:00
XiaoQiDigipen
7c53700692
Merge pull request #329 from SHADE-DP/SP3-6-c-scripting
...
Added UI Element and other QoL fixes for scripting
2023-02-02 10:57:20 +08:00
Glence
ec11f8cb8f
Merge branch 'main' into PlayerController
2023-02-02 10:45:21 +08:00
Kah Wei
ee03722153
Merge branch 'main' into SP3-6-c-scripting
2023-02-01 23:49:44 +08:00
Kah Wei
3a4288d4bc
Merge branch 'SP3-6-c-scripting' into SP3-6-CSharpStaticReset
2023-02-01 19:18:29 +08:00
maverickdgg
d149aae6fb
Merge branch 'main' into SP3-20-UI-System
2023-02-01 12:44:30 +08:00
maverickdgg
2dfaa75ab3
Add CreateComponentSparseSet and bug fix for togglebutton nt triggering
2023-02-01 12:42:51 +08:00
Kah Wei
0b0590180d
Fixed incorrect functor called in SHScriptEngine::onUIElementClicked()
2023-02-01 11:57:11 +08:00
Kah Wei
39fbfbd6fa
Added more reliable method of reloading static C# data
2023-02-01 00:34:09 +08:00
Kah Wei
72953762cb
Attempt at resetting static data members
2023-01-31 23:48:44 +08:00
XiaoQiDigipen
ab48efce30
Merge pull request #326 from SHADE-DP/SP3-1-Rendering
...
Fixed UI Rendering
2023-01-31 22:53:03 +08:00
Brandon Mak
d9833ca8b0
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-01-31 19:07:28 +08:00
XiaoQiDigipen
71613143f6
Merge pull request #325 from SHADE-DP/SP3-4-Editor
...
Added Asset Browser Filters, double click asset id in inspector to highlight asset in asset browser
2023-01-31 19:05:21 +08:00
Brandon Mak
109f35f297
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-01-31 19:02:11 +08:00
Brandon Mak
ea74f5ebf6
Fixed some errors in SHUISystem
2023-01-31 19:01:21 +08:00
SHAM-DP
d6fc83d3b7
Merge branch 'main' into SP3-4-Editor
2023-01-31 18:56:09 +08:00
SHAM-DP
4c4d39d4bb
Added double click asset id in inspector to scroll to asset in asset browser
...
Added asset browser filter by name and type
2023-01-31 18:55:50 +08:00
Xiao Qi
883c3c8fc1
Added recognition for audio bank files
...
Added wrapper class to hold path for fmod system
2023-01-31 18:27:39 +08:00
Glence
8d43fca1cc
added models for level 1 and made gamemanager a singleton
2023-01-31 18:13:34 +08:00
Kah Wei
8f9a4e8c73
Fixed bug where onDestroy() is not called for scripts that are destroyed when leaving play mode in the editor
2023-01-31 18:09:07 +08:00
Xiao Qi
8c9673cafd
Removed editor config from repo
2023-01-31 17:48:29 +08:00
Xiao Qi
e0f363f1ec
Changed line to only ignore editor config
2023-01-31 17:47:36 +08:00
Xiao Qi
164b4f7197
Changed gitignore line to ignore all items in Editor Folder
2023-01-31 17:38:48 +08:00
Kah Wei
53f599a238
Added RemoveScript(Script) for Scripts and GameObjects
2023-01-31 17:28:24 +08:00
Diren D Bharwani
3b6e0be364
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2023-01-31 17:14:52 +08:00
Brandon Mak
e9452093f0
Fixed UI
2023-01-31 15:17:40 +08:00
Glence
0f8e1d6310
Merge branch 'main' into PlayerController
2023-01-31 13:47:55 +08:00
XiaoQiDigipen
24c15743a1
Merge pull request #324 from SHADE-DP/SP3-10-input-management
...
Set to force the use of dedicated GPU
2023-01-31 12:53:13 +08:00
mushgunAX
710bfe1dac
Merge branch 'main' into SP3-10-input-management
2023-01-31 12:51:50 +08:00
mushgunAX
38f2ba69db
Force use of Dedicated GPU
2023-01-31 12:43:02 +08:00
Kah Wei
b46d2135bc
Modified Renderable and TextRenderable to no longer use reference to Assets, and use the Asset directly instead
2023-01-31 10:53:58 +08:00
Glence
d1d7d430b1
added breakable food into the scene
...
#issues to fix
egg collision too small so weight is really small
throwing heavy objects doesnt give enuff force compared to rolling and hitting it
2023-01-31 00:43:25 +08:00
Glence
3e015d924e
Merge branch 'main' into PlayerController
2023-01-30 23:30:55 +08:00
Kah Wei
a5b7672102
Merge branch 'main' into SP3-6-c-scripting
2023-01-30 20:53:42 +08:00
Kah Wei
f93d5fcd63
Added scripting inteface for SHUIComponent
2023-01-30 20:52:39 +08:00
Xiao Qi
c13f06e4a6
Added warning line to check for existing path
2023-01-30 19:55:42 +08:00
XiaoQiDigipen
eedcd44b8e
Merge pull request #323 from SHADE-DP/delete-editorconfig
...
Delete Editor.SHConfig (Delete this branch)
2023-01-30 18:32:29 +08:00
XiaoQiDigipen
f1bf9cb865
Merge pull request #322 from SHADE-DP/SP3-4-Editor
...
Added hierarchy panel filter
2023-01-30 18:29:47 +08:00
Xiao Qi
f2b8e52608
Commented unused shader build lines
2023-01-30 18:28:49 +08:00
Sri Sham Haran
559cda92f1
Delete Editor.SHConfig
2023-01-30 18:27:29 +08:00
SHAM-DP
f2a0b38406
Merge branch 'main' into SP3-4-Editor
2023-01-30 17:56:38 +08:00
SHAM-DP
cf999b0d3b
Added entity filter
2023-01-30 17:44:06 +08:00
XiaoQiDigipen
213ac9d275
Merge pull request #321 from SHADE-DP/SP3-17-animation-system
...
Animation WIP merge
2023-01-30 17:35:56 +08:00
XiaoQiDigipen
4c5becff46
Merge pull request #320 from SHADE-DP/AudioScripting
...
Added Scripting interface for AudioClips
2023-01-30 17:08:38 +08:00
Kah Wei
c2aa067cc4
Fixed crash caused by loading incorrect renderpass for subpass replacement
2023-01-30 16:55:15 +08:00
SHAM-DP
59ef28baf1
Merge branch 'main' into AudioScripting
2023-01-30 16:47:46 +08:00
SHAM-DP
526c6dc883
Spatial scripting inteface changes (remove eid requirement)
2023-01-30 16:47:38 +08:00
SHAM-DP
74b8ee73c5
Spatial setup
2023-01-30 16:47:03 +08:00
Brandon Mak
a3ca04535f
More changes
2023-01-30 16:46:42 +08:00
Brandon Mak
89b101f3e5
passed string by value dum dum brandon
2023-01-30 16:46:14 +08:00
Brandon Mak
c45c469c8e
Change GetUsableSubpasses to GetUsableSubpass
2023-01-30 16:42:19 +08:00
Brandon Mak
f8bde9fc35
Added map to retrieve usable subpasses
2023-01-30 16:35:12 +08:00
Kah Wei
8a4a469abf
Added ability to change subpass for a material and fixed typo for vertex shader in the material editor
2023-01-30 15:52:42 +08:00
Brandon Mak
a67e65ff76
Made array for usable subpasses
2023-01-30 15:34:22 +08:00
Brandon Mak
23734fa42c
Merge branch 'main' into SP3-1-Rendering
2023-01-30 15:23:00 +08:00
Kah Wei
61fa2ae923
Merge branch 'main' into SP3-17-animation-system
2023-01-30 15:16:09 +08:00
Kah Wei
53ef202e46
Merge branch 'main' into SP3-17-animation-system
...
# Conflicts:
# SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
# SHADE_Engine/src/Serialization/SHYAMLConverters.h
2023-01-30 15:15:46 +08:00
XiaoQiDigipen
5240c837ec
Merge pull request #318 from SHADE-DP/SP3-10-input-management
...
Implemented Input Binding Panel via Editor
2023-01-30 15:00:58 +08:00
Kah Wei
b3f79e31db
Forgot to commit shader binary
2023-01-30 14:58:52 +08:00
Kah Wei
52c0cc2f84
Merge branch 'main' into SP3-17-animation-system
...
# Conflicts:
# Assets/Shaders/TestCube_VS.shshaderb
# SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
# SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.h
# SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsPredefinedData.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsPredefinedData.h
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsConstants.h
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Meshes/SHPrimitiveGenerator.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Meshes/SHPrimitiveGenerator.h
# SHADE_Engine/src/Graphics/MiddleEnd/Pipeline/SHPipelineLibrary.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Pipeline/SHPipelineLibrary.h
# SHADE_Engine/src/Serialization/SHYAMLConverters.h
2023-01-30 14:57:46 +08:00
XiaoQiDigipen
2fd8506fab
Merge pull request #319 from SHADE-DP/revert-316-SHPhysics
...
Revert "Implemented a custom physics engine"
2023-01-30 14:41:09 +08:00
XiaoQiDigipen
3ff2e6bb92
Revert "Implemented a custom physics engine"
2023-01-30 14:40:55 +08:00
Kah Wei
8c3703ce04
Fixed models using wrong animation bone matrices
2023-01-29 20:52:04 +08:00
Kah Wei
4a00312f57
Added serialization of AnimatorComponent
2023-01-29 20:35:18 +08:00
Kah Wei
2d1987e14b
Added handling for rendering objects using an animated shader but without an animator component or an attached rig
2023-01-29 19:27:58 +08:00
Kah Wei
741489b0ae
Merge branch 'SP3-17-animation-system' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-17-animation-system
2023-01-29 18:51:36 +08:00
Kah Wei
6af4933b52
Fixed on-close crashes coming from SHResourceManager
2023-01-29 18:51:31 +08:00
Xiao Qi
83a33b3851
Bone count data member in mesh asset
2023-01-29 18:38:12 +08:00
Kah Wei
eab2f2d54a
Fixed bug where replacing an animator's rig causes the GPU to be lost
2023-01-29 16:03:08 +08:00
Kah Wei
3f1a25c95b
Fixed crash caused by loading more than one SHRig
2023-01-29 15:39:48 +08:00
Kah Wei
1472823dc0
Removed buggy animation debug draw
2023-01-29 14:45:46 +08:00
Brandon Mak
d5897387c5
Merge branch 'main' into SP3-1-Rendering
2023-01-29 13:25:40 +08:00
mushgunAX
ac10b95b01
Tooltips
2023-01-25 23:54:04 +08:00
mushgunAX
bde191aeca
Input Bindings Panel Done
2023-01-25 23:22:15 +08:00
Glence
7d9ab7a381
items changes
...
items now return back to their original position when owner collides with it
2023-01-25 18:20:26 +08:00
Kah Wei
80a7fe701b
Added debug draw for animation system
2023-01-24 23:31:00 +08:00
mushgunAX
e70354df74
Get input code name functions
2023-01-24 19:17:27 +08:00
mushgunAX
834d474f21
Merge branch 'main' into SP3-10-input-management
2023-01-23 18:04:07 +08:00
XiaoQiDigipen
cec8d9e618
Merge pull request #316 from SHADE-DP/SHPhysics
...
Implemented a custom physics engine
2023-01-23 15:55:45 +08:00
Diren D Bharwani
4ed7aa3aed
Reverted an attempt to stabilise edge detection between polyhedrons
2023-01-23 03:03:40 +08:00
Diren D Bharwani
5730381302
Physics objects can be implicity static if only a collider was added.
...
Removed the need to create an extra body. Math is great.
2023-01-23 00:56:46 +08:00
Diren D Bharwani
a0f6cd3ae7
Cached SAT for improved stability
...
The effects of baumgarte stabilisation can be rather obvious especially when polyhedrons are thrown around at angles. Regardless, the system is relatively stable bar the added energy from the solving method, which may make for a more "bombastic" physics playground
2023-01-23 00:37:22 +08:00
Kah Wei
354d9434f6
SHAnimatorComponent and SHRig now use the proper transform and offset matrices
2023-01-22 21:43:37 +08:00
Diren D Bharwani
0c3106f15b
Abstracted contact derivation as setup for cached SAT
2023-01-22 19:20:03 +08:00
mushgunAX
dddb556553
Progress
2023-01-22 17:59:36 +08:00
Diren D Bharwani
826a1bc617
Merge remote-tracking branch 'origin/main' into SHPhysics
2023-01-22 17:39:06 +08:00
Diren D Bharwani
1dc16fdcda
Fixed typos
2023-01-22 17:38:51 +08:00
Xiao Qi
80fb8f7c73
Saved and loaded bone offsets
2023-01-22 17:00:55 +08:00
Glence
7f787f2593
Merge branch 'main' into PlayerController
2023-01-20 15:19:49 +08:00
mushgunAX
79a40cb58b
Merge branch 'main' into SP3-10-input-management
2023-01-20 14:02:06 +08:00
mushgunAX
71572381f7
Progress on input bindings in editor
2023-01-20 14:00:24 +08:00
Kah Wei
62f104a535
Added Global Inverse Matrix for SHRig
2023-01-18 20:11:48 +08:00
Kah Wei
a543f6cc3a
Removed unecessary check in SHAnimatorComponent
2023-01-18 19:52:26 +08:00
Kah Wei
3e23f08aa8
Fixed bug where keyframes of animation clips are not interpolated
2023-01-18 19:25:27 +08:00
Kah Wei
b9fcdc43d4
Modified how SHAnimatorComponent computes the bone matrices
2023-01-18 19:16:45 +08:00
Kah Wei
35b7ac0178
Fixed SHAnimationClip::GetTotalTime()
2023-01-18 19:16:20 +08:00
Kah Wei
e013112b2c
Fixed validation errors when rendering a non-animated model
2023-01-18 16:03:25 +08:00
Kah Wei
6c6e3bfe28
Merge branch 'SP3-17-animation-system' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-17-animation-system
2023-01-18 15:12:03 +08:00
XiaoQiDigipen
4854e35e75
Merge pull request #315 from SHADE-DP/SP3-4-Editor
...
Added open by default for component inspector toggle headers, Added drag/drop receiving for all uint32_t fields
2023-01-18 04:05:49 +08:00
Xiao Qi
1b97cd72bd
TEMP fix to get anim timing correct
2023-01-18 04:05:36 +08:00
Xiao Qi
6872bae151
Updated compiled shmodel file for racoon with fixed rig node order and build format
...
Fixed bug when building histogram for vertex weights
2023-01-18 04:00:48 +08:00
Kah Wei
b36145fa39
Added isAnimated check with base 0-index identity matrix for bones
2023-01-17 22:55:33 +08:00
Kah Wei
20ffd67fcc
Fixed move constructor and assignment for SHBatch and added a check for if a batch is animated
2023-01-17 21:54:53 +08:00
SHAM-DP
c3a140b9aa
Merge branch 'main' into SP3-4-Editor
...
reordered draw order for some windows
2023-01-17 21:08:37 +08:00
SHAM-DP
3cb1e5c7fc
Merge branch 'main' into SP3-4-Editor
2023-01-17 21:02:01 +08:00
SHAM-DP
6b19a635e3
All component view toggle headers open by default
...
uint32_t fields now accept EID & Resource drag/drop
2023-01-17 20:52:22 +08:00
Kah Wei
af3e4a3cfd
Modified SHRig to use indices provided by SHRigAsset instead of auto generated indices
2023-01-17 18:26:58 +08:00
Xiao Qi
2d898851c5
Fixed rig asset node delete
2023-01-17 16:07:19 +08:00
Xiao Qi
1b4397c76d
Updated all compiled models
...
Fixed UV mappings
2023-01-17 14:38:50 +08:00
Glence
19c11447c0
added base to return item back to original pos
2023-01-16 21:31:38 +08:00
Glence
affa6f0dd8
added implantation for audio scripting
2023-01-16 21:05:21 +08:00
Kah Wei
bce7237e20
Modified shader to support instanced bone first index and system to support runtime updating of animations
2023-01-16 21:02:37 +08:00
Kah Wei
a668f38c87
Fixed bone vertex data not correctly passed to the GPU
2023-01-16 17:49:16 +08:00
Kah Wei
1fc2897150
Added SHVec4U and modified SHMesh to use SHVec4U instead of uint32_t
2023-01-16 16:30:15 +08:00
Diren D Bharwani
36e01260ec
Merge changes from main missing from previous commit
2023-01-16 16:23:48 +08:00
Diren D Bharwani
dc55c31c36
Merge remote-tracking branch 'origin/main' into SHPhysics
2023-01-16 16:23:20 +08:00
Diren D Bharwani
8475bdccd7
Merge remote-tracking branch 'origin/main' into SHPhysics
2023-01-16 16:22:59 +08:00
Xiao Qi
5089957468
Implemented bone weight reading into desired format.
2023-01-16 16:12:43 +08:00
XiaoQiDigipen
b6724eed77
Merge pull request #314 from SHADE-DP/SP3-1-Rendering
...
Implemented Shadow maps (still needs improvement)
2023-01-16 15:40:30 +08:00
XiaoQiDigipen
51b5fc03c7
Merge pull request #313 from SHADE-DP/SP3-20-UI-System
...
Added asset browser tool tip that shows asset id
2023-01-16 15:39:50 +08:00
Brandon Mak
09911cc50c
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-01-16 15:33:37 +08:00
Brandon Mak
e115d4b965
Reverted light properties back to main
2023-01-16 15:33:20 +08:00
maverickdgg
cb93fab363
Merge branch 'main' into SP3-20-UI-System
2023-01-16 15:17:43 +08:00
maverickdgg
fe39be0d61
Added asset browser tool tip that shows asset id
2023-01-16 15:17:06 +08:00
Brandon Mak
1526176c58
Shadows WIP
2023-01-16 15:06:46 +08:00
XiaoQiDigipen
dfb8500c9b
Merge pull request #311 from SHADE-DP/SP3-20-UI-System
...
Added Changing of textures for buttons. Change button events to be on release
2023-01-16 15:01:51 +08:00
Diren D Bharwani
c077575a73
Fixed convex-convex face detection
...
Minor bugs with contact point detection. Will test more before pushing into main
2023-01-16 15:01:14 +08:00
XiaoQiDigipen
5994c83263
Merge pull request #310 from SHADE-DP/SP3-1-DebugDraw
...
Fix #307 and SHDebugDraw::WireCapsule is now made static
2023-01-16 14:57:06 +08:00
maverickdgg
cdb5102630
Added a 0 check for button textures.
2023-01-16 14:51:06 +08:00
maverickdgg
1e351366af
fix clicked texture to take priority over hovered texture
2023-01-16 14:44:20 +08:00
Kah Wei
b5c9392baf
Merge branch 'main' into SP3-1-DebugDraw
2023-01-16 14:39:53 +08:00
Kah Wei
b603044579
Fixed validation errors caused by debug draw and fixed SHDebugDraw::WireCapsule not being static
2023-01-16 14:39:35 +08:00
maverickdgg
077f6f0fc9
Merge branch 'main' into SP3-20-UI-System
2023-01-16 14:36:29 +08:00
maverickdgg
a41354f2ce
Added changing texture of buttons
2023-01-16 14:35:16 +08:00
Xiao Qi
7f9991038a
Working commit
2023-01-16 14:34:59 +08:00
XiaoQiDigipen
18610b724b
Merge pull request #308 from SHADE-DP/SP3-20-UI-System
...
Fixed Buttons, Added Button events, Added Toggle Buttons, Added Sliders(WIP no graphics), Rework backend
2023-01-16 14:11:51 +08:00
SHAM-DP
34f22808ee
transition scenescave prompt
2023-01-16 14:07:44 +08:00
maverickdgg
02ba0c6dc9
merge
2023-01-16 11:44:34 +08:00
maverickdgg
132e66c6c0
Merge branch 'UI-Test' into SP3-20-UI-System
2023-01-16 11:43:00 +08:00
maverickdgg
0c7224b8be
Merge branch 'main' into UI-Test
2023-01-16 11:37:38 +08:00
maverickdgg
5190c490c9
added events
2023-01-16 11:36:12 +08:00
mushgunAX
c5998c3b53
Laying out foundations for input editor UI
2023-01-16 10:32:18 +08:00
maverickdgg
5aa7bfe03e
button fixed
2023-01-16 07:34:44 +08:00
Diren D Bharwani
85f0902c2d
Removed unused collision table and fixed bug with kinematic bodies exploding
2023-01-16 03:48:08 +08:00
Diren D Bharwani
19bffc9124
First half of re-implementing face-face contact derivation
2023-01-16 02:44:27 +08:00
Diren D Bharwani
dab109bc77
Fixed a fatal error with rigid body rotations.
2023-01-16 02:43:31 +08:00
Kah Wei
7ecb8b11ad
Added support for rendering bone-less models using the animated shader
2023-01-13 21:26:05 +08:00
Kah Wei
d1a41ea194
Fixed raccoon not rendering for animated material
2023-01-13 20:33:25 +08:00
Kah Wei
74d6e5cee7
SHPipelineLibrary now sets the pipeline layouts correctly
2023-01-13 18:14:40 +08:00
Glence
1c47f17d92
Merge branch 'SP3-129-AudioSystem' into AudioScripting
2023-01-13 17:46:23 +08:00
Glence
de6f4dd138
Added functions to attach and detach audio clips to objects
2023-01-13 17:46:01 +08:00
Diren D Bharwani
6c76849cd8
Merge remote-tracking branch 'origin/SHPhysics' into SHPhysics
2023-01-13 15:26:28 +08:00
Diren D Bharwani
ef5016351b
Reverted changes to inertia tensors
...
Created a new branch since I reverted to an older commit but kept some new updates. This will be the main branch moving forward.
2023-01-13 15:26:21 +08:00
Diren D Bharwani
13d5625055
Reverted changes to inertia tensors
...
Created a new branch since I reverted to an older commit but kept some new updates
2023-01-13 15:25:57 +08:00
Kah Wei
d1ab595126
Fixed certain crashes when assigning rig and clip
2023-01-12 20:04:49 +08:00
Kah Wei
406759f856
Added animator inspector to the editor
2023-01-11 23:02:09 +08:00
Brandon Mak
f217562fef
Shadows are sort of working
2023-01-11 20:04:53 +08:00
Kah Wei
c0e8c032b9
Added inspector for animator component
2023-01-11 16:17:32 +08:00
Kah Wei
3d73185926
Fixed vector issues when constructing the SHRig
2023-01-11 15:15:35 +08:00
Brandon Mak
4cd9a6cea0
shadows WIP
2023-01-11 10:35:29 +08:00
Brandon Mak
4a06032bea
Shadows WIP
2023-01-11 08:25:38 +08:00
Xiao Qi
190665bbbf
Changed function signature to take in rig node pointer reference instead of r value ptr
2023-01-10 20:52:34 +08:00
Kah Wei
c0de2d4705
Fixed SHAnimationClip not copying name of channels correctly and added extra check for SHRig if an invalid rig is being constructed
2023-01-10 19:42:43 +08:00
Kah Wei
5c14a0829a
Added support for edge cases in transforms interpolation for animation clips
2023-01-10 11:46:37 +08:00
Brandon Mak
9538636af6
Shadows WIP
2023-01-10 01:47:10 +08:00
Kah Wei
e9624977cd
Modified SHAnimationComponent to handle interpolation of separate position, rotation and scale keyframes
2023-01-09 23:32:20 +08:00
Kah Wei
7bf0c26052
Added support for loading SHRig and SHAnimationClip into SHResourceManager and modified SHAnimationClip to support proper keyframe data
2023-01-09 17:51:54 +08:00
XiaoQiDigipen
8e58d47115
Merge pull request #306 from SHADE-DP/SP3-10-input-management
...
Changed default pathing for binding file serialisation
2023-01-09 17:44:14 +08:00
maverickdgg
8b2297f451
CreateSparseSet
2023-01-09 17:40:21 +08:00
Brandon Mak
918018b6fe
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2023-01-09 17:34:17 +08:00
mushgunAX
356ec24cc2
Change default pathing for binding file I/O
2023-01-09 17:21:24 +08:00
maverickdgg
402bd16522
fix for editor window size
2023-01-09 17:18:22 +08:00
Xiao Qi
a58c3e86a5
Reinserted genMeta in compiling function
2023-01-09 17:10:13 +08:00
Kah Wei
19ba71e51c
Added animated raccoon material and deleted unused skinned vertex shader
2023-01-09 17:05:10 +08:00
XiaoQiDigipen
be337a2687
Merge pull request #305 from SHADE-DP/SP3-5-ECS
...
Added GetComponents to Component Manager
2023-01-09 16:59:45 +08:00
XiaoQiDigipen
82f65a112c
Merge pull request #304 from SHADE-DP/SP3-10-input-management
...
Implemented Input Binding Serialisation
2023-01-09 16:56:59 +08:00
Brandon Mak
cb9223db0b
Enabled partially bound bit for descriptor sets with variable size
...
- Shadow maps can be sampled from compute shaders
2023-01-09 11:06:10 +08:00
maverickdgg
28829213c9
merge
2023-01-09 10:53:56 +08:00
maverickdgg
3638feba05
Merge branch 'main' into SP3-20-UI-System
2023-01-09 10:50:36 +08:00
maverickdgg
4f63558f40
Added GetComponents to Component Manager
2023-01-09 10:44:36 +08:00
maverickdgg
88491ffbd8
ToggleButton fix
2023-01-09 09:56:46 +08:00
Brandon Mak
4928ed4bcf
Will update commit message tomorrow. Fuck Vulkan. *KW in BG: DiReCtX*
...
- Changed RenderGraphNodeNames to RenderGraphEntityNames
- Managed to get shadow maps into desc sets
2023-01-09 09:44:40 +08:00
maverickdgg
e89b6f5c4c
Fixing button
2023-01-09 09:38:53 +08:00
maverickdgg
5f11a931c7
Added Toggle Button, Fixed canvas Scalar
2023-01-09 09:24:20 +08:00
maverickdgg
b293b28a56
Button fix
2023-01-09 07:14:40 +08:00
mushgunAX
7dbd0b93b3
Minor comment fix
2023-01-08 21:39:48 +08:00
mushgunAX
4123e76a7d
Checking Input Binding I/O
2023-01-08 21:36:19 +08:00
mushgunAX
92a7555370
Merge branch 'main' into SP3-10-input-management
2023-01-08 21:05:18 +08:00
mushgunAX
baaeb9ee10
Input Binding File I/O
2023-01-08 21:05:09 +08:00
XiaoQiDigipen
d913a6dd08
Merge pull request #303 from SHADE-DP/Model-Loader-Update
...
Updated Loading of .shmodel files and updated original models
2023-01-08 12:40:01 +08:00
Xiao Qi
67db3e636c
Updated racoon model and files
2023-01-08 12:37:48 +08:00
XiaoQiDigipen
f120f365eb
Merge pull request #302 from SHADE-DP/SP3-1-DebugDraw
...
Added support for debug drawing wireframe capsules
2023-01-08 12:20:11 +08:00
Kah Wei
686e141efa
Fixed comment for SHPrimitiveGenerator::LineCapsuleCap
2023-01-08 01:46:52 +08:00
Kah Wei
f44e7b7a1c
Debug draw capsule now works with different orientations
2023-01-08 01:43:40 +08:00
Kah Wei
5c5ff38b49
Merge branch 'main' into SP3-1-DebugDraw
2023-01-08 01:07:15 +08:00
Kah Wei
98bfbc1048
Added DrawWireCapsule for debug draw (doesn't support orientation changes yet)
2023-01-08 01:06:50 +08:00
Brandon Mak
1a0edf30d7
Will update commit message tomorrow. Fuck Vulkan. *KW in BG: DiReCtX*
2023-01-07 22:40:29 +08:00
Xiao Qi
1eab15d129
Root nullptr check when destroying rig tree
2023-01-07 22:04:11 +08:00
Xiao Qi
1a2a514f98
Updated all models
2023-01-07 22:00:46 +08:00
Xiao Qi
de0dc5db61
Recompiled models
2023-01-07 21:48:31 +08:00
Xiao Qi
c3d027f5b1
AssetID check for 0
2023-01-07 21:32:16 +08:00
Xiao Qi
ae024e9757
Changed order of init in asset manager to init all loaders first before building directory to avoid crash
2023-01-07 21:13:59 +08:00
Xiao Qi
73a1aaa480
Updated model loading to match new model binary implementation
...
Changed some calls in resource to match new names and defines
2023-01-07 21:00:11 +08:00
Brandon Mak
77a5829fc9
Shadows WIP
2023-01-07 17:45:49 +08:00
SHAM-DP
f726592557
Popup window base & popup management
...
Added Scene save prompt popup (WIP)
2023-01-07 17:34:07 +08:00
Xiao Qi
64323f6cf8
Merge branch 'SP3-17-animation-system' into Model-Loader-Update
2023-01-07 16:43:01 +08:00
Xiao Qi
ab766d9304
Updated Model asset and rig loading
2023-01-07 16:42:13 +08:00
XiaoQiDigipen
83eb3fffcd
Merge pull request #301 from SHADE-DP/SP3-16-Math
...
Added rotate method with quaternions for Vector3
2023-01-07 16:18:36 +08:00
Diren D Bharwani
222bda9a13
Replaced Transform's Forward.get with new rotate method
2023-01-07 16:16:35 +08:00
Diren D Bharwani
c3582cf5ee
Added a rotate method with quaternions for Vector3
2023-01-07 16:14:55 +08:00
Diren D Bharwani
8914dea574
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2023-01-07 16:01:03 +08:00
Brandon Mak
8bb406e17f
Shadows WIP
...
- new subpass generated for shadow maps now use light's renderer
- Added support to pass in custom binding and location for vertex attributes
- SHLightingSubSystem GetViewMatrix uses SHMatrix::LookAtLH but with hard-coded values for now. This will eventually be replaced with real position and target values
- Created new shadow map rendering vertex input state.
2023-01-07 15:27:08 +08:00
SHAM-DP
1188c61c7d
Filter WIP (Need to optimize the search first)
2023-01-07 15:25:50 +08:00
Brandon Mak
3e01c9e80a
shadows WIP
2023-01-07 12:01:09 +08:00
Brandon Mak
d3cd36984d
Shadow map WIP
2023-01-07 07:42:42 +08:00
Brandon Mak
19f9b67550
Shadow map WIP
...
- Added companion subpass object to subpass
- Lighting sub system updates a light's renderer when it is a valid handle
- Light component's renderer will be created in the graphics system event when a light's shadow is enabled
2023-01-06 10:40:19 +08:00
Diren D Bharwani
8ca4045d55
R for retard
2023-01-05 17:53:48 +08:00
Diren D Bharwani
6ca2ea4fa8
Merge remote-tracking branch 'origin/PhySH' into PhySH
2023-01-05 14:41:07 +08:00
Diren D Bharwani
0c92e7ff6c
Added more comments and clarity for polyhedron edge contacts
2023-01-05 14:40:59 +08:00
Diren D Bharwani
016f6c804d
Added more comments and clarity for
2023-01-05 14:40:06 +08:00
Diren D Bharwani
68e11ba48e
Added edge vs edge contacts for convex polyhedron collisions
2023-01-05 13:42:17 +08:00
Diren D Bharwani
c484a088fd
Added first half of Gauss Map Optimised SAT
2023-01-05 01:12:25 +08:00
Diren D Bharwani
dffdec9d9c
Cleaned up colliders
2023-01-04 19:45:41 +08:00
Kah Wei
9d17328262
Added bone animation supported vertex shader
2023-01-04 18:20:04 +08:00
Diren D Bharwani
dd2fc934a2
Removed Redundant Geometry
2023-01-04 17:48:08 +08:00
Kah Wei
7da89def50
Refactored SHBatch to support animation data in the same descriptor set
2023-01-04 17:42:02 +08:00
Kah Wei
3ca6859fcb
Merge branch 'main' into SP3-17-animation-system
...
# Conflicts:
# SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.h
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
2023-01-04 15:52:08 +08:00
Diren D Bharwani
a49c674c2b
Generalised the Parallel Axis Theorem for computing inertia tensors
2023-01-04 15:03:58 +08:00
Diren D Bharwani
d7fa40776a
Merge remote-tracking branch 'origin/main' into PhySH
2023-01-04 14:35:37 +08:00
Brandon Mak
db87bea002
Added pre compute functions for render graph node compute
2023-01-04 09:58:29 +08:00
XiaoQiDigipen
75f4490409
Merge pull request #300 from SHADE-DP/SP3-4-Editor
...
Added Copy/Paste of component values, scene name display, editor config
2023-01-04 01:01:34 +08:00
Brandon Mak
87b2103f6e
Shadows WIP
2023-01-03 22:05:36 +08:00
Diren D Bharwani
f7e867098d
Small changes to rigidbody tooltips
2023-01-03 20:30:20 +08:00
Sri Sham Haran
562c9e2064
Merge branch 'main' into SP3-4-Editor
2023-01-03 20:29:09 +08:00
Kah Wei
06b7db14d5
Added code for bone matrices
2023-01-03 18:57:14 +08:00
Diren D Bharwani
b2645fb584
Added support for composite colliders
2023-01-03 18:53:21 +08:00
Diren D Bharwani
0460d776b0
Fixed collision tag panel fallacies and saving of tag masks
2023-01-03 10:40:02 +08:00
Diren D Bharwani
1b5024793c
Added debug drawing for rays
2023-01-03 10:14:39 +08:00
Brandon Mak
b771cdbfc6
Added barrier for shadow maps
2023-01-03 07:41:37 +08:00
Kah Wei
c1910db2af
Fleshed out SHAnimatorComponent
2023-01-03 00:23:37 +08:00
Diren D Bharwani
1f2a9820d1
Readded collision tags and moved collision filtering to an earlier stage
2023-01-02 22:49:12 +08:00
Diren D Bharwani
58a44997b2
Reworked raycasting on engine side. Re-added raycasting to scripting
2023-01-02 22:31:48 +08:00
Brandon Mak
ef8867a7a5
Shadows WIP
2023-01-02 22:16:35 +08:00
Brandon Mak
7f8dc2b647
Added constants for render graph node names
...
- Fleshed out event function to add resource and subpass to shadow map render graph node when shadow is turned on
- Added support for linking resources and subpasses to render graph at runtime
2023-01-02 18:24:29 +08:00
Diren D Bharwani
ddfbc71400
Added implementation for raycasting into the collision space
2023-01-01 19:39:16 +08:00
Diren D Bharwani
7a92c2c86f
Reverted a change
2023-01-01 17:23:06 +08:00
Diren D Bharwani
50de3a8ef0
Added some todo comments
2023-01-01 17:15:49 +08:00
Diren D Bharwani
6f55f202b9
Added planes
2023-01-01 16:53:13 +08:00
Diren D Bharwani
37db6a2bf1
Merge remote-tracking branch 'origin/main' into PhySH
2023-01-01 14:11:47 +08:00
Brandon Mak
03becd8e47
Removing resources now remove subpasses and computes involved
...
- Added an empty node in the render graph for shadow mapping
2023-01-01 13:59:10 +08:00
XiaoQiDigipen
a6a0e1588b
Merge pull request #299 from SHADE-DP/SP3-6-c-scripting
...
Added scripting quality of life features
2023-01-01 12:37:09 +08:00
XiaoQiDigipen
1590982507
Merge pull request #298 from SHADE-DP/SP3-10-input-management
...
Fixed and Enhanced Input Binding Management
2023-01-01 12:35:49 +08:00
XiaoQiDigipen
3ddf0c39d5
Merge pull request #297 from SHADE-DP/SP3-1-Rendering
...
Refactored Graphics
2023-01-01 12:35:09 +08:00
Brandon Mak
d7754e125d
Wrote remove resource for render graph (untested)
2023-01-01 12:02:51 +08:00
Diren D Bharwani
38764e79b3
Added trigger check for sphere vs convex polyhedron
2023-01-01 03:32:59 +08:00
Diren D Bharwani
f3c0bdbcfd
Clean up
2023-01-01 03:24:34 +08:00
Diren D Bharwani
67907b1ca9
Replaced twin-edge dependency on sphere vs convex polyhedron
2023-01-01 02:48:02 +08:00
Diren D Bharwani
00f8726e46
Solved edge case for sphere vs convex polyhedron
2023-01-01 02:42:44 +08:00
Kah Wei
38e27ce21a
Merge branch 'main' into SP3-17-animation-system
2022-12-31 19:17:19 +08:00
Diren D Bharwani
3a7336fe15
Improved stability of sphere vs convex polyhedron except for one edge case
2022-12-31 18:43:46 +08:00
Kah Wei
fee2cdd8bf
Merge branch 'main' into SP3-6-c-scripting
2022-12-31 18:32:41 +08:00
Diren D Bharwani
136b7e7bfc
Renamed HalfEdgeDS to HalfEdgeStructure for clarity
...
do not abbreviate. abbreviation are usually bad!!
2022-12-31 01:47:42 +08:00
Diren D Bharwani
6451ca5e95
forgot to flip a normal
2022-12-31 01:40:28 +08:00
Diren D Bharwani
987a1fa515
Fixed false positives with convex polyhedron radii
2022-12-31 01:18:35 +08:00
Diren D Bharwani
896b47c1a0
Fixed and optimised sphere vs convex polyhedron
...
Improved sphere vs convex polyhedron from O(n^2) to O(n). Math is amazing.
2022-12-31 01:11:25 +08:00
Kah Wei
dcf7a65cac
Added launching of Visual Studio by double clicking on a script file
2022-12-31 00:21:00 +08:00
Diren D Bharwani
82d46fce99
Fixed voronoi region tests for sphere vs convex polyhedron
2022-12-30 23:53:45 +08:00
mushgunAX
0e417fa7d6
Merge branch 'main' into SP3-10-input-management
2022-12-30 21:58:11 +08:00
mushgunAX
fed7f340cd
Add Binding Parameters
2022-12-30 21:57:59 +08:00
Diren D Bharwani
3586c7ffdc
Added mostly working sphere vs convex polyhedron collision detection
2022-12-30 21:43:22 +08:00
Diren D Bharwani
d98d6a9e06
Refactored polyhedron and half-edge structures
2022-12-30 21:43:06 +08:00
Diren D Bharwani
a36d03b03b
Contacts now draw normals
2022-12-30 21:42:44 +08:00
Diren D Bharwani
50e3ddf0dd
Fixed box inertia tensor calculation
2022-12-30 17:59:59 +08:00
Kah Wei
8db5b35f25
Added additional file utilities, PowerShell based execution of commands and tools for working with visual studio
2022-12-30 17:02:09 +08:00
mushgunAX
472f52af89
Should be finished for now, final checks to do
2022-12-30 15:56:36 +08:00
Brandon Mak
118ad33109
Got rid of SHEnumWrapper
2022-12-30 15:54:45 +08:00
Kah Wei
2e8535d3cf
Fixed script building causing a freeze
2022-12-30 15:43:54 +08:00
Kah Wei
ce16ca6f8d
Exposed transform and MDI buffers in SHBatch and exposed Batches in SHSuperBatch
2022-12-30 15:29:17 +08:00
Diren D Bharwani
7b1b4873ec
dumb dumb energy
2022-12-30 01:27:31 +08:00
Diren D Bharwani
6bab419428
Fixed collision tag bugs
2022-12-30 01:23:14 +08:00
Diren D Bharwani
196945ae84
Merge remote-tracking branch 'origin/main' into PhySH
2022-12-30 01:23:02 +08:00
Diren D Bharwani
fba338eaef
Fixed half edge builder and built box polyhedron
2022-12-30 01:14:40 +08:00
Diren D Bharwani
400cbb35d9
Partial implementation of a generic convex polyhedron object
2022-12-30 00:45:37 +08:00
Diren D Bharwani
ea1dd57996
Added stub functions for collision detection algorithms
2022-12-30 00:45:01 +08:00
Diren D Bharwani
8ead885d0d
Renamed CollisionShapeFactory to CollisionShapeLibrary
2022-12-30 00:44:08 +08:00
Diren D Bharwani
b14ddac1e6
Added missing serialisation for box colliders
2022-12-30 00:42:10 +08:00
Kah Wei
2f5d855fc6
Added stub for SHVSUtiltiies
2022-12-29 23:46:44 +08:00
Kah Wei
abf9c6b813
Refactored SHExecUtilities to return additional data
2022-12-29 23:46:27 +08:00
SHAM-DP
2037aab3df
Added current scenename display
...
Cleaned up menu bar
2022-12-29 15:31:27 +08:00
Brandon Mak
8e2c32d110
Graphics refactor more or less tested and working
...
- Descriptors sets are now independent from a set index. Camera matrices for example can be bound to set index 1 for the batching system but index 2 for compute shaders.
- Truly global descriptors sets (misc data, textures and light data) are now manually bound to a global static class that allows retrieval of these sets to be bound whenever in the middle end.
- Predefined descriptor set layouts (but not truly global such as camera data, materials and font) have their layouts predefined in a class and used for descriptor set initialization within the middle end. The sets themselves are allocated using these layouts (also accessible globally).
- Descriptor sets that are more flexible with their bindings such as render graph resources are introspected from shaders and not predefined at all (though their types are recorded in SHGraphicsPredefinedData to avoid magic numbers when binding descriptor sets in some systems).
- Systems now have fixed mappings for descriptors used in shaders and these are defined in SHGraphicsPredefinedData. Batching for example has 3 fixed descriptors: Static global bound at 0, camera data bound at 1, materials bound at 2.
- Viewports no longer contain renderers and renderers no longer contain render graphs. The graphics system only has 1 render graph and subpasses can have both viewports and renderers bound to them to have options for viewport/scissor and camera settings.
- Light data is now bound before every compute system.
- There is only 1 render graph in the entire system and contains only 6 nodes: G-Buffer pass (with lighting compute pass), debug draw with depth, debug draw, screen space pass, dummy pass for transition to input attachment for imGui and lastly the imGui pass for rendering editor to swapchain.
2022-12-29 14:29:25 +08:00
SHAM-DP
17b9520fff
Fixed bug where all components are serialized for any entity even if it does not have the component(s)
...
Hierarchy Controls are no longer disabled when it is not in focus
2022-12-28 22:05:06 +08:00
SHAM-DP
16d34c6478
Added Copy/Paste of Component Values
...
- Command should fail if deserialization fails
2022-12-28 21:23:34 +08:00
Brandon Mak
99e7dbfa01
WIP
2022-12-28 20:47:20 +08:00
SHAM-DP
51c9058ab8
Window now maximized by default
...
Application now loads working scene if run with editor
Added editor config to save:
- Window size
- Window Maximized
- Working Scene
- Editor Style
2022-12-28 17:21:08 +08:00
Brandon Mak
497889c050
Merge branch 'main' into SP3-1-Rendering
2022-12-28 15:09:38 +08:00
Brandon Mak
b84364ffe9
Minor changes
...
- Render Node Compute now has access to camera to send camera data to shaders
- Fonts now have functions to bind descriptor set
2022-12-28 12:43:40 +08:00
Brandon Mak
4210f5c533
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-12-28 12:24:50 +08:00
Brandon Mak
3bfec1e54f
WIP will update later, afraid for BSOD again
...
- All Shaders now take in a single projection matrix. The type of projection matrix is dependent on the SHRenderer projection type.
- SHGraphicsSystem now only has a single render graph.
- SHGlobalDescriptorSets now store a descriptor set for static global data and a handle to the lighting system. Functions to bind their descriptor sets are also available.
- Font desc set layout is added back into SHPredefinedData because while its possible to introspect the layouts from the shaders, the layouts is required beforehand to generate the font objects
- SHRenderers and SHViewport are now 2 separate entities, both passable to SHSubpass to be contained and used to set viewport/scissor and send camera matrices to shaders.
- SHRenderer descriptor sets are now updated separately from the binding. They happen directly before the render graph executes.
2022-12-28 12:19:30 +08:00
Brandon Mak
44ca317e1d
WIP will update later, afraid for BSOD again
2022-12-28 10:22:01 +08:00
SHAM-DP
f49ecdbb14
Remove a few redundancies.
...
Audio System now creates handles to audio clips
2022-12-27 16:23:53 +08:00
XiaoQiDigipen
35c8321e98
Merge pull request #296 from SHADE-DP/SP3-4-Editor
...
Added Collision Tag Matrix
2022-12-27 13:59:49 +08:00
XiaoQiDigipen
d2b786dd52
Merge pull request #295 from SHADE-DP/SP3-16-Math
...
Added Conversions To and From WXYZ Quaternion Representations
2022-12-27 13:58:25 +08:00
Sri Sham Haran
37f62fdd24
Collision Tag Matrix
2022-12-26 14:35:48 +08:00
Brandon Mak
5f2fa7fdf5
WIP
...
- Created a class that allows custom mappings of descriptor types to set indices
- SHPredefinedData now contains objects of the above class with predefined mappings for the different sub systems in the Graphics System.
- These mappings are also accompanied with descriptor set layout vectors that are only for that system. This helps the sub systems have access to these layouts easily without having to pass them around.
- Created another class to manage global descriptor sets such as lights.
- Modified pipeline layout creation code to take in the correct descriptor set layouts.
2022-12-26 09:28:15 +08:00
Brandon Mak
b035582b30
Renamed SHGraphicsGlobalData to SHPredefinedData
...
- SHPredefinedData now contains the font data descriptor set layout as well
- Added a function for SHPredefinedData to retrieve descriptor sets based on a bitfield
- Modified descriptor sets to not be tied to a set index anymore
- Descriptor set layout doesn't have a set anymore
- Removed desc set index constants from SHGraphicsConstants since they aren't really needed anymore
2022-12-25 14:32:55 +08:00
mushgunAX
43950400ae
Merge branch 'main' into SP3-10-input-management
2022-12-25 14:13:30 +08:00
mushgunAX
ee4ec83f7a
Progress on Input Manager Fixes
2022-12-25 14:13:21 +08:00
Brandon Mak
dfa9facfe0
Merge branch 'main' into SP3-1-Rendering
2022-12-24 20:43:16 +08:00
Diren D Bharwani
0df6e09ed6
Added box collision shapes
2022-12-24 13:32:50 +08:00
Diren D Bharwani
89f1f60064
Added physics settings menu for easily toggling debug draw states
2022-12-24 02:19:53 +08:00
Sri Sham Haran
c44f0f093a
Merge branch 'main' into SP3-4-Editor
2022-12-23 19:07:21 +08:00
mushgunAX
605d408a3a
Binding types, scroll wheel support, bind clears
2022-12-23 15:24:12 +08:00
Diren D Bharwani
22c0a14081
Renamed SHBox to SHAABB for clarity
...
The future SHBox will represent an OBB
2022-12-23 00:55:36 +08:00
Kah Wei
861e47812f
Fixed bug where StrToWstr and WstrToStr may contain invalid characters from a previous call
2022-12-22 15:06:52 +08:00
Diren D Bharwani
b667e4df87
Implemented axis locking constraints
2022-12-22 03:11:14 +08:00
Diren D Bharwani
f4f6cb7eae
Fixed sequential impulses
2022-12-22 01:10:25 +08:00
Diren D Bharwani
92ed8a29ff
Fixed bug with non-dynamic masses being overriden
2022-12-21 19:04:10 +08:00
Diren D Bharwani
d109d06764
Implemented sequential impulses using baumgarte stabilisation
...
There is a bug with masses of static bodies not being properly set
2022-12-21 18:57:10 +08:00
Kah Wei
360b362b7b
Moved command and process execution helpers to SHExecUtilities
2022-12-21 16:47:10 +08:00
Diren D Bharwani
33ef5e0d3d
Implemented accumulated impulses
...
untested
2022-12-21 01:10:28 +08:00
Diren D Bharwani
265a5bece8
Slight refactor to fix collision states for very fast moving objects
2022-12-21 00:40:01 +08:00
Diren D Bharwani
b58b475c04
Separated collision detection and added contact manager
2022-12-20 23:10:23 +08:00
Kah Wei
88e89a226a
Added the option to open the script csproj via menu bar
2022-12-20 22:35:47 +08:00
Kah Wei
8212ed2280
Application::Quit() no longer kills the application if in editor
2022-12-20 20:29:28 +08:00
Kah Wei
b402a44d95
Added SHAnimationClip stub
2022-12-20 17:26:27 +08:00
Diren D Bharwani
5def5392a1
Cleaned up CollisionKey object
2022-12-20 02:26:31 +08:00
Diren D Bharwani
751a16dcc3
Tested collision detection with collision states
2022-12-20 02:13:06 +08:00
Diren D Bharwani
cf9d4ef04b
Implemented backbone for collision detection with broadphase
2022-12-19 16:56:34 +08:00
Diren D Bharwani
3b55888fa1
Added conversions to and from wxyz quaternion representations
2022-12-16 23:19:44 +08:00
Diren D Bharwani
bbffdc5cd7
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-12-16 23:02:36 +08:00
Kah Wei
51479d2bd0
Fixed bug where meshes added to the mesh library will not have correct corresponding "null" vertex bone weights and indices
2022-12-16 21:43:33 +08:00
Diren D Bharwani
d55a965e32
Merge remote-tracking branch 'origin/PhySH' into PhySH
2022-12-16 18:34:58 +08:00
Diren D Bharwani
24b13ed6e4
Refactored colliders to use parent-child transform logic
2022-12-16 18:34:53 +08:00
Diren D Bharwani
6a20e93704
Refactored colliders to use a parent-child transform logic
2022-12-16 18:34:29 +08:00
Diren D Bharwani
a6e1064e64
Fixed bug where collider offsets were not recomputed
2022-12-16 15:03:55 +08:00
Diren D Bharwani
2bd90e7c14
Adjusted physics debug draw to fit new debug draw interface
2022-12-16 14:38:46 +08:00
Diren D Bharwani
1b91f60c4a
Fixed warning with wrongly declared friends
2022-12-16 14:38:22 +08:00
Diren D Bharwani
ddf2d8bde9
Fixed warnings for subscript operator in vectors and removed react conversions
2022-12-16 14:38:01 +08:00
Diren D Bharwani
af39662748
Merge remote-tracking branch 'origin/main' into PhySH
2022-12-16 14:04:58 +08:00
Kah Wei
12a46c4266
Merge branch 'main' into SP3-17-animation-system
...
# Conflicts:
# SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHDebugDrawSystem.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Meshes/SHPrimitiveGenerator.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Meshes/SHPrimitiveGenerator.h
2022-12-16 12:59:11 +08:00
XiaoQiDigipen
c479e6c8d8
Merge pull request #294 from SHADE-DP/SP3-1-DebugDraw
...
Reworked DebugDraw System
2022-12-16 02:21:32 +08:00
Diren D Bharwani
6b8232ae91
Fixed bug where intertia tensors were not reset when unlocking axes
2022-12-16 02:02:20 +08:00
Kah Wei
0a3ff527d9
SHDebugDraw drawing functions now have the colour parameter defaulted to white
2022-12-16 00:05:03 +08:00
Kah Wei
77a164cefb
Updated C# Gizmos class with DrawCube and DrawSphere in
2022-12-15 23:33:53 +08:00
Kah Wei
8978515cb9
Reworked SHDebugDraw to fit new interface of SHDebugDrawSystem
2022-12-15 23:25:49 +08:00
Diren D Bharwani
27760a95c9
Tested physics interactions with scripts
2022-12-15 23:00:15 +08:00
Diren D Bharwani
27c7a17397
Fixed computation of global inverse inertia tensor
2022-12-15 22:59:55 +08:00
Kah Wei
eb06eebc32
Added ability to debug draw circles
2022-12-15 20:30:20 +08:00
Kah Wei
78575b11e4
Added debug draw of wire spheres, filled cube and filled sphere
2022-12-15 18:08:12 +08:00
Kah Wei
b6ab7b44d9
Renamed DrawWireBox to DrawWireCube
2022-12-15 02:19:30 +08:00
Diren D Bharwani
53edffebac
Added (untested) rotational motion to rigidbodies
...
Also added a temporary solution for debug drawing rotated spheres
2022-12-15 02:08:25 +08:00
Kah Wei
9ef005346b
Merge branch 'main' into SP3-1-DebugDraw
2022-12-15 01:46:26 +08:00
Kah Wei
98ff16d00c
Added deebug drawing of cubes of any transform
2022-12-15 01:45:44 +08:00
mushgunAX
3041761e96
Merge branch 'main' into SP3-10-input-management
2022-12-14 16:13:27 +08:00
Kah Wei
06cc969658
Reworked DebugDraw system (only lines now)
2022-12-14 01:20:12 +08:00
XiaoQiDigipen
269edfcdfc
Merge pull request #293 from SHADE-DP/SP3-12-SceneGraph
...
Added ActiveInHierarchy property to Scene Nodes
2022-12-13 21:58:13 +08:00
Diren D Bharwani
af3a5e7dc9
Re-implemented Collider Debug Drawing
2022-12-13 03:54:37 +08:00
mushgunAX
775dcd5337
Merge branch 'main' into SP3-10-input-management
2022-12-12 20:11:51 +08:00
Diren D Bharwani
7820d332b1
Changed managed code's GameObject to synce with the node's active state
2022-12-12 17:58:15 +08:00
Diren D Bharwani
9b17c62b1d
Added active in hierarchy property to scene nodes
2022-12-12 17:07:18 +08:00
Diren D Bharwani
970b9e7ec0
Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph
2022-12-12 17:00:43 +08:00
Sri Sham Haran
82765648c4
fix colliderpanel
2022-12-12 11:49:52 +08:00
Sri Sham Haran
a820d19670
Merge branch 'main' into SP3-4-Editor
2022-12-12 10:39:07 +08:00
Diren D Bharwani
0cebedeee0
Fixed compile errors with merged scene init and exit events
2022-12-11 20:44:40 +08:00
Diren D Bharwani
60409b47cb
Merge remote-tracking branch 'origin/main' into PhySH
2022-12-11 20:44:25 +08:00
Diren D Bharwani
bf8a410fa2
Fixed bug where colliders were not properly deserialised
2022-12-11 20:33:30 +08:00
Diren D Bharwani
c1d7702914
Moved debug draw state to colliders. Synced collider positions with rigid bodies
2022-12-11 20:12:26 +08:00
Diren D Bharwani
74e50e10bd
Refactored the colliders?
...
This took me 4 days omg
2022-12-09 01:15:43 +08:00
XiaoQiDigipen
8df2d66f79
Merge pull request #291 from SHADE-DP/SP3-12-SceneGraph
...
Added Scene Init Exit events
2022-12-06 13:39:58 +08:00
maverickdgg
4f1007e6be
Added scene init exit events
2022-12-06 13:09:47 +08:00
maverickdgg
9eddcc8460
Merge branch 'main' into SP3-12-SceneGraph
2022-12-06 12:54:43 +08:00
mushgunAX
9a5dc52d77
Minor fixes to input manager
...
- Pass binding names into functions by const reference instead of by value
- Fixed oversight of not being able to modify or read mouse Y positive multiplier for a binding
2022-12-05 23:25:43 +08:00
Diren D Bharwani
38b1c46d1f
Added physics world and tested applied gravity for linear movement
2022-12-05 00:20:29 +08:00
Diren D Bharwani
36ceec5855
Added SceneInit & SceneExit events
2022-12-05 00:19:48 +08:00
Diren D Bharwani
ca45a12186
Restructured Physics Systems & Interfaces
2022-12-04 17:31:22 +08:00
Diren D Bharwani
6cd203179a
Added Rigid Body
2022-12-02 19:01:08 +08:00
Diren D Bharwani
52dc993941
goodbye react
2022-12-02 17:44:44 +08:00
XiaoQiDigipen
d25253118f
Merge pull request #286 from SHADE-DP/PlayerController
...
Change Script folders and added more audio
2022-11-26 10:09:23 +08:00
Glence
81978a90b6
added more audio and tidy up folder
...
tidy up scripts folder
added more audio (cause burden randall cant make up his mind)
adjusted main scene abit
2022-11-26 08:28:37 +08:00
Sri Sham Haran
128f07030b
Merge pull request #285 from SHADE-DP/PlayerController
...
Updated Audio and Scene along with bug fixes
2022-11-25 23:11:01 +08:00
Glence
cae8358341
updated scene changes
2022-11-25 23:10:17 +08:00
Glence
1302a7e58d
added jump var changes
...
change jump to be in update
added audio for AI
2022-11-25 22:53:38 +08:00
Glence
92ce7c96a8
Merge branch 'main' into PlayerController
2022-11-25 22:34:49 +08:00
Sri Sham Haran
e20675b144
Merge pull request #284 from SHADE-DP/Fix-Material
...
Fixed crash which occurs when changing the material of an object twice in a row in the inspector
2022-11-25 22:34:31 +08:00
Sri Sham Haran
c098f92532
Merge pull request #283 from SHADE-DP/AIFinalFixesGAM300M3
...
Fixed AI C# Script for final submission
2022-11-25 22:33:57 +08:00
Glence
fb512e7fc5
added the new banks in
...
removed unneeded bank
added new audio
2022-11-25 22:32:41 +08:00
Kah Wei
c84e33731b
Fixed crash which occurs when changing the material of an object twice in a row
2022-11-25 22:24:30 +08:00
mushgunAX
609be908f9
Revert "Made player jumping more responsive"
...
This reverts commit d6fab4439f
.
2022-11-25 20:18:36 +08:00
mushgunAX
a541565e55
Merge branch 'main' into AIFinalFixesGAM300M3
2022-11-25 20:17:11 +08:00
mushgunAX
5b41e832c6
Enhanced AI with better chase logic
...
- AI now keeps track of last waypoint he has seen player at and heads there in an attempt to chase him down
- AI can be made to reverse his chase/patrol path by running around him
- The scene with the AI fix is called "MainGameWithAIFixed"
2022-11-25 20:16:31 +08:00
XiaoQiDigipen
6694ce2e17
Merge pull request #282 from SHADE-DP/MergeAIToMainScene
...
Added in AI to maingame.shade
2022-11-25 19:05:31 +08:00
Sri Sham Haran
27aadf67d3
threw in AI to maingame.shade
2022-11-25 19:03:23 +08:00
XiaoQiDigipen
173b10ca64
Merge pull request #281 from SHADE-DP/PlayerController
...
Updated Player and MainGame scene, fix bugs
2022-11-25 16:34:51 +08:00
Glence
181af5b3e5
fix throw food bug
...
added inverse camera controls
2022-11-25 16:23:26 +08:00
mushgunAX
7499011ea2
Merge branch 'main' into ScriptingAI
2022-11-25 16:14:06 +08:00
mushgunAX
7003262a5d
Fixed AI even after scene change
...
-More reliance on the blackboard for keeping variables among a tree's nodes
-Half extents of the AI fixed
2022-11-25 16:12:58 +08:00
Glence
413156dabb
Merge branch 'main' into PlayerController
2022-11-25 15:45:35 +08:00
XiaoQiDigipen
b778b6d6e9
Merge pull request #280 from SHADE-DP/SP3-2-Physics
...
Fixed transform updates to clear dirty flags appropriately
2022-11-25 15:10:32 +08:00
Glence
6ac9bc4e94
added breakables to the main game and fix issues with it
2022-11-25 14:45:19 +08:00
Diren D Bharwani
1cfd3cfd3a
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-25 14:06:28 +08:00
Diren D Bharwani
afd2abf036
Fixed pre & post physics transforms update routines
2022-11-25 14:06:20 +08:00
Diren D Bharwani
43a5cb4deb
Reverted world extents computation
2022-11-25 14:05:43 +08:00
Glence
9daaade56a
Merge branch 'main' into PlayerController
2022-11-25 13:22:51 +08:00
XiaoQiDigipen
d9c8296aca
Merge pull request #279 from SHADE-DP/SP3-6-c-scripting
...
Added support for enabling and disabling components from scripts
2022-11-25 13:06:40 +08:00
Kah Wei
73d0486fc8
Added support for enabling and disabling components
2022-11-25 13:05:35 +08:00
Xiao Qi
300647afa6
Stopped camera from running when editor is in pause
2022-11-25 12:24:13 +08:00
Diren D Bharwani
7f9f2bd194
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-25 12:16:13 +08:00
Xiao Qi
d72a532623
Added object checks in leaf scripts
2022-11-25 12:09:03 +08:00
mushgunAX
c5d490b8b2
Added null checks for AI blackboard data
...
- Null checks added to prevent AI causing the engine to crash
2022-11-25 11:44:58 +08:00
XiaoQiDigipen
46ae50949e
Merge pull request #278 from SHADE-DP/SP3-141-Camera-System
...
Added Camera Collision WIP
2022-11-25 11:08:11 +08:00
maverickdgg
f3e7f1747a
Merge branch 'main' into SP3-141-Camera-System
2022-11-25 10:06:11 +08:00
maverickdgg
428f8f29c6
Camera collision. WIP
2022-11-25 10:06:02 +08:00
mushgunAX
4daaa8e897
Added SFX to AI
...
- Footsteps, alert yell and unalert humming
2022-11-25 00:56:40 +08:00
Glence
c07fa3c5ae
remove the clamp from the phsysicSystem routines
...
added cheats for maingame
added raycast for pick throw
2022-11-25 00:54:45 +08:00
XiaoQiDigipen
5274aa5184
Merge pull request #277 from SHADE-DP/SP3-6-c-scripting
...
Fixed bugs related to C# script serialization and deserialization
2022-11-25 00:08:58 +08:00
Kah Wei
50232cd15f
Fixed bug where scripts loaded after a scene change would not have serialised data
2022-11-25 00:07:19 +08:00
Kah Wei
9ada998151
Fixed bug where lists failed to be deserialized correctly
2022-11-24 23:27:13 +08:00
Kah Wei
72c8a504c5
Fixed crash from adding an element to a list of strings in the script inspector
2022-11-24 23:22:02 +08:00
Kah Wei
7c58c9a23d
Fixed crash caused when building scripts in debug mode when a debugger is attached
2022-11-24 23:20:37 +08:00
Glence
f71675ad0e
Merge branch 'main' into PlayerController
2022-11-24 22:41:00 +08:00
mushgunAX
d6fab4439f
Made player jumping more responsive
...
- Changed the input check in the jump function from a GetKeyDown() / GetKeyUp() to a GetKey() / !GetKey()
- This makes jumping a lot more responsive
- This also means holding the jump button causes the raccoon to "bunny hop" until jump button is released
2022-11-24 21:56:06 +08:00
XiaoQiDigipen
49b66e5c26
Merge pull request #275 from SHADE-DP/ScriptingAI
...
Fixed AI for the Gameplay Scene
2022-11-24 21:44:38 +08:00
mushgunAX
c0f3720fd2
AI expected to work with the scene. To Verify.
2022-11-24 21:26:05 +08:00
XiaoQiDigipen
a182f9a8fb
Merge pull request #274 from SHADE-DP/SP3-2-Physics
...
Fixed collision listener bug & incorrect transform forward. Added collision tags to raycasts.
2022-11-24 15:15:33 +08:00
Diren D Bharwani
6525a39df2
Added collision tags for raycasting. Does not apply to collider raycasting
2022-11-24 15:11:07 +08:00
Diren D Bharwani
3775df23a4
Debug draw is disabled on publish builds.
2022-11-24 14:43:41 +08:00
Diren D Bharwani
438a597a25
Fixed managed Transform returning the wrong forward
2022-11-24 14:43:11 +08:00
Diren D Bharwani
a9bacc9e48
Fixed incorrect storing of world extents
2022-11-24 14:42:34 +08:00
Diren D Bharwani
f6c74ad3d2
Fixed recurring bug with collision listener
2022-11-24 14:41:52 +08:00
Glence
9473359076
added the base for raycast in pickandthrow
2022-11-24 14:05:02 +08:00
XiaoQiDigipen
982760fb20
Merge pull request #273 from SHADE-DP/SP3-2-Physics
...
Added extensive Vector3 Rotation methods in Managed code & Debug draw is always available (temporarily).
2022-11-24 12:25:48 +08:00
Diren D Bharwani
74a85180ac
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-24 12:02:34 +08:00
Diren D Bharwani
9e7d7afe33
Added proper Vector3 Rotate functions to Managed code.
2022-11-24 12:02:26 +08:00
Diren D Bharwani
7d7d40ba8e
Debug draw is always enabled.
2022-11-24 12:02:08 +08:00
XiaoQiDigipen
d09fefe9b4
Merge pull request #271 from SHADE-DP/SP3-2-Physics
...
Fixed Physics Bugs
2022-11-24 02:10:54 +08:00
XiaoQiDigipen
191ea0fdb1
Merge pull request #270 from SHADE-DP/UI-Bug-Fix
...
Fixed main menu rendering after scene change
2022-11-24 02:02:24 +08:00
Xiao Qi
b7b3301158
Added isDirty copy in move ctor for SHBatch
2022-11-24 02:01:41 +08:00
Diren D Bharwani
90ac168309
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-24 01:46:46 +08:00
Diren D Bharwani
33ac1a868a
Fixed wrongly returning fixed DT in managed code & collision listener bug
2022-11-24 01:46:29 +08:00
XiaoQiDigipen
83a4577081
Merge pull request #269 from SHADE-DP/PlayerController
...
Change playercontroller to fixed dt and change starting scene
2022-11-24 01:41:01 +08:00
Glence
d23683f34a
Merge branch 'main' into PlayerController
2022-11-24 01:08:22 +08:00
Glence
5ee8403e80
make starting scene mainmenu
...
change playercontroller to fixed dt
2022-11-24 01:08:08 +08:00
XiaoQiDigipen
26e4499d85
Merge pull request #268 from SHADE-DP/PlayerController
...
adding ai fixes in
2022-11-24 01:05:35 +08:00
Glence
d8b2addd1f
added the fix for AI
2022-11-23 22:44:15 +08:00
Diren D Bharwani
97837c2829
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-23 22:21:09 +08:00
Glence
48f51f1913
Merge branch 'main' into PlayerController
2022-11-23 21:02:46 +08:00
Glence
ff318cee2e
added ai scripts and in the scene
2022-11-23 21:02:33 +08:00
XiaoQiDigipen
8227b0993a
Merge pull request #267 from SHADE-DP/PlayerController
...
Bug fixes and scene changes
2022-11-23 20:53:44 +08:00
Glence
caefae3aac
added the change scene into winscene
2022-11-23 20:51:22 +08:00
Glence
8469ebd960
setting the value into scripts
2022-11-23 20:48:40 +08:00
Glence
ca60b64a89
Merge branch 'main' into PlayerController
2022-11-23 20:39:47 +08:00
XiaoQiDigipen
acc13fd0e4
Merge pull request #266 from SHADE-DP/Fix-AwakeLater
...
Fixed awake() and start() getting called before all objects are loaded when changing scenes
2022-11-23 20:37:46 +08:00
Kah Wei
57df4e2905
Fixed awake() and start() getting called before all objects are loaded when changing scenes
2022-11-23 20:36:28 +08:00
Glence
af93e59d0e
added text to maingame
2022-11-23 20:26:53 +08:00
XiaoQiDigipen
c32aa1e00c
Merge pull request #265 from SHADE-DP/Fix-BatchCrash
...
Added potential fix for Vulkan buffer creation crashes from SHBatch
2022-11-23 19:33:20 +08:00
Kah Wei
6261661ef6
Added potential fix for Vulkan buffer creation crashes from SHBatch
2022-11-23 19:30:51 +08:00
Glence
ee4e31f45f
remove unwanted items in some scripts
2022-11-23 19:11:41 +08:00
XiaoQiDigipen
29b50bd255
Merge pull request #264 from SHADE-DP/SP3-141-Camera-System
...
Added a target offset for camera arm
2022-11-23 18:29:06 +08:00
maverickdgg
49b475442f
Added a targetOffset for camera arm
2022-11-23 18:27:54 +08:00
Glence
22972d7455
updated the music banks
...
update a tem fix for physicsSystem
2022-11-23 17:37:06 +08:00
Glence
3dfa3c050a
Merge branch 'main' into PlayerController
2022-11-23 17:07:53 +08:00
XiaoQiDigipen
f896b4a6e0
Merge pull request #263 from SHADE-DP/SP3-6-c-scripting
...
Fixed Application::Close() minimizing the window instead of closing it
2022-11-23 17:07:12 +08:00
Kah Wei
20a1fdc16e
Fixed Application::Close() not closing but instead minimizing the window
2022-11-23 17:03:57 +08:00
XiaoQiDigipen
cec5569ebf
Merge pull request #262 from SHADE-DP/SP3-2-Physics
2022-11-23 16:58:23 +08:00
Glence
152007e810
adding audio for the rest of the level
...
setting player position so it doesnt fall through the floor
2022-11-23 16:57:32 +08:00
Diren D Bharwani
9bdaea10f5
Fixed...another..bug...:(
2022-11-23 16:56:25 +08:00
Glence
eaae1bd821
Merge branch 'main' into PlayerController
2022-11-23 15:57:02 +08:00
XiaoQiDigipen
13ed36655e
Merge pull request #261 from SHADE-DP/SP3-2-Physics
...
Fixed bug where rigidbody setters in the first frame causes a crash
2022-11-23 15:33:17 +08:00
Diren D Bharwani
4865a49bfa
Fixed bug where rigidbody setters in the first frame causes a crash
2022-11-23 15:32:14 +08:00
Diren D Bharwani
ef0243c335
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-23 15:08:37 +08:00
XiaoQiDigipen
5af5d4ef96
Merge pull request #260 from SHADE-DP/SP3-16-Math
...
Added Forward & LookAt to C# Transforms
2022-11-23 15:07:23 +08:00
Diren D Bharwani
872b80dc40
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-11-23 14:57:58 +08:00
Diren D Bharwani
0aaf5b7e79
Added LookAt & Forward to C# Transforms
2022-11-23 14:57:48 +08:00
Diren D Bharwani
7202551838
Added Vector rotation with Quaternions
2022-11-23 14:56:20 +08:00
Glence
33bab64f12
Merge branch 'main' into PlayerController
2022-11-23 14:00:28 +08:00
XiaoQiDigipen
87936f1e31
Merge pull request #259 from SHADE-DP/SP3-2-Physics
...
Fixed fatal bug where rigidbody masses was incorrectly computed when editor is enabled
2022-11-23 13:50:22 +08:00
XiaoQiDigipen
6d2591331b
Merge pull request #257 from SHADE-DP/SP3-6-c-scripting
...
Fixed bug where rendering inspectors for scripts that contain uninitialized List<T>s causes crashes
2022-11-23 13:49:42 +08:00
XiaoQiDigipen
6161d81c4a
Merge pull request #256 from SHADE-DP/Fix-NoGPUClarity
...
Added explicit error check for when no supported GPUs are available to use
2022-11-23 13:48:37 +08:00
Glence
5356cd0800
added item model and setting the main game scene
2022-11-23 13:44:03 +08:00
Diren D Bharwani
db69cfb567
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-23 13:30:40 +08:00
Diren D Bharwani
1402139369
Fixed bug where colliders were not properly added with editor enabled
2022-11-23 13:30:28 +08:00
Xiao Qi
8ad46afc22
Removed spaces from UI Test scene to stop regenerating of asset meta
2022-11-23 13:06:50 +08:00
XiaoQiDigipen
aa9c678f63
Merge pull request #258 from SHADE-DP/FloorTiling
...
Added VS and FS shaders to tile singular textures
2022-11-23 13:04:15 +08:00
Xiao Qi
0edd2f24e3
Added VS and FS shaders to tile singular textures
...
Added shader stage flag bit for vertex shaders
2022-11-23 13:02:33 +08:00
Glence
64d521a651
Merge branch 'main' into PlayerController
2022-11-23 12:48:29 +08:00
Kah Wei
67db744856
Uninitialized List<> will no longer cause crashes with the script inspector
2022-11-23 10:08:48 +08:00
Kah Wei
1a26b0ac70
When no GPU is detected, a proper exception describing it is now thrown instead of failing silently
2022-11-23 09:57:55 +08:00
XiaoQiDigipen
ae85c246ed
Merge pull request #255 from SHADE-DP/SP3-2-Physics
...
Fixed fatal bug that caused a crash on changing scenes with the editor enabled
2022-11-23 02:45:51 +08:00
Diren D Bharwani
2523613732
Fixed fatal bug that prevent scene changing while the editor is enabled
2022-11-23 01:01:29 +08:00
Diren D Bharwani
fa83e2bc4c
Modified Shape.Raycast functions to return RaycastResult
2022-11-23 01:01:12 +08:00
Glence
4cacbb3300
adding main/lose/win scene
2022-11-23 00:44:27 +08:00
Diren D Bharwani
899736d54a
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-22 22:33:44 +08:00
Glence
332d0a846d
Merge branch 'main' into PlayerController
2022-11-22 22:13:52 +08:00
Diren D Bharwani
4277ba10d7
Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph
2022-11-22 22:11:42 +08:00
XiaoQiDigipen
1962d449cd
Merge pull request #254 from SHADE-DP/SP3-13-Assets-Manager
...
Fixed major bug when generating new meta files for materials
2022-11-22 21:55:22 +08:00
Xiao Qi
cc2587a7bd
Added recognition for material and prefab types when generating meta files
2022-11-22 21:54:51 +08:00
Xiao Qi
bcd8b37fd7
Merge branch 'main' into SP3-13-Assets-Manager
2022-11-22 21:53:46 +08:00
Diren D Bharwani
82b92d45cf
Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph
2022-11-22 21:31:45 +08:00
Diren D Bharwani
807ad54d7d
Fixed Scene Node SetActive & SceneGraph CheckActiveInHierarchy
2022-11-22 21:31:37 +08:00
Sri Sham Haran
f119acdb65
collider tag panel
2022-11-22 21:15:18 +08:00
XiaoQiDigipen
524ecebc7e
Merge pull request #253 from SHADE-DP/SP3-20-UI-System
...
Fix for Canvas Scaler
2022-11-22 21:06:25 +08:00
maverickdgg
44733308f1
Merge branch 'main' into SP3-20-UI-System
2022-11-22 21:04:03 +08:00
maverickdgg
7c36886669
Fix for Canvas scaler
2022-11-22 21:03:53 +08:00
XiaoQiDigipen
31d88f3691
Merge pull request #252 from SHADE-DP/Fix-RemoveDocGen
...
Disabled xmldoc build, admin mode no longer required to build the engine
2022-11-22 21:00:04 +08:00
Kah Wei
ac09007862
Disabled xmldoc build, admin mode no longer required to build the engine
2022-11-22 20:59:17 +08:00
XiaoQiDigipen
cecd8ab717
Merge pull request #251 from SHADE-DP/SP3-2-Physics
...
Fixed Rigidbodies not sleeping
2022-11-22 20:58:11 +08:00
XiaoQiDigipen
5049effd0f
Merge pull request #250 from SHADE-DP/SP3-20-UI-System
...
Added Buttons, Added Canvas Scaling matrix, Added Serialization of buttons and camera arm
2022-11-22 20:57:49 +08:00
maverickdgg
142f025692
Added check for editor camera.
2022-11-22 20:54:16 +08:00
Diren D Bharwani
0bf549f478
Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph
2022-11-22 20:53:15 +08:00
Diren D Bharwani
72d70e4747
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-22 20:46:37 +08:00
Diren D Bharwani
62c4b3837d
Fixed bug where transform dirty flags were not being properly cleared.
...
This was preventing bodies from going to sleep and transforms always updating.
2022-11-22 20:46:31 +08:00
maverickdgg
a57145b510
Merge branch 'main' into SP3-20-UI-System
2022-11-22 20:39:39 +08:00
maverickdgg
a612e71f0c
Added Buttons, Added Canvas Scaling matrix, Added Serialization of buttons and camera arm
2022-11-22 20:39:15 +08:00
XiaoQiDigipen
720ccb6eab
Merge pull request #249 from SHADE-DP/SP3-2-Physics
...
Fixed various physics bugs and added Physics Material to Inspector
2022-11-22 20:14:31 +08:00
Xiao Qi
57a0bbdb8c
Added entity count at the bottom bar of editor
...
Changed colour of bottom bar
2022-11-22 20:14:21 +08:00
Diren D Bharwani
dab51ee4cf
Readded testing function in physics routines for future use
2022-11-22 20:00:58 +08:00
Diren D Bharwani
c4e391a6db
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-22 19:56:18 +08:00
XiaoQiDigipen
8a292a5e9d
Merge pull request #248 from SHADE-DP/SP3-6-c-scripting
...
Fixed compilation error in Editor.h++
2022-11-22 19:49:55 +08:00
Kah Wei
8cdc49463a
Merge branch 'main' into SP3-6-c-scripting
2022-11-22 19:44:18 +08:00
Kah Wei
fb25d2b714
Fixed compilation error in Editor.h++
2022-11-22 19:44:07 +08:00
Diren D Bharwani
053c3e04fd
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-22 19:26:47 +08:00
Diren D Bharwani
c18d58cba3
Fixed various physics bugs
...
Fixed bug where world was prebuilt and entity IDs were wrongly synced
Fixed collider properties not being synced in the first frame during mass property computations
Fixed static objects being wrongly updated post world update
2022-11-22 19:26:17 +08:00
XiaoQiDigipen
9e49d223d1
Merge pull request #247 from SHADE-DP/SP3-6-c-scripting
...
Added C# Assets System and Serialization of Script Enabled State
2022-11-22 18:59:32 +08:00
Kah Wei
9964d5dfce
Fixed missing comments for SHEditorUI
2022-11-22 18:17:24 +08:00
Kah Wei
1bd19b90a8
Merge branch 'main' into SP3-6-c-scripting
2022-11-22 18:11:17 +08:00
Kah Wei
6afcaa9263
Enabled state of scripts are now serialised
2022-11-22 18:09:50 +08:00
Kah Wei
9a7bf335bb
Added serialization and deserialization of MeshAsset, FontAsset and MaterialAsset
2022-11-22 17:58:07 +08:00
Kah Wei
4478b6db62
Added editor support for FontAsset, MeshAsset and MaterialAsset.
2022-11-22 17:48:01 +08:00
Glence
c91897f46a
made changescene a public in sceneManager.hxx
...
added a main menu scene
added some new texture
2022-11-22 17:28:48 +08:00
Kah Wei
7d692061fb
Reworked how Materials are handled on C#
2022-11-22 17:23:50 +08:00
Kah Wei
719d29dec3
Renamed Mesh and Font structs in Managed to MeshAsset and FontAsset and reworked them to be a abstraction for asset IDs
2022-11-22 16:51:07 +08:00
XiaoQiDigipen
dd76d16a2c
Merge pull request #246 from SHADE-DP/PlayerController
...
Bug fixes and new assets
2022-11-22 16:25:14 +08:00
Glence
f1c7f42e13
Merge branch 'main' into PlayerController
2022-11-22 16:21:28 +08:00
Glence
71e8ba6044
doing up the main menu
2022-11-22 16:18:16 +08:00
XiaoQiDigipen
1ca216801f
Merge pull request #245 from SHADE-DP/SP3-1-Rendering
...
Updated SSAO shader
2022-11-22 16:01:11 +08:00
Brandon Mak
780c716199
Updated SSAO shader
2022-11-22 16:00:05 +08:00
Kah Wei
a78b3c0123
Reworked NativeAsset system
2022-11-22 15:52:55 +08:00
Kah Wei
81d067dc87
Merge branch 'main' into SP3-6-c-scripting
2022-11-22 15:27:12 +08:00
Glence
be16e46872
Merge branch 'main' into PlayerController
2022-11-22 15:12:22 +08:00
Glence
81d44e6c59
small changes to the scene
2022-11-22 14:59:46 +08:00
XiaoQiDigipen
25c9d6eea2
Merge pull request #244 from SHADE-DP/SP3-5-ECS
...
Added SceneManager Managed code to change scene
2022-11-22 14:57:18 +08:00
Kah Wei
893ab9ed46
Merge branch 'main' into SP3-6-c-scripting
2022-11-22 14:56:46 +08:00
Xiao Qi
681e7f3506
Added invalid Asset ID Macro
2022-11-22 14:26:10 +08:00
maverickdgg
3f39cfc637
include pch
2022-11-22 14:14:58 +08:00
Glence
219d5025f3
adding in the env and world
2022-11-22 14:14:55 +08:00
maverickdgg
fcf258d773
Added SceneManager managed code
2022-11-22 14:11:10 +08:00
maverickdgg
5d04149797
buttons WIP
2022-11-22 14:02:45 +08:00
Xiao Qi
3b6d1c815d
Merge branch 'main' into SP3-17-animation-system
2022-11-22 13:55:17 +08:00
Xiao Qi
5024956c04
Merge branch 'main' into SP3-13-Assets-Manager
2022-11-22 13:54:40 +08:00
XiaoQiDigipen
7e7ee8002f
Merge pull request #243 from SHADE-DP/SP3-6-c-scripting
...
Fixed TextRenderable components not being retrievable by C# scripts
2022-11-22 13:51:08 +08:00
Kah Wei
06b2a5640e
Merge branch 'main' into SP3-6-c-scripting
2022-11-22 13:51:00 +08:00
Glence
6c4ec7c807
Merge branch 'main' into PlayerController
2022-11-22 13:44:27 +08:00
maverickdgg
cf10724f3a
Update SHSerialization.cpp
2022-11-22 13:17:45 +08:00
maverickdgg
3e4ebaab7b
Merge branch 'main' into SP3-20-UI-System
2022-11-22 13:16:04 +08:00
maverickdgg
080c2c70d5
Added canvas to serialization
2022-11-22 13:09:40 +08:00
XiaoQiDigipen
437cb075d3
Merge pull request #242 from SHADE-DP/SP3-141-Camera-System
...
FIxed major crashes caused by main camera retrieval and entity destroy
2022-11-22 12:55:17 +08:00
maverickdgg
858e200fb3
Bug fixes
2022-11-22 11:32:19 +08:00
Kah Wei
ece0a92717
Fixed TextRenderable components not being retrievable by C# scripts
2022-11-22 11:29:01 +08:00
XiaoQiDigipen
69d07992dc
Merge pull request #241 from SHADE-DP/SP3-1-Rendering
...
Added functionality for graphics system to render to swapchain image when SHEDITOR is disabled.
2022-11-22 10:58:26 +08:00
Brandon Mak
cf0b94e97d
Merge branch 'main' into SP3-1-Rendering
2022-11-22 10:50:04 +08:00
Brandon Mak
dfe86ce7db
Fixed resizing bug
2022-11-22 10:43:59 +08:00
Brandon Mak
4377972315
Added functionality for graphics system to render to swapchain image
...
- Added functionality for graphics system to render to swapchain image when SHEDITOR is disabled. This is done via rendering a simple quad on screen and using an input attachment as a texture to the shader.
2022-11-22 10:10:26 +08:00
Brandon Mak
964b375ccd
Write to swapchain image without SHEDITOR defined WIP
2022-11-22 09:05:56 +08:00
XiaoQiDigipen
8f7c7e5e13
Merge pull request #239 from SHADE-DP/SP3-6-c-scripting
...
Renamed SHTextRenderer and to SHTextRenderable and added C# interface
2022-11-22 01:19:51 +08:00
Diren D Bharwani
23bae3d515
Fixed bug with Bounciness failing to serialise
2022-11-22 00:46:32 +08:00
Kah Wei
07efa1ab51
Added an abstract base class for NativeAsset to prepare to support serialization of Assets for scripts
2022-11-22 00:39:53 +08:00
Diren D Bharwani
f1ac689bb0
Added Physics Materials to Inspector
2022-11-22 00:37:09 +08:00
Glence
56e7f73bbb
adding var audios into scripting
2022-11-21 21:01:44 +08:00
Kah Wei
af2ad6cc80
Merge branch 'main' into SP3-6-c-scripting
2022-11-21 20:59:08 +08:00
Kah Wei
6550846b0f
Added C# interface for Fonts and TextRenderable
2022-11-21 20:58:47 +08:00
Diren D Bharwani
857e4a6b75
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-21 20:57:33 +08:00
Kah Wei
4172362790
Renamed SHTextRenderer to SHTextRenderable
2022-11-21 20:35:31 +08:00
Brandon Mak
cd6edeeee4
Merge branch 'main' into SP3-1-Rendering
2022-11-21 20:29:10 +08:00
XiaoQiDigipen
6d8fba8e05
Merge pull request #238 from SHADE-DP/Fix-BatchPersistence
...
Fixed ghosts of a renderable being rendered when a material is changed
2022-11-21 20:27:48 +08:00
Xiao Qi
1ed0181c9e
Reverted premake changes
2022-11-21 20:27:38 +08:00
XiaoQiDigipen
81043a5927
Merge pull request #237 from SHADE-DP/SP3-2-Physics
...
Added more debug drawing & Fixed Physics running without SHEDITOR
2022-11-21 20:24:05 +08:00
XiaoQiDigipen
3c7346885f
Merge pull request #236 from SHADE-DP/SP3-6-c-scripting
...
Added GameObject.Null and Enabling/Disabling of Scripts
2022-11-21 20:21:48 +08:00
Kah Wei
9cc008eaf4
Fixed ghosts of a renderable being rendered when a material is changed
2022-11-21 20:21:08 +08:00
Diren D Bharwani
3baedd8ffa
Merge branch 'main' into SP3-2-Physics
2022-11-21 20:15:58 +08:00
Diren D Bharwani
1d692d3301
Physics works without SHEDITOR defines. Mass is temporarily auto computed.
2022-11-21 19:59:32 +08:00
Kah Wei
1a20eeed96
Added system routine stub for the SHAnimationSystem
2022-11-21 19:46:53 +08:00
Kah Wei
e3c573baa7
Added support for enabling and disabling scripts
...
OnEnable and OnDisable are not called on GameObject active toggling for now but will be added in future
2022-11-21 17:16:16 +08:00
Kah Wei
819607925f
Added GameObject.Null for setting GameObjects to null.
2022-11-21 15:41:15 +08:00
Kah Wei
611744f5d4
Fleshed out SHAnimationComponent more and added preliminary implementation of SHBatch for bone data
2022-11-21 15:09:15 +08:00
Kah Wei
1ff8c9715d
Merge branch 'main' into SP3-17-animation-system
2022-11-21 12:15:57 +08:00
XiaoQiDigipen
fdaa9984da
Merge pull request #235 from SHADE-DP/SP3-6-c-scripting
...
Disabled xmldoc generation warnings for SHADE projects
2022-11-21 12:15:55 +08:00
Kah Wei
0a9dea1c83
Disabled xmldoc generation warnings for SHADE projects
2022-11-21 12:14:07 +08:00
Brandon Mak
485b60c6d8
Added debug check in SHGraphicsSystem to compile assets only in debug
2022-11-21 00:39:13 +08:00
Xiao Qi
1666a0113b
Removed test lines for shader compile in graphics system
2022-11-21 00:29:46 +08:00
Kah Wei
2a6db58cd9
Added SHRig and stubs for SHAnimatorComponent and SHAnimationSystem
2022-11-21 00:22:46 +08:00
Glence
293cc586d1
aiming is done in player
2022-11-21 00:12:09 +08:00
XiaoQiDigipen
e10c1f518f
Merge pull request #234 from SHADE-DP/SP3-1-Rendering
...
Implemented serialization and editor inspector display for text renderer component
2022-11-20 22:41:06 +08:00
XiaoQiDigipen
9553c19b80
Merge pull request #233 from SHADE-DP/SP3-2-Physics
...
Added Collision Tags
2022-11-20 22:40:53 +08:00
Brandon Mak
5d3603ac7d
Text Renderer Component serialization
2022-11-20 22:24:24 +08:00
Diren D Bharwani
d4ad60ea79
Fix compile error with collision tags
2022-11-20 20:12:20 +08:00
Brandon Mak
c686954c77
Implemented Text Rendering
...
- The Text Renderer Component serialization and reflection onto inspector is not in yet, but there is basic functionality.
- Updated shaders
- Topology for text rendering is changed to triangle fan. Front facing for primitives is clockwise. Vertex state has both the positionOffset and glyphIndex attribute set as instanced.
- Freetype instance is now initialized in InitBoilerplate
- SHCamera no longer calling SetPerspective/Ortho inside HandleResize
- Font Geometry is now loaded in SHFontLoader into SHFontAsset fontGeometry variable.
2022-11-20 19:03:12 +08:00
Diren D Bharwani
cada3acb8a
Collision tags should be referenced by pointers
2022-11-20 18:30:18 +08:00
Diren D Bharwani
5871f32547
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-20 17:23:38 +08:00
Diren D Bharwani
4ebc16564a
Added collision matrix for configurating individual collision tags
2022-11-20 17:23:28 +08:00
Glence
8107c92754
Merge branch 'main' into PlayerController
2022-11-20 16:53:12 +08:00
Glence
875657cfde
added playerstate scripts
...
added sub folders for player
remove unneeded scripts
2022-11-20 16:27:39 +08:00
Brandon Mak
85f0b67f67
Merge branch 'main' into SP3-1-Rendering
2022-11-20 15:44:31 +08:00
XiaoQiDigipen
788ba22e0a
Merge pull request #232 from SHADE-DP/UI_Integration
...
Added UI functionality to the Graphics System
2022-11-20 15:43:34 +08:00
XiaoQiDigipen
a355d9911a
Merge pull request #231 from SHADE-DP/SP3-4-Editor
...
Fix not being able to disable/enable Rigidbody freeze rotation through editor inspector panel
2022-11-20 15:36:02 +08:00
Diren D Bharwani
4198310b7a
Missing implementation for updating all tag names through the physics system
2022-11-20 15:34:34 +08:00
XiaoQiDigipen
2a74690e16
Merge pull request #230 from SHADE-DP/SP3-1-VertexSwitch
...
Vertex shader can now be modified in the material inspector
2022-11-20 15:33:55 +08:00
Diren D Bharwani
a0f4f3b00a
Added collision tag names file
2022-11-20 15:32:33 +08:00
Sri Sham Haran
2b41394a74
Fix not being able to disable/enable Rigidbody freeze rotation through editor inspector panel
2022-11-20 15:30:14 +08:00
Diren D Bharwani
7226ccf279
Tested Collision Tags
2022-11-20 03:16:49 +08:00
Diren D Bharwani
b8530dfc89
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-20 02:35:12 +08:00
Diren D Bharwani
62433d1a53
Added Collision Tags
2022-11-20 02:35:02 +08:00
Brandon Mak
c566d065c8
Merge remote-tracking branch 'origin/UI_Integration' into UI_Integration
2022-11-20 01:45:27 +08:00
Brandon Mak
575132c4bb
Added UI Component check in SHBatch
...
- UI Component shader changes
- Fixed picking issue
2022-11-20 01:45:14 +08:00
Brandon Mak
6bb27414e2
Added UI Component check in SHBatch
...
- UI Component shader changes
2022-11-20 01:38:26 +08:00
Kah Wei
841948b82c
Added support for Bone Weights and Bone Indices vertex attributes for meshes
2022-11-20 01:33:55 +08:00
Brandon Mak
b323735ba8
Merge remote-tracking branch 'origin/SP3-1-VertexSwitch' into UI_Integration
2022-11-19 23:27:06 +08:00
Kah Wei
a988c45d52
Vertex shader can now be modified in the material inspector
2022-11-19 23:22:54 +08:00
Brandon Mak
d55adcdfe4
Merge remote-tracking branch 'origin/main' into UI_Integration
2022-11-19 22:08:16 +08:00
Brandon Mak
6d1f30e05b
Merge branch 'SP3-1-Rendering' into UI_Integration
2022-11-19 21:45:21 +08:00
Brandon Mak
223276dd87
Created partial functionality to render a texture to swapchain image
2022-11-19 21:44:41 +08:00
Xiao Qi
6fa14aff85
Fixed sizeof bug when reading old model header
2022-11-19 21:27:30 +08:00
Xiao Qi
c4be9b1cba
Initial commit, change of data structs containing data for model and animation assets.
...
Changed all other references to previous mode and mesh asset names
2022-11-19 21:16:24 +08:00
Xiao Qi
5fb51511f6
Merge branch 'main' into SP3-13-Assets-Manager
2022-11-19 19:59:24 +08:00
XiaoQiDigipen
61acbdc34e
Merge pull request #229 from SHADE-DP/Fix-BatchCrash
...
Re-aded ability to change shaders
2022-11-19 18:49:48 +08:00
Kah Wei
92b1c6676b
Merge branch 'main' into Fix-BatchCrash
2022-11-19 18:26:37 +08:00
Kah Wei
b2dc440d03
Fixed bug where moving objects stopped moving after chanigng their material's shader
2022-11-19 18:26:11 +08:00
Diren D Bharwani
b1179d02c2
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-19 17:38:18 +08:00
Kah Wei
58e6a3c4c2
Re-aded ability to change shaders
...
Bugged, replacing shaders results in object being rendered in the old position
2022-11-19 17:30:48 +08:00
XiaoQiDigipen
bd3b643c19
Merge pull request #228 from SHADE-DP/Fix-BatchCrash
...
Fixed crash caused when loading more than one graphics pipeline
2022-11-19 16:26:37 +08:00
XiaoQiDigipen
06e8ee6b2d
Merge pull request #227 from SHADE-DP/SP3-6-c-scripting
...
Fixed premake bug where project configuration tag was missing for SHADE_CSharp
2022-11-19 16:25:32 +08:00
XiaoQiDigipen
51d663ab14
Merge pull request #226 from SHADE-DP/SP3-2-Physics
...
Added in Raycasting through Physics
2022-11-19 16:24:50 +08:00
XiaoQiDigipen
8753bc14a6
Merge pull request #225 from SHADE-DP/SP3-1-RenderOnlyActive
...
Renderables now no longer render if disabled
2022-11-19 16:24:22 +08:00
Kah Wei
f3a44d2ead
Fixed crash caused when loading more than one graphics pipeline
2022-11-19 16:11:07 +08:00
Kah Wei
daa6247bff
Fixed premake bug where project configuration tag was missing
2022-11-19 15:03:49 +08:00
Diren D Bharwani
6ad05d306f
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-19 04:21:58 +08:00
Diren D Bharwani
411c4a4e56
Added C# Interface for Raycasting
...
Untested with Scripts, tested engine side.
2022-11-19 04:21:46 +08:00
Brandon Mak
798803cf81
UI WIP
2022-11-18 22:03:21 +08:00
Kah Wei
27413c380e
Renderables now no longer render if disabled
2022-11-18 21:59:18 +08:00
Kah Wei
5ec8475842
Merge branch 'main' into SP3-1-RenderOnlyActive
2022-11-18 21:34:28 +08:00
XiaoQiDigipen
fa05d8d719
Merge pull request #224 from SHADE-DP/PlayerController
...
Update changes to scripts and AudioSystem
2022-11-18 19:01:24 +08:00
Diren D Bharwani
a4e5a1c269
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-18 18:31:38 +08:00
Diren D Bharwani
6b5b0387a9
Fixed bug where pausing then playing crashes physics
2022-11-18 18:31:07 +08:00
Diren D Bharwani
b328d1df82
Added Physics Raycasts with Debug Drawing
...
Press F11 while the scene is playing to toggle debug drawing of rays.
2022-11-18 18:15:19 +08:00
Glence
a77740db51
Merge branch 'main' into PlayerController
2022-11-18 17:16:04 +08:00
Glence
0551b1fb8a
added the new banks
...
added onplay/onpause/onstop for audiosytem
2022-11-18 17:04:06 +08:00
Brandon Mak
09249cf9e8
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-11-18 16:48:09 +08:00
XiaoQiDigipen
9ada09dec1
Merge pull request #223 from SHADE-DP/SP3-20-UI-System
...
Added UI and Canvas to editor
2022-11-18 16:39:46 +08:00
maverickdgg
e5b9192044
Merge branch 'main' into SP3-20-UI-System
2022-11-18 16:37:41 +08:00
maverickdgg
a181d7b896
Added Canvas and UI to editor
2022-11-18 16:37:33 +08:00
Brandon Mak
03ce142137
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-11-18 16:37:06 +08:00
Brandon Mak
b5f37195a9
Merge branch 'FontIntegration' into SP3-1-Rendering
2022-11-18 16:36:10 +08:00
Brandon Mak
66f33554a3
Tested adding text component to entities
2022-11-18 16:35:49 +08:00
XiaoQiDigipen
8f513de9c3
Merge pull request #222 from SHADE-DP/SP3-20-UI-System
...
Implemented Canvas and UI Component
2022-11-18 12:29:40 +08:00
maverickdgg
36a1a1c696
Merge branch 'main' into SP3-20-UI-System
2022-11-18 12:24:24 +08:00
XiaoQiDigipen
84dc63d6d3
Merge pull request #221 from SHADE-DP/SP3-141-Camera-System
...
Separated Ortho and perspective matrices in camera
2022-11-18 12:24:19 +08:00
maverickdgg
0b5ec34b00
Merge branch 'main' into SP3-141-Camera-System
2022-11-18 09:38:52 +08:00
maverickdgg
9ac1c01008
Merge branch 'main' into SP3-20-UI-System
2022-11-18 09:38:42 +08:00
maverickdgg
d997cd4da6
Added canvas ID to UI Component
2022-11-18 09:38:31 +08:00
XiaoQiDigipen
c493432f3f
Merge pull request #219 from SHADE-DP/SP3-6-c-scripting
...
Scripts are now always built on engine launch
2022-11-17 17:38:17 +08:00
Kah Wei
e8bd33ec9e
Scripts are now always built on engine launch
2022-11-17 17:36:35 +08:00
XiaoQiDigipen
379c44086d
Merge pull request #218 from SHADE-DP/SP3-6-c-scripting
...
Fixed edge cases for serialization and deserialization of scripts
2022-11-17 17:17:12 +08:00
XiaoQiDigipen
e31f868257
Merge pull request #217 from SHADE-DP/SP3-2-Physics
...
Fixed various Physics bugs
2022-11-17 17:13:01 +08:00
XiaoQiDigipen
c54c59a445
Merge pull request #216 from SHADE-DP/SP3-4-Editor
...
Added controls to adjust editor camera movement speed and turn speed
2022-11-17 17:12:16 +08:00
Kah Wei
042bff5c1a
Added additional exception handling for serialization and deserialization failures for scripts to prevent data loss
2022-11-17 15:49:06 +08:00
Kah Wei
6efbea54e1
Fixed issue where scripts of Entities destroyed during scene unloading are not properly disposed
2022-11-17 15:43:35 +08:00
Kah Wei
17662abef1
Fixed bug where certain null objects in deserialization was not handled
2022-11-17 15:42:40 +08:00
Sri Sham Haran
920e977232
Merge branch 'main' into SP3-4-Editor
2022-11-17 13:34:34 +08:00
Sri Sham Haran
e170a5fca8
Added controls to editor viewport menu bar to adjust movement speed and turn speed for editor camera
2022-11-17 13:33:22 +08:00
Diren D Bharwani
b3fbfce56f
FIxed debug draw for offset colliders
2022-11-17 12:58:01 +08:00
Glence
7d2435131f
added game manager along with scoring zones for item to be thrown in
2022-11-17 12:54:08 +08:00
Diren D Bharwani
360c55fa2b
Disabled automass on rigid bodies
2022-11-17 12:27:00 +08:00
Diren D Bharwani
18218443ec
Fixed a bug
2022-11-17 12:20:28 +08:00
Diren D Bharwani
c967f9355f
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-17 10:42:53 +08:00
Diren D Bharwani
7288894507
Fixed bug where adding colliders would fail to maintain previous collider sizes
2022-11-17 10:42:45 +08:00
XiaoQiDigipen
098c621316
Merge pull request #215 from SHADE-DP/SP3-1-MaterialEditSupport
...
Added full support for runtime editing of material properties
2022-11-17 09:22:52 +08:00
maverickdgg
ad30f150d1
UI component and UI System prep
2022-11-17 07:12:38 +08:00
maverickdgg
0bb97413ef
Added Canvas and UI Components
2022-11-17 05:39:55 +08:00
maverickdgg
7d71390d43
separated ortho and proj matrix in camera comp
2022-11-17 05:29:11 +08:00
maverickdgg
6b80a4baa9
Merge branch 'main' into SP3-141-Camera-System
2022-11-17 04:56:04 +08:00
maverickdgg
c80a819b6e
Guard Find entity by name function
2022-11-17 04:55:46 +08:00
Diren D Bharwani
8f9fedff41
Added sleeping debug info to Rigidbody Inspector
2022-11-17 01:39:05 +08:00
Glence
e4f23dc6c3
added a game manager along with some player controller changes
2022-11-17 00:23:38 +08:00
Diren D Bharwani
503f32c3a6
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-17 00:21:18 +08:00
Diren D Bharwani
39a8ca131f
Fixed Collision & Trigger Messages not being cleared on deactivating objects
2022-11-17 00:11:55 +08:00
Kah Wei
b129a68680
Disabled setting of shader for now as it is buggy
2022-11-16 23:19:25 +08:00
Kah Wei
ae5f7801d4
Merge branch 'main' into SP3-1-MaterialEditSupport
2022-11-16 22:52:42 +08:00
Glence
e4bba27671
Merge branch 'main' into PlayerController
2022-11-16 22:30:38 +08:00
Glence
df9cb11446
add to vel instead of setting it
2022-11-16 22:28:08 +08:00
Kah Wei
19bc90845f
Added additional checks for SetProperty() of Material and MaterialInstance
2022-11-16 21:01:51 +08:00
Kah Wei
8869b42db2
Fixed memory corruption in SHSubpass
2022-11-16 21:00:27 +08:00
Kah Wei
fe91f58d28
Fixed material inspector saving not saving the correct texture ID into the runtime material
2022-11-16 19:25:17 +08:00
Kah Wei
c5bca4111b
Fixed validation error caused by deleting empty batches
2022-11-16 19:23:26 +08:00
Kah Wei
f0c09817ce
EnsureBufferAndCopy utility functions now avoid resizes if new size is smaller or equal
2022-11-16 17:49:11 +08:00
Kah Wei
29b4465dfd
Split pre-rendering tasks to a PrepareRenderRoutine
2022-11-16 17:48:15 +08:00
Sri Sham Haran
edd44604f1
Merge branch 'main' into SP3-4-Editor
2022-11-16 17:47:36 +08:00
Sri Sham Haran
37e845336b
Fix line draws for asset browser
2022-11-16 17:46:48 +08:00
Kah Wei
506b8836fe
Materials now keep track of their modified state and associated MaterialInstances keep track of changes to their base
2022-11-16 17:46:36 +08:00
Sri Sham Haran
1bd7183231
Added validation for Renderable drag drop fields
2022-11-16 17:30:19 +08:00
XiaoQiDigipen
9c4c665fa8
Merge pull request #214 from SHADE-DP/SP3-1-MaterialUpdate
...
Fixed material property setting at runtime
2022-11-16 17:01:57 +08:00
Brandon Mak
f991e7b227
Fixed some text shaders and changed some image parameters
...
- SHApplication has a font compiler exe call to test compiling a sample font
- SHVkImage now takes in a vector instead of a span for mip offsets (fuck it, copy the mip offset. The RAM can cry about it).
- Removed font data descriptor set layouts from graphics global data
- FONT_DATA set index is changed to 4 instead. This clashes with Render graph resource set index but it won't matter.
- Added entity ID render graph resource to scene render graph
- SHFont format for images is now R8G8B8A8UNorm
2022-11-16 16:57:08 +08:00
Kah Wei
760c0386a9
Merge branch 'SP3-1-MaterialUpdate' into SP3-1-MaterialEditSupport
...
# Conflicts:
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHMaterial.h
2022-11-16 16:45:22 +08:00
Kah Wei
db7c4a6d38
Merge branch 'main' into SP3-1-MaterialUpdate
2022-11-16 16:40:15 +08:00
Kah Wei
acae84d12c
Fixed bug where creation of custom material instance for Renderables are not updated on the GPU
2022-11-16 16:38:04 +08:00
Kah Wei
3e3a66f261
Fixed memory corruption issue caused by SHMaterialInstance::SetMaterial()
2022-11-16 16:32:12 +08:00
XiaoQiDigipen
690ebef77d
Merge pull request #213 from SHADE-DP/SP3-4-Editor
...
Added Custom RigidBody Component View in Editor
2022-11-16 15:33:38 +08:00
XiaoQiDigipen
b887a303ef
Merge pull request #212 from SHADE-DP/SP3-6-c-scripting
...
Added Audio class for playing audio from C#
2022-11-16 15:31:17 +08:00
Kah Wei
3a6f1f852b
SHMaterialInstance::GetProperty() will now retrieve a property from the base material if it was not overriden
2022-11-16 15:29:11 +08:00
Sri Sham Haran
ba39c02f9f
Changed formatting slightly for RigidBody component view
2022-11-16 15:28:42 +08:00
Kah Wei
dc9291bc01
Added Audio class for playing audio from C#
2022-11-16 15:00:56 +08:00
Kah Wei
3affaf426d
WIP Runtime Material Editing support
2022-11-16 09:06:29 +08:00
Diren D Bharwani
a9f77d666c
Fixed compile error
2022-11-16 00:04:56 +08:00
Diren D Bharwani
f172ccb744
Added Automass and Sleep check for Rigidbodies
2022-11-15 23:58:08 +08:00
Diren D Bharwani
1b2ff7f4a2
Expanded Collision Shape C# Interface
2022-11-15 23:57:38 +08:00
Sri Sham Haran
37aad49406
Added requested rigidbody component view with debug information
...
Changed DragVec controls to not push commands if ImGuiSliderFlags_ReadOnly is enabled
2022-11-15 21:09:24 +08:00
Brandon Mak
292fdf4ee2
Fixed some bugs but SHFont constructor still breaks
...
the vkImage is not loading correctly
2022-11-15 20:40:43 +08:00
XiaoQiDigipen
ec215b944e
Merge pull request #211 from SHADE-DP/SP3-16-Math
...
Fixed Vector3.GetNormalised!!!!!!!
2022-11-15 19:27:27 +08:00
Glence
3f3770f74f
now hard sets the vel instead of adding force
2022-11-15 18:52:46 +08:00
Diren D Bharwani
a752bdb985
someone donno how to normalise sia
2022-11-15 18:45:58 +08:00
Diren D Bharwani
a3d2f95aa0
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-11-15 18:41:16 +08:00
Brandon Mak
b6bae850bf
Merge remote-tracking branch 'origin/main' into FontIntegration
2022-11-15 18:25:40 +08:00
Kah Wei
958310a8ea
Renderable now shows the name of the mesh and material assigned instead of asset IDs
2022-11-15 18:16:07 +08:00
Kah Wei
c69ad04f1e
Added functions to get name of a backing asset from SHResourceManager
2022-11-15 18:15:49 +08:00
XiaoQiDigipen
4b70fbf0d6
Merge pull request #210 from SHADE-DP/SP3-8-serialization
...
Added serialization of component isActive
2022-11-15 18:15:23 +08:00
Diren D Bharwani
cd164cc2d5
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-15 18:10:54 +08:00
Sri Sham Haran
93cded6ed9
Added serialization of component isActive
2022-11-15 17:04:52 +08:00
XiaoQiDigipen
0aaa493bcc
Merge pull request #209 from SHADE-DP/SP3-4-Editor
...
Editor fixes - Parenting of range selected entities, Component IsActive Checkbox, Scene Play/Pause behaviour, Gizmo controls
2022-11-15 16:37:09 +08:00
Sri Sham Haran
0e4d97da81
tooltip now reflects the correct keys
2022-11-15 16:28:46 +08:00
Diren D Bharwani
f62fec77e3
Merge branch 'main' into SP3-2-Physics
2022-11-15 16:26:42 +08:00
Sri Sham Haran
b0404bd59a
Merge branch 'main' into SP3-4-Editor
2022-11-15 16:22:56 +08:00
Sri Sham Haran
d3be8127cd
[FIXED] Parenting of entities selected using Shift+Select
...
[FIXED] Component Active Checkbox not working for non reflected components
2022-11-15 16:22:48 +08:00
Diren D Bharwani
d3103598f3
Removed old SHLog trace methods
2022-11-15 16:22:16 +08:00
Kah Wei
75f103c372
Setting pipeline of a material now triggers a reset of all properties for material instances based on the material
2022-11-15 15:58:38 +08:00
Diren D Bharwani
0c6cae5ec8
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-15 15:41:53 +08:00
Sri Sham Haran
e7a66eed08
Merge branch 'main' into SP3-4-Editor
2022-11-15 15:12:16 +08:00
Xiao Qi
f7cca42e59
Added shlog information source
2022-11-15 13:53:15 +08:00
Xiao Qi
96cb832e81
Font meta file and line in application to manually trigger font load
2022-11-15 13:48:54 +08:00
Xiao Qi
786e15771c
Addedo control paths for font compilation and loading
2022-11-15 13:44:39 +08:00
Xiao Qi
92ddc3f1eb
Fixed wrong include path to SHUtilities
2022-11-15 13:30:25 +08:00
Xiao Qi
3dcb6f26c2
Merge branch 'main' into SP3-1-Rendering
2022-11-15 13:21:28 +08:00
XiaoQiDigipen
c8ba066929
Merge pull request #208 from SHADE-DP/SP3-15-Tools
...
Added debug-only logging macros
2022-11-15 13:19:37 +08:00
Diren D Bharwani
e93eea6381
Cleaned up tools folder. Added debug only logging macros with _D suffix
2022-11-15 03:03:37 +08:00
Diren D Bharwani
b164e95b12
Merge remote-tracking branch 'origin/main' into SP3-15-Tools
2022-11-15 02:30:05 +08:00
XiaoQiDigipen
94b4e3d169
Merge pull request #206 from SHADE-DP/SP3-6-c-scripting
...
Updated projects documentation auto generation
2022-11-15 01:52:53 +08:00
XiaoQiDigipen
638e95473c
Merge pull request #207 from SHADE-DP/SP3-13-Assets-Manager
...
Fixed and Updated internal asset creation pipeline for editor (Textures)
Accounted for texture compilation within editor
Fixed bug with rebuilding of asset collection and asset directory
Added checks for already registered assets and sub assets
2022-11-15 01:50:13 +08:00
Kah Wei
5cb87402b2
Hide .shmeta files from C# script project
2022-11-15 01:22:22 +08:00
Xiao Qi
16e357acb0
Accounted for texture compilation
...
Changed refresh, doesnt clear asset collection anymore
Checks for preexisting sub assets and asset meta in collection
2022-11-14 21:18:36 +08:00
Sri Sham Haran
7c636adbfc
Merge branch 'main' into SP3-4-Editor
2022-11-14 20:41:50 +08:00
Sri Sham Haran
36ed195a69
[FIX] Scene saving when you press play from pause
...
[FIX] WER for transform gizmo can now be pressed regardless of whether editor viewport is focused
2022-11-14 20:40:52 +08:00
Kah Wei
47c50c3a31
Merge branch 'main' into SP3-6-c-scripting
2022-11-14 19:38:43 +08:00
Brandon Mak
4eb5fa64e0
Text Rendering WIP
2022-11-14 19:31:26 +08:00
XiaoQiDigipen
870e2dd36d
Merge pull request #205 from SHADE-DP/SP3-2-Physics
...
SP3-2 Collider Materials synchronisation with ReactPhysics & Clear Forces method
UPDATES
Collider Materials now sync with react physics. C# methods will be added later tonight.
Clear forces methods added to RigidBodyComponent.
2022-11-14 19:25:02 +08:00
Kah Wei
6673e6f266
Merge branch 'main' into SP3-6-c-scripting
2022-11-14 19:08:46 +08:00
Kah Wei
9df5b131ee
Fixed build error with deletion of net5.0
2022-11-14 19:08:36 +08:00
Glence
37bbf22779
added changes
2022-11-14 19:05:48 +08:00
Diren D Bharwani
d897ac01e6
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-14 18:39:06 +08:00
Diren D Bharwani
10335f3033
Added syncing of physics materials & clear forces methods
2022-11-14 18:38:32 +08:00
Brandon Mak
2a05d821d5
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-11-14 18:36:33 +08:00
Brandon Mak
d95ed3f067
Text Rendering WIP
2022-11-14 18:36:26 +08:00
Kah Wei
5ccd2263c7
Documentation files are now generated for projects
2022-11-14 18:35:52 +08:00
XiaoQiDigipen
6d227ec846
Merge pull request #204 from SHADE-DP/SP3-13-Assets-Manager
...
Asset recognise bugfix
Added meta generation recognisation for scene and font extension types on load up
Check for std::optional value exist
2022-11-14 18:32:48 +08:00
Xiao Qi
3cc5ed0dec
Added meta generation recognisation for scene and font extension types on load up
...
Check for std::optional value exist
2022-11-14 18:31:56 +08:00
Sri Sham Haran
dd2b9f4f23
Alter template
2022-11-14 18:26:31 +08:00
Sri Sham Haran
874977775d
Update issue templates
2022-11-14 18:24:08 +08:00
XiaoQiDigipen
45ec617c3a
Merge pull request #203 from SHADE-DP/SP3-6-c-scripting
...
Script QoL Improvements
Added
GetComponentsInChildren() for GameObject
GetScriptsInChildren() for GameObject
GetComponentsInChildren() for Scripts
GetScriptsInChildren() for Scripts
Fixed
Bug causing crash if a Renderable is added without any mesh or materials
Serialization failure caused by null objects in Scripts
2022-11-14 17:57:54 +08:00
Kah Wei
77cab3e4c5
Merge branch 'main' into SP3-6-c-scripting
2022-11-14 17:08:50 +08:00
Kah Wei
9e8674859c
Fixed script serialization for objects with no default values set
2022-11-14 17:05:54 +08:00
Kah Wei
9e90a78ee4
Added GetComponentsInChildren and GetScriptsInChildren for Scripts and GameObjects
2022-11-14 16:29:53 +08:00
Glence
22da6e237d
Merge branch 'main' into PlayerController
2022-11-14 16:17:03 +08:00
XiaoQiDigipen
101dbb7a6f
Merge pull request #202 from SHADE-DP/SP3-2-Physics
...
SP3-2 Bugfixes
UPDATES
SHBoundingBox & SHBoundingSphere are renamed to SHBox & SHSphere
BUGFIXES
Colliders & Rigidbodies active states affect behaviour
Forces are cleared after every physics update
2022-11-14 16:07:51 +08:00
Brandon Mak
ac17721363
Merge branch 'main' into SP3-1-Rendering
2022-11-14 15:38:33 +08:00
Diren D Bharwani
9515fcca4f
Renames & Bugfixes
...
Renamed BoundingBox & BoundingSphere to Box & Sphere
Forces are forcefully cleared
2022-11-14 15:35:02 +08:00
Glence
bba85c3d1f
removing the constructor for c#
2022-11-14 15:20:58 +08:00
maverickdgg
eb32e87387
Camera Orthographic projection
2022-11-14 15:10:23 +08:00
Glence
04273620a6
Merge branch 'main' into PlayerController
2022-11-14 15:03:04 +08:00
Brandon Mak
7209785f9b
Text Rendering WIP
...
- Added font library to store font resources (not yet synced with resource manager)
2022-11-14 14:14:11 +08:00
Brandon Mak
898b7fbf2c
Text Rendering WIP
2022-11-14 10:11:47 +08:00
Xiao Qi
9e0bc0bbc9
Added checks for path exist and bin and obj folders when building directory for asset browser
2022-11-14 02:52:13 +08:00
Kah Wei
ab869348f1
Added code that only renders objects which are active
2022-11-14 00:59:21 +08:00
Diren D Bharwani
3c61b7519b
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-14 00:25:52 +08:00
Diren D Bharwani
fe1b9d14f5
Partial implementation of syncing SHADE and ReactPhysics active states
2022-11-14 00:25:24 +08:00
Diren D Bharwani
d36d70e3eb
Added a forced update to the physics system
2022-11-14 00:20:54 +08:00
XiaoQiDigipen
557a198367
Merge pull request #201 from SHADE-DP/SP3-6-c-scripting
...
References path for csproj generated file is now dynamically generated
2022-11-13 22:30:46 +08:00
Kah Wei
73a5d5e4b9
References path for csproj generated file is now dynamically generated
2022-11-13 22:29:04 +08:00
Glence
d9beeda7e0
adding the base for fsm for player
2022-11-13 21:56:28 +08:00
Xiao Qi
e3d2515740
Modular house part asset test
2022-11-13 20:49:31 +08:00
Xiao Qi
d0bcd4869f
Removed unused raw asset files
2022-11-13 20:19:26 +08:00
XiaoQiDigipen
0f38ed304d
Merge pull request #200 from SHADE-DP/SP3-13-Assets-Manager
...
On building of asset file directory, check for recognised assets without meta file and generate
2022-11-13 20:04:23 +08:00
Xiao Qi
a8d4f9c756
On building of asset file directory, check for recognised assets without meta file and generate
2022-11-13 19:51:19 +08:00
XiaoQiDigipen
ed25262914
Merge pull request #199 from SHADE-DP/SP3-2-Physics
...
SP3-2 Physics System restructure & bugfixes
UPDATES
If a collider is added without a rigidbody, it is treated as a static body.
BUGFIXES
Physics components can be deleted during play
Physics behaviour SHOULD be deterministic from now on
2022-11-13 18:53:45 +08:00
Diren D Bharwani
c98693c6bc
missing change from last commit
2022-11-13 17:57:46 +08:00
Diren D Bharwani
c953931f4f
Merge branch 'main' into SP3-2-Physics
2022-11-13 17:57:30 +08:00
XiaoQiDigipen
0e7d547782
Merge pull request #198 from SHADE-DP/SP3-4-Editor
...
New Undo/Redo commands + Integration of editor camera arm
Added undo/redo for copy/paste entities
Added undo/redo for entity deletion
Integration of editor camera arm (Alt + Left Click)
2022-11-13 17:44:57 +08:00
Diren D Bharwani
277a3ca011
Fixed deletion bugs
2022-11-13 17:42:48 +08:00
Sri Sham Haran
eed950f26f
Merge branch 'main' into SP3-4-Editor
2022-11-13 17:26:56 +08:00
Sri Sham Haran
b1c004771c
Gave the damn entities names cuz i was going crazy
2022-11-13 17:26:35 +08:00
Sri Sham Haran
895eb56cc0
Integrate cam arm
2022-11-13 17:26:21 +08:00
XiaoQiDigipen
57182f9715
Merge pull request #197 from SHADE-DP/SP3-6-c-scripting
...
Modified how scripts are added and updated to support runtime adding of scripts
2022-11-13 16:38:32 +08:00
Kah Wei
4dc8527395
Reworked scripts to no longer need definition of constructors
2022-11-13 16:29:25 +08:00
Kah Wei
39e26f1b6e
Merge branch 'main' into SP3-6-c-scripting
2022-11-13 16:07:40 +08:00
Kah Wei
af361062e7
Modified how scripts are added and updated to support runtime adding of scripts
2022-11-13 16:07:14 +08:00
Diren D Bharwani
6fd6ee61a6
Merge remote-tracking branch 'origin/SP3-2-Physics' into SP3-2-Physics
2022-11-13 16:02:18 +08:00
Diren D Bharwani
3512ed3397
AHHHHHH
...
i want to pull my hair out
2022-11-13 15:50:03 +08:00
Diren D Bharwani
6fc08f21ed
AHHHHHH
2022-11-13 15:49:35 +08:00
XiaoQiDigipen
f62ce2297d
Merge pull request #195 from SHADE-DP/SP3-6-c-scripting
...
Fixed crash on launch due to script rebuilds and support undo-ing add/remove of scripts
Also restricted access to internal types that SHADE_Scripting should not be accessing.
Redo wonkiness has also been fixed
2022-11-13 14:52:33 +08:00
Diren D Bharwani
86ca047c88
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-13 14:49:44 +08:00
Kah Wei
23320863e3
Added support for undo-redo of adding/removing scripts
2022-11-13 14:49:32 +08:00
Sri Sham Haran
66dbd7df93
Merge branch 'main' into SP3-4-Editor
2022-11-13 13:55:57 +08:00
Sri Sham Haran
276e0806fa
Can now undo/redo entity deletion (working afaik)
2022-11-13 13:55:30 +08:00
Kah Wei
635d999c2c
Fixed redo not working correctly
2022-11-13 13:16:36 +08:00
Kah Wei
a83a38eba8
Fixed bin and obj folders respawning and causing engine crashes
2022-11-13 13:07:49 +08:00
Kah Wei
4b6ede88e2
Merge branch 'main' into SP3-6-c-scripting
2022-11-13 12:44:50 +08:00
Kah Wei
fd7a47b4c0
Added changes to hide internal types and constructors that should not be available to SHADE_Scripting
2022-11-13 12:44:23 +08:00
XiaoQiDigipen
897294426f
Merge pull request #194 from SHADE-DP/SP3-141-Camera-System
...
Sp3 141 camera system
Added EditorCameraArm functionality
Added helper functions in SceneManager to help check scene node and component actives
2022-11-13 11:58:50 +08:00
XiaoQiDigipen
2d8dc8c44e
Merge pull request #193 from SHADE-DP/SP3-6-ArraySerialization
...
List Serialization and Editor for Scripts
Also improved editor fields for single value numbers
Reworked Undo-Redo system for scripts which should be more stable
[Known Issue] Editor for List<Vector2/Vector3> looks a bit off but works for now
2022-11-13 11:58:06 +08:00
Sri Sham Haran
19f0c0ea70
Copy/Paste of entities can now be undone
...
Fixed bug where Shift Select would reset in a duplicate entity selection
Moved editor window manager to its own file.
2022-11-13 11:43:08 +08:00
maverickdgg
efed33ce94
Added code to test EditorCameraArm.
2022-11-13 05:45:43 +08:00
maverickdgg
922d5b0996
Merge branch 'main' into SP3-141-Camera-System
2022-11-13 05:31:34 +08:00
maverickdgg
258c07e857
Added helper functions to check if Scene nodes are active
2022-11-13 05:31:18 +08:00
maverickdgg
4d0598a7f5
Added Editor Camera Arm function
2022-11-13 05:19:46 +08:00
Kah Wei
26e0e72b25
Fixed lists not deserialising correctly
2022-11-13 04:57:10 +08:00
Kah Wei
cf60210b4a
Merge branch 'main' into SP3-6-ArraySerialization
2022-11-13 02:43:12 +08:00
Kah Wei
d98deda63d
Implemented deserialization of lists
2022-11-13 02:42:47 +08:00
XiaoQiDigipen
f0d7ee655d
Merge pull request #192 from SHADE-DP/SP3-4-Editor
...
Editor Tweaks
Play/Pause/Stop bound to F5/F6/F7
Gizmo does not render on play now
Command Manager uses separate stack for undo/redo when editor state is in play
2022-11-13 01:05:32 +08:00
Sri Sham Haran
e2bcb0bbbb
play pause stop bound to F5 F6 F7
2022-11-12 23:57:12 +08:00
Kah Wei
889d3dac4c
Split serialization code into SerialisationUtilities, refactored serialisation code and implemented list serialisation
2022-11-12 23:14:25 +08:00
Sri Sham Haran
69ac074926
change entity active to scene node active
2022-11-12 18:38:57 +08:00
Sri Sham Haran
78ca464c65
Editor now uses separate stacks; 1 set of stacks when in play and another set of stacks otherwise.
...
CommandStack now uses SHDeque
2022-11-12 18:22:45 +08:00
Sri Sham Haran
3402992189
dont draw gizmos on play
2022-11-12 18:09:55 +08:00
Diren D Bharwani
f8bbcdd909
Small fixes
2022-11-12 17:28:49 +08:00
Diren D Bharwani
4ad23a605f
Fixed compilation issues from merge
2022-11-12 17:04:09 +08:00
Diren D Bharwani
3faf3804aa
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-12 16:57:45 +08:00
Diren D Bharwani
45e549f9f1
.....small restructure....
2022-11-12 16:56:58 +08:00
Kah Wei
24dcd77f32
Added tooltip and range attribute support for lists in scripts
2022-11-12 12:17:11 +08:00
Kah Wei
6dbda12f30
Adjusted design of list on scripts and all numbers now use sliders
2022-11-12 03:53:30 +08:00
Kah Wei
d6764b4551
Added support for adding and removing elements from a list
2022-11-12 03:25:46 +08:00
Kah Wei
4c01d68f95
Added list editor tests
2022-11-12 02:33:12 +08:00
Kah Wei
543c199b03
Fixed lists undo not working
2022-11-12 02:33:00 +08:00
Kah Wei
2d2cc532a5
Fixed editing intermdiate list values not working
2022-11-11 22:59:45 +08:00
Kah Wei
dfc03839db
Renamed functions for clarity
2022-11-11 22:18:32 +08:00
Sri Sham Haran
7c7589ce8e
idk why creation of new material is not working here send help. Change to popup for asset creation
2022-11-11 21:12:08 +08:00
Sri Sham Haran
e96db99ee3
Merge branch 'main' into SP3-4-Editor
2022-11-11 20:41:14 +08:00
Sri Sham Haran
153f040c40
Refresh
2022-11-11 20:41:05 +08:00
Kah Wei
d98d00b916
Wonky solution for array editor that doesn't work for elements outside of the first
2022-11-11 15:20:14 +08:00
Glence
fbec2bf866
Auto stash before merge of "main" and "origin/main"
2022-11-11 14:17:47 +08:00
Sri Sham Haran
c9db3b283d
asset browser
2022-11-11 14:00:51 +08:00
Kah Wei
5d2aae3561
Made enum editor template specializations instead
2022-11-11 13:41:58 +08:00
Xiao Qi
3b22f95e29
Added font identifiers
2022-11-11 13:21:22 +08:00
Kah Wei
ed3694bde1
Merge branch 'main' into SP3-6-ArraySerialization
2022-11-11 12:07:40 +08:00
Kah Wei
fdc8965b62
Made String and GameObject editor template specializations instead
2022-11-11 12:07:26 +08:00
Kah Wei
85cc97ca27
Added implementation for ListElementAddCommand and ListElementRemoveCommand
2022-11-11 12:07:05 +08:00
XiaoQiDigipen
34dcc98a41
Merge pull request #191 from SHADE-DP/SP3-13-Assets-Manager
...
Filesystem directory features and bugfix
Fixed type from extension bug that results in null meta
Added compiled check for SHFiles
2022-11-11 10:56:44 +08:00
Xiao Qi
94b64e92dd
Initialise files to not compiled
2022-11-11 10:55:19 +08:00
Xiao Qi
9fe5dc385b
Implemented check for raw asset if compiled
2022-11-11 10:52:57 +08:00
Xiao Qi
6df3f3d417
Fixed get type from extension bug in asset handler
2022-11-11 10:47:03 +08:00
XiaoQiDigipen
6e98776165
Merge pull request #190 from SHADE-DP/SP3-13-Assets-Manager
...
Assets bugfix
Fixed asset type conversion bug when loading from meta files
Removed compile all function
Set parent id to 0 for non sub assets
2022-11-11 10:07:19 +08:00
Xiao Qi
e824c17405
Fixed asset type conversion bug when loading from meta files
...
Removed compile all function
Set parent id to 0 for non sub assets
2022-11-11 10:06:26 +08:00
Glence
4f9015995c
Merge branch 'main' into PlayerController
2022-11-11 09:21:36 +08:00
Brandon Mak
25841c6899
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-11-11 02:40:14 +08:00
Brandon Mak
95d2836c94
God I felt so much pain writing this
...
- Thank god this botchy/hacky resource linking feature between graphs will only be used for a couple of resources.
- Setup environment for UI rendering
- "Scene" resource is now used in BOTH world render graph and screen render graph. Layouts are setup accordingly.
- A very horrible result of this is that linked resources have to be resized in their original graph and it has to be resized BEFORE the graphs linked to it since the framebuffers use their image views.
- sigh.
2022-11-11 02:40:02 +08:00
Brandon Mak
71619d0159
God I felt so much pain writing this
...
- Thank god this botchy/hacky resource linking feature between graphs will only be used for a couple of resources.
- Setup environment for UI rendering
- "Scene" resource is now used in BOTH world render graph and screen render graph. Layouts are setup accordingly.
2022-11-11 02:38:05 +08:00
XiaoQiDigipen
6fc9f804b5
Merge pull request #189 from SHADE-DP/SP3-6-c-scripting
...
GameObjects now provide access to children
2022-11-11 01:14:48 +08:00
Kah Wei
80db641b6f
Added ListElementChangeCommand
2022-11-11 00:49:20 +08:00
Brandon Mak
d17a83ab77
From last commit. Whoops.
2022-11-11 00:02:18 +08:00
Brandon Mak
c78aade245
Resource manager for render graph is the one in Graphics System
...
- Renamed SH_ATT_DESC_TYPE_FLAGS to SH_RENDER_GRAPH_RESOURCE_FLAGS and added SHARED flag to represent that a resource is shared between graphs
- Allowed linking of resources between graphs (unideal implementation)
- Added info tracker for the render graph resources. Right now only layouts are being tracked.
2022-11-11 00:02:07 +08:00
Kah Wei
5875107ce2
Merge branch 'main' into SP3-6-ArraySerialization
2022-11-10 23:44:07 +08:00
Kah Wei
d93ea8e49b
Child caches are now updated when scene hierarchy changes
2022-11-10 23:34:53 +08:00
Sri Sham Haran
aad83d9e32
Revert "Asset browser is wonky now"
...
This reverts commit 2fdff77420
.
2022-11-10 23:02:29 +08:00
Sri Sham Haran
57941cd2dc
Merge remote-tracking branch 'origin/main' into main
2022-11-10 23:02:17 +08:00
Sri Sham Haran
3d848118b2
Revert "Asset browser is wonky now"
...
This reverts commit 2fdff77420
.
2022-11-10 23:02:01 +08:00
Sri Sham Haran
2fdff77420
Asset browser is wonky now
...
Refresh asset browser
Compile asset
2022-11-10 23:01:09 +08:00
Kah Wei
8670b419d0
Merge branch 'main' into SP3-6-c-scripting
2022-11-10 22:25:58 +08:00
Kah Wei
cf5cc41a3f
Reworked Undo-Redo system to be more flexible and stable
2022-11-10 18:10:15 +08:00
Xiao Qi
c95a6a2492
Added open modes for ofstream when building csharp project
2022-11-10 17:37:59 +08:00
Xiao Qi
ed1bc7c62d
Changed scripting project relative path to managed and csharp dlls
2022-11-10 17:34:33 +08:00
XiaoQiDigipen
7da61f4a22
Merge pull request #188 from SHADE-DP/SP3-13-Assets-Manager
...
SP3-13 Assets Management
Added data member to SHFile to indicate whether file can be compiled
Added asset directory refresh (rebuilds asset collection and directory)
Fixed File link to meta
Fixed extension to type conversion
2022-11-10 17:11:27 +08:00
Xiao Qi
03f9c593b6
Function to call to refresh asset directory
2022-11-10 17:09:55 +08:00
Brandon Mak
9d367a359a
Text Rendering WIP
2022-11-10 16:59:26 +08:00
Xiao Qi
0e5609995f
Added data member to signal whether asset file can be compiled
...
Properly linked meta file to file in directory
Fixed extension to type conversion bug
2022-11-10 16:44:16 +08:00
Kah Wei
bdc7297937
Converted macros for script field inspectors to use templates
2022-11-10 16:20:04 +08:00
Diren D Bharwani
901c007cb2
Added Transform Matrix method to SHMatrix
2022-11-10 14:55:28 +08:00
Diren D Bharwani
dcf8b02d22
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-11-10 14:44:30 +08:00
Diren D Bharwani
c40992b48c
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-10 14:44:18 +08:00
Diren D Bharwani
3efecd64e7
Added box & sphere debug draw for physics
2022-11-10 14:30:30 +08:00
Glence
d4d9e0c3b3
setting stuff up for fsm
...
rename file name to fit convention
pickandthrow got ref issue
2022-11-10 13:06:37 +08:00
maverickdgg
e4e4894610
Canvas Component
...
Added a canvas component. No functionality added yet
2022-11-10 13:01:31 +08:00
Xiao Qi
35bcdc5239
Missed out path for config
2022-11-10 11:14:40 +08:00
Kah Wei
e8d2179d76
Added test support for List<int> display in editor
2022-11-10 11:01:17 +08:00
Xiao Qi
fa0787d349
Changed hardcoded paths to use defined asset root folder
...
Shifted scripts and project into folder in assets
2022-11-10 10:33:21 +08:00
XiaoQiDigipen
78e94ca389
Merge pull request #187 from SHADE-DP/SP3-12-SceneGraph
...
SP3-12 Cleaned up SceneGraph Interface & QoL
NEW
Added IsChildOf method to SceneGraph
Added Events when Adding & Removing Children
UPDATES
Scene Nodes are now rea- only aside from active states
2022-11-10 10:32:25 +08:00
Diren D Bharwani
578f384808
Removed redundant overloads to restrict potential bad function calls
2022-11-10 10:24:09 +08:00
Diren D Bharwani
08b3cbafcd
Added IsChildOf method to SceneGraph
2022-11-10 10:20:54 +08:00
Diren D Bharwani
ac217ffe97
Added Add and Remove Child Events to SceneGraph
2022-11-10 09:06:38 +08:00
Brandon Mak
be6a11c629
Text Rendering WIP
2022-11-10 08:28:44 +08:00
Diren D Bharwani
eeab3494ba
Reworked SceneGraph Interface
2022-11-10 03:30:02 +08:00
Diren D Bharwani
914376495e
Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph
2022-11-10 02:33:31 +08:00
Diren D Bharwani
99f41e947f
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-10 02:16:42 +08:00
Diren D Bharwani
4731df28f0
Skeleton for Reworked Physics Debug Draw
2022-11-10 02:16:33 +08:00
Brandon Mak
67f7d0ea2e
Text Rendering WIP
2022-11-10 00:19:38 +08:00
XiaoQiDigipen
717f82f231
Merge pull request #186 from SHADE-DP/S3-6-Gizmos
...
Added Script.OnDrawGizmos and Gizmos class for debug draw in C#
Also fixed performance issues with Script inspectors and deplushie-ed comments.
2022-11-09 14:51:28 +08:00
Kah Wei
da12db6726
Merge branch 'main' into S3-6-Gizmos
2022-11-09 14:45:31 +08:00
Kah Wei
bbe8622d1e
De-plushied SHADE_Managed comments
2022-11-09 14:45:08 +08:00
Kah Wei
a3fe98317d
Fixed performance issue in scripts editor when multiple attributes are applied onto script fields
2022-11-09 10:31:30 +08:00
Kah Wei
349f4a875b
Added full implementation of Gizmos class
2022-11-09 10:22:11 +08:00
XiaoQiDigipen
7ac910149e
Merge pull request #185 from SHADE-DP/SP3-6-CSharpLights
...
Add interface for C# light class and modified Color to match Unity's interface
2022-11-08 21:51:04 +08:00
XiaoQiDigipen
fe018fc95d
Merge pull request #184 from SHADE-DP/SP3-2-Physics
...
SP3-2 Fixed physics bugs and collider improvements
BUGFIXES
Added a relative collider size for ease of use. This variable does not affect any calculations or intersection tests.
Fixed bug where duplicate triggers are caught.
2022-11-08 21:50:07 +08:00
Kah Wei
41b7cb842c
Added C# Gizmos class interface
2022-11-08 21:31:53 +08:00
Kah Wei
e89f5b4b9e
Added OnDrawGizmos for debug draw for scripts
2022-11-08 20:49:07 +08:00
Kah Wei
715699b63b
Add interface for C# light class and modified Color to match Unity's interface
2022-11-08 20:18:50 +08:00
Kah Wei
f0c81116a8
Merge branch 'main' into SP3-6-c-scripting
2022-11-08 18:42:36 +08:00
Kah Wei
8512c658f9
Made GameObject an IEnumerable to follow Unity's Transform interface for iterating through children
2022-11-08 18:32:47 +08:00
Kah Wei
9be58e7e5d
Added SceneGraph interaction functions in GameObject
2022-11-08 18:32:13 +08:00
Diren D Bharwani
f8417f6116
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-08 15:22:28 +08:00
XiaoQiDigipen
80ab010b4b
Merge pull request #183 from SHADE-DP/SP3-6-c-scripting
...
Added support for parameter-less CallbackEvent and CallbackAction in C#
2022-11-08 15:18:17 +08:00
XiaoQiDigipen
639cf4448d
Merge pull request #182 from SHADE-DP/SP3-1-DebugLabels
...
Fixed compile error in Release caused by Debug Labels implementation
2022-11-08 15:18:05 +08:00
Kah Wei
78db3305d4
Merge branch 'SP3-1-DebugLabels' into SP3-6-c-scripting
2022-11-08 15:04:49 +08:00
Kah Wei
ee814fa61d
Added support for parameter-less CallbackActions and CallbackEvents
2022-11-08 15:02:08 +08:00
Kah Wei
1f4a530dcc
Fixed compile error in Release
2022-11-08 14:06:01 +08:00
XiaoQiDigipen
2ab8efb097
Merge pull request #181 from SHADE-DP/SP3-6-c-scripting
...
GameObjects can now be marked as invalid
2022-11-08 13:52:08 +08:00
XiaoQiDigipen
72df3c2d45
Merge pull request #180 from SHADE-DP/SP3-1-DebugLabels
...
Added debug labels for numerous Vulkan objects and RenderGraph regions
2022-11-08 13:51:43 +08:00
Kah Wei
e3369c688d
Added comment to document invalid/null GameObject usage
2022-11-08 13:49:49 +08:00
Kah Wei
e0481ad8af
Removed debug log
2022-11-08 13:47:39 +08:00
Brandon Mak
572700fbb3
Text Rendering WIP
2022-11-08 10:57:07 +08:00
Kah Wei
ddd93a85f4
Added support for null GameObjects (loading is buggy)
2022-11-08 00:53:47 +08:00
Diren D Bharwani
8fbd32a144
Added Relative Sizes to Shapes
2022-11-08 00:46:09 +08:00
Kah Wei
ed3131143d
Added debug labels for samplers and fixed issue with compute pipeline names not being labelled correctly
2022-11-07 23:51:48 +08:00
Kah Wei
0b813d769a
Added WIP Compute Pipelines labeling
2022-11-07 19:41:19 +08:00
Brandon Mak
1165b9fa47
Text Rendering WIP
2022-11-07 19:38:08 +08:00
Kah Wei
d302d7e07d
Added labels for more buffers, images, imageviews, frames, semaphores and more
2022-11-07 19:32:12 +08:00
Diren D Bharwani
70dcad1313
Changed Collider to CollisionShape for improved clarity
2022-11-07 18:19:39 +08:00
Diren D Bharwani
4e02f64133
Fixed bug where duplicate triggers were caught due to swapped entity IDs
2022-11-07 18:06:43 +08:00
Kah Wei
44ae6d0a8f
Removed unused descriptor sets in SHGraphicsGlobalData
2022-11-07 17:28:03 +08:00
Kah Wei
0bda3d5151
Added labels for resources of Mesh and Texture libraries
2022-11-07 14:08:19 +08:00
Diren D Bharwani
10ba68b284
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-07 13:29:17 +08:00
Kah Wei
fb37742ee0
Staging Buffers are now labeled
2022-11-07 13:28:49 +08:00
Kah Wei
782db1e2a4
Added debug labels for Renderpasses
2022-11-07 13:22:16 +08:00
Kah Wei
4bd9f0817a
Buffers are now tagged as buffers for debug labels
2022-11-07 13:21:17 +08:00
Kah Wei
37c765d5cd
Merge branch 'main' into SP3-1-DebugLabels
2022-11-07 11:24:18 +08:00
Brandon Mak
6a6785d296
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-11-07 11:11:56 +08:00
Brandon Mak
cc5c764307
Text Rendering WIP
2022-11-07 02:32:38 +08:00
Brandon Mak
88530e9909
Text Rendering WIP
2022-11-07 00:10:57 +08:00
Brandon Mak
1eb6bc5ef2
Merge branch 'main' into SP3-1-Rendering
2022-11-05 21:48:31 +08:00
XiaoQiDigipen
7e1a909709
Merge pull request #179 from SHADE-DP/FixesForMs2Submission
...
small fixes for ms2 submission - delete this branch
2022-11-05 18:18:40 +08:00
Sri Sham Haran
de38b29f25
small fixes for ms2 submission
2022-11-05 18:15:18 +08:00
XiaoQiDigipen
5506d14f84
Merge pull request #178 from SHADE-DP/PlayerController
...
made rb a properties
2022-11-05 17:46:16 +08:00
Glence
b9996c7b51
made rb a properties
2022-11-05 17:44:34 +08:00
XiaoQiDigipen
a5c0456eb7
Merge pull request #177 from SHADE-DP/SP3-6-c-scripting
...
Scenes are now reloaded and scripts are no longer lost when building scripts
2022-11-05 15:36:05 +08:00
Kah Wei
04e2c255b0
Build script options are now disabled when in play or pause mode
2022-11-05 15:34:56 +08:00
Brandon Mak
09f1b152e8
Merge branch 'main' into SP3-1-Rendering
2022-11-05 15:10:50 +08:00
Kah Wei
06afd384af
Scenes are now reloaded and scripts are no longer lost when building scripts
2022-11-05 14:56:52 +08:00
XiaoQiDigipen
29c25c2d6d
Merge pull request #176 from SHADE-DP/SP3-1-BuiltInMesh
...
Pregenerates default meshes and provides a function to retrieve them
2022-11-05 00:13:45 +08:00
Xiao Qi
81d94c0a29
Merge remote-tracking branch 'origin/main' into main
2022-11-05 00:13:29 +08:00
Xiao Qi
7bfe459c02
Called assimp git pull from root bat directly instead of calling bat inside dependency
2022-11-05 00:13:24 +08:00
Kah Wei
40422a6d23
Added built-in primitives
2022-11-05 00:10:54 +08:00
XiaoQiDigipen
841a73b712
Merge pull request #175 from SHADE-DP/SP3-4-Editor
...
Asset browser now recurses down subassets
2022-11-04 23:35:41 +08:00
Sri Sham Haran
ab17d57756
Asset browser now recurses down subassets
2022-11-04 23:32:29 +08:00
XiaoQiDigipen
740c144565
Merge pull request #174 from SHADE-DP/SP3-305-configurationsMerge
...
Scenes now load from file based on application config starting scene id
Added application config
Load starting scene from application config
Pressing play saves the scene
Pressing stop reloads the scene
2022-11-04 19:21:42 +08:00
Kah Wei
b5bc64456c
Added debug names for some SHVkBuffers
2022-11-04 19:16:57 +08:00
Sri Sham Haran
b30da7e495
Fixes
2022-11-04 19:16:32 +08:00
Kah Wei
d8ee991213
Steps in the rendering process are now highlighted and named for debugging tools
2022-11-04 18:39:45 +08:00
Sri Sham Haran
b86f092f52
Merge branch 'main' into SP3-305-configurationsMerge
2022-11-04 18:37:19 +08:00
Sri Sham Haran
1267442210
Deserialization flow is now as follows:
...
Create entities and components >> Fetch Assets needed >> Load assets needed >> Initialize entities
Some other bug fixes
2022-11-04 18:27:25 +08:00
XiaoQiDigipen
378e4a67ce
Merge pull request #173 from SHADE-DP/SP3-13-Assets-Manager
...
Support for External Model Compiler and Model/Mesh sub assets
Compiling of external files (.gltf, .fbx) done by externally built exe
Models recognised as whole assets, contained meshes recognises and individual assets as well but saved into one file
Structured control paths for assets with and without sub assets for loading
2022-11-04 17:53:04 +08:00
Xiao Qi
f2b589071c
Merge branch 'main' into SP3-13-Assets-Manager
2022-11-04 17:49:43 +08:00
XiaoQiDigipen
6ad6db7997
Merge pull request #172 from SHADE-DP/PlayerController
...
additional changes for player controller
added itemweight to affect player jump
small bug fix to player throw
player caught will now reset its location
2022-11-04 17:49:25 +08:00
Xiao Qi
6d0089ee12
Merge branch 'main' into SP3-13-Assets-Manager
2022-11-04 17:49:13 +08:00
Glence
be16fbed19
added item script in the scene
2022-11-04 17:35:09 +08:00
Glence
d6804c09f4
fixed player throwing
...
added item script
player jump is now affected by item weight
2022-11-04 17:31:53 +08:00
Xiao Qi
9ef956029e
Changed name check for hardcoded racoon mesh
2022-11-04 17:20:52 +08:00
Xiao Qi
1f0d54486d
Added sub asset data members
...
Changed some control flow in asset manager to accommodate for subassets
Read/Write meta files for assets with sub assets
2022-11-04 17:20:42 +08:00
Xiao Qi
6984653b64
Renamed and restructured model asset members
...
Added mesh asset vector for model asset to contain
2022-11-04 17:18:40 +08:00
Xiao Qi
608b204f88
Changed premake to copy model compiler exe
2022-11-04 17:17:48 +08:00
Xiao Qi
04113a0480
Shifted assets and generated new assets
2022-11-04 17:17:24 +08:00
Xiao Qi
4eecc0c08d
Removed old mesh and meta files
2022-11-04 16:23:13 +08:00
XiaoQiDigipen
3b90c84a85
Merge pull request #171 from SHADE-DP/SP3-4-Editor
...
Fix drag-drop parenting issue
Users can now drop onto empty space in hierarchy panel to unparent
2022-11-04 16:11:38 +08:00
XiaoQiDigipen
c7f6ded5ae
Merge pull request #170 from SHADE-DP/Fix-MultiplyShader
...
Switched shaders to use multiply colour instead of additive
2022-11-04 16:11:12 +08:00
Sri Sham Haran
2b34e8c13b
Fix drag-drop parenting issue
...
Users can now drop onto empty space in hierarchy panel to unparent
2022-11-04 16:09:15 +08:00
Sri Sham Haran
4ee0294977
Scene loads correctly now
2022-11-04 14:44:18 +08:00
Kah Wei
eea35600d3
Switched shaders to use multiply colour instead of additive
2022-11-04 14:04:59 +08:00
XiaoQiDigipen
74b9882024
Merge pull request #169 from SHADE-DP/ScriptingAI
...
AI Capture Mechanic
AI will set player's state to 'CAUGHT' if close enough. This threshold distance can be set in the editor.
2022-11-04 10:34:50 +08:00
mushgunAX
ecd1efee56
AI Capture Mechanic
2022-11-03 21:25:43 +08:00
Xiao Qi
544716547e
Added preprocessor check for debug to turn off renderdoc
2022-11-03 02:37:38 +08:00
Glence
5fe10ce8d1
Changes to main for presentation
...
Change TestCube_FS.glsl
Change debugdraw Key input to F10
TestScene changes
AI waypoint changed
playercontroller camera axis change
2022-11-03 01:50:02 +08:00
Xiao Qi
f24346a6fd
Revert "TEMPORARY Push with all relative paths changed for building exe"
...
This reverts commit 0979ee93e6
.
2022-11-03 00:11:56 +08:00
Xiao Qi
0979ee93e6
TEMPORARY Push with all relative paths changed for building exe
2022-11-02 22:44:27 +08:00
Xiao Qi
c96eeb7c5b
Removed xml
2022-11-02 22:36:44 +08:00
XiaoQiDigipen
09792d23ad
Merge pull request #165 from SHADE-DP/ScriptingAI
...
AI Prototype implemented
Runs about four fixed corners in the scene. Chases an object called "Player" if it exists and is close enough. Stops chasing and resumes patrol if player is far enough.
2022-11-02 22:36:16 +08:00
XiaoQiDigipen
02e9df4df7
Merge pull request #164 from SHADE-DP/SP3-10-input-management
...
Zero out arrays in input manager
Properly zero out arrays in input manager so that it works in Release Mode, where arrays are not zeroed-out to save time.
2022-11-02 22:35:57 +08:00
XiaoQiDigipen
4b09f42adc
Merge pull request #168 from SHADE-DP/SP3-4-Editor
...
Added material inspector and setting of materials
Fixed imgui breaking in release
Added material inspector
Allow setting of materials to renderable component
2022-11-02 21:48:07 +08:00
Sri Sham Haran
86254a5bf3
Merge branch 'main' into SP3-4-Editor
2022-11-02 21:41:38 +08:00
Sri Sham Haran
e609b5634a
Material Inspector
...
Can set material
2022-11-02 21:31:27 +08:00
Xiao Qi
d1f624b2eb
Removed SHMeshData declaration/definition in graphics middle end
...
Renamed some data members in SHMeshData
Replaced calls and references to mesh data in Primitive Generator
2022-11-02 21:09:53 +08:00
Xiao Qi
2beae24924
Removed Original mesh compiler, rewriting mesh loader to reflect ModelCompiler format
2022-11-02 20:50:51 +08:00
Kah Wei
c68c5adc0d
Added GetTextureHandle() to SHGraphicsSystem
2022-11-02 17:51:07 +08:00
Kah Wei
4721a133e1
Added a way to retrieve texture handles from texture indices
2022-11-02 17:43:28 +08:00
XiaoQiDigipen
c7f7254ff8
Merge pull request #167 from SHADE-DP/PlayerController
...
PlayerController and PickAndThrow
PlayerController is done with movement and jump
PickAndThrow is done , can throw and pick up an object
Added getright in camera.cxx/.hxx
2022-11-02 17:40:50 +08:00
Glence
4f70b543b2
Merge branch 'main' into PlayerController
2022-11-02 17:36:04 +08:00
Glence
fc56973645
added getright in camera.cxx/.hxx
...
PickandThrow is done
adjusted thirdPersonCamera and PlayerController to work with each other
2022-11-02 17:31:57 +08:00
XiaoQiDigipen
062a6c8c10
Merge pull request #166 from SHADE-DP/SP3-1-Rendering
...
SSAO and lighting changes
2022-11-02 17:22:39 +08:00
Kah Wei
976c220145
Deserialization of SHMaterialSpec will return an empty SHMaterialSpec on failure now instead
2022-11-02 17:19:18 +08:00
Brandon Mak
53397e884d
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-11-02 17:18:44 +08:00
Brandon Mak
ebc94225e7
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-11-02 17:04:31 +08:00
Kah Wei
d207042fec
Reworked SHMaterialSpec and SHMaterial loading system
2022-11-02 16:56:38 +08:00
XiaoQiDigipen
8495175bd8
Merge pull request #163 from SHADE-DP/SP3-2-Physics
...
SP3-2 Integrated some Debug Draw, Added Trigger checkbox
NEW
Debug Draw can be toggled for colliders. Hardcoded to space for now in Application until I have a menu to toggle it. (Feel free to change or remove it).
Trigger Checkbox added to Collider Inspector View
2022-11-02 16:31:26 +08:00
XiaoQiDigipen
3175d4c3a4
Merge pull request #162 from SHADE-DP/SP3-1-DebugDraw2
...
Added editor gridlines and fixed SHDebugDraw::DrawPoly()
2022-11-02 16:30:53 +08:00
mushgunAX
6ab6cc15a9
Zero out arrays for input manager
2022-11-02 16:14:26 +08:00
Diren D Bharwani
27526dfd92
Fixed relative size for sphere colliders
2022-11-02 16:12:47 +08:00
Diren D Bharwani
02c79b4cc4
Added Debug Drawing for Colliders (wonk) and Trigger checkbox to Colldiers
...
Press space to toggle debug draw. Does not work until you press play, then it can be toggled on and off.
2022-11-02 15:44:24 +08:00
Kah Wei
d818adf2a2
Fixed DrawPoly()
2022-11-02 15:34:35 +08:00
Kah Wei
f0ef9fc0cf
Fixed validation errors due to debug draw
2022-11-02 15:13:12 +08:00
Brandon Mak
73be299aae
new SHMETA
2022-11-02 15:05:34 +08:00
mushgunAX
901e49cf1c
Merge branch 'main' into SP3-10-input-management
2022-11-02 14:50:56 +08:00
Brandon Mak
eb569a4263
Shader updates
2022-11-02 14:21:27 +08:00
XiaoQiDigipen
be53244a00
Merge pull request #161 from SHADE-DP/SP3-6-c-scripting
...
Added IsInterpolating to RigidBody in C#
2022-11-02 13:53:28 +08:00
Kah Wei
7bda8b3998
Added IsInterpolating to RigidBody in C#
2022-11-02 13:48:53 +08:00
Kah Wei
93c684fbb1
Merge branch 'main' into SP3-6-c-scripting
2022-11-02 13:42:41 +08:00
mushgunAX
f513603479
AI Prototype implemented
2022-11-02 13:14:17 +08:00
mushgunAX
3826406f55
Merge branch 'main' into SP3-10-input-management
2022-11-02 11:37:23 +08:00
mushgunAX
4eb7879bf2
Revert "Create AIPrototype.cs"
...
This reverts commit b0054d62c6
.
2022-11-02 11:37:03 +08:00
Kah Wei
82e0e4df5c
Added editor gridlines and cardinal axes
2022-11-02 10:33:17 +08:00
Glence
218fc89fc8
Merge branch 'main' into PlayerController
2022-11-02 10:24:09 +08:00
Glence
8df82cae09
Merge remote-tracking branch 'origin/PlayerController' into PlayerController
2022-11-02 10:22:13 +08:00
Kah Wei
41e1f01f29
Added support for persistent debug draw
2022-11-02 10:11:13 +08:00
Kah Wei
1371302a40
Generalised Draw functions in SHDebugDrawSystem for potentially any number of draw queues
2022-11-02 09:34:36 +08:00
XiaoQiDigipen
8c666ef236
Merge pull request #160 from SHADE-DP/SP3-1-DebugDraw2
...
Added Debug Draw System
2022-11-02 02:29:33 +08:00
XiaoQiDigipen
b8e4c2b1bb
Merge pull request #159 from SHADE-DP/SP3-16-Math
...
SP3-16 Slight rework to SHColour for compatibility
UPDATES
*SHColour is now compatible with SHVec4
2022-11-02 02:29:06 +08:00
Kah Wei
5f7b28e8a0
Added SHDebugDraw convenience static class for debug drawing
2022-11-02 01:11:28 +08:00
Kah Wei
ed446002aa
Merge branch 'SP3-16-Math' into SP3-1-DebugDraw2
2022-11-02 01:05:29 +08:00
Diren D Bharwani
b9ada6a5be
Reworked SHColour to be compatible with SHVec4
2022-11-02 00:47:19 +08:00
Glence
4eef6143dc
base for pick and throw
2022-11-02 00:25:43 +08:00
Diren D Bharwani
07bfb2f485
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-11-02 00:22:36 +08:00
Glence
97a39d62c6
player controller done for now
2022-11-01 23:28:31 +08:00
Glence
dd0d336ccb
Merge branch 'main' into PlayerController
2022-11-01 22:03:52 +08:00
Kah Wei
dc8ed48be3
Fixed debug draw system cube rendering
2022-11-01 21:49:57 +08:00
Sri Sham Haran
129f92e4b6
mat inspector properties handling (WIP)
2022-11-01 21:49:42 +08:00
Kah Wei
904d6be6b0
Merge branch 'main' into SP3-1-DebugDraw2
...
# Conflicts:
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h
2022-11-01 21:00:55 +08:00
Xiao Qi
e2778da955
WIP Rewrite flow from compiling to loading to recognising assets
2022-11-01 20:54:51 +08:00
Kah Wei
0096bc4975
Debug Draw fixes
2022-11-01 20:32:35 +08:00
Kah Wei
674b4d5155
Fixed extra # appearing on all names of script variables
2022-11-01 20:29:03 +08:00
Brandon Mak
b0d08d27fd
SSAO is fully implemented
2022-11-01 20:10:59 +08:00
XiaoQiDigipen
5fe81932e1
Merge pull request #158 from SHADE-DP/SP3-12-SceneGraph
...
SP3-12 Hierarchy Interface for C#
UPDATES
Setting & Getting of Parent has been moved from Transform to GameObject
2022-11-01 19:03:16 +08:00
Sri Sham Haran
26591e8c24
material inspector
2022-11-01 19:03:08 +08:00
Diren D Bharwani
72dc07bbd9
Shifted Hierarchy interface from Transform to GameObject
2022-11-01 19:00:31 +08:00
Diren D Bharwani
40be8a7962
Merge branch 'main' into SP3-12-SceneGraph
2022-11-01 19:00:12 +08:00
Glence
04f6e54007
Merge branch 'main' into PlayerController
2022-11-01 17:50:53 +08:00
Glence
e397d180dd
jumping almost there
2022-11-01 17:49:01 +08:00
XiaoQiDigipen
ff74c090d5
Merge pull request #157 from SHADE-DP/SP3-6-c-scripting
...
GameObjects on scripts can now be edited in the inspector and are serialized
Also credit to @srishamharan for fix to SHHierarchyPanel's drag and drop
2022-11-01 17:26:26 +08:00
Kah Wei
8afe8c1a79
GameObjects on scripts can now be edited in the inspector and are serialized
2022-11-01 17:24:20 +08:00
XiaoQiDigipen
1f7abc7a96
Merge pull request #156 from SHADE-DP/SP3-141-Camera-System
...
Sp3 141 camera system
Added C# interface for Camera and Camera Arm
Added Time.DeltaTimeF and Input.GetMouseVelocity to C# interface
Added ThirdPersonCamera and Camera Control scripts
Added a GetForward function to Camera C# interface. This gets the forward of the last calculated view Matrix.
2022-11-01 16:06:37 +08:00
maverickdgg
eb54b49a5e
Merge branch 'main' into SP3-141-Camera-System
2022-11-01 15:50:45 +08:00
maverickdgg
39910afa54
Added GetForward to Camera C# interface.
...
GetForward gets the forward according to Camera's last calculated view matrix
2022-11-01 15:49:15 +08:00
XiaoQiDigipen
294e61a549
Merge pull request #153 from SHADE-DP/SP3-2-Physics
...
SP3-2 Reworked Physics Component Removal, Added Editor State Change events
NEW
Events for editor state change added:
SH_EDITOR_ON_PLAY_EVENT,
SH_EDITOR_ON_PAUSE_EVENT,
SH_EDITOR_ON_STOP_EVENT
BUGFIX
Reworked physics component removal to match ECS update
2022-11-01 15:36:34 +08:00
maverickdgg
a45432ef66
Merge conflict
2022-11-01 15:35:50 +08:00
XiaoQiDigipen
e8553b6181
Merge pull request #152 from SHADE-DP/SP3-6-c-scripting
...
Added EntityID retrieval from GameObject and compiled docs for Intellisense in C# projects
2022-11-01 15:35:46 +08:00
XiaoQiDigipen
f0c90ceb37
Merge pull request #151 from SHADE-DP/Fix-SetMesh
...
Fix SetMesh(), SHResourceManager and BatcherDispatcher issues that blocked mesh switching
2022-11-01 15:35:04 +08:00
Diren D Bharwani
e0dcf9e13e
Added Editor State Change events
2022-11-01 15:32:01 +08:00
maverickdgg
d917159f67
Merge branch 'main' into SP3-141-Camera-System
2022-11-01 15:31:11 +08:00
maverickdgg
f919d95c0b
Added C# interface for Camera and Camera Arm. Added some test scripts
2022-11-01 15:30:13 +08:00
Kah Wei
00ee8a4641
Added compiled documentation for C# interfaces
2022-11-01 15:29:12 +08:00
Kah Wei
69e625014d
Added EntityID retrieval from GameObject
2022-11-01 15:25:19 +08:00
Diren D Bharwani
4dcd60f239
Added rotation offsets to colliders
2022-11-01 15:10:47 +08:00
Glence
0bd8cf5569
Merge branch 'main' into PlayerController
2022-11-01 14:58:05 +08:00
Kah Wei
d7429c4627
Merge branch 'main' into Fix-SetMesh
2022-11-01 14:56:16 +08:00
Kah Wei
e1587c7252
Fixed SetMesh() not working and loading of mesh and textures
2022-11-01 14:56:03 +08:00
Diren D Bharwani
35771a619a
Adjusted for new component removal method
2022-11-01 14:46:56 +08:00
Diren D Bharwani
8139cc78b2
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-01 14:32:48 +08:00
XiaoQiDigipen
2f94002561
Merge pull request #150 from SHADE-DP/SP3-5-ECS
...
Sp3 5 ecs
Removed Component event now runs after the component has been removed from the sparse set
2022-11-01 14:24:05 +08:00
maverickdgg
43604066b2
Merge branch 'main' into SP3-5-ECS
2022-11-01 14:22:20 +08:00
maverickdgg
d5cadfe8ed
Removed Component event now runs after the component has been removed from the sparse set
2022-11-01 14:21:43 +08:00
maverickdgg
d82bc8833f
Camera C# interface
2022-11-01 14:20:03 +08:00
XiaoQiDigipen
56f2ac3f7f
Merge pull request #149 from SHADE-DP/SP3-2-Physics
...
SP3-2 More Physics Bugfixes
BUGFIXES
My change got overriden somehow. Fixed bug where collisions are reported in the correct state
2022-11-01 14:10:39 +08:00
Diren D Bharwani
68be65f341
Fixed bug where collisions were reported in the wrong state
2022-11-01 14:08:47 +08:00
Kah Wei
450970579a
Merge branch 'main' into Fix-SetMesh
2022-11-01 13:38:34 +08:00
Glence
c4ed57fea8
sprinting works now
2022-11-01 13:24:14 +08:00
Brandon Mak
78545889da
SHSHSHAO
2022-11-01 12:47:50 +08:00
Brandon Mak
53fc1fce95
WIP
2022-11-01 12:10:15 +08:00
mushgunAX
2466ef00f3
Merge branch 'main' into SP3-10-input-management
2022-11-01 12:09:59 +08:00
mushgunAX
b0054d62c6
Create AIPrototype.cs
2022-11-01 12:09:50 +08:00
Brandon Mak
5852c409e6
SSAO WIP
2022-11-01 11:57:08 +08:00
Glence
d51a87ed36
Merge branch 'main' into PlayerController
2022-11-01 11:07:48 +08:00
Diren D Bharwani
9ec9411ce3
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-01 02:42:33 +08:00
Diren D Bharwani
2d411cad4a
Merge remote-tracking branch 'origin/SP3-2-Physics' into SP3-2-Physics
2022-11-01 02:41:28 +08:00
Diren D Bharwani
da690e4395
Simplified RigidBody Implementation
2022-11-01 02:41:08 +08:00
Diren D Bharwani
a9de63a053
Simplified RigidBody Interface
2022-11-01 02:40:48 +08:00
Brandon Mak
54a36e1476
SSAO WIP
2022-11-01 02:32:14 +08:00
Glence
dc7d5a7ec3
updates to the player controller
2022-11-01 01:31:13 +08:00
Kah Wei
b35ca86ae9
BatcherDispatcher should now account for mesh changes properly
2022-11-01 00:53:15 +08:00
Xiao Qi
a8f5d021d3
Switch case initialisation error fix
2022-11-01 00:50:57 +08:00
Xiao Qi
220e1a7d8b
Fixed asset creation broken logic loop
2022-11-01 00:44:37 +08:00
XiaoQiDigipen
7ed5279f8c
Merge pull request #148 from SHADE-DP/SP3-6-c-scripting
...
Added collision and trigger event functions for scripts and double multiplication with vectors
2022-11-01 00:39:08 +08:00
Diren D Bharwani
20c1057314
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-01 00:38:14 +08:00
Kah Wei
c08afcb804
Fixed incorrect FixedUpdate() execution and added Time.FixedDeltaTime
2022-11-01 00:37:09 +08:00
Diren D Bharwani
45cc8c01b6
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-11-01 00:31:02 +08:00
Kah Wei
4e97392098
Added support for multiplying doubles with Vectors in C#
2022-11-01 00:27:45 +08:00
Kah Wei
76737a735a
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Engine/src/Physics/SHPhysicsSystem.cpp
2022-11-01 00:12:51 +08:00
Kah Wei
e4cb8ede5a
Added support for collision and trigger events in code properly
2022-11-01 00:11:09 +08:00
XiaoQiDigipen
ec9aa4bb6e
Merge pull request #147 from SHADE-DP/SP3-2-Physics
...
SP3-2 Relative Collider Size Bugfix
BUGFIXES
Fixed bug where collider size was wrongly displayed and set
2022-10-31 23:50:40 +08:00
Kah Wei
b7aca5b118
Merge branch 'main' into SP3-6-c-scripting
2022-10-31 23:39:56 +08:00
Brandon Mak
53b9c8f746
SSAO WIP
2022-10-31 23:28:46 +08:00
Diren D Bharwani
6e604fe7e9
Fixed bug with relative collider sizes
2022-10-31 23:18:20 +08:00
Diren D Bharwani
da561421b2
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-31 22:31:14 +08:00
Glence
dcd257229b
Merge branch 'main' into PlayerController
2022-10-31 22:28:45 +08:00
XiaoQiDigipen
b6c595f175
Merge pull request #146 from SHADE-DP/SP3-10-input-management
...
Update C# Input Enums
Most input enums are now reachable by C# scripting, including Left Shift
2022-10-31 22:11:30 +08:00
mushgunAX
caf6006c9e
Update C# Input Enums
2022-10-31 22:06:28 +08:00
Glence
75a5127648
Merge branch 'main' into PlayerController
2022-10-31 21:49:30 +08:00
Kah Wei
a6a8700b82
Moved commits over to C# Branch
2022-10-31 21:39:53 +08:00
Kah Wei
f9810684ed
Added functions for execution of OnCollision*() and OnTrigger*()
2022-10-31 21:38:17 +08:00
Kah Wei
60c2c9facb
Added collision and trigger event functions for Script
2022-10-31 21:31:33 +08:00
Kah Wei
40044cbbfe
Added definitions for CollisionInfo properties
2022-10-31 21:26:39 +08:00
Kah Wei
27e71558ad
SHPhysicsSystemInterface now uses a forward declaration for SHPhysicsUtils
2022-10-31 21:26:12 +08:00
Kah Wei
ccbbdc6485
Added CollisionInfo and SHPhysicsSystemInterface
2022-10-31 21:05:46 +08:00
Brandon Mak
441207260b
shmeta
2022-10-31 20:49:49 +08:00
Brandon Mak
2bd3b45ba0
SSAO sort of working
2022-10-31 20:49:28 +08:00
XiaoQiDigipen
68237ae086
Merge pull request #145 from SHADE-DP/SP3-2-Physics
...
SP3-2 Remove component bugfix
BUGFIX
Fixed crash from attempted removal of non-existent rigidbodies / colliders
2022-10-31 18:42:56 +08:00
XiaoQiDigipen
93284bcbfb
Merge pull request #144 from SHADE-DP/SP3-1-SerialisedRenderable
...
Materials are now Serializable and Renderables will load the correct Material if it exists
2022-10-31 18:36:35 +08:00
Diren D Bharwani
b0544d69d2
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-31 18:24:21 +08:00
Kah Wei
2ca353a0b7
Fixed compilation issues in SHResourceManager
2022-10-31 18:18:06 +08:00
Glence
48f01e4164
camp vel
2022-10-31 18:05:36 +08:00
maverickdgg
a5e1862649
Merge branch 'main' into SP3-141-Camera-System
2022-10-31 17:59:09 +08:00
Diren D Bharwani
a8cb36b46f
Fixed component removal bug on application close
2022-10-31 17:55:32 +08:00
Kah Wei
33431d71a6
Merge branch 'main' into SP3-1-SerialisedRenderable
2022-10-31 17:48:02 +08:00
Kah Wei
5bb728663c
Materials are now serializable and deserializable
2022-10-31 17:47:38 +08:00
XiaoQiDigipen
d96ba153ed
Merge pull request #143 from SHADE-DP/SP3-141-Camera-System
...
Sp3 141 camera system
Added Camera Look at.
Fixed Camera Arm.
Added Camera Set View Matrix.
Added ViewMatrix decomposition
2022-10-31 17:44:20 +08:00
Kah Wei
797f4bfd75
Fixed shader changes
2022-10-31 17:35:52 +08:00
Diren D Bharwani
90bcae03a8
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-31 17:33:27 +08:00
XiaoQiDigipen
0957c39283
Merge pull request #141 from SHADE-DP/SP3-5-ECS
...
SP3-5 ECS
Bugfix: Added remove component broadcast to removeComponentOfEntity
2022-10-31 17:32:42 +08:00
Glence
c572bb0f58
Merge branch 'main' into PlayerController
2022-10-31 17:30:12 +08:00
XiaoQiDigipen
13c8928828
Merge pull request #140 from SHADE-DP/SP3-2-Physics
...
SP3-2 Physics Bugfixes
BUGFIXES
Fixed the same velocity bug from before :<
Trigger Info are now stored in the correct container
2022-10-31 17:27:40 +08:00
Diren D Bharwani
dc20317a70
M dumb again.
2022-10-31 17:25:31 +08:00
maverickdgg
a9c1bd7e7a
Added remove component broadcast to removeComponentOfEntity
2022-10-31 17:25:17 +08:00
maverickdgg
883c5460bc
Added a boolean for CameraArm to lock and unlock camera look at
2022-10-31 17:23:03 +08:00
maverickdgg
acf52c77ce
Merge branch 'main' into SP3-141-Camera-System
2022-10-31 16:55:56 +08:00
Glence
f498cfe1fe
Merge branch 'main' into PlayerController
2022-10-31 16:54:29 +08:00
Diren D Bharwani
3d53a7cd40
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-31 16:53:41 +08:00
Diren D Bharwani
c6cc327141
M dumb.
2022-10-31 16:53:34 +08:00
Diren D Bharwani
f863f57466
Triggers were being stored in the wrong container
2022-10-31 16:49:09 +08:00
Glence
0ffd596734
update player controller
2022-10-31 16:45:47 +08:00
maverickdgg
65013969a8
Added Camera LookAt and CameraArmComponent works now
2022-10-31 16:39:06 +08:00
XiaoQiDigipen
75e073d45b
Merge pull request #138 from SHADE-DP/SP3-6-c-scripting
...
Added proper implementation of IsActiveInHierarchy()
2022-10-31 16:32:53 +08:00
XiaoQiDigipen
ef506a2ffe
Merge pull request #137 from SHADE-DP/SP3-2-Physics
...
SP3-2 Added Contact & Trigger Events + Bugfixes
NEW
Contacts & Trigger events are now reported (not implemented on scripting)
BUGFIXES
Fixed desync of rigidbody velocities
2022-10-31 16:32:34 +08:00
Kah Wei
a9b9695155
Merge branch 'main' into SP3-1-SerialisedRenderable
2022-10-31 16:31:22 +08:00
Kah Wei
2ffba202f7
Added proper implementation of IsActiveInHierarchy()
2022-10-31 16:29:29 +08:00
Diren D Bharwani
c47c5653b4
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-31 16:04:48 +08:00
Diren D Bharwani
3638828541
Fixed desync of rigid body velocities
2022-10-31 16:04:40 +08:00
Diren D Bharwani
b7abfde310
Added Collision and Trigger Events
2022-10-31 15:54:54 +08:00
maverickdgg
0e2b017716
View matrix decomposition and set view matrix
...
View matrix decomposition does not decompose roll yet but there isn't much use case
2022-10-31 15:39:04 +08:00
XiaoQiDigipen
69fbd4167d
Merge pull request #136 from SHADE-DP/SP3-6-c-scripting
...
Added Application, GameObject.Find(), implicit null checks for scripts and components and fixed bugs with Script retrieval and deletion
2022-10-31 15:32:57 +08:00
Kah Wei
42a80bfc3b
Merge branch 'main' into SP3-1-SerialisedRenderable
2022-10-31 15:31:38 +08:00
Kah Wei
f91b1f00ad
Added implementation for GameObject.Find()
2022-10-31 15:28:28 +08:00
Kah Wei
d03780a9b3
Merge branch 'main' into SP3-6-c-scripting
2022-10-31 15:20:23 +08:00
Kah Wei
1d2b23d762
Fixed script deletion and OnDestroy never being called
2022-10-31 15:19:57 +08:00
XiaoQiDigipen
2a31ea6798
Merge pull request #135 from SHADE-DP/SP3-5-ECS
...
Sp3 5 ecs
Added GetEntityByName to EntityManager.
Defaults to MAX_EID if none are found.
2022-10-31 15:10:53 +08:00
Kah Wei
b04565c9dc
Added implementation for scripts and component functions for scripts
2022-10-31 15:07:10 +08:00
maverickdgg
f5f9b80490
Added GetEntityByName to EntityManager
2022-10-31 15:06:08 +08:00
maverickdgg
7c59fb16bd
Merge branch 'main' into SP3-5-ECS
2022-10-31 15:03:21 +08:00
maverickdgg
ab46d0a96a
Decompose matrix WIP
2022-10-31 15:02:28 +08:00
Kah Wei
66529474cd
Added Application class equivalent to SHADE_Managed
2022-10-31 14:51:50 +08:00
Diren D Bharwani
ed88b9e5d3
Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph
2022-10-31 13:15:07 +08:00
Diren D Bharwani
ea516189d2
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-31 13:14:38 +08:00
Glence
ad065965ff
Merge branch 'main' into PlayerController
2022-10-31 13:13:28 +08:00
Diren D Bharwani
d4dbb38dc4
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-10-31 13:12:20 +08:00
Kah Wei
5eaf2b55aa
Added WIP Application class and adjustments to how ScriptStore destroys scripts (SpdLog errors)
2022-10-31 12:20:46 +08:00
Brandon Mak
94a57219da
Created CPU and GPU data for SSAO
...
Renderpass for SSAO not yet done (that's next)
2022-10-31 10:32:32 +08:00
XiaoQiDigipen
18093433fa
Merge pull request #134 from SHADE-DP/SP3-4-Editor
...
asset browser
added asset browser
shortcuts for copy/paste and select all
fix checkbox bug
fix entity parenting bug
2022-10-31 00:38:16 +08:00
Glence
7a6474eaf8
base class for playercontroller
2022-10-30 23:59:35 +08:00
Brandon Mak
997ce3011a
Screw you SPIRV-Reflect and screw you GLSL
...
- Pipeline layouts now have a parameter to decide if a binding with a buffer descriptor stores a dynamic type instead.
- SHRenderGraphNodeCompute has catered for this as well through its ctor params
2022-10-30 23:15:52 +08:00
Sri Sham Haran
d3dc87accb
can assign mesh
...
add bigobj option to command line till we find a better solution
2022-10-30 23:15:41 +08:00
Brandon Mak
647182241e
Fixed a buy with view space lighting calculations
2022-10-30 19:21:02 +08:00
Sri Sham Haran
0aebc3053f
Asset browser (currently only displays asset and can drag drop for setting of mesh. except setting mesh in inspector doesnt work)
2022-10-30 18:26:49 +08:00
Kah Wei
b1a933a2c3
Merge branch 'main' into SP3-1-SerialisedRenderable
...
# Conflicts:
# Assets/Shaders/TestCube_FS.shshaderb
# Assets/Shaders/TestCube_VS.shshaderb
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
2022-10-30 17:14:28 +08:00
Brandon Mak
39b5ac0774
LIGHTING NOW DONE IN VIEW SPACE
2022-10-30 16:52:40 +08:00
Brandon Mak
96112e5251
Merge remote-tracking branch 'origin/SP3-16-Math' into SP3-1-Rendering
2022-10-30 16:37:38 +08:00
Brandon Mak
4711a131eb
Shifted the lighting system run outside the viewport loop.
...
- Since lighting is only calculated in the world render graph for now, this will do just fine
- Renderer takes in a view and projection matrix and does the transpose of the multiplication in the renderer
2022-10-30 16:35:55 +08:00
Sri Sham Haran
13ad7d46c6
Fix crash when entity w no transform being set as child of entity w transform
...
Add select all
2022-10-30 15:19:42 +08:00
Diren D Bharwani
03c0d10014
Fixed bug where objects without transform causes a crash on reparenting
2022-10-30 15:10:39 +08:00
Sri Sham Haran
ca659e272b
Designate keys for Copy/Paste of entities in hierarchy panel
...
Change default brush for SHWindow so we don't flashbang everytime we run engine
2022-10-30 15:01:36 +08:00
Diren D Bharwani
605ff9710d
Added Matrix * Vec4
2022-10-30 14:37:30 +08:00
Diren D Bharwani
54b7fa7cd3
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-10-30 14:32:09 +08:00
Sri Sham Haran
f21f501d5a
Merge branch 'main' into SP3-4-Editor
2022-10-30 14:23:39 +08:00
Sri Sham Haran
dd8d913071
Add widget for drag drop read only
...
field
Editor tweaks
2022-10-30 14:22:55 +08:00
Brandon Mak
fad9d37cd4
Lighting data is now copied to CPU buffer and GPU buffer every frame
...
Since lighting will be done in view space, the camera's constant movement will make it so that the light data is often changing. Keeping track of these changes for optimization might prove to be counter productive. Copying data every frame might just be more ideal.
2022-10-30 14:17:36 +08:00
XiaoQiDigipen
ca0ecc1641
Merge pull request #133 from SHADE-DP/SP3-8-serialization
...
Resolve serialization errors
All components are serialized/deserialized
2022-10-30 14:14:27 +08:00
Brandon Mak
94f579e8e3
CompileAsset function from Asset manager is working
2022-10-30 13:25:15 +08:00
Brandon Mak
7b769057a2
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-30 13:18:15 +08:00
Sri Sham Haran
86e8415845
Merge branch 'main' into SP3-4-Editor
2022-10-30 11:28:01 +08:00
Sri Sham Haran
04d3c6c9bb
Merge branch 'main' into SP3-8-serialization
2022-10-30 11:26:23 +08:00
Xiao Qi
087cbcabaf
Forgot function to actually retrieve root folder pointer hehe
2022-10-30 04:41:24 +08:00
XiaoQiDigipen
ffc55c5e0c
Filesystem builds directory tree of asset folder to show all files and subfolders
2022-10-30 04:40:02 +08:00
Xiao Qi
2ebcd3fd47
Filesystem builds directory tree of asset folder to show all files and subfolders
2022-10-30 04:39:16 +08:00
XiaoQiDigipen
06ab0e1fb9
Merge pull request #131 from SHADE-DP/SP3-13-Assets-Manager
...
SP3-13 Assets Management
Added Scene, Prefab, Material loaders and savers
Added function to compile single asset, currently only for shaders
Changed vector to unordered_map to store asset meta classes
2022-10-30 03:10:10 +08:00
Xiao Qi
d3b44f9c22
Merge branch 'main' into SP3-13-Assets-Manager
2022-10-30 03:08:36 +08:00
Xiao Qi
00d4d5d910
Removed code that accidentally calls delete on freed memory for asset loaders
2022-10-30 03:06:18 +08:00
XiaoQiDigipen
ad19cd145d
Merge pull request #130 from SHADE-DP/SP3-6-c-scripting
...
Fixed script error and added support for static functions in CallbackAction
2022-10-30 02:57:05 +08:00
XiaoQiDigipen
b0b9b3eebf
Merge pull request #129 from SHADE-DP/SP3-1-Rendering
...
Ambient and directional lighting implemented
Also solved some bugs
2022-10-30 02:56:29 +08:00
Kah Wei
47df3efae3
Merge branch 'main' into SP3-6-c-scripting
2022-10-30 02:38:31 +08:00
Kah Wei
da05cb3edc
Fixed script error and added support for static functions in CallbackAction
2022-10-30 02:37:58 +08:00
Brandon Mak
b46b6b0b85
CompileAll uncommented and asset manager metadata writes commented
...
SHmeta files should now be identical to what's on main
Shaders themselves have some changes (binaries also updated)
2022-10-30 00:25:49 +08:00
Brandon Mak
5db9299699
Reverted back to old asset IDs
2022-10-30 00:07:02 +08:00
Brandon Mak
7c5a24b8e1
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-30 00:00:17 +08:00
Kah Wei
cac93b7df9
Fixed indentation issue in SHGraphicsSystem
2022-10-29 23:56:37 +08:00
Brandon Mak
5da7638c0a
Compute barriers
2022-10-29 22:52:15 +08:00
Brandon Mak
6f2ca54f7e
WIP compute barriers
2022-10-29 21:36:11 +08:00
Brandon Mak
25db4db99a
Catered to light comp deletion and solved minimize bugs
...
Editor can also now shift the viewport around without Vulkan vomiting validation layers
2022-10-29 17:00:35 +08:00
Diren D Bharwani
72cdbf55e5
Fixed boolean for updating entities in Transform system
2022-10-29 16:42:02 +08:00
Xiao Qi
70533b1712
Changed Application exit call to asset manager
2022-10-29 15:53:15 +08:00
Xiao Qi
c71a84cc59
Simple file deletion
2022-10-29 15:50:26 +08:00
Xiao Qi
219492dedd
Changed asset collection from vector to unordered_map for better id col check
...
Reduce use of for loops to iterate through asset collection
2022-10-29 15:36:34 +08:00
Diren D Bharwani
015b443e4e
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-29 14:54:54 +08:00
Diren D Bharwani
96bd982e4c
Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph
2022-10-29 14:51:48 +08:00
Diren D Bharwani
c9b116b8be
Added skeleton functions to managed GameObject for scene graph interface
2022-10-29 14:51:34 +08:00
Xiao Qi
270205b0ba
Added line to write asset meta into file when saving
...
Does check for data write before saving
2022-10-29 14:50:44 +08:00
Xiao Qi
0182c90a21
Interface to create and save new assets that are internal: Prefabs, Scenes, Materials
2022-10-29 14:42:38 +08:00
Xiao Qi
cd62dbbb25
Material WIP
2022-10-29 11:58:14 +08:00
XiaoQiDigipen
6477617b1b
Merge pull request #128 from SHADE-DP/SP3-6-c-scripting
...
Added Renderable, Mesh, Material and Asset Interface for C#
2022-10-29 02:33:36 +08:00
Kah Wei
dbf1b0b8de
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Managed/src/Components/Collider.hxx
2022-10-29 02:32:21 +08:00
Kah Wei
19dc999e4f
Added full implementation of Renderable script interface
2022-10-29 02:19:36 +08:00
Kah Wei
15e9aaa57d
Modified SHSerialization to load Material using SHResourceManager
2022-10-29 01:54:43 +08:00
Kah Wei
3c2e51cb0b
Built-in shaders are now fully loaded via the SHResourceManager
2022-10-29 01:38:29 +08:00
Kah Wei
e4394b6170
Generalised SHResourceManager
2022-10-28 21:32:05 +08:00
Xiao Qi
22b0a2f97b
Changed tabs/spacing
2022-10-28 21:20:59 +08:00
Xiao Qi
6ce143665a
Added scene and prefab asset classes
...
Added scene and prefab text based loaders
Added write functions to all asset loaders to overwrite data
2022-10-28 20:48:50 +08:00
Sri Sham Haran
001c25f554
fix camera not updating when undock/dock
2022-10-28 20:47:28 +08:00
Sri Sham Haran
f9f818b49c
Merge branch 'main' into SP3-4-Editor
2022-10-28 20:31:51 +08:00
Sri Sham Haran
ea9f90f60d
Serialize Collider Component done
2022-10-28 19:39:39 +08:00
Kah Wei
9617ed3838
Added NativeAsset, Material and Mesh representations along with a stub for Renderable
2022-10-28 19:23:40 +08:00
Xiao Qi
017cbf90c5
Changed filesystem interface in preparation for asset browser functionalities
2022-10-28 19:07:48 +08:00
Kah Wei
7e5c819813
Fixed warning with Collider not being made abstract
2022-10-28 19:03:07 +08:00
Kah Wei
541f44c039
Fixed bugs in SHMaterial, SHMeshLibrary and removed unused functions in SHTextureLibrary
2022-10-28 19:02:54 +08:00
Kah Wei
199897adb4
Added GenericHandles to SHADE_Managed
2022-10-28 19:02:26 +08:00
Sri Sham Haran
04d372b9b8
Merge branch 'main' into SP3-8-serialization
2022-10-28 18:00:08 +08:00
Sri Sham Haran
fa6e3cf1df
Light Component Serialization & Inspector
2022-10-28 17:58:16 +08:00
XiaoQiDigipen
ade24b904f
Merge pull request #127 from SHADE-DP/SP3-2-Physics
...
SP3-2 Colliders use relative size
NEW
Colliders have materials. The material system is intended to emulate Unity's physics materials.
UPDATE
Colliders now show relative size on the Editor. This change has not been reflected in Scripting.
Colliders will deep copy the shape in case it was not already doing so.
If this doesn't compile, beat me. I swear I just compiled, ran and tested for functionality.
2022-10-28 16:38:44 +08:00
XiaoQiDigipen
f276595202
Merge pull request #126 from SHADE-DP/SP3-1-SerialisedRenderable
...
All Vec3 and Vec4s in materials are now automatically set to full 1.0 Vectors
2022-10-28 16:38:17 +08:00
Diren D Bharwani
270f69572c
Replaced cout with SHLOG
2022-10-28 16:25:57 +08:00
Brandon Mak
f110f9b16b
Removed isActive from component
2022-10-28 15:56:22 +08:00
Diren D Bharwani
5bcf20142e
Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph
2022-10-28 15:37:33 +08:00
Diren D Bharwani
b0175dba31
Ensured a deep copy (recreation) of collision shapes
2022-10-28 15:29:28 +08:00
Diren D Bharwani
1a4b15feb2
Changed ColliderBound to CollisionShape because ColliderBound sounds weird
2022-10-28 14:29:05 +08:00
Diren D Bharwani
4fc87866ee
Fixed compilation error
2022-10-28 14:23:11 +08:00
Brandon Mak
baa77e5d37
setter for culling mask
2022-10-28 14:10:08 +08:00
Diren D Bharwani
d4f775843c
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-28 14:08:18 +08:00
Kah Wei
7d6af884a4
Added Color struct
2022-10-28 13:59:41 +08:00
Brandon Mak
5ab2ebbff4
Getters for light
2022-10-28 13:54:46 +08:00
Kah Wei
621dae4c40
All Vec3 and Vec4s in materials are now automatically set to full 1.0 vectors
2022-10-28 13:32:13 +08:00
Sri Sham Haran
a04e57d048
Merge branch 'main' into SP3-8-serialization
2022-10-28 13:17:22 +08:00
Sri Sham Haran
c35f3d5e15
fix hierarchy panel menu bar padding
2022-10-28 12:47:17 +08:00
XiaoQiDigipen
c750bffd1d
Merge pull request #125 from SHADE-DP/SP3-1-SerialisedRenderable
...
Added Serialized Renderable
2022-10-27 23:27:00 +08:00
XiaoQiDigipen
de1407f49e
Merge pull request #124 from SHADE-DP/SP3-6-c-scripting
...
Added Collider & RigidBody and Initial Implementation of CallbackActions and CallbackEvent
2022-10-27 23:26:02 +08:00
Kah Wei
e733cd2e1c
Fixed bug where changes to meshes were not saved by batching system
2022-10-27 23:18:02 +08:00
Brandon Mak
0cab0107b2
Fixed minimizing by resetting command pools and fences
2022-10-27 19:37:05 +08:00
Kah Wei
cc1fe71d4b
Serialization and deserialization of SHRenderable to use default material for now
2022-10-27 19:31:00 +08:00
Kah Wei
003a99ae07
Merge branch 'main' into SP3-1-SerialisedRenderable
...
# Conflicts:
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderable.h
# SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraphNode.cpp
# SHADE_Engine/src/Graphics/RenderGraph/SHSubpass.cpp
# SHADE_Engine/src/Graphics/RenderGraph/SHSubpass.h
2022-10-27 19:30:54 +08:00
Brandon Mak
09c5843cdb
Ambient lighting added
2022-10-27 19:02:55 +08:00
Sri Sham Haran
c7e2116df0
Fix editor component view bug where fields from different components that have the same name clash
2022-10-27 18:34:19 +08:00
Kah Wei
392ecae434
Merge branch 'main' into SP3-6-c-scripting
2022-10-27 17:52:52 +08:00
Kah Wei
623e964160
Fixed bug causing issues with debugging not working
2022-10-27 17:51:30 +08:00
Diren D Bharwani
a354928e0d
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-27 17:41:01 +08:00
maverickdgg
b0f28f98c5
WIP camera arm component
2022-10-27 15:01:18 +08:00
XiaoQiDigipen
1e95c9f7ba
Merge pull request #123 from SHADE-DP/SP3-13-Assets-Manager
...
Asset Manager restructure
Better distinction between loaders and compilers
Added shader compile and load
Temporary interface to compile shader based on file
2022-10-27 14:27:27 +08:00
Xiao Qi
2102835629
Added function to manually compile shaders by path
2022-10-27 14:24:03 +08:00
Xiao Qi
b10da2d160
Merge branch 'main' into SP3-13-Assets-Manager
2022-10-27 14:19:22 +08:00
Xiao Qi
e1de423483
Treat all shaders as built in for now to facilitate getting shader module by name
2022-10-27 14:12:53 +08:00
Xiao Qi
b5a1d5ea88
SP3-282 Restructured loaders and compilers
...
Completed shader compiling and loading
2022-10-27 12:54:58 +08:00
Kah Wei
97432b8666
Accounted for updating collider storage when a collider is removed
2022-10-27 12:46:42 +08:00
Kah Wei
d45d621701
Collider now will have it's sub collider list updated based on events
2022-10-27 12:32:06 +08:00
Kah Wei
cd04132fd7
Merge branch 'main' into SP3-6-c-scripting
2022-10-27 11:41:14 +08:00
Brandon Mak
b7b3ef08ab
Some lighting fixes
2022-10-27 11:31:11 +08:00
XiaoQiDigipen
41ef49a8d3
Merge pull request #122 from SHADE-DP/SP3-141-Camera-System
...
Sp3 141 camera system
Fixed weird camera movement,
Added clamping for camera pitch.
Added RTTR reflection for camera.
Editor inspector now draws camera component.
2022-10-27 10:39:33 +08:00
maverickdgg
dee4e9acbd
Fixed RTTR registration. Added back Camera Clamp
2022-10-27 10:33:54 +08:00
Kah Wei
d2c7630af4
Merge branch 'main' into SP3-6-c-scripting
2022-10-27 10:12:52 +08:00
Kah Wei
2108d9e1f6
Added triple buffering to SHDebugDrawSystem
2022-10-27 10:12:30 +08:00
maverickdgg
0c2d020f89
Merge branch 'main' into SP3-141-Camera-System
2022-10-27 09:26:53 +08:00
maverickdgg
012070ba6d
Added RTTR registration
2022-10-27 09:26:49 +08:00
Sri Sham Haran
a854a50fb2
Fix error from shader graph preventing compilation on main
2022-10-27 09:22:42 +08:00
maverickdgg
d8086edbe2
Merge branch 'main' into SP3-141-Camera-System
2022-10-27 08:55:06 +08:00
Diren D Bharwani
75fd02c08a
small change to where forces are cleared (1 less comparison)
2022-10-27 03:35:32 +08:00
Diren D Bharwani
371ffc52da
Colliders now use relative sizes
2022-10-27 03:14:46 +08:00
Brandon Mak
da3edb2b6b
Working abit more now. Error with device extension thingy.
2022-10-27 02:46:38 +08:00
Brandon Mak
ae88c70936
Lighting shader kind of done (still has bugs)
2022-10-27 02:28:38 +08:00
Xiao Qi
5154b579d7
Re-restructured compilers to be more self contained
...
Loaders only load internal binary asset files
2022-10-26 23:07:01 +08:00
Brandon Mak
6e9f54987f
Prepared light global desc set layout data and render graph resources
...
- Fixed material padding
- Lighting desc sets now have a buffer at binding 0 to store light counts.
- Added position, normals, albedo resources in render graph
2022-10-26 22:40:04 +08:00
Sri Sham Haran
3518004266
Add Open File DIalog (WIP)
2022-10-26 21:06:09 +08:00
Sri Sham Haran
1018454f2e
Add Win32 MessageBox
...
Add Prefab Manager
2022-10-26 20:21:47 +08:00
XiaoQiDigipen
6189768e6f
Merge pull request #121 from SHADE-DP/SP3-2-Physics
...
SP3-2 Fixed another physics bug & added Collider Add/Remove events
[NEW]
Added events when adding/removing colliders
[BUGFIX]
Multiple colliders are now properly deleted.
2022-10-26 18:44:07 +08:00
Xiao Qi
f2e2b21d47
Merge branch 'main' into SP3-13-Assets-Manager
2022-10-26 18:40:10 +08:00
Diren D Bharwani
19ceab84df
Added events for adding and removing colliders
2022-10-26 18:35:41 +08:00
Xiao Qi
4eaa15d999
Added function to compile built in shaders
2022-10-26 17:16:09 +08:00
Diren D Bharwani
12758878c5
Fixed bug with multiple collider removals
2022-10-26 16:55:28 +08:00
XiaoQiDigipen
29dccf77b3
Merge pull request #120 from SHADE-DP/SP3-2-Physics
...
SP3-2 Physics Bugfixes
NEW
Forces can be added to the rigid body.
BUGFIXES
Rigidbody transforms can be modified while the editor is in play.
Deleting a rigid body no longer causes a crash (please let me know if it does happen again and how to replicate it)
Deleting a collider actually gets rid of the collider
On editor stop, forces and velocities are cleared from rigid bodies.
2022-10-26 16:40:31 +08:00
Diren D Bharwani
4f28161e45
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-26 16:30:36 +08:00
Kah Wei
57027da80b
Integrated into SBApplication and accounted for case where number of points to draw is 0.
2022-10-26 16:27:58 +08:00
Diren D Bharwani
58491fcbff
Fixed physics bugs
...
1. Colliders are now properly deleted along with its component.
2. Forces and velocities are reset on stop.
2022-10-26 16:17:22 +08:00
Sri Sham Haran
7c0bcd8a3e
Delete UserLayout.ini
...
@Xenosas1337 stop pushing this please
2022-10-26 16:09:54 +08:00
Sri Sham Haran
51489ecb3b
Merge branch 'main' into SP3-4-editor_fix
2022-10-26 16:07:01 +08:00
Sri Sham Haran
1c099acccb
handle vec2/3/4 that contain values in radians
2022-10-26 16:05:52 +08:00
Kah Wei
550b8d85f0
Added SHDebugDrawSystem class
2022-10-26 16:05:50 +08:00
Kah Wei
632df80d06
Refactored SHPrimitiveGenerator and added Sphere generation support
2022-10-26 16:05:18 +08:00
XiaoQiDigipen
b49bfa4a25
Merge pull request #119 from SHADE-DP/SP3-1-Rendering
...
Lighting WIP. Some bug fixes.
2022-10-26 15:36:13 +08:00
Sri Sham Haran
b013d09f42
Tooltips. editor tweaks
2022-10-26 15:31:23 +08:00
Brandon Mak
43ea33cabf
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-26 15:26:41 +08:00
Sri Sham Haran
d9584a0e39
Changed SHEditor.hpp to .h
...
Handle editor camera update when interacting with viewport window only
2022-10-26 14:32:00 +08:00
Brandon Mak
5637fb707f
Tested light component. Values reflected in renderdoc correctly
...
- Added pure copy compute shader (used instead of kirsch)
- Created sparse set for lights
- Note that while the instanced attribute contains both EID and layer light index and in the future potentially more, the objects still write to a uint framebuffer.
- Light layer index is in a different frame buffer than the eid one.
- Updated shaders to accommodate light layer index.
2022-10-26 02:14:43 +08:00
Xiao Qi
54796773b2
Added built in shader extension
...
Collision check for asset IDs
2022-10-26 01:53:26 +08:00
Xiao Qi
c0c6d35b29
Split function in shader module library to get vk flag conversion
...
Changed some calls to get build in modules
2022-10-26 01:53:08 +08:00
Diren D Bharwani
7ba02aeb0f
Removed unused functions, fixed RigidBody
2022-10-26 01:46:13 +08:00
Diren D Bharwani
fbb613b859
m dumb. it work.
2022-10-26 01:16:49 +08:00
Brandon Mak
4b7a837469
Fixed some bugs in render graph
...
- Changed the eid buffer for instanced rendering to a vec2 (potentially vec3 or 4), to pass other types of data like light layer index.
- Renamed some render graph nodes and subpasses. Added a dummy render pass to transition the scene to read only optimal.
- offscreen buffer resource now transitions to eShaderReadOnlyOptimal instead of eGeneral
2022-10-26 01:08:02 +08:00
Brandon Mak
5016600397
Lights WIP
2022-10-25 23:39:35 +08:00
Diren D Bharwani
0defa58c77
Physics Component Synchronisation is now done through events
2022-10-25 23:09:46 +08:00
Diren D Bharwani
3c5a1b73d6
Fixed bug with destroying a rigidbody component
2022-10-25 22:26:07 +08:00
Diren D Bharwani
024ad44e84
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-25 22:14:04 +08:00
Diren D Bharwani
388795a2db
Transform Components are Enforced through the editor for certain components
2022-10-25 22:13:27 +08:00
XiaoQiDigipen
a1b0e95123
Merge pull request #118 from SHADE-DP/SP3-4-editor_fix
...
Asset Browser Ver. 0 and New default layout
Editor widget tweaks
Anything else i added i cant rmb
2022-10-25 21:04:35 +08:00
Xiao Qi
84ce369607
Changed shader module library to Import shaders and reflect all on its own
...
Preparation for separation for built in shaders distinction
2022-10-25 21:04:21 +08:00
Sri Sham Haran
534aeba06b
Latest Default Layout
2022-10-25 20:59:32 +08:00
Sri Sham Haran
6d9a8e484c
Asset browser
2022-10-25 20:55:46 +08:00
Brandon Mak
0395df5c63
Lights WIP (bug fixes)
2022-10-25 19:59:16 +08:00
Sri Sham Haran
393422a0a3
Merge branch 'main' into SP3-4-editor_fix
2022-10-25 19:48:08 +08:00
Glence
d1d64ec167
added tooltips for the rest of the widgets
2022-10-25 18:48:45 +08:00
XiaoQiDigipen
3486da7a7a
Merge pull request #117 from SHADE-DP/Fix-SamplerCrash
...
Added proper deletion of VKSamplers
2022-10-25 17:42:29 +08:00
Kah Wei
416c571fd2
Added proper deletion of VKSamplers
2022-10-25 17:40:13 +08:00
maverickdgg
53fc0c970c
Added a DegreesToRadians when setting rotation of camera comp
2022-10-25 17:30:11 +08:00
Sri Sham Haran
0acd6a99a4
Tweaks to editor widgets
2022-10-25 17:08:15 +08:00
Kah Wei
3bdc48260f
Improved CallbackEvent inspector
2022-10-25 16:55:50 +08:00
Diren D Bharwani
f04ff595c4
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-25 16:37:59 +08:00
Kah Wei
73a85e4aab
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Managed/src/Utility/Convert.cxx
# SHADE_Managed/src/Utility/Convert.hxx
2022-10-25 15:56:11 +08:00
Xiao Qi
b4726ae992
Removed Shader source library, changed header and enum type locations
2022-10-25 15:43:36 +08:00
XiaoQiDigipen
82f9499f5d
Merge pull request #116 from SHADE-DP/EditorConfig
...
Added .editorconfig to enforce 2-spacing indentation
2022-10-25 15:42:31 +08:00
Kah Wei
da167ec3a5
Added .editorconfig to enforce 2-spacing indentation
2022-10-25 15:39:18 +08:00
Diren D Bharwani
9a6fa32a32
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-25 15:21:37 +08:00
XiaoQiDigipen
7c35d2955b
Merge pull request #115 from SHADE-DP/Fix-IncorrectMDI
...
Fixed instanced rendering the wrong number of instances
2022-10-25 15:20:50 +08:00
Kah Wei
9f98bed4d1
Fixed batching renedering the wrong number of instances
2022-10-25 15:11:01 +08:00
Sri Sham Haran
d0714cee16
Merge branch 'main' into SP3-8-serialization
2022-10-25 15:10:35 +08:00
Sri Sham Haran
dfdd477a37
Merge branch 'main' into SP3-4-editor_fix
2022-10-25 15:10:20 +08:00
Sri Sham Haran
8466309e2f
Serialize/Deserialize SHCollider & SHColliderComponent
2022-10-25 15:09:45 +08:00
XiaoQiDigipen
be9f55ec6b
Merge pull request #114 from SHADE-DP/Fix-RenderableDeleteCrash
...
Fixed deletion crash caused by Renderables
Can delete after merge.
2022-10-25 14:43:35 +08:00
Kah Wei
b059385c8b
Merge branch 'main' into Fix-RenderableDeleteCrash
2022-10-25 14:33:03 +08:00
Kah Wei
c2e51dc603
Fixed deletion crash caused by Renderables
2022-10-25 14:31:28 +08:00
XiaoQiDigipen
e384a520ef
Merge pull request #113 from SHADE-DP/SP3-16-Math
...
SP3-16 Updated SHADE Managed Math & Transform
NEW
Quaternions in SHADE Managed
UPDATES
All Math in managed are using floats instead of doubles
Managed Transform Components store Rotations as Quaternions. Euler angles are stored separately.
2022-10-25 14:09:06 +08:00
Brandon Mak
869916cb2a
Lights WIP
2022-10-25 13:47:27 +08:00
Sri Sham Haran
f64f13521b
SHVec to yaml node convert
2022-10-25 08:42:51 +08:00
Kah Wei
f6cbb18143
Added display of WIP CallbackEvents on the inspector
2022-10-25 01:34:46 +08:00
Brandon Mak
8fb0eddcc1
Lights WIP
2022-10-25 00:00:22 +08:00
Xiao Qi
2dbd2f6030
Split asset into 2 categories for internal assets to be loaded and external assets to be compiled
2022-10-24 22:46:01 +08:00
Diren D Bharwani
ff025f212c
Added Euler Angles properties to Managed Transforms
2022-10-24 22:41:36 +08:00
Diren D Bharwani
24c591ec27
Modified Managed Transform Interface to use Quaternions
2022-10-24 20:07:59 +08:00
Sri Sham Haran
26eb4ad18c
Fix command registrations and mouse pick polling when using transform gizmo
2022-10-24 16:18:18 +08:00
Xiao Qi
8a01065641
Moved original shader source library
...
Added functions to asset manager to get all by type
2022-10-24 04:17:51 +08:00
Xiao Qi
254fc4e641
SP3-284 Restructured Shader source loader into asset manager to follow design pattern for loaders and asset data
2022-10-24 03:54:28 +08:00
Diren D Bharwani
7643ca4289
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-24 02:46:08 +08:00
Diren D Bharwani
c34faade86
Converted doubles to floats in SHADE Managed. Added Quaternions.
2022-10-24 02:45:47 +08:00
Kah Wei
c6d29a1038
Added CallbackAction and CallbackEvent
2022-10-24 02:04:22 +08:00
Kah Wei
51c79d33d6
Added C-style versions of SHLog functions and P/Invoke versions in SHADE_CSharp
2022-10-24 02:04:12 +08:00
Diren D Bharwani
46de36d587
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-10-23 23:45:17 +08:00
XiaoQiDigipen
23b8b66297
Merge pull request #112 from SHADE-DP/SP3-16-Math
...
SP3-16 Quaternions
NEW
Added implementations for Quaternion LookRotation, FromToRotation, Slerp, Lerp and RotateTowards
Transform now stores orientations instead of euler angle rotations. Transform Component interface unchanged.
Added Orientation getters and setters to Transform Component.
2022-10-23 20:07:17 +08:00
Diren D Bharwani
57f9898e07
Finished quaternion implementation
2022-10-23 20:03:18 +08:00
Diren D Bharwani
bf0c068cc7
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-10-23 18:23:06 +08:00
Diren D Bharwani
e15f7696e6
Rotations are stored as radians to reduce the number of conversions
2022-10-23 18:22:58 +08:00
Kah Wei
10a945a35d
Added SHADE_CSharp
2022-10-23 18:20:38 +08:00
XiaoQiDigipen
5f73e8d1c0
Merge pull request #111 from SHADE-DP/SP3-13-Assets-Manager
...
Restructured Asset Manager with Generalised Template Types for Asset Data
All asset types are derived from asset type for casting and storing to facilitate general GetData function
2022-10-23 17:21:17 +08:00
Xiao Qi
f9a28c81d4
Fixed vulkan breaking error
2022-10-23 17:18:46 +08:00
Xiao Qi
4019b4914c
Merge branch 'main' into SP3-13-Assets-Manager
2022-10-23 17:08:37 +08:00
Brandon Mak
0788084bbd
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-23 16:59:16 +08:00
Diren D Bharwani
8559f7d27c
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-10-23 16:59:11 +08:00
XiaoQiDigipen
bf2baee144
Merge pull request #110 from SHADE-DP/SP3-1-Rendering
...
Added customization for compute shader post processing after renderpass end
Added customization for compute shader post processing after renderpass end
Added Input attachment descriptor set support (incomplete, still need to bind and handle resizing)
Command buffers now take in a pipeline type to specify bind point. They also now store bind point specific data such as pipeline layout
More descriptor type support
Fixed a bug in batches where the frame index was not correct
Fixed a bug in pipeline layout where the descriptor set layout order was wrong
Render Graph now has 1 extra function at the start of generate where it checks render graph nodes for node computes. If they exist, add another subpass to transition all images involved.
Kirsch node compute for testing is in Graphics System.
Added function in SHVkUtil to convert pipeline type to pipeline bind point
2022-10-23 16:57:15 +08:00
Xiao Qi
a83d1f8f04
Removed line that loaded all assets
...
Separated template function in asset manager into hpp file
Fixed bug in checking map contains
2022-10-23 16:55:57 +08:00
Diren D Bharwani
33a6d3798c
Added orientation interface and fixed compatibility between physics and transform
2022-10-23 16:55:01 +08:00
Brandon Mak
a81ef91373
Removed some commented code
2022-10-23 16:47:39 +08:00
Brandon Mak
6d2affcbb9
Merge branch 'Rendering-Camera-Integration' into SP3-1-Rendering
2022-10-23 16:36:32 +08:00
Brandon Mak
982f2de286
Merge remote-tracking branch 'origin/main' into Rendering-Camera-Integration
2022-10-23 16:36:22 +08:00
Brandon Mak
64002c6f2b
Camera Director integrated
...
Still has bug
2022-10-23 16:04:58 +08:00
XiaoQiDigipen
438bce43f2
Merge pull request #109 from SHADE-DP/SP3-141-Camera-System
...
Fixed editor camera
2022-10-23 15:07:10 +08:00
Brandon Mak
d4fe63722a
WIP (TODO: remember to change commit message)
2022-10-23 15:05:31 +08:00
maverickdgg
aa1b45c3de
Fixed editor camera
2022-10-23 15:03:24 +08:00
XiaoQiDigipen
845c833915
Merge pull request #108 from SHADE-DP/SP3-141-Camera-System
...
Sp3 141 camera system
Added camera directors.
Use Transform Component's position and rotation for camera if entity has transform component.
Added a function to update editor camera
2022-10-23 12:52:36 +08:00
maverickdgg
96a7896da9
changed includes to SHHandle and SHResourceLibrary
2022-10-23 12:50:56 +08:00
maverickdgg
679533819f
Merge branch 'main' into SP3-141-Camera-System
2022-10-23 12:43:39 +08:00
maverickdgg
c15994532b
Added a function for editor camera update
2022-10-23 12:42:25 +08:00
maverickdgg
6039ec534d
Added clamping of camera, and copying of position and rotation from transform
2022-10-23 12:32:08 +08:00
XiaoQiDigipen
a484cb8e22
Merge pull request #106 from SHADE-DP/SP3-10-input-management
...
Bindings and Controllers
Logical bindings are stored in a map of strings (keys) and logical binding data (values). Logical binding data includes:
Positive Key Codes
Negative Key Codes
Positive Controller Codes
Negative Controller Codes
Mouse X Positive Multiplier
Mouse Y Positive Multiplier
Bindings can only handle for one player for now. Up to four users can be implemented with relative ease, but that depends on whether we want to make the game multiplayer for some reason.
Controller inputs are also handled, with 20 different inputs for the controller.
2022-10-23 01:06:04 +08:00
mushgunAX
77aa5b8c7d
Bindings and Controllers
2022-10-22 23:27:43 +08:00
Kah Wei
2bd633c11b
Added RigidBody component
2022-10-22 23:00:50 +08:00
Kah Wei
885f22c984
Merge branch 'main' into SP3-6-c-scripting
2022-10-22 21:36:40 +08:00
Kah Wei
6ea5ae7707
Added serialization and deserialization of pipeline on the material (no shader loading yet)
2022-10-22 21:36:02 +08:00
Diren D Bharwani
ebfcf1c6bb
Transform now stores orientation as Quaternions. Interface unchanged
2022-10-22 20:16:38 +08:00
Kah Wei
9d8dfd334f
Added serialization interfaces for Material (missing Shader)
2022-10-22 19:38:02 +08:00
Diren D Bharwani
db751bd141
Editor & Scripts can now override Physics-Based objects' Transforms
2022-10-22 18:22:26 +08:00
Kah Wei
76f83068ba
Added type information to SHShaderBlockInterface variables
2022-10-22 02:07:28 +08:00
Xiao Qi
304071cb0a
Apparently static keyword gives error but it compiles
2022-10-22 00:42:50 +08:00
Xiao Qi
459d9dd9fd
Merge branch 'main' into SP3-13-Assets-Manager
2022-10-22 00:08:43 +08:00
Kah Wei
bc8b5f8167
Merge branch 'main' into SP3-8-RenderableSerialization
2022-10-21 22:48:50 +08:00
XiaoQiDigipen
eba318c54d
Merge pull request #105 from SHADE-DP/SP3-4-editor_fix
...
Add Editor Features - Transform Gizmo
Added transform gizmo (UPDATE IMGUIZMO DEPENDENCY)
Small tweaks and fixes to editor
2022-10-21 20:58:47 +08:00
Brandon Mak
cc6e2189fa
WIP
2022-10-21 20:56:14 +08:00
Xiao Qi
449cd28bb3
Took test scene from main
2022-10-21 20:55:21 +08:00
Xiao Qi
44833d22c6
Merge branch 'main' into SP3-13-Assets-Manager
2022-10-21 20:52:28 +08:00
Sri Sham Haran
d6123c8ed7
Merge branch 'main' into SP3-4-editor_fix
2022-10-21 20:45:16 +08:00
Sri Sham Haran
99a69b0020
tweaks + add new ui font
2022-10-21 20:45:03 +08:00
Xiao Qi
9df517f3b3
SP3-170 SP3-238 Restructured asset and asset loading library types to be derived from common base class.
...
Storage of assets and loaders based on pointers.
Created general templated calls to get data from asset manager based on asset type passed in as template argument.
More concise internal interface when loading and storing assets with libraries
2022-10-21 20:28:54 +08:00
Sri Sham Haran
b3ed320f9b
Transform Gizmo done. (Commands for it are wonky)
2022-10-21 18:39:50 +08:00
Kah Wei
1ea482ff38
Added serialization of SHRenderable (only Mesh)
2022-10-21 18:36:56 +08:00
Kah Wei
c47a68947a
Merge branch 'SP3-13-ResourceManager' into SP3-1-SerialisedRenderable
2022-10-21 17:12:00 +08:00
XiaoQiDigipen
52311d0ba6
Merge pull request #104 from SHADE-DP/SP3-13-ResourceManager
...
Added SHResourceManager and Generic Handle
2022-10-21 17:11:51 +08:00
Kah Wei
e5628fbed8
Added functionality to retrieve AssetID from SHResourceManager using a Handle
2022-10-21 17:09:50 +08:00
Diren D Bharwani
82e416fe9e
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-10-21 16:29:31 +08:00
Kah Wei
43c2680a82
Added generic Handles and fixed bugs with SHResourceManager
2022-10-21 15:38:39 +08:00
Kah Wei
7e15edb052
Completed initial implementation of SHResourceManager
2022-10-21 13:58:27 +08:00
maverickdgg
7e04bee8d6
Defaults main camera if the mainCamera is still unset
2022-10-21 10:17:32 +08:00
maverickdgg
267ad5f8c6
Set up the CameraDirector creation and setting of main camera
2022-10-21 09:53:19 +08:00
maverickdgg
31ad8b8c87
Added Resource Lib and handle for CameraDirector into camera system
2022-10-21 09:29:13 +08:00
Sri Sham Haran
bf0e7ab256
Merge branch 'main' into SP3-4-editor_fix
2022-10-21 08:57:25 +08:00
Brandon Mak
e8073bb67f
WIP
2022-10-21 08:42:58 +08:00
maverickdgg
29b6e7050d
camera director WIP
2022-10-21 08:11:12 +08:00
Brandon Mak
c252e4ce4b
Some restructuring with render graph storage.
...
Lesser parameters passed around.
2022-10-21 07:01:51 +08:00
Diren D Bharwani
a52f0ddeed
Added a degree getter and setter for rotation
2022-10-21 00:08:24 +08:00
Diren D Bharwani
fda33f7461
Fixed multi-level transform updates
2022-10-20 22:55:59 +08:00
Brandon Mak
c177dabcd0
WIP (not working)
2022-10-20 19:36:43 +08:00
Sri Sham Haran
e01a608d8c
Transform gizmo finally rendering correctly
2022-10-20 19:16:03 +08:00
XiaoQiDigipen
2cf9c87509
Merge pull request #103 from SHADE-DP/Rename-ResourceManager
...
The Great SHRenaming
Renamed Handle, ResourceManager and ResourceLibrary to SHHandle, SHResourceHub and SHResourceLibrary
2022-10-20 19:02:49 +08:00
Kah Wei
0fadbc8a9d
Renamed Handle, ResourceManager and ResourceLibrary to SHHandle, SHResourceHub and SHResourceLibrary
2022-10-20 19:00:36 +08:00
Diren D Bharwani
314d497b66
Reparenting objects maintain world transforms
2022-10-20 18:35:57 +08:00
Diren D Bharwani
0625ca6bcf
Merge branch 'SP3-12-SceneGraph' into SP3-16-Math
2022-10-20 17:49:47 +08:00
Diren D Bharwani
5a0b34ceea
Added Event for Scene Graph Change Parent
2022-10-20 17:47:32 +08:00
Diren D Bharwani
6172ff35b6
Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph
2022-10-20 17:15:28 +08:00
Kah Wei
c7357d1cde
Merge branch 'main' into SP3-1-SerialisedRenderable
2022-10-20 17:13:11 +08:00
Kah Wei
4d119d80e8
Merge branch 'main' into SP3-6-c-scripting
2022-10-20 17:08:17 +08:00
Kah Wei
488fd51d05
Added Collider component and Ray struct for C#
2022-10-20 17:07:21 +08:00
Diren D Bharwani
610ecc6baa
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-10-20 13:03:08 +08:00
XiaoQiDigipen
f5060ba0b0
Merge pull request #102 from SHADE-DP/SP3-6-c-scripting
...
Added Script Serialization and Deserialization
2022-10-20 11:19:10 +08:00
XiaoQiDigipen
2db6644536
Merge pull request #101 from SHADE-DP/SP3-141-Camera-System
...
Sp3 141 camera system
Done with editor camera
2022-10-20 11:18:57 +08:00
Kah Wei
323a95e5d5
Merge branch 'main' into SP3-6-c-scripting
2022-10-20 11:08:41 +08:00
Kah Wei
166a036142
Completed script serialization in YAML
2022-10-20 11:08:20 +08:00
Kah Wei
4bc91283c8
Fixed primitive fields not being serialised
2022-10-20 10:10:43 +08:00
Kah Wei
cfed342f9c
Modified script serialization to use a sequence of scripts instead of a map
2022-10-20 09:54:51 +08:00
maverickdgg
d32eb790ba
Some clean up
2022-10-20 09:34:33 +08:00
maverickdgg
736d7b652b
Added camera turning
2022-10-20 03:21:42 +08:00
maverickdgg
c23da81f68
Merge branch 'main' into SP3-141-Camera-System
2022-10-19 23:57:16 +08:00
Kah Wei
4f177bc455
Reworked script serialization and deserialization functions (WIP)
2022-10-19 20:43:22 +08:00
Sri Sham Haran
6051b7ded5
Tfm gizmo wip
2022-10-19 20:42:38 +08:00
Xiao Qi
51eba31ad4
Added animation asset class
...
Added animation reading from assimp scene
Separated assimp loading from mesh loader in preparation for exe use
2022-10-19 18:38:11 +08:00
Sri Sham Haran
125ce7b564
Merge branch 'main' into SP3-4-editor_fix
2022-10-19 17:43:22 +08:00
Brandon Mak
71502daac3
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-19 17:23:31 +08:00
Sri Sham Haran
a7e8320008
Copy/Paste Entities
2022-10-19 17:23:25 +08:00
XiaoQiDigipen
a21fc2ba11
Merge pull request #100 from SHADE-DP/SP3-1-Rendering
...
Resize fix
2022-10-19 17:08:42 +08:00
Brandon Mak
603470eeb6
Fixed some camera resizing issues
2022-10-19 17:06:37 +08:00
Brandon Mak
b499d5fc55
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-19 16:59:50 +08:00
XiaoQiDigipen
49b32d1992
Merge pull request #99 from SHADE-DP/CameraIntegration
...
Camera Integration, viewport resize and resize fix
2022-10-19 16:59:11 +08:00
Brandon Mak
212e1e7c1f
Merge remote-tracking branch 'origin/main' into CameraIntegration
2022-10-19 16:54:24 +08:00
Brandon Mak
d9136de134
Integrated Daniel's camera
...
Still need to integrate camera directors
2022-10-19 16:53:45 +08:00
XiaoQiDigipen
2dcf367bc5
Merge pull request #98 from SHADE-DP/SP3-6-c-scripting
...
Added Time class for C#
2022-10-19 16:08:38 +08:00
Kah Wei
a3c4c347bb
Added Time class for C#
2022-10-19 16:06:26 +08:00
Brandon Mak
284ee12205
Broken Camera
2022-10-19 15:32:07 +08:00
Brandon Mak
95310b99bd
Merge branch 'RenderingEditorVPIntegration' into SP3-1-Rendering
2022-10-19 12:27:05 +08:00
maverickdgg
efe8ba4f11
Added some editor camera controls
2022-10-19 10:32:52 +08:00
XiaoQiDigipen
db78e2c973
Merge pull request #97 from SHADE-DP/SP3-6-RangeAttribute
...
Added Range attribute for constraining numerical script fields
2022-10-19 10:26:38 +08:00
Kah Wei
896d399a54
Merge branch 'main' into SP3-6-RangeAttribute
2022-10-19 10:13:15 +08:00
Kah Wei
7df24e7a66
Fixed RangeAttribute not working correctly
2022-10-19 10:12:56 +08:00
maverickdgg
33b173ab9e
Merge branch 'main' into SP3-141-Camera-System
2022-10-19 09:57:52 +08:00
Sri Sham Haran
5bd5cec9d4
Merge branch 'main' into SP3-4-editor_fix
2022-10-19 09:49:10 +08:00
XiaoQiDigipen
7e3ca4c45f
Merge pull request #96 from SHADE-DP/SP3-8-serialization
...
Added Serialization/Deserialization
Added serialization and deserialization of scenes, entities and components with the exception of collider component and renderable component
2022-10-19 08:48:18 +08:00
Sri Sham Haran
3a3f7efb29
[WIP] Transform Gizmo
2022-10-19 01:31:48 +08:00
Sri Sham Haran
96f5b29418
Serialization/Deserialization
2022-10-19 01:03:32 +08:00
Sri Sham Haran
2f429f33f8
Merge branch 'main' into SP3-8-serialization
2022-10-19 00:26:14 +08:00
Sri Sham Haran
0e6893840b
Merge remote-tracking branch 'origin/SP3-8-serialization' into SP3-8-serialization
2022-10-19 00:17:03 +08:00
Kah Wei
ceb4c6c4ca
Added Range Attribute
2022-10-18 22:34:46 +08:00
XiaoQiDigipen
2623952d47
Merge pull request #95 from SHADE-DP/SP3-6-c-scripting
...
Added script inspector tooltips support via Tooltip attribute
2022-10-18 20:13:30 +08:00
Kah Wei
5727bf3905
Merge branch 'main' into SP3-6-c-scripting
2022-10-18 20:10:06 +08:00
Kah Wei
87cf3ffa61
Added script inspector tooltips support via Tooltip attribute
2022-10-18 20:09:50 +08:00
Sri Sham Haran
b18d1f66ae
Merge branch 'main' into SP3-8-serialization
2022-10-18 19:50:20 +08:00
Sri Sham Haran
82637b620d
Delete UserLayout.ini
2022-10-18 19:36:49 +08:00
XiaoQiDigipen
0a6f777c07
Merge pull request #94 from SHADE-DP/RenderingEditorVPIntegration
...
Viewport
Added viewport thing to editor.
and mouse picking
2022-10-18 19:20:08 +08:00
Sri Sham Haran
da99a5559e
Merge branch 'main' into RenderingEditorVPIntegration
2022-10-18 19:09:08 +08:00
Sri Sham Haran
15a17deaf0
select picked entity in hierarchy panel
2022-10-18 19:08:31 +08:00
Brandon Mak
9ce5a4a47b
Mouse picking system now uses cursor returned from editor
...
- This new cursor position is relative to where the viewport is rendering
- Window resize callback in Graphics system now checks if editor is enabled before signaling for resize. This is because editor will handle the signaling for resizing when its enabled. When its disabled, the graphics system will signal itself to resize when the window resize callback is called.
2022-10-18 17:41:14 +08:00
Kah Wei
a221cfc1cd
Modified SHScriptEngine's serialization functions to take in EntityID instead of SHEntity
2022-10-18 17:25:45 +08:00
Brandon Mak
033ba48304
Editor changes to support viewport integration
2022-10-18 15:04:25 +08:00
Brandon Mak
e76bc6ef58
World render graph now doesn't render to swapchain image.
...
world render graph now only renders to "Scene" resource.
Editor render graph renders to "Present" swapchain image.
Removed some unnecessary if statements slowing down the resizing
Printing for success also disabled for now
2022-10-18 02:41:27 +08:00
Brandon Mak
7b7533420e
WIP
2022-10-18 01:12:03 +08:00
Sri Sham Haran
ec6772657f
Hierarchy QOL
...
Undo/Redo Parent Child
Shift select
Undo/Redo create entity
2022-10-17 21:25:59 +08:00
Brandon Mak
17b71393f3
Restructured abit
2022-10-17 16:50:53 +08:00
XiaoQiDigipen
86f4125100
Merge pull request #92 from SHADE-DP/SP3-13-Assets-Manager
...
SP3-13 Assets Management
Pushed functions to retrieve mesh and texture asset data
2022-10-17 15:05:14 +08:00
Xiao Qi
013bb71325
Functions to retrieve mesh and texture data
2022-10-17 15:04:38 +08:00
XiaoQiDigipen
161d33280a
Merge pull request #91 from SHADE-DP/SP3-13-Assets-Manager
...
SP3-13 Assets Management
Automatic loading of data with existing meta files
Asset meta file written into disk
Commented hardcoded asset loading lines
2022-10-16 23:16:55 +08:00
Xiao Qi
b10f490e45
SP3-102 SP3-248 Saving of SHMETA files with asset IDs, retrieval of asset data under works, currently all assets are loaded into memory automatically
2022-10-16 23:15:11 +08:00
Brandon Mak
95ee4b7b55
Resize half working
2022-10-16 19:42:44 +08:00
Diren D Bharwani
a481970e5f
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-16 19:16:02 +08:00
Sri Sham Haran
7fc417e35a
Parent/child multiple entities (WIP)
2022-10-16 18:16:05 +08:00
Brandon Mak
c16bea2d39
WIP
2022-10-16 17:35:15 +08:00
Brandon Mak
1117ecc5ef
WIP
2022-10-16 17:31:53 +08:00
XiaoQiDigipen
bda38049ea
Merge pull request #90 from SHADE-DP/SP3-1-Rendering
...
Support for docking (incomplete)
2022-10-16 16:38:30 +08:00
XiaoQiDigipen
0a042f3a3f
Merge pull request #89 from SHADE-DP/SP3-6-c-scripting
...
Added Input class for C#
2022-10-16 16:38:20 +08:00
Brandon Mak
0d02ece4c1
Wrote handle resize for mouse picking objects
2022-10-16 16:28:29 +08:00
Sri Sham Haran
7f2935dcf6
add window pos change for editor windows
...
add git ignore for user ini
2022-10-16 15:36:14 +08:00
Brandon Mak
2830dad8e3
Fixed Kai Wei's issues (sampler move ctor never move device :D)
2022-10-16 15:35:32 +08:00
Sri Sham Haran
228868604a
Editor fixes
...
Integration of mouse pick
Add editor state
Add editor layout
2022-10-16 14:20:35 +08:00
Brandon Mak
808274fce0
Lots of changes
...
- World renderer graph add new resource for scene
- G-Buffer Write subpass now renders offscreen to a color attachment
- Added a new subpass "Scene layout transition" to get vulkan to help transition our scene image layout to shader read
- Added back SHEDITOR check
- Created a post offscreen render system to create the necessary objects
- SH_ATT_DESC_TYPE is now SH_ATT_DESC_TYPE_FLAGS. Render graph resources also now store a bit field instead of a single type.
- Render graph nodes now have more customization when it comes to registering resources. They now have the option to not clear resources on begin.
2022-10-16 14:16:14 +08:00
Kah Wei
3b3492843f
Added input class
2022-10-16 03:25:33 +08:00
Brandon Mak
7005f4d839
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-16 00:26:53 +08:00
Diren D Bharwani
daa4b74c17
Merge branch 'main' into SP3-2-Physics
2022-10-14 17:05:14 +08:00
Sri Sham Haran
a7ed10c0b4
Merge branch 'main' into SP3-8-serialization
2022-10-14 16:05:53 +08:00
XiaoQiDigipen
c257842156
Merge pull request #88 from SHADE-DP/SP3-4-editor_fix
...
Collider Component Inspector, Editor routine
Added inpector view for collider component (WIP)
Converted Editor to SHSystem (i feel dirty now) so that it can have a routine
Converted Editor update to a SHSystemRoutine so that the routine can be sequenced between some graphics system routines.
2022-10-14 15:58:43 +08:00
Sri Sham Haran
22cad78728
Clean up
2022-10-14 15:53:29 +08:00
Sri Sham Haran
20cedbb4ec
Merge branch 'main' into SP3-4-editor_fix
2022-10-14 15:53:12 +08:00
Sri Sham Haran
49575893fe
Made Editor a system and create editor routine so that the editor routine will run between graphics routines
2022-10-14 15:39:43 +08:00
Sri Sham Haran
e027318d22
Inspector View - Collider Component
2022-10-14 14:35:09 +08:00
XiaoQiDigipen
2ed2e04f83
Merge pull request #87 from SHADE-DP/SP3-1-Rendering
...
Mouse picking system for rendering side is in
2022-10-14 12:19:56 +08:00
Brandon Mak
d6101c936e
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-14 11:53:06 +08:00
Brandon Mak
faa55847cb
Mouse picking is working from rendering side
...
- Buffer now has function to get data from mapped pointer if it exists
- Batches now also pass a buffer of EIDs to the GPU
- Global vertex attributes now have 1 extra instanced attribute for storing EntityIDs
- Render graph resources now have a usage flags on top of the usage flags calculated in the graph AddResource function. This is to tell vulkan that we want some resources to be copyable for example (EID render target copy to buffer).
- Mouse pick system stores eid picked
2022-10-14 11:52:15 +08:00
XiaoQiDigipen
ec99a6f0f9
Merge pull request #86 from SHADE-DP/SP3-10-input-management
...
Fixed timing of memcpy of keys to keysLast
This in turn fixes GetKeyDown() and GetKeyUp() as the input manager now knows changes of keys between the last frame and current frame.
2022-10-14 01:54:20 +08:00
Brandon Mak
682a5a6cbf
bug fix
2022-10-14 00:10:56 +08:00
Brandon Mak
d265aa4541
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-14 00:10:45 +08:00
Brandon Mak
ab09d78e42
removed routines for graphics from application (remember to add back after ingui update routine is added).
...
Scene graph and physics system had some extra couts
input system bug fix (this change is now in main)
Mouse pick system wip
2022-10-14 00:08:14 +08:00
mushgunAX
288f58c978
fixed timing of memcpy of keys to keysLast
...
This in turn fixes GetKeyDown() and GetKeyUp() as the input manager now knows changes of keys between the last frame and current frame.
2022-10-13 23:03:30 +08:00
Diren D Bharwani
1321a0ba36
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-13 20:23:11 +08:00
XiaoQiDigipen
28ec02afee
Merge pull request #85 from SHADE-DP/SP3-2-Physics
...
SP3-2 Cleaned Up Physics System
NEW
Added Sphere Collider
UPDATES
Reworked Physics System and Cleaned up Interface
Added Support for multiple colliders & collider offsets
2022-10-13 18:32:25 +08:00
XiaoQiDigipen
3b60cee764
Merge pull request #84 from SHADE-DP/SP3-16-Math
...
SP3-16 Adding Ray, Colour & Bounding Sphere
NEW
Added Ray
Added Colour
Added Bounding Sphere
UPDATE
Reworked Bounding Box to use DIrectX Collision type
2022-10-13 18:21:26 +08:00
Diren D Bharwani
acd3174c39
Merge branch 'SP3-16-Math' into SP3-2-Physics
2022-10-13 18:15:52 +08:00
Diren D Bharwani
e1fb92e3f1
Adding Bounding Spheres
2022-10-13 17:32:53 +08:00
Sri Sham Haran
9aaacbf5ea
Merge branch 'main' into SP3-8-serialization
2022-10-13 17:05:23 +08:00
Brandon Mak
0a3d211f02
Added a render target to store entity ID
...
Pipelines created from pipeline library now checks if the resources pointed to by a subpass requires blending and adds a blend state accordingly.
Fragment shader writes to this new render target for testing (works)
2022-10-13 16:57:08 +08:00
Brandon Mak
b153ccd1e3
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-13 13:44:34 +08:00
Diren D Bharwani
381217a1b8
Added Colour
2022-10-13 03:03:21 +08:00
Diren D Bharwani
d95dbd5ce6
Reworked Bounding Boxes
2022-10-12 21:59:34 +08:00
Diren D Bharwani
2fa71f0fd9
Added Ray
2022-10-12 19:12:34 +08:00
Diren D Bharwani
5b4838c5b9
Merge branch 'main' into SP3-16-Math
2022-10-11 02:26:50 +08:00
Diren D Bharwani
ff9b504bc5
Moved collider interface into physics object. Added support for removing rigidbodies
2022-10-11 01:26:12 +08:00
Diren D Bharwani
e68ef89c00
synced rigidbodies through physics object
2022-10-10 21:21:20 +08:00
Diren D Bharwani
46a082b62e
Moved rigidbody creation into physics object
2022-10-10 21:13:14 +08:00
Diren D Bharwani
7c4a9ca004
Added conversions for shade math to reactphysics math
2022-10-10 18:07:21 +08:00
Diren D Bharwani
877507284e
Merge branch 'main' into SP3-2-Physics
2022-10-10 13:47:33 +08:00
XiaoQiDigipen
3ebf42fc1a
Merge pull request #83 from SHADE-DP/SP3-4-editor_fix
2022-10-02 11:01:33 +08:00
Sri Sham Haran
db0b61d16f
Reflect RB Enumeration
...
Add RB to inspector view
2022-10-02 10:56:13 +08:00
Diren D Bharwani
0e518c52a9
Fixed bug when SceneGraph is destroyed
2022-10-02 04:22:32 +08:00
Diren D Bharwani
45d526c0e0
Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph
2022-10-02 04:13:38 +08:00
XiaoQiDigipen
530db8b7d6
Merge pull request #82 from SHADE-DP/SP3-1-Rendering
...
Window resize, minimize and close fix. Destruction mem leaks for vulkan are gone
2022-10-02 03:12:35 +08:00
Brandon Mak
3f334da934
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-02 03:09:25 +08:00
Brandon Mak
0dba60f9f1
Small fix
2022-10-02 03:09:09 +08:00
Kah Wei
45514ac77e
Fixed warnings and errors
2022-10-02 03:06:13 +08:00
XiaoQiDigipen
39302bc7f1
Merge pull request #79 from SHADE-DP/SP3-6-c-scripting
...
Added Undo-Redo support for Script Inspectors
2022-10-02 02:47:47 +08:00
Brandon Mak
4771fbfb76
WIP
2022-10-02 02:28:50 +08:00
Kah Wei
e5df98aaa6
Added missing move assignment and extra check for command buffer destructor
2022-10-02 02:00:11 +08:00
Kah Wei
cfa07e9b3b
Temp fix for SceneGraph crash
2022-10-02 02:00:10 +08:00
Brandon Mak
d432822608
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-02 01:13:43 +08:00
Brandon Mak
9fabb7d672
Window can close properly (with the exception of scene graph dtor crash)
2022-10-02 01:13:04 +08:00
Sri Sham Haran
8a6ef1fc2d
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-10-02 01:01:50 +08:00
Sri Sham Haran
9e8b4414d1
add window close callback
2022-10-02 01:00:07 +08:00
Kah Wei
201ce17a40
Fixed validation errors when closing the app
2022-10-02 00:56:34 +08:00
Brandon Mak
64d1c2ab2e
Minimize is now working
2022-10-02 00:47:26 +08:00
Xiao Qi
40bcea133d
Changed texture index to 0 for both racoons
2022-10-02 00:09:38 +08:00
Brandon Mak
32a3cc0674
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-10-02 00:00:07 +08:00
XiaoQiDigipen
d273c24410
Merge pull request #81 from SHADE-DP/SP3-13-Assets-Manager
...
SP3-13 Assets Management
Fixed all warnings
2022-10-01 23:57:19 +08:00
Xiao Qi
61e353164b
Fixed all asset related warnings
2022-10-01 23:57:26 +08:00
Brandon Mak
0f13476c08
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-10-01 23:57:13 +08:00
Brandon Mak
e2b86545bb
Window resize working
2022-10-01 23:57:08 +08:00
Sri Sham Haran
77653ebde5
add window isMinimized
2022-10-01 23:56:45 +08:00
XiaoQiDigipen
18a74ffd45
Merge pull request #80 from SHADE-DP/SP3-14-FileSystem
...
SP3-14 File System
Changed asserts to logging
2022-10-01 23:44:22 +08:00
Sri Sham Haran
01f648ceb6
Serialize/Deserialize [WIP]
2022-10-01 23:43:00 +08:00
Xiao Qi
8e60d4b771
Changed asserts to SHLOG related functions
2022-10-01 23:42:54 +08:00
Sri Sham Haran
6fd1cadf01
Merge branch 'main' into SP3-8-serialization
2022-10-01 23:41:55 +08:00
Kah Wei
1a14e5241b
Added names for SHGraphicsSystem Routines
2022-10-01 23:14:42 +08:00
Kah Wei
15c39d7028
Removed mixed tabs and spaces
2022-10-01 22:58:19 +08:00
Kah Wei
5e07383cf1
Merge branch 'main' into SP3-6-c-scripting
2022-10-01 22:56:33 +08:00
Kah Wei
f717b61c88
Added undo and redo support for script changes in the inspector
2022-10-01 22:56:15 +08:00
XiaoQiDigipen
c1006821f3
Merge pull request #78 from SHADE-DP/SP3-2-Physics
...
SP3-2 Integrated Physics with a test scene
NEW
Added RigidBody Component with Reflection
Added Collider Component (no reflection yet)
Linked Components to RP3D through SHPhysicsObject & SHPhysicsSystem
Do not remove any components. I did not implement that in the interest of time to show that physics works.
2022-10-01 22:17:23 +08:00
Diren D Bharwani
4007120dbd
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-01 22:06:50 +08:00
XiaoQiDigipen
3a9a1d878a
Merge pull request #77 from SHADE-DP/SP3-129-AudioSystem
...
fix audiosystem warnings
2022-10-01 21:38:45 +08:00
XiaoQiDigipen
e906039af8
Merge pull request #76 from SHADE-DP/SP3-4-editor_fix
...
SP3-4 Editor Warning Fixes
2022-10-01 21:38:15 +08:00
Glence
8a3a08986b
fix audiosystem warnings
2022-10-01 21:29:40 +08:00
Brandon Mak
1a725c24e2
Stored renderpass attachement information in SHVkRenderpass
2022-10-01 21:25:22 +08:00
Sri Sham Haran
9913e5a68b
Merge branch 'main' into SP3-4-editor_fix
2022-10-01 21:19:07 +08:00
Sri Sham Haran
c5efefcf4f
Editor warning fixes
2022-10-01 21:18:54 +08:00
Diren D Bharwani
e4a6877ed3
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-01 20:43:18 +08:00
Kah Wei
1477aaaead
Merge branch 'SP3-6-c-scripting' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-6-c-scripting
2022-10-01 20:34:45 +08:00
Kah Wei
b3d15b6a39
Added WIP UndoRedoStack
2022-10-01 20:34:23 +08:00
XiaoQiDigipen
48413bdc1f
Merge pull request #75 from SHADE-DP/ProjectWarningDisables
...
Warning disables
2022-10-01 19:44:17 +08:00
XiaoQiDigipen
f95f28a750
Merge pull request #74 from SHADE-DP/SP3-10-input-management
...
Input Manager is not a system anymore
2022-10-01 19:43:45 +08:00
Sri Sham Haran
a6e17847bf
Warning disables
...
Remove SDL hint that gave warning (it was unnecessary anyway)
2022-10-01 18:58:13 +08:00
mushgunAX
3c58a538ae
Mouse Vel & UpdateInput called from SBApplication
2022-10-01 18:02:27 +08:00
mushgunAX
aef3e4ef1a
Update SBApplication.cpp
2022-10-01 17:04:07 +08:00
mushgunAX
857f88c4a8
Merge branch 'main' into SP3-10-input-management
2022-10-01 17:03:58 +08:00
Diren D Bharwani
374f1a961d
Integrated rigidbodies into physics system
2022-10-01 16:50:50 +08:00
maverickdgg
5aee22a5e3
Revert "Changed some couts and asserts to use SHLOG"
...
This reverts commit 78d13c0ab8
.
2022-10-01 16:37:47 +08:00
Brandon Mak
b657ad8884
Handled resizing for the render graph resource (not tested)
2022-10-01 16:33:16 +08:00
Diren D Bharwani
4f56a32a9b
Added physics system (untested)
2022-10-01 15:26:08 +08:00
XiaoQiDigipen
f2b27b35fc
Merge pull request #73 from SHADE-DP/SP3-129-AudioSystem
...
added audiosystem back in
2022-10-01 15:13:42 +08:00
Glence
0c78eca1bc
added audiosystem back in
...
added a button for the audio
2022-10-01 15:09:26 +08:00
Brandon Mak
ec2ec82163
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-01 15:00:01 +08:00
XiaoQiDigipen
8ad315193d
Merge pull request #72 from SHADE-DP/SP3-6-c-scripting
...
Fixed MSIL warning when building scripts
2022-10-01 14:55:31 +08:00
Kah Wei
b3b565454f
Merge branch 'main' into SP3-6-c-scripting
2022-10-01 14:50:46 +08:00
mushgunAX
0360a8bfa1
made the Input Manager NOT be a System anymore
2022-10-01 14:34:30 +08:00
maverickdgg
78d13c0ab8
Changed some couts and asserts to use SHLOG
2022-10-01 14:28:13 +08:00
mushgunAX
dc8d58d95c
fix GetMouseWindowPosition()
2022-10-01 13:49:11 +08:00
Kah Wei
af24ed78dc
Fixed MSIL warning when building scripts
2022-10-01 13:43:34 +08:00
XiaoQiDigipen
a011e9a795
Merge pull request #71 from SHADE-DP/SP3-13-Assets-Manager
...
SP3-13 Assets Management
SP3-103 SP3-104 SP3-237 GLTF/DDS Loading complete. Compilation/Loading of mesh and texture data into custom binary files implemented
2022-10-01 13:39:33 +08:00
Xiao Qi
0792979dff
Moved some comments
2022-10-01 13:31:08 +08:00
Xiao Qi
adbb77932c
Merge branch 'main' into SP3-13-Assets-Manager
2022-10-01 13:29:51 +08:00
Xiao Qi
c82d01631c
SP3-237 Texture load/compile successfully
2022-10-01 13:27:51 +08:00
Xiao Qi
5069a42319
SP3-237 Mesh compile and load successfully. Although now path to load/compile is hardcoded. Flow will be done after MS1
2022-10-01 13:12:37 +08:00
Diren D Bharwani
e956797441
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-01 01:13:13 +08:00
Xiao Qi
8a3d3c8d4e
SP3-237 SP3-103 SP3-104 Implemented SHTexture and SHMesh binary file writing and loading. NOT TESTED
...
Added file level comments
2022-09-30 22:08:17 +08:00
XiaoQiDigipen
e046dafced
Merge pull request #70 from SHADE-DP/SP3-5-ECS
...
Sp3 5 ecs
Added event manager include for added/removedComponentEvent
2022-09-30 20:36:02 +08:00
maverickdgg
cbf4a1f5fd
Merge branch 'main' into SP3-5-ECS
2022-09-30 20:35:12 +08:00
maverickdgg
e4be5e0987
Added event manager include
2022-09-30 20:34:46 +08:00
XiaoQiDigipen
4647a94aa3
Merge pull request #68 from SHADE-DP/SP3-5-ECS
...
Sp3 5 ecs
Fixed SHFamilyID for SHSystem and SHComponent. It is still bugged for SHScene. For now we cant change SHScene.
Added ComponentAdded and ComponentRemoved events. (untested).
2022-09-30 20:27:44 +08:00
maverickdgg
2d07fb0afc
Added component added and removed events
2022-09-30 20:25:26 +08:00
maverickdgg
9930b002c6
Merge pull request #67 from SHADE-DP/SHFamilyID-BugFix
...
Sh family id bug fix
2022-09-30 20:15:03 +08:00
maverickdgg
114ae86a9f
Fixed SHFamilyID for SHSystem and SHComponent but still have issues with SHScene
2022-09-30 20:13:18 +08:00
Xiao Qi
584b7e425f
WIP Write meta files to track whether raw asset (fbx/gltf/dds) have been compiled into custom binary
2022-09-30 08:57:25 +08:00
Brandon Mak
00695950d9
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-29 10:59:18 +08:00
Xiao Qi
a51cbb7e70
Merge branch 'main' into SP3-13-Assets-Manager
2022-09-29 10:55:49 +08:00
maverickdgg
b1a799cf05
Attempt using dllimport/dllexport
2022-09-29 07:59:04 +08:00
XiaoQiDigipen
a9ff693646
Merge pull request #66 from SHADE-DP/SP3-6-c-scripting
...
Added script inspector, added Transform component for C# and added hot reloading options into editor
2022-09-29 00:11:51 +08:00
Kah Wei
70559204bf
Added spinning raccoons and fixed TRansform component bug
2022-09-28 23:55:44 +08:00
Kah Wei
566c12a922
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Application/src/Scenes/SBTestScene.cpp
# SHADE_Engine/src/Editor/SHEditorWidgets.hpp
2022-09-28 23:27:48 +08:00
Diren D Bharwani
0e07960938
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-09-28 21:30:57 +08:00
Diren D Bharwani
561f2b091f
Added PhysicsObject to handle interface between components and physics system
2022-09-28 21:09:27 +08:00
XiaoQiDigipen
c963f1d978
Merge pull request #65 from SHADE-DP/SP3-1-Rendering
...
Rendering merge
2022-09-28 20:42:03 +08:00
Brandon Mak
363e09bd55
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-28 20:39:42 +08:00
Brandon Mak
78f216e445
Rendered multiple racoons
2022-09-28 20:33:29 +08:00
XiaoQiDigipen
238ed1665c
Merge pull request #64 from SHADE-DP/SP3-4-editor_fix
...
New editor widgets and windows
Add new editor widgets
Handle remaining reflected types for component view (arithmetic and enumerations)
Add simple profiler
2022-09-28 19:53:02 +08:00
Sri Sham Haran
371f8e5e6f
Add simple profiler
2022-09-28 19:45:40 +08:00
Sri Sham Haran
10f5817c15
Merge branch 'main' into SP3-4-editor_fix
2022-09-28 19:01:18 +08:00
XiaoQiDigipen
9909cfaa96
Merge pull request #63 from SHADE-DP/SP3-129-AudioSystem
...
change engine premake to copy fmod over from its lib
2022-09-28 18:56:08 +08:00
Glence
551853084b
Merge branch 'main' into SP3-129-AudioSystem
2022-09-28 18:54:21 +08:00
Glence
a96ef67ec4
change engine premake to copy fmod lib over
2022-09-28 18:53:53 +08:00
XiaoQiDigipen
9a774508a8
Merge pull request #62 from SHADE-DP/SP3-129-AudioSystem
...
added fmod to dependencies.bat
2022-09-28 18:42:29 +08:00
Glence
f83b40c96c
added fmod to dependencies.bat
2022-09-28 18:40:45 +08:00
Sri Sham Haran
a1775db60b
Merge branch 'main' into SP3-4-editor_fix
2022-09-28 18:36:44 +08:00
Sri Sham Haran
02ec5d88e8
Add remaining controls to component view
2022-09-28 18:36:22 +08:00
XiaoQiDigipen
fa6175256f
Merge pull request #61 from SHADE-DP/SP3-129-AudioSystem
...
Added AudioSystem
added audio system with banks
change the Dependencies to clone fmod
change premake to include fmode
space to play sound
Currently audiosystem is commented out due to causing the raccoon to not be rendered
2022-09-28 18:36:13 +08:00
Xiao Qi
219aaa1707
Split texture loader into 2 paths for dds and shtexture format.
...
SHTexture binary load half done
2022-09-28 18:35:59 +08:00
Xiao Qi
201b19e8a6
SP3-237
...
Renamed MeshWriter to MeshCompiler
Implemented texture compiler
2022-09-28 18:35:22 +08:00
Glence
5f4c81aeed
comment out audiosystem from application to prevent accidents
2022-09-28 18:22:53 +08:00
Glence
e71941cccf
removing not needed buttons
2022-09-28 18:12:01 +08:00
Glence
43ad883bdb
removing unnecessary creation of cpmponent
2022-09-28 18:08:49 +08:00
Brandon Mak
4fcb5e313b
Added more objects + tested materials (still needs testing)
2022-09-28 18:03:46 +08:00
Diren D Bharwani
c698bac731
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-09-28 17:52:02 +08:00
Glence
658562bdc4
Merge branch 'main' into SP3-129-AudioSystem
2022-09-28 17:51:40 +08:00
Glence
bed6a144f8
banks curr working
2022-09-28 17:25:14 +08:00
Xiao Qi
6ef30bc415
post processing copy for publish build
2022-09-28 17:22:22 +08:00
XiaoQiDigipen
2ce927d471
Merge pull request #60 from SHADE-DP/SP3-16-Math
...
SP3-16 Fixed vector subscript operator return type
BUGFIX
SHVec2, 3 & 4 (non-const) subscript operators now return a reference to the element
2022-09-28 17:09:58 +08:00
XiaoQiDigipen
a9932d5494
Merge pull request #59 from SHADE-DP/SP3-19-frame-rate-controller
...
FRC changed
FRC code changed to adapt better with current state of the engine. Sole purpose to retrieve the varying raw delta time
Only two functions:
Get the varying raw delta time of the current frame
Update the FRC to update the raw delta time
2022-09-28 17:09:31 +08:00
XiaoQiDigipen
9d00748d85
Merge pull request #58 from SHADE-DP/SP3-12-SceneGraph
...
SP3-12 Changed Predicate Type for SCeneGraph::Traverse
2022-09-28 17:08:59 +08:00
Diren D Bharwani
170ae5ac6b
Fixed vector subscript operators return types
2022-09-28 17:06:37 +08:00
Diren D Bharwani
b8224771d2
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-09-28 16:53:44 +08:00
Diren D Bharwani
097b1be3f7
Added Physics System
2022-09-28 16:15:36 +08:00
Kah Wei
94a7258eb3
Context menu for the script inspector will now work even when collapsed
2022-09-28 15:33:32 +08:00
Brandon Mak
2df9252e17
Fixed material desc set binding
2022-09-28 15:31:37 +08:00
Kah Wei
3730c2125f
Modified script inspectors to use the vector widgets from SHEditorWidgets. SHEditorWidget is now a static class.
2022-09-28 15:28:59 +08:00
Diren D Bharwani
658054bc14
Merge branch 'SP3-12-SceneGraph' into SP3-2-Physics
2022-09-28 15:26:07 +08:00
Kah Wei
d9582cd0bd
Fixed first instance in MDI call being wrong
2022-09-28 14:47:50 +08:00
Diren D Bharwani
a08b123814
Added reactphysics to SHADE_Application premake file
2022-09-28 13:34:35 +08:00
Brandon Mak
a2311a473e
Auto stash before merge of "SP3-1-Rendering" and "origin/SP3-1-Rendering"
2022-09-28 10:29:42 +08:00
Brandon Mak
a23f4f5218
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-28 10:28:19 +08:00
Brandon Mak
d9cdf26098
Changed depth buffer format
2022-09-28 10:28:12 +08:00
Sri Sham Haran
ac70758341
Merge remote-tracking branch 'origin/main' into SP3-4-editor_fix
2022-09-28 10:14:20 +08:00
maverickdgg
766abbc0ec
#comment Added camera component and system
2022-09-28 07:43:37 +08:00
Kah Wei
7010e1b688
Added initial implementation of script inspector
2022-09-28 00:06:47 +08:00
Glence
7fcac5e0eb
god knows whats diff but audio is sort of working ish
2022-09-27 23:57:11 +08:00
Xiao Qi
d5cc923413
Hard coded to always load racoon mesh instead of bag
2022-09-27 22:37:49 +08:00
mushgunAX
1813ad138c
FRC changed
2022-09-27 22:05:59 +08:00
Kah Wei
d71fbc22de
Merge branch 'SP3-1-Rendering' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-1-Rendering
...
# Conflicts:
# TempShaderFolder/TestCubeFs.glsl
# TempShaderFolder/TestCubeFs.spv
2022-09-27 21:07:55 +08:00
Sri Sham Haran
cebb1a2cf8
Deserialization WIP
2022-09-27 21:06:25 +08:00
Kah Wei
61219f5136
Added tests for material binding and fixed some crashes
2022-09-27 21:06:14 +08:00
Sri Sham Haran
36b3872fb6
combo box for enumerations [WIP]
2022-09-27 21:05:49 +08:00
Brandon Mak
70940534e1
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-27 20:07:29 +08:00
Kah Wei
055a0a1711
Fixed textures not loading correctly
2022-09-27 19:52:36 +08:00
Sri Sham Haran
d6cff821dd
Merge branch 'main' into SP3-4-editor_fix
2022-09-27 19:48:08 +08:00
Brandon Mak
b7adf8815b
Fixed camera. Can see texture now
2022-09-27 19:18:45 +08:00
Kah Wei
a57c4d0d73
WIP Script Inspector
2022-09-27 19:17:53 +08:00
Diren D Bharwani
cfd387e51c
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-09-27 19:07:27 +08:00
Diren D Bharwani
e58bb4f061
Changed predicate type for scene graph traverse to std::function
2022-09-27 17:15:43 +08:00
Kah Wei
4effe016e4
Options to rebuild scripts at runtime are now present in the editor
2022-09-27 17:13:32 +08:00
Diren D Bharwani
b0d3d3a6c5
Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph
2022-09-27 16:59:31 +08:00
Kah Wei
14cd0b4be9
Fixed SHTextureLoader loading wrong mipmap offsets
2022-09-27 16:45:35 +08:00
Kah Wei
337894ebc2
Merge branch 'main' into SP3-6-c-scripting
2022-09-27 16:39:02 +08:00
Diren D Bharwani
357b36a9b0
Added RigidBody Component
2022-09-27 16:24:08 +08:00
Kah Wei
ecd1c10fea
Merge branch 'main' into SP3-1-Rendering
2022-09-27 16:13:31 +08:00
Xiao Qi
e0ad6fbc71
Forked tinyddsloader into org
...
Updated dependencies.bat
2022-09-27 16:11:03 +08:00
Kah Wei
04b452543c
Modified TextureLibrary to use SHTextureAsset instead of SHDDSAsset
2022-09-27 16:05:47 +08:00
Kah Wei
10b22374c0
Merge branch 'main' into SP3-1-Rendering
...
# Conflicts:
# SHADE_Application/src/Scenes/SBTestScene.cpp
2022-09-27 15:48:51 +08:00
Kah Wei
b3417c2011
Made SHGraphicsGlobalData static and modified SHBatch to generate and bind material descriptor set
2022-09-27 15:44:36 +08:00
XiaoQiDigipen
4c23151a14
Merge pull request #57 from SHADE-DP/SP3-13-Assets-Manager
...
SP3-13 Assets Management
Changed texture struct to contain pre processed information ready for buffer
2022-09-27 14:27:28 +08:00
Kah Wei
76617ae571
Enabled Multi-Draw Indirect feature
2022-09-27 14:12:14 +08:00
Xiao Qi
5d022b7123
Fixed mipoffset
2022-09-27 14:12:05 +08:00
Kah Wei
65c67c14b7
Fixed crash if no textures were loaded
2022-09-27 14:11:56 +08:00
Glence
3c3b6a285b
Merge branch 'main' into SP3-129-AudioSystem
2022-09-27 14:11:16 +08:00
Glence
ee7cb36896
added the banks for testing
2022-09-27 14:11:04 +08:00
Xiao Qi
60540b1adc
Temp function to retrieve all textures
2022-09-27 14:09:44 +08:00
XiaoQiDigipen
033414f7ea
Merge pull request #56 from SHADE-DP/SP3-10-input-management
...
Input Manager: Wheel Delta Poll and SH_API.h header
Minor changes. No new features.
2022-09-27 13:58:37 +08:00
Xiao Qi
a7badba8b9
Copied over function from Texture Library to Texture loader to convert dds format to vk format
2022-09-27 13:58:19 +08:00
Kah Wei
e9496bead6
Fixed bug where different Renderables of different meshes are thrown into the same SubBatch
2022-09-27 13:43:59 +08:00
mushgunAX
ce721b99e5
include SH_API.h
2022-09-27 13:37:52 +08:00
Xiao Qi
7487602151
SP3-104
...
Renamed DDS to Texture in most places
Prepared SHTextureAsset for ease of load into buffer and compilation
Added Copy constructor for SHTextureAsset
2022-09-27 13:02:12 +08:00
Brandon Mak
6f3c1ed97b
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-27 12:56:19 +08:00
Brandon Mak
187329c384
Fixed texture issues
2022-09-27 12:02:06 +08:00
Sri Sham Haran
c4ed199165
Serialize Vec 2/3/4
2022-09-27 07:03:31 +08:00
Kah Wei
085ab50ec7
Added a script to test Transform modifications
2022-09-27 01:57:23 +08:00
Kah Wei
e42283a553
Fixed RTTR linker errors
2022-09-27 01:12:02 +08:00
Sri Sham Haran
233e7a0e8f
Serialization fix
2022-09-26 23:51:20 +08:00
Glence
69041980f5
added the base for bank
2022-09-26 23:27:55 +08:00
Glence
eeaf86e968
Merge branch 'main' into SP3-129-AudioSystem
2022-09-26 23:21:01 +08:00
Sri Sham Haran
b375ab9a50
device wait idle
2022-09-26 23:14:10 +08:00
Kah Wei
b5f7ff1106
Merge branch 'main' into SP3-6-c-scripting
2022-09-26 22:40:35 +08:00
Sri Sham Haran
7247faee73
Serialization [WIP]
2022-09-26 21:08:59 +08:00
Kah Wei
3e2bcf28b6
Added texture loading that is almost working
2022-09-26 20:59:20 +08:00
Xiao Qi
1ea4689a89
SP3-237 Mesh write to binary file
2022-09-26 19:10:32 +08:00
Xiao Qi
caab2c37ab
Added GLTF extension recognisation
2022-09-26 19:10:12 +08:00
Xiao Qi
4dd2335fb8
Removed assimp post processing flag that was removing animations
2022-09-26 19:09:45 +08:00
Glence
240e5e9394
Merge branch 'main' into Editor_widgets
2022-09-26 18:55:31 +08:00
Glence
3d7876c987
added fix for closing editor windows
2022-09-26 18:33:37 +08:00
Glence
1f45b0ceca
added all the widgets helper
2022-09-26 18:09:21 +08:00
mushgunAX
3b0ea251f3
mouse wheel delta poll
2022-09-26 18:08:59 +08:00
Kah Wei
a06c30266e
Merge branch 'main' into SP3-1-Rendering
2022-09-26 17:56:30 +08:00
XiaoQiDigipen
728d615425
Merge pull request #55 from SHADE-DP/SP3-13-Assets-Manager
...
SP3-13 Assets Management
Added function in asset manager to retrieve all dds images
2022-09-26 17:49:06 +08:00
Xiao Qi
3800c01c4a
Added function in asset manager to retrieve all dds images
2022-09-26 17:48:27 +08:00
Kah Wei
5ac90eebec
Fixed compilation errors
2022-09-26 17:26:33 +08:00
Kah Wei
927944d55a
Merge branch 'SP3-1-Rendering' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-1-Rendering
2022-09-26 17:18:55 +08:00
Kah Wei
d938007d8a
Added TextureLibrary updating of descriptor sets
2022-09-26 17:18:51 +08:00
Kah Wei
5e7ffd6028
Added SHVkSampler and SHVKSamplerCache
2022-09-26 16:41:57 +08:00
XiaoQiDigipen
5c2a799e83
Merge pull request #54 from SHADE-DP/SP3-4-editor_fix
...
Editor implementation
Add in Hierarchy Panel and Inspector Panel
Editor init
Editor backend
2022-09-26 16:02:04 +08:00
Sri Sham Haran
de8c2ce630
Merge branch 'main' into SP3-4-editor_fix
2022-09-26 15:59:38 +08:00
Sri Sham Haran
2c16eb4393
Reflect transform component
2022-09-26 15:53:54 +08:00
Glence
5a92b77a3a
added missing ,
2022-09-26 15:52:21 +08:00
Glence
ac7ab83c16
Merge branch 'main' into SP3-129-AudioSystem
2022-09-26 15:51:59 +08:00
Glence
d0d796781b
remove audiosourcecomponent
2022-09-26 15:50:07 +08:00
Brandon Mak
6307369e7f
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-26 14:50:04 +08:00
Brandon Mak
0a024e1b2d
Separated render graph contents into separate files
2022-09-26 14:49:48 +08:00
Diren D Bharwani
ea9390766b
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-09-26 14:48:03 +08:00
XiaoQiDigipen
0c8fdb4985
Merge pull request #53 from SHADE-DP/SP3-13-Assets-Manager
...
SP3-13 Assets Management
Asset Manager Integration
Load fbx files into meshes
Load dds into memory
2022-09-26 14:43:04 +08:00
Xiao Qi
1c45b49937
Merge branch 'main' into SP3-13-Assets-Manager
2022-09-26 14:40:57 +08:00
Xiao Qi
99534c1613
SP3-103 SP3-104 Separated mesh and texture loading
...
Added in lines in SBApplication to load racoon fbx and dds textures
Racoon shows up in renderdoc hehe
2022-09-26 14:38:12 +08:00
Glence
65a6014b1c
Merge branch 'main' into SP3-129-AudioSystem
2022-09-26 14:08:43 +08:00
Sri Sham Haran
247930ea68
Merge branch 'main' into SP3-4-editor_fix
2022-09-26 14:04:02 +08:00
Diren D Bharwani
09ad981a96
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-09-26 13:59:00 +08:00
Diren D Bharwani
080ac83816
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-09-26 13:41:12 +08:00
Brandon Mak
a6f7ffab43
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-26 09:48:48 +08:00
Brandon Mak
9fe5793dd7
Split the render graph into multiple files
...
doesn't compile
2022-09-26 09:37:59 +08:00
Kah Wei
7cbb127937
Merge branch 'main' into SP3-6-c-scripting
2022-09-26 09:09:19 +08:00
XiaoQiDigipen
8d32d76381
Merge pull request #52 from SHADE-DP/SP3-1-Rendering
...
Render graph fixes with attachment layouts
Render graph node was not moving batcher (this is now fixed)
2022-09-26 00:53:08 +08:00
XiaoQiDigipen
9e43cdd1a7
Merge pull request #51 from SHADE-DP/HandleDebugging
...
Handles will now properly show up automatically dereferenced or NULL in Visual Studio's debug views
2022-09-26 00:52:30 +08:00
Brandon Mak
2305cb7588
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-26 00:38:44 +08:00
Brandon Mak
6d68e6cb5e
FIXED MY SHIT WHEE
...
(render graph color present attachment now have correct layout)
2022-09-26 00:38:36 +08:00
Brandon Mak
31dff230ef
FIXED MY SHIT WHEE
2022-09-26 00:37:58 +08:00
Kah Wei
a5c804ca8b
Fixed SHRenderGraph not moving the batcher
2022-09-26 00:08:32 +08:00
Brandon Mak
8649833604
subpass not null anymore
2022-09-25 23:45:05 +08:00
Brandon Mak
dc6289e8cf
WIP
2022-09-25 23:25:51 +08:00
Brandon Mak
8ac2c39e2b
Fixed some render graph ctors and added if checks for buffers
2022-09-25 23:13:37 +08:00
Kah Wei
fc5ff763f3
Added SHMaterialInstanceCache
2022-09-25 22:55:14 +08:00
Sri Sham Haran
335c19cfc7
Editor
2022-09-25 22:33:07 +08:00
Kah Wei
a197ae842c
Fixed crash on AMD GPUs resulting from Nvidia treating UniformBuffers and UniformBuffersDynamic as the same
2022-09-25 21:46:57 +08:00
Kah Wei
4e60b3495a
Handles will now properly show up automatically dereferenced or NULL in Visual Studio's debug views
2022-09-25 20:28:01 +08:00
Kah Wei
dd46881b67
Merge branch 'main' into SP3-1-Rendering
2022-09-25 18:57:14 +08:00
XiaoQiDigipen
f6ef5a443d
Merge pull request #50 from SHADE-DP/SP3-10-input-management
...
Input Manager System first version implemented
Presently able to handle:
Reading keyboard key presses, mouse movement (with movement speed recorded), buttons and scrolling (which needs connection to WM_MOUSEWHEEL to call PollWheelVerticalDelta(wParam))
Records how long buttons have been pressed / released, able to get values by functions
Checks if buttons are toggled on / off & how long they've been toggled on / off
Bool returning functions. Check if keys / mouse buttons are pressed / held / released or not in frameWhat should be added soon:
Reading and handling controller input via XInput
Key bindings
Axis bindings
Custom axis
Axis data-retrieval functions
Input Buffer
Editor BindingsFunctions tested to work in an isolated breadboard environment. Should be able to work in this engine's context.
2022-09-25 17:00:30 +08:00
mushgunAX
8ab5afd3c4
first version of IM ready for PR
2022-09-25 16:39:01 +08:00
mushgunAX
ef36ae462e
Merge branch 'main' into SP3-10-input-management
2022-09-25 11:36:01 +08:00
Xiao Qi
a0a57e7c29
Added test assets
...
Test line to call asset manager temporary load
2022-09-25 00:13:17 +08:00
Xiao Qi
18eca1897e
Added in post build command to copy assimp dll
...
Added in SH_API to asset manager class
2022-09-24 22:52:42 +08:00
Glence
d7b5ae9f02
audiosystem base level done along with its components
2022-09-24 19:13:23 +08:00
Xiao Qi
a39230ce42
More setting up for testing of gltf loading
2022-09-24 16:07:51 +08:00
Xiao Qi
78a20173e0
Changed AssetType underlying type
...
Added mesh name to mesh asset object
Added in static token for LoadGLTF function
Fixed warning in GetTypeFromExtension
2022-09-24 16:07:26 +08:00
Xiao Qi
a907c7c575
SP3-103 SP3-104 Testing set up for loading gltf and dds
2022-09-24 13:37:12 +08:00
Xiao Qi
a8a2e90c26
SP3-237 Added header data type into mesh asset in preparation for compilation of mesh
2022-09-24 13:36:43 +08:00
Xiao Qi
cb73a8c5d1
Added file list in filesystem
2022-09-24 13:36:09 +08:00
Xiao Qi
225c247a85
Added missing SDL line back into engine premake
2022-09-24 12:59:21 +08:00
Xiao Qi
cf4f905d91
Merge branch 'main' into SP3-13-Assets-Manager
2022-09-24 12:40:31 +08:00
Kah Wei
15f12a2608
Fixed warnings in SHBatch.cpp
2022-09-24 02:13:09 +08:00
Kah Wei
759c87e2a1
Material data on the GPU is now updated when material data changes
2022-09-24 02:07:47 +08:00
XiaoQiDigipen
6c82d2b7d5
Merge pull request #47 from SHADE-DP/SP3-1-Rendering
...
Now able to render a cube and fixed numerous behind the scene issues with Vulkan abstractions
Updated rendering system to use transform system's matrices
2022-09-23 23:36:52 +08:00
Glence
c4105510b8
Merge branch 'main' into SP3-129-AudioSystem
2022-09-23 23:01:22 +08:00
Kah Wei
187142d5c3
Added Transform Component C# interface
2022-09-23 19:57:29 +08:00
Brandon Mak
32278e1564
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-23 18:50:52 +08:00
Brandon Mak
bd54b16e01
Ctor for compute pipelines
2022-09-23 18:50:40 +08:00
Kah Wei
bb38246111
Added stress test code for 20000 objects
2022-09-23 18:49:04 +08:00
mushgunAX
3ed1034e62
Merge branch 'main' into SP3-10-input-management
2022-09-23 17:59:30 +08:00
mushgunAX
800732706e
input pch move, init, exit, etc definitions
2022-09-23 17:42:31 +08:00
Kah Wei
f8391d6c9e
Modified TestScene space bar input to not destroy the object, only remove scripts
2022-09-23 16:45:06 +08:00
Kah Wei
77cccd63be
Renderables now use TransformComponent's matrix
2022-09-23 16:41:44 +08:00
Kah Wei
04cdb25ddd
Merge branch 'main' into SP3-1-Rendering
...
# Conflicts:
# SHADE_Application/src/Application/SBApplication.cpp
# SHADE_Application/src/Scenes/SBTestScene.cpp
2022-09-23 16:41:29 +08:00
Kah Wei
23f0f9f77e
Triple buffered the batching buffers
2022-09-23 16:24:35 +08:00
XiaoQiDigipen
6848672899
Merge pull request #48 from SHADE-DP/SP3-16-Math
...
SP3-16 Transform System Hotfix
2022-09-23 15:50:05 +08:00
Diren D Bharwani
c2e948a100
Fixed active state checks in transform system
...
Apparently entity and scene node active states do not sync....
2022-09-23 15:48:00 +08:00
mushgunAX
ed56ad99df
Merge branch 'main' into SP3-10-input-management
2022-09-23 13:41:50 +08:00
mushgunAX
a0c29c666f
progress on input manager, near ready for PR
2022-09-23 13:14:46 +08:00
Glence
f6bab2165c
Merge branch 'main' into SP3-129-AudioSystem
2022-09-23 09:59:52 +08:00
XiaoQiDigipen
7f527c30f3
Merge pull request #46 from SHADE-DP/SP3-16-Math
...
SP3-16 Transform System integration into Application
UPDATES
Added missing instantiation of transform system into application
BUGFIXES
Fixed an error with the Transform System being an abstract class.
Fixed warning coming from Scene Graph when adding new nodes.
Changed editor pause to true for the Transform System
2022-09-23 00:32:55 +08:00
Diren D Bharwani
c77d9b2ff5
Changed editor pause for transform system to true
2022-09-22 22:58:14 +08:00
Kah Wei
5c4384b589
Fixed SHVkBuffer initial copy data for mapped buffers and made the cube spin
2022-09-22 20:53:03 +08:00
Kah Wei
c4ab45ad34
Merge branch 'main' into SP3-1-Rendering
...
# Conflicts:
# SHADE_Application/src/Scenes/SBTestScene.cpp
# SHADE_Application/src/Scenes/SBTestScene.h
# SHADE_Engine/SHADE_Engine.vcxproj
# SHADE_Engine/SHADE_Engine.vcxproj.filters
2022-09-22 20:51:33 +08:00
Diren D Bharwani
6d646851e2
Added missing transpose to transform update and a test component to application
2022-09-22 20:39:46 +08:00
Diren D Bharwani
2c0fa3a6b2
Fixed warning from scene graph when adding new nodes to root.
2022-09-22 20:25:42 +08:00
Diren D Bharwani
0250687e06
Instantiated Transform System & Update Routine
2022-09-22 20:25:23 +08:00
Diren D Bharwani
f03a0d4be7
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-09-22 20:05:49 +08:00
Kah Wei
495d2b4b66
Added per-frame update of gpu transforms buffer
2022-09-22 20:04:53 +08:00
Brandon Mak
cb31628e66
Dummy pipeline layout ctor created
...
Renderer now can update and bind descriptor set
2022-09-22 19:38:43 +08:00
XiaoQiDigipen
3457759ed3
Merge pull request #44 from SHADE-DP/SP3-6-c-scripting
...
Script lifecycle functions now run and ScriptEngine has been made a ECS System
2022-09-22 17:39:40 +08:00
XiaoQiDigipen
802e038938
Merge pull request #43 from SHADE-DP/SP3-16-Math
...
SP3-16 Reworked Transform System
UPDATES
Reworked transform system to match intended system structure
2022-09-22 17:39:15 +08:00
Kah Wei
1bede86ff6
Awake(), Start() and Update(), OnDestroy() for scripts now all run as intended
2022-09-22 17:25:43 +08:00
Xiao Qi
3a908b717b
Merge remote-tracking branch 'origin/SP3-6-c-scripting' into SP3-6-c-scripting
2022-09-22 17:08:11 +08:00
Xiao Qi
5bd35cec61
Fixed SHEventReceiver constructor callback return signature.
2022-09-22 17:07:59 +08:00
Kah Wei
2051d485eb
Merge branch 'main' into SP3-6-c-scripting
2022-09-22 17:04:18 +08:00
Kah Wei
3b533ac03d
Added faulty registration to entityDestroyed event
2022-09-22 16:40:49 +08:00
Diren D Bharwani
becd8e3ec8
Merge branch 'SP3-16-Math' into SP3-2-Physics
2022-09-22 15:57:46 +08:00
Diren D Bharwani
38dbd0c217
Removed static data member...again...
2022-09-22 15:49:00 +08:00
Diren D Bharwani
d648fc8645
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-09-22 15:42:09 +08:00
XiaoQiDigipen
003b1fdea1
Merge pull request #41 from SHADE-DP/SP3-12-SceneGraph
...
SP3-12 Hierarchical Active States
UPDATES
Scene Nodes now hold active state in hierarchy.
Active states will propagate down into children.
2022-09-22 15:09:58 +08:00
Diren D Bharwani
cda7330c5b
Removed static data member for transform update routine
2022-09-22 14:56:58 +08:00
Diren D Bharwani
2d93c9559d
Restructured Transform system to match intended system structure
2022-09-22 14:54:06 +08:00
Diren D Bharwani
52c17dcc3f
Merge branch 'main' into SP3-16-Math
2022-09-22 14:32:37 +08:00
Diren D Bharwani
ed143661b3
Scene node active states propagate down the hierarchy
...
Vulkan is throwing an exception...
2022-09-22 14:26:07 +08:00
Glence
8066c3cd6a
added audioSystem(the base not working yet)
...
added components to use the audioSystme
2022-09-22 14:05:53 +08:00
Diren D Bharwani
cd1f1a8fea
Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph
2022-09-22 13:53:17 +08:00
Kah Wei
f28d966ebb
Merge branch 'SP3-1-Rendering' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-1-Rendering
2022-09-22 12:40:25 +08:00
Kah Wei
e87c4c8dc8
Fixed SHTextureLibrary compiler errors
2022-09-22 12:39:05 +08:00
Kah Wei
5bc24b09d4
Added generalisation of csproj file location
2022-09-22 12:32:15 +08:00
Xiao Qi
8cfe58a3ad
SP3-103 SP3-104 Implemented DDS loading and error reporting
...
Not tested
2022-09-22 12:29:30 +08:00
Brandon Mak
1290e99dda
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-22 12:12:47 +08:00
Brandon Mak
7ddf665460
Updated Descriptor sets
...
Descriptor set layouts now have set index stored in them
It should be noted that when passed into a pipeline layout as global descriptor sets, these don't matter since the pipeline layout will use these in the order that they are passed in.
2022-09-22 12:12:44 +08:00
Xiao Qi
8ea845e9f7
Changed slash in dependencies lua
2022-09-22 11:42:29 +08:00
Xiao Qi
a13e8f43fd
Merge branch 'main' into SP3-13-Assets-Manager
2022-09-22 11:41:44 +08:00
Xiao Qi
6f1592e16f
SP3-103 SP3-102 Added call to mesh loader in asset manager. Removed old references to previous maps and vectors.
2022-09-22 11:40:24 +08:00
Kah Wei
5ff375113f
Removed CallbackAction and CallbackEvent for moving to C# library in future
2022-09-22 11:39:50 +08:00
Kah Wei
4958240806
Added implementation of GetComponentInChildren() for scripts
2022-09-22 11:37:24 +08:00
Xiao Qi
8ac6ef95d6
SP3-103 Implemented library to load GLTF with assimp and processmesh
2022-09-22 11:26:06 +08:00
Kah Wei
21a3d6ecd7
Added test code for scripts
2022-09-22 11:22:51 +08:00
Kah Wei
b04789945f
Merge branch 'main' into SP3-6-c-scripting
2022-09-22 11:06:26 +08:00
XiaoQiDigipen
b2f8ed23b1
Merge pull request #40 from SHADE-DP/PremakeCopyFix
...
Fixed certain DLLs and includes missing when copying
2022-09-22 11:06:07 +08:00
Kah Wei
af1d24d874
Fixed certain DLLs and includes missing when copying
2022-09-22 10:52:07 +08:00
Kah Wei
2004a1739b
Merge branch 'main' into SP3-6-c-scripting
2022-09-22 10:25:39 +08:00
Xiao Qi
edfa8c8ace
Fixed premake outputdir and interdir
2022-09-22 10:03:03 +08:00
Kah Wei
c1b7c7ded8
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Application/src/Application/SBApplication.cpp
# SHADE_Engine/src/Scene/SHSceneManager.h
2022-09-22 09:55:31 +08:00
Brandon Mak
ba181eb9c9
Shifted Command buffers outside of render graph
...
Command buffers now exist in renderer instead
Graphics system that calls the renderer, begins and ends the renderer recording in it's main loop as well
2022-09-22 09:23:40 +08:00
Kah Wei
3d9abcf19c
Implemented image creation for textures in the texture bank
2022-09-22 09:19:18 +08:00
Diren D Bharwani
b6b2a3350c
Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph
2022-09-21 23:53:07 +08:00
Diren D Bharwani
1c5a66b569
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-09-21 23:53:01 +08:00
Xiao Qi
4446d0a60d
Merge branch 'main' into SP3-13-Assets-Manager
2022-09-21 22:54:53 +08:00
Xiao Qi
d2e2e85726
Added build path ignore
...
Readded output dir and removed interdir from premake
Added DEBUG guards in SHVkPhysicalDeviceLibrary when using SHLOG_TRACE
2022-09-21 22:54:15 +08:00
Xiao Qi
ae3fb448d4
Merge branch 'main' into SP3-13-Assets-Manager
2022-09-21 22:28:31 +08:00
Xiao Qi
124b367413
Fixed SHTransform compile error
...
Include header in math path wrong
Added proj and filter ignore into git (again)
2022-09-21 22:24:52 +08:00
Xiao Qi
ba4d85a4e1
SP3-103 SP3-104 Implementing Mesh Loader for asset manager to use assimp to load gltf
...
Loading of dds from gltf file planned ahead
2022-09-21 22:20:52 +08:00
Brandon Mak
7acf25a770
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-21 20:09:48 +08:00
Kah Wei
791c4cd0d0
Merge branch 'SP3-1-Rendering' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-1-Rendering
2022-09-21 20:03:03 +08:00
XiaoQiDigipen
f52fa9463d
Merge pull request #39 from SHADE-DP/SP3-16-Math
2022-09-21 20:02:20 +08:00
XiaoQiDigipen
67d673ff80
Merge pull request #38 from SHADE-DP/SP3-12-SceneGraph
2022-09-21 20:01:44 +08:00
XiaoQiDigipen
de983cdc66
Merge pull request #37 from SHADE-DP/SP3-1-Rendering
2022-09-21 19:54:13 +08:00
Diren D Bharwani
14eed4c726
Added missing active check in transform system
2022-09-21 18:30:20 +08:00
Diren D Bharwani
ac379e3ef3
Added method to scene graph to easily traverse and execute a unary function
2022-09-21 18:23:01 +08:00
Brandon Mak
270c8240c1
Shifted Graphics system to SBTestScene
2022-09-21 16:29:54 +08:00
Brandon Mak
80dc8d0a71
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-21 15:41:36 +08:00
Brandon Mak
8d2b6aec46
Descriptor set fix and camera descriptor set
...
Fixed SHVkDescriptorSetGroup bug with vkLayouts inside the ctor
Added descriptor set to renderer for camera
Logical Device now stores a buffer alignment variable for UBOs
2022-09-21 15:41:30 +08:00
Diren D Bharwani
d69d70c7c9
Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph
2022-09-21 14:55:51 +08:00
Diren D Bharwani
415e47780c
Completed Transform System
2022-09-21 14:54:57 +08:00
Diren D Bharwani
0db7392eed
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-09-21 14:06:36 +08:00
XiaoQiDigipen
e7eac229ee
Merge pull request #36 from SHADE-DP/SP3-12-SceneGraph
...
SP3-12 More Scene Graph Fixes
BUGFIXES
Fixed bug where parenting an object will spawn infinite children
Fixed bug where parents held on to a child after the child left
2022-09-21 09:06:01 +08:00
XiaoQiDigipen
2097edd94d
Merge pull request #35 from SHADE-DP/CleanAndGenerate
...
Modified generate.bat to delete all generated files before generating files with Premake
Should fix issues where sometimes Premake excludes some files from the generated projects. The usual fix is to manually delete the files so this change automates that.
2022-09-21 09:04:53 +08:00
Cocoa
9c69d41a4e
Added 90% of transform component & transform system.
2022-09-21 00:49:52 +08:00
Cocoa
3cd538562c
More Scene Graph Fixes
2022-09-20 19:32:28 +08:00
Kah Wei
5f305f9609
Added SHTextureLibrary stub
2022-09-20 18:13:13 +08:00
Cocoa
cc6d1dd95b
Added Transform Component
2022-09-20 17:20:57 +08:00
Kah Wei
f461a0e658
Modified generate.bat to delete all generated files before generating files
2022-09-20 16:37:29 +08:00
Kah Wei
9896c5c913
Added CallbackAction and CallbackEvent
2022-09-20 16:23:03 +08:00
Brandon Mak
c194765889
More warnings fixed. More graphics constants.
2022-09-20 16:12:47 +08:00
Cocoa
7f173b3207
Added SH_API to Math Classes
2022-09-20 16:10:47 +08:00
Cocoa
7b7a4788e4
Merge branch 'main' into SP3-16-Math
2022-09-20 15:42:53 +08:00
XiaoQiDigipen
5b6f60ee8a
Merge pull request #34 from SHADE-DP/SP3-12-SceneGraph
...
SP3-12 Scene Graph Fixes
BUGFIXES
Scene Graph automatically creates a root which is set to MAX_EID
Fixed constness of getter functions in Scene Graph & Scene Node
2022-09-20 15:37:58 +08:00
Cocoa
b5f3ec85aa
Merge branch 'main' into SP3-16-Math
2022-09-20 15:37:28 +08:00
Cocoa
f4bf895e45
Fixed constness of functions in scene graph
2022-09-20 15:35:10 +08:00
Brandon Mak
0bc3a23161
Fixed the fence with high quality wood
2022-09-20 14:15:09 +08:00
Brandon Mak
147292f91c
Fence is broken. The neighbour's kids went to knock it down again.
2022-09-20 12:15:06 +08:00
Brandon Mak
d9213fe35d
Moved a bunch of global data from Graphics System to new class
...
New class in SHGraphicsGlobalData
2022-09-20 10:39:52 +08:00
Brandon Mak
77330511ee
Fixed pipeline default color blend state
...
Remember to switch winding back to CCW after rendering in world space
2022-09-20 09:27:13 +08:00
Cocoa
c0290b7185
Added fixes to scene graph. Read description for details.
...
1. Scene graph creates a root on construction. EntityID is set to MaxEID. The root is not intended to be modified.
2. When adding a node, if the 2nd arg (parent) is omitted, the node will be a child of the root.
2022-09-20 01:31:59 +08:00
Cocoa
34685e6726
Regenerated project files
2022-09-20 00:48:27 +08:00
Kah Wei
8772ce0cea
Fixed SHSceneManager not SH_API-ed
2022-09-20 00:03:29 +08:00
Kah Wei
95b01fb96d
Merge branch 'main' into SP3-6-c-scripting
2022-09-19 23:12:52 +08:00
Kah Wei
8ad0eee032
Fixed vertex data buffer being incorrect
2022-09-19 21:31:23 +08:00
Kah Wei
9e09896984
Fixed SHVkBuffer move and reworked batching buffers to be host visible
2022-09-19 20:15:39 +08:00
Xiao Qi
c6e1ba7f15
Added tinyddsloader to dependencies
2022-09-19 18:40:27 +08:00
Kah Wei
4023b9d136
Added tests for rendering and fixed bugs with Batching system
2022-09-19 18:37:57 +08:00
XiaoQiDigipen
624c8fa4d6
Merge pull request #33 from SHADE-DP/SP3-5-ECS
...
SP3-5 ecs
Added Scene Graph functionality to Entity, Scene graph set parent missing old parent check (diren handling)
Scene graph functionality untested.
Added SH_API to Scene Graph
2022-09-19 17:31:21 +08:00
maverickdgg
ceb96938fb
Added SHAPI to Scene graph
2022-09-19 17:28:59 +08:00
Cocoa
e51a3688af
Merge branch 'main' into SP3-16-Math
2022-09-19 17:17:40 +08:00
Kah Wei
308aa35e00
Merge branch 'main' into SP3-6-c-scripting
2022-09-19 17:17:28 +08:00
Xiao Qi
620f8a01ac
Merge branch 'main' into SP3-13-Assets-Manager
2022-09-19 17:16:51 +08:00
Xiao Qi
52efdcf65e
Merge branch 'main' into SP3-5-ECS
2022-09-19 17:12:54 +08:00
XiaoQiDigipen
de08955467
Merge pull request #32 from SHADE-DP/SP3-18-Events
...
SP3-18 Event/Messaging System
2022-09-19 17:09:21 +08:00
Cocoa
ec3470c443
Merge branch 'main' into SP3-16-Math
2022-09-19 17:08:16 +08:00
Xiao Qi
a867ecbcbf
SP3-108 Shifted definitions for functions in Event Manager from cpp to hpp
2022-09-19 17:08:08 +08:00
Cocoa
471ec27a6d
Added Bounding Box
2022-09-19 16:50:06 +08:00
Kah Wei
a05ca41117
Fixed issue with SystemRoutines being created with the wrong version
2022-09-19 15:58:31 +08:00
Kah Wei
f408247007
Linked MeshLibrary to RenderGraph
2022-09-19 15:52:51 +08:00
maverickdgg
f72b004b95
Merge branch 'main' into SP3-5-ECS
2022-09-19 15:41:59 +08:00
maverickdgg
44611115fe
Added Scene graph functionality (un tested)
2022-09-19 15:41:52 +08:00
Brandon Mak
d025abe43a
Render graph execution now takes in graph scope buffers
2022-09-19 15:32:03 +08:00
Cocoa
f1e6031d2e
Added Transform, adjusted alignment in math files for better readability on smaller screens
2022-09-19 14:32:01 +08:00
Kah Wei
8070b2dafa
Accounted for Shaders with no SHShaderBlockInterface
2022-09-19 00:11:57 +08:00
Brandon Mak
23fe51b483
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-19 00:04:42 +08:00
Brandon Mak
643efbe1bb
WIP
2022-09-19 00:00:07 +08:00
Kah Wei
b9185eab18
Added Mesh Registration Functions to SHGraphicsSystem and a SHGraphicsSystem compatible version of mesh generation functions for SHPrimitiveGenerator
2022-09-18 23:23:48 +08:00
Kah Wei
41daaaba9c
Added SHPrimitiveGenerator
2022-09-18 23:11:08 +08:00
Brandon Mak
28a5f8e4e5
Auto stash before merge of "SP3-1-Rendering" and "origin/SP3-1-Rendering"
2022-09-18 22:34:48 +08:00
Kah Wei
96ec1afcdd
Changed batching system to use SHRenderable* instead of handles
2022-09-18 17:02:02 +08:00
XiaoQiDigipen
37fde32e7c
Merge pull request #30 from SHADE-DP/SP3-5-ECS
...
Sp3-5-ECS
Added Entity Creation/Destroyed events
2022-09-18 16:51:54 +08:00
maverickdgg
f21aa8836c
Merge branch 'main' into SP3-5-ECS
2022-09-18 16:50:10 +08:00
maverickdgg
b3d9a54d8f
Added entity creation event and entity destroyed events
2022-09-18 16:46:08 +08:00
Brandon Mak
ec40754eb9
Render graph, graphics system and pipeline library changes lel
...
Solved errors
Graphics system AddMaterial now takes in a subpass
Pipeline library now stored in render graph node instead since pipelines have to be compatible with a renderpass.
Renderers now bind render graphs instead of storing them
2022-09-18 15:23:10 +08:00
Kah Wei
8c30e656f7
Modified AddMaterial() to take in a subpass
2022-09-18 14:58:32 +08:00
Kah Wei
7a126bf1fc
SHViewport now takes in a RenderGraph instead of creating one
2022-09-18 14:49:15 +08:00
XiaoQiDigipen
02b17095d0
Merge pull request #29 from SHADE-DP/SP3-18-Events
...
SP3-18 Event/Messaging System
2022-09-18 13:42:52 +08:00
Kah Wei
a3aa708b34
Fixed numerous template errors and warnings
2022-09-18 00:49:27 +08:00
Kah Wei
6e4d6abd1c
Fixed Handle<> include issues
2022-09-17 23:37:22 +08:00
Kah Wei
1c8a434b26
Added Batcher classes and fixed errors
2022-09-17 23:37:22 +08:00
Brandon Mak
c1a3a6acf1
Created global descriptor set layouts
2022-09-17 23:32:03 +08:00
Xiao Qi
6706f9acf0
SP3-108 Created templated derived classes for events to accommodate for automatic type sending ability
2022-09-17 22:33:11 +08:00
Brandon Mak
3cf22b04a5
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-17 22:30:40 +08:00
Brandon Mak
bff27a7188
Added a bunch of KW's files for batching
...
Prepared Graphics system for merging with batcher
2022-09-17 22:29:22 +08:00
Brandon Mak
3766a10edd
WIP
2022-09-17 22:28:03 +08:00
Kah Wei
5171ddd2bf
Added SHLog class and changed Debug::Log to use SHLog
2022-09-17 03:20:24 +08:00
Brandon Mak
a85df55fc9
Merge branch 'SP3-4-editor' into SP3-1-Rendering
2022-09-16 17:32:51 +08:00
Brandon Mak
2f2567044a
Submitted command buffer :D
2022-09-16 17:28:27 +08:00
Kah Wei
c83a5a379e
Added Awake, Start, Update, LateUpdate, OnDestroy calls via SystemRoutines
2022-09-16 17:02:36 +08:00
Sri Sham Haran
eb8cbaeebb
init vulkan for imgui
2022-09-16 16:40:42 +08:00
Kah Wei
0f63ee10d0
Converted SHScriptEngine into a SHSystem
2022-09-16 16:37:50 +08:00
Kah Wei
941f4a135f
Merge branch 'main' into SP3-6-c-scripting
2022-09-16 16:21:58 +08:00
Kah Wei
4546b84c06
Added YAML serialization of scripts
2022-09-16 16:19:58 +08:00
Sri Sham Haran
470e1f07f0
Merge branch 'main' into SP3-4-editor
2022-09-16 15:02:56 +08:00
XiaoQiDigipen
5ff765c6b9
Merge pull request #28 from SHADE-DP/SP3-1-Rendering
...
Rendering system updates
SH_APIed appropriate classes
Routine class for graphics created but not called via RunRoutines (Daniel needs to call this in application I believe)
2022-09-16 15:02:34 +08:00
Brandon Mak
c1c5e70676
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-16 14:46:48 +08:00
Brandon Mak
a42a8b0c46
SH_API EVERYWHERE
2022-09-16 14:20:21 +08:00
XiaoQiDigipen
e976dee601
Merge pull request #27 from SHADE-DP/SP3-5-ECS
...
SP3-5 ECS
System manager rework. Added system routines
2022-09-16 14:15:23 +08:00
Xiao Qi
7315d3038f
Fixed outdated header includes in cxx files
...
Changed references to isActive to function calls
2022-09-16 14:14:51 +08:00
Brandon Mak
4b168fb2d7
Merge branch 'main' into SP3-1-Rendering
2022-09-16 14:09:14 +08:00
Brandon Mak
eb975d96c6
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-16 14:08:36 +08:00
Xiao Qi
0373754e37
Merge branch 'main' into SP3-5-ECS
2022-09-16 14:06:05 +08:00
XiaoQiDigipen
7a7807b7fa
Merge pull request #26 from SHADE-DP/BackTo5.0
...
Downgraded back to .NET 5.0 due to lack of VS 2019 support
2022-09-16 14:05:30 +08:00
Kah Wei
c89fe48182
Merge branch 'BackTo5.0' into SP3-6-c-scripting
2022-09-16 14:04:56 +08:00
Kah Wei
aaf3d67eed
Downgraded back to .NET 5.0 due to lack of VS 2019 support
2022-09-16 14:02:55 +08:00
Kah Wei
da582e0f1d
added serial
2022-09-16 13:58:08 +08:00
Sri Sham Haran
6f67c1acc7
Base Editor (WIP, no vulkan)
2022-09-16 13:55:29 +08:00
Kah Wei
b933b0f7fc
Added SerializeField attribute
2022-09-16 13:13:38 +08:00
Brandon Mak
f0b9f19f4d
clear color value fix
2022-09-16 12:33:42 +08:00
XiaoQiDigipen
cf3f74e47d
Merge pull request #25 from SHADE-DP/SP3-18-Events
...
SP3-18 SP3-108 Event/Messaging System
Ported over Events Manager from 200
Removed singleton design pattern
Removed event package design
Implemented event dynamic data
Instructions to use are in SHEventManager.h
2022-09-16 01:33:47 +08:00
Xiao Qi
1dde480a9f
Merge branch 'main' into SP3-18-Events
2022-09-15 18:38:11 +08:00
Xiao Qi
f9743f394d
Added some lines in comments for clarity
2022-09-15 18:37:05 +08:00
Xiao Qi
e1074887c8
Added instructions
2022-09-15 18:34:07 +08:00
Xiao Qi
5af0bf7d25
Instructions on how to use events
2022-09-15 18:33:36 +08:00
XiaoQiDigipen
415451535c
Merge pull request #24 from SHADE-DP/IgnoreVcxProjSln
...
Removed and ignored VS project and solution files
2022-09-15 17:10:33 +08:00
Kah Wei
382d75528a
Removed and ignored VS project and solution files
2022-09-15 12:50:48 +08:00
XiaoQiDigipen
ae570969ad
Merge pull request #23 from SHADE-DP/SP3-6-c-scripting
...
Integration of .NET Scripting Backend
After this is merged, the following tools need to be installed in Visual Studio:
C++/CLI support for v142 build tools
.NET 6.0 Runtime
2022-09-15 12:31:30 +08:00
Kah Wei
2714503efa
Fixed warnings
2022-09-15 12:28:53 +08:00
Kah Wei
e5b7742955
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# Dependencies.bat
2022-09-15 12:22:37 +08:00
maverickdgg
7900c52984
Merge branch 'main' into SP3-5-ECS
2022-09-15 12:18:20 +08:00
maverickdgg
6da2fa9c4e
Merge pull request #22 from SHADE-DP/SP3-209-System-Manager-Rework
...
Sp3 209 system manager rework
2022-09-15 12:14:14 +08:00
Glence
58cd71110a
Merge remote-tracking branch 'origin/main' into main
2022-09-15 12:10:50 +08:00
Glence
f6ad22530a
fix dependencies.bat
2022-09-15 12:10:45 +08:00
maverickdgg
a90c137445
#comment Completed System Routine Added Unit Test version 1
2022-09-15 12:10:06 +08:00
Xiao Qi
ddf6a7bee5
SP3-108
...
Removed singleton instance from event manager and changed it to static class instead.
WARNING: Might need to change back to singleton next time, I had to do it previously for some reason but I don't remember why
2022-09-15 12:06:09 +08:00
Kah Wei
972fe46ec2
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Engine/SHADE_Engine.vcxproj
# SHADE_Engine/SHADE_Engine.vcxproj.filters
# SHADE_Engine/premake5.lua
2022-09-15 12:05:12 +08:00
XiaoQiDigipen
e1b7cb05bf
Merge pull request #20 from SHADE-DP/CopySDLDLL
...
SHADE_Engine now copies the SDL2.dll to the out directory
2022-09-15 12:02:45 +08:00
Kah Wei
e1fb74f784
SHADE_Engine now copies the SDL2.dll to the out directory
2022-09-15 11:55:22 +08:00
Kah Wei
9b25d909dd
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Engine/SHADE_Engine.vcxproj.filters
2022-09-15 11:43:30 +08:00
Kah Wei
10c38a10a7
Merge branch 'DisableDllWarnings' into SP3-6-c-scripting
...
# Conflicts:
# Dependencies.bat
# SHADE_Application/SHADE_Application.vcxproj
# SHADE_Application/premake5.lua
# SHADE_Application/src/Application/SBApplication.cpp
# SHADE_Engine/SHADE_Engine.vcxproj
2022-09-15 11:43:03 +08:00
XiaoQiDigipen
d680a07918
Merge pull request #19 from SHADE-DP/DisableDllWarnings
...
Disable DLL Export Warnings (4251)
Might not be the 100% correct way but in existing usage in GAM 200, there were no issues at all.
2022-09-15 11:38:27 +08:00
XiaoQiDigipen
5ebdf87714
Merge pull request #18 from SHADE-DP/SP3-19-frame-rate-controller
...
FRC implemented
Handles the main game loop, which includes:
Handling restarting of scenes by freeing and initializing again
Handling changes of scenes by unloading previous scene and loading the next
Calling to update on a fixed time basis and reducing the accumulator
Calling to render on a variable time basis and adding to the accumulator
Measuring of variable time elapsed per frame
Ready for integration. Anticipating much change from this implementation during integration.
2022-09-15 11:34:53 +08:00
Kah Wei
67290c03e7
Updated vcxproj files
2022-09-15 11:34:04 +08:00
Kah Wei
c48a467e57
Disabled warnings for DLL export
2022-09-15 11:33:40 +08:00
Kah Wei
12cfbb9952
Fixed SHDotNetRuntime::IsLoaded() giving incorrect data and updated qualifiers and comment formats
2022-09-15 11:25:58 +08:00
Xiao Qi
ff3f5db397
Merge remote-tracking branch 'origin/main' into main
2022-09-15 09:32:23 +08:00
XiaoQiDigipen
96a844c9d8
Merge pull request #17 from SHADE-DP/SDLIntegration
...
SDL integration (To Archive SDLIntegration Branch)
Integrate SDL into application (For editor usage)
2022-09-15 09:31:51 +08:00
Xiao Qi
8f09c0b34c
Replaced premake exe with custom compiled one
2022-09-15 09:31:37 +08:00
Sri Sham Haran
20f4b59f41
Merge branch 'main' into SDLIntegration
2022-09-15 09:30:03 +08:00
Sri Sham Haran
bd69c6043a
SDL Updates
2022-09-15 09:26:43 +08:00
Kah Wei
9a97d12d96
Fixed SHADE_Managed target and intermediate directory paths
2022-09-15 09:23:40 +08:00
Kah Wei
79828740fd
Fixed hot reloading copying the wrong DLL
2022-09-15 09:21:51 +08:00
Kah Wei
ad7df083bf
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# Premake/premake5.exe
# SHADE_Application/src/Application/SBApplication.cpp
# SHADE_Engine/SHADE_Engine.vcxproj
# SHADE_Engine/SHADE_Engine.vcxproj.filters
# SHADE_Engine/premake5.lua
2022-09-15 09:17:17 +08:00
Brandon Mak
169822c221
Render graph execution fixed
...
GetVkQueue function deleted. More specific function implemented (Present).
2022-09-15 09:16:13 +08:00
Kah Wei
196ef93fed
CSProj for SHADE_Scripting is now generated if a build is attempted without it existing
2022-09-15 09:11:02 +08:00
Xiao Qi
d62201367a
Merge branch 'main' into SP3-18-Events
2022-09-15 09:10:49 +08:00
Xiao Qi
8e601e60e5
Added SHCommonTypes header file
...
Changed C++ std from latest to 20
Updated premake program
2022-09-15 01:51:04 +08:00
Xiao Qi
a3b1660013
SP3-108 Removed old event register method
...
added new events define
2022-09-15 01:46:11 +08:00
XiaoQiDigipen
0cf4093b63
Merge pull request #16 from SHADE-DP/SetWorkingDirectory
...
Set working directory of the application to be the executable location
2022-09-15 01:39:33 +08:00
XiaoQiDigipen
98d61f1ca7
Merge branch 'main' into SetWorkingDirectory
2022-09-15 01:39:10 +08:00
XiaoQiDigipen
cff0b29ce8
Merge pull request #15 from SHADE-DP/CleanUpPremake
...
Moved spdlog lib link to SHADE_Engine and removed KTX references in Premake
2022-09-15 01:37:32 +08:00
Sri Sham Haran
5e4eabc582
[WIP] SDL Window wrap
2022-09-15 00:48:43 +08:00
Kah Wei
7bc0dfb399
Set working directory of the application to be the executable location
2022-09-15 00:33:12 +08:00
mushgunAX
a2353e4446
frc commit, not connected yet
2022-09-14 22:00:00 +08:00
Sri Sham Haran
599f1e4ffe
add sdl to dependencies
2022-09-14 21:47:39 +08:00
Kah Wei
57393ad7e4
Updated projects to use .NET 6.0
2022-09-14 20:29:40 +08:00
Kah Wei
95c3609d21
Removed all references to Plushie
2022-09-14 20:26:31 +08:00
Kah Wei
7e4c6a986a
Merge branch 'CleanUpPremake' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Engine/SHADE_Engine.vcxproj
# SHADE_Engine/SHADE_Engine.vcxproj.filters
2022-09-14 20:10:10 +08:00
Kah Wei
7c64a12896
Moved spdlog lib link to SHADE_Engine and removed KTX references in Premake
2022-09-14 20:09:01 +08:00
Kah Wei
e67b90c6a8
Added calls to SHScriptEngine in SBApplication
2022-09-14 20:07:13 +08:00
Kah Wei
08f3a52dab
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Application/premake5.lua
# SHADE_Engine/SHADE_Engine.vcxproj
# SHADE_Engine/SHADE_Engine.vcxproj.filters
# SHADE_Engine/premake5.lua
# premake5.lua
2022-09-14 19:57:59 +08:00
Brandon Mak
44e529f06f
Merge branch 'SP3-4-editor' into SP3-1-Rendering
2022-09-14 19:44:01 +08:00
XiaoQiDigipen
becce86160
Merge pull request #14 from SHADE-DP/UseSharedOutInterDirs
...
Convert SHADE_Engine to a DLL and made all projects use a shared output and intermediate directory
2022-09-14 19:40:50 +08:00
XiaoQiDigipen
b66e2cf3d1
Merge branch 'main' into UseSharedOutInterDirs
2022-09-14 19:40:33 +08:00
XiaoQiDigipen
414b6204a5
Merge pull request #13 from SHADE-DP/SP3-15-Tools
...
SP3-15 Tools
NEW
Added Logging Functions that wrap around logging macros for C++/CLI
2022-09-14 19:29:12 +08:00
Brandon Mak
921680d472
Deleted editor folder
2022-09-14 19:19:54 +08:00
Brandon Mak
7459e19846
Changes
2022-09-14 19:19:24 +08:00
Brandon Mak
5a1abe6530
Auto stash before merge of "SP3-4-editor" and "origin/SP3-4-editor"
2022-09-14 19:18:54 +08:00
Cocoa
803b29146e
Fixed memory error with SHLogger & spdlog
...
The logger needs to be registered outside the library. As such, a macro SHLOG_REGISTER has been added, as well as a variable to the actual logger. The logger needs to be passed into the macro anywhere outside the library after it has been initialised to work on the dll. This has already been done right before the application runs.
2022-09-14 17:57:36 +08:00
Sri Sham Haran
fdc8a61c1d
Added SHWindow to SHImguiWindow
2022-09-14 16:01:40 +08:00
Kah Wei
44ef3a500f
Added post build command to copy spdlog.dll to output
2022-09-14 13:29:23 +08:00
maverickdgg
b7cd1bed48
Added System Routines
2022-09-14 10:32:50 +08:00
Sri Sham Haran
a3e4b0a845
update premakes for spdlog changes
2022-09-14 09:14:18 +08:00
Cocoa
2332e5401f
Merge branch 'main' into SP3-15-Tools
2022-09-13 23:29:44 +08:00
Cocoa
e45e589ba9
Added functions that wrap around logging macros for C++/CLI integration
2022-09-13 23:29:20 +08:00
Kah Wei
cba3aa0663
Converted SHADE_Engine to a DLL project and exported common use classes
2022-09-13 21:08:13 +08:00
Kah Wei
91709b16c3
Changed out and intermediatery directories for all projects to use shared directories
2022-09-13 20:35:30 +08:00
Kah Wei
8e45b5895e
Removed references to SHLogger in Debug.cxx
2022-09-13 20:31:08 +08:00
Kah Wei
0c28199acf
Converted SHScriptEngine to static and replaced json references with yaml
2022-09-13 20:30:32 +08:00
Kah Wei
cfa12eb865
Added NOMINMAX to SHADE_Managed
2022-09-13 20:28:34 +08:00
Brandon Mak
4ccfd399af
Renderpass execution and descriptor set writes
2022-09-13 19:46:51 +08:00
Kah Wei
9c833da88a
Added implementation for various GameObject functions
2022-09-13 18:42:43 +08:00
Kah Wei
073cf902a9
Fixed warnings and errors in Vector2/3 and GameObject
2022-09-13 18:37:05 +08:00
Kah Wei
32a68d22ae
Merge branch 'main' into SP3-6-c-scripting
2022-09-13 18:31:24 +08:00
XiaoQiDigipen
95440b8d26
Merge pull request #12 from SHADE-DP/MTtoMD
...
Converted projects to use MD instead of MT library
2022-09-13 18:27:34 +08:00
Kah Wei
d643fe66b0
Fixed errors in SHADE_Managed
2022-09-13 17:16:36 +08:00
Xiao Qi
23a599abe8
SP3-107 SP3-108
...
Initial port from 200
Removed unused classes
Changing Event package for better ease of use
2022-09-13 16:34:05 +08:00
maverickdgg
f342fdcb95
changed more stuff to pragma once
2022-09-13 15:36:34 +08:00
maverickdgg
8842269c6d
Changed everything to use pragma once
2022-09-13 15:36:03 +08:00
maverickdgg
e9241feb69
moved all managers to their own folder
2022-09-13 15:26:23 +08:00
Kah Wei
0ed5cecbf3
Fixed ECS references in various files in SHADE_Managed
2022-09-13 15:18:56 +08:00
maverickdgg
d483916cc5
Changed SystemManager to use SystemID map instead of using a string map
2022-09-13 14:28:32 +08:00
Xiao Qi
3b9d14944e
SP3-102 Changed all previous references to updated versions. Removed function call to obsolete functons
2022-09-13 14:23:33 +08:00
Kah Wei
04cae0fad9
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Engine/SHADE_Engine.vcxproj
# SHADE_Engine/SHADE_Engine.vcxproj.filters
# SHADE_Engine/premake5.lua
2022-09-13 14:09:32 +08:00
maverickdgg
51fc65b825
Added some typedefs
2022-09-13 14:07:40 +08:00
maverickdgg
8b8f0a076d
Added const to some functions
2022-09-13 13:57:01 +08:00
maverickdgg
9c5a705bef
Merge branch 'main' into SP3-5-ECS
2022-09-13 13:52:52 +08:00
Kah Wei
b674805547
Added ECS and Component classes for SHADE_Managed
2022-09-13 13:51:11 +08:00
Xiao Qi
1cabcefe0f
SP3-102 Initial port of 200 resource manager into 300 Asset manager
2022-09-13 13:37:32 +08:00
maverickdgg
88894d1c3c
Merge branch 'main' into SP3-5-ECS
2022-09-13 13:30:21 +08:00
Kah Wei
4ed417cbea
Added EngineInterface
2022-09-13 11:43:49 +08:00
Brandon Mak
8f7d8cd8bc
Added vertex attributes
2022-09-13 09:13:39 +08:00
Kah Wei
ccdb1d0e19
Added shlwapi.lib linker input for SHADE_Engine
2022-09-13 00:18:54 +08:00
Kah Wei
5a6ff60fe1
Added ScriptStore
2022-09-13 00:18:33 +08:00
Kah Wei
216a9ac7cb
Added Script class
2022-09-12 22:42:46 +08:00
Brandon Mak
506d3a1c35
WIP
2022-09-12 20:08:01 +08:00
Kah Wei
b0e9469e4e
Added Entity and WIP GameObject
2022-09-12 19:00:54 +08:00
Kah Wei
2fb61609e9
Added C# Math functions and types along with DisposableAssemblyLoadContext
2022-09-12 18:17:59 +08:00
Kah Wei
1400a25c4d
Added SHADE_Managed project and added patched premake5.exe
2022-09-12 17:46:01 +08:00
Kah Wei
548b09df06
Added SHScriptEngine and SHDotNetRuntime for managed code execution
2022-09-12 16:04:22 +08:00
Kah Wei
ba5bea9d53
Added dotnet dependencies acquisition
2022-09-12 16:04:08 +08:00
Brandon Mak
47e9e3d3f2
WIP
2022-09-11 22:34:55 +08:00
Brandon Mak
bf447c1d1d
Auto stash before merge of "SP3-4-editor" and "origin/SP3-4-editor"
2022-09-11 20:03:11 +08:00
Sri Sham Haran
4b8c842615
[WIP] SHADE ImGui Vulkan Backend
2022-09-09 21:46:30 +08:00
Sri Sham Haran
a8d00a29ec
[WIP] Editor: ImGui-Vulkan integration
2022-09-09 16:04:49 +08:00
Brandon Mak
09c1d2654d
WIP
2022-09-09 16:02:34 +08:00
Sri Sham Haran
4eb7e1f5f4
Merge branch 'SP3-1-Rendering' into SP3-4-editor
2022-09-09 14:38:28 +08:00
Brandon Mak
361237ede1
GETTER FOR RENDER GRAPH
2022-09-09 14:38:09 +08:00
Sri Sham Haran
122dc2f531
Merge branch 'SP3-1-Rendering' into SP3-4-editor
2022-09-09 14:35:23 +08:00
Brandon Mak
ae372f2917
Getter for renderpass in render node
2022-09-09 14:34:09 +08:00
Sri Sham Haran
8208e14fed
Merge branch 'SP3-1-Rendering' into SP3-4-editor
2022-09-09 14:21:42 +08:00
Brandon Mak
d7954245d6
Created a descriptor pool for Graphics System
2022-09-09 14:21:13 +08:00
Sri Sham Haran
8ab95e9a6d
Merge branch 'SP3-1-Rendering' into SP3-4-editor
2022-09-09 14:04:11 +08:00
Brandon Mak
fe954271cb
Getter for queue
2022-09-09 14:02:48 +08:00
Sri Sham Haran
03075ce738
Merge branch 'SP3-1-Rendering' into SP3-4-editor
2022-09-09 13:55:14 +08:00
Brandon Mak
78f8a9e455
Getter for physical device
2022-09-09 13:55:00 +08:00
Sri Sham Haran
b164ecbd16
Merge branch 'SP3-1-Rendering' into SP3-4-editor
2022-09-09 13:37:10 +08:00
Brandon Mak
94a358995a
Window is rendering black screen
2022-09-09 13:32:55 +08:00
Brandon Mak
bed017e539
Fixed some warnings and premake files now include hpp files
2022-09-09 13:28:57 +08:00
Brandon Mak
cce1d24374
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-09 11:20:46 +08:00
Brandon Mak
fe6c5be8c6
Graphics System called in application
2022-09-09 11:20:38 +08:00
Kah Wei
cecbca26c5
Fixed some warnings in ResourceLibrary and SparseSet
2022-09-08 20:55:56 +08:00
Sri Sham Haran
28ab89cf91
set up backend functions
2022-09-08 20:34:44 +08:00
Sri Sham Haran
407ac11753
Merge branch 'main' into SP3-4-editor
2022-09-08 19:38:09 +08:00
Sri Sham Haran
32dc894608
SHEditor Base
2022-09-08 19:37:49 +08:00
Brandon Mak
ae8e30f120
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-08 19:19:36 +08:00
maverickdgg
4c5c5f61e8
Merge branch 'main' into SP3-5-ECS
2022-09-08 12:17:10 +08:00
maverickdgg
85a63cec1f
#comment removed two CreateEntity function overloads and added a default value to desired EID instead
2022-09-08 12:06:29 +08:00