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