5ec8475842
Merge branch 'main' into SP3-1-RenderOnlyActive
2022-11-18 21:34:28 +08:00
a4e5a1c269
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-18 18:31:38 +08:00
6b5b0387a9
Fixed bug where pausing then playing crashes physics
2022-11-18 18:31:07 +08:00
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
a77740db51
Merge branch 'main' into PlayerController
2022-11-18 17:16:04 +08:00
0551b1fb8a
added the new banks
...
added onplay/onpause/onstop for audiosytem
2022-11-18 17:04:06 +08:00
09249cf9e8
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-11-18 16:48:09 +08:00
a181d7b896
Added Canvas and UI to editor
2022-11-18 16:37:33 +08:00
03ce142137
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-11-18 16:37:06 +08:00
66f33554a3
Tested adding text component to entities
2022-11-18 16:35:49 +08:00
36a1a1c696
Merge branch 'main' into SP3-20-UI-System
2022-11-18 12:24:24 +08:00
0b5ec34b00
Merge branch 'main' into SP3-141-Camera-System
2022-11-18 09:38:52 +08:00
9ac1c01008
Merge branch 'main' into SP3-20-UI-System
2022-11-18 09:38:42 +08:00
d997cd4da6
Added canvas ID to UI Component
2022-11-18 09:38:31 +08:00
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
e8bd33ec9e
Scripts are now always built on engine launch
2022-11-17 17:36:35 +08:00
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
e31f868257
Merge pull request #217 from SHADE-DP/SP3-2-Physics
...
Fixed various Physics bugs
2022-11-17 17:13:01 +08:00
6efbea54e1
Fixed issue where scripts of Entities destroyed during scene unloading are not properly disposed
2022-11-17 15:43:35 +08:00
920e977232
Merge branch 'main' into SP3-4-Editor
2022-11-17 13:34:34 +08:00
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
b3fbfce56f
FIxed debug draw for offset colliders
2022-11-17 12:58:01 +08:00
360c55fa2b
Disabled automass on rigid bodies
2022-11-17 12:27:00 +08:00
18218443ec
Fixed a bug
2022-11-17 12:20:28 +08:00
c967f9355f
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-17 10:42:53 +08:00
7288894507
Fixed bug where adding colliders would fail to maintain previous collider sizes
2022-11-17 10:42:45 +08:00
ad30f150d1
UI component and UI System prep
2022-11-17 07:12:38 +08:00
0bb97413ef
Added Canvas and UI Components
2022-11-17 05:39:55 +08:00
7d71390d43
separated ortho and proj matrix in camera comp
2022-11-17 05:29:11 +08:00
6b80a4baa9
Merge branch 'main' into SP3-141-Camera-System
2022-11-17 04:56:04 +08:00
c80a819b6e
Guard Find entity by name function
2022-11-17 04:55:46 +08:00
8f9fedff41
Added sleeping debug info to Rigidbody Inspector
2022-11-17 01:39:05 +08:00
503f32c3a6
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-17 00:21:18 +08:00
39a8ca131f
Fixed Collision & Trigger Messages not being cleared on deactivating objects
2022-11-17 00:11:55 +08:00
b129a68680
Disabled setting of shader for now as it is buggy
2022-11-16 23:19:25 +08:00
19bc90845f
Added additional checks for SetProperty() of Material and MaterialInstance
2022-11-16 21:01:51 +08:00
8869b42db2
Fixed memory corruption in SHSubpass
2022-11-16 21:00:27 +08:00
fe91f58d28
Fixed material inspector saving not saving the correct texture ID into the runtime material
2022-11-16 19:25:17 +08:00
c5bca4111b
Fixed validation error caused by deleting empty batches
2022-11-16 19:23:26 +08:00
f0c09817ce
EnsureBufferAndCopy utility functions now avoid resizes if new size is smaller or equal
2022-11-16 17:49:11 +08:00
29b4465dfd
Split pre-rendering tasks to a PrepareRenderRoutine
2022-11-16 17:48:15 +08:00
edd44604f1
Merge branch 'main' into SP3-4-Editor
2022-11-16 17:47:36 +08:00
37e845336b
Fix line draws for asset browser
2022-11-16 17:46:48 +08:00
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
1bd7183231
Added validation for Renderable drag drop fields
2022-11-16 17:30:19 +08:00
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
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
db7c4a6d38
Merge branch 'main' into SP3-1-MaterialUpdate
2022-11-16 16:40:15 +08:00
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
3e3a66f261
Fixed memory corruption issue caused by SHMaterialInstance::SetMaterial()
2022-11-16 16:32:12 +08:00
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
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
ba39c02f9f
Changed formatting slightly for RigidBody component view
2022-11-16 15:28:42 +08:00
dc9291bc01
Added Audio class for playing audio from C#
2022-11-16 15:00:56 +08:00
3affaf426d
WIP Runtime Material Editing support
2022-11-16 09:06:29 +08:00
a9f77d666c
Fixed compile error
2022-11-16 00:04:56 +08:00
f172ccb744
Added Automass and Sleep check for Rigidbodies
2022-11-15 23:58:08 +08:00
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
292fdf4ee2
Fixed some bugs but SHFont constructor still breaks
...
the vkImage is not loading correctly
2022-11-15 20:40:43 +08:00
a3d2f95aa0
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-11-15 18:41:16 +08:00
b6bae850bf
Merge remote-tracking branch 'origin/main' into FontIntegration
2022-11-15 18:25:40 +08:00
958310a8ea
Renderable now shows the name of the mesh and material assigned instead of asset IDs
2022-11-15 18:16:07 +08:00
c69ad04f1e
Added functions to get name of a backing asset from SHResourceManager
2022-11-15 18:15:49 +08:00
93cded6ed9
Added serialization of component isActive
2022-11-15 17:04:52 +08:00
0e4d97da81
tooltip now reflects the correct keys
2022-11-15 16:28:46 +08:00
b0404bd59a
Merge branch 'main' into SP3-4-Editor
2022-11-15 16:22:56 +08:00
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
d3103598f3
Removed old SHLog trace methods
2022-11-15 16:22:16 +08:00
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
e7a66eed08
Merge branch 'main' into SP3-4-Editor
2022-11-15 15:12:16 +08:00
f7cca42e59
Added shlog information source
2022-11-15 13:53:15 +08:00
786e15771c
Addedo control paths for font compilation and loading
2022-11-15 13:44:39 +08:00
92ddc3f1eb
Fixed wrong include path to SHUtilities
2022-11-15 13:30:25 +08:00
3dcb6f26c2
Merge branch 'main' into SP3-1-Rendering
2022-11-15 13:21:28 +08:00
e93eea6381
Cleaned up tools folder. Added debug only logging macros with _D suffix
2022-11-15 03:03:37 +08:00
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
5cb87402b2
Hide .shmeta files from C# script project
2022-11-15 01:22:22 +08:00
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
7c636adbfc
Merge branch 'main' into SP3-4-Editor
2022-11-14 20:41:50 +08:00
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
47c50c3a31
Merge branch 'main' into SP3-6-c-scripting
2022-11-14 19:38:43 +08:00
4eb5fa64e0
Text Rendering WIP
2022-11-14 19:31:26 +08:00
6673e6f266
Merge branch 'main' into SP3-6-c-scripting
2022-11-14 19:08:46 +08:00
d897ac01e6
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-14 18:39:06 +08:00
10335f3033
Added syncing of physics materials & clear forces methods
2022-11-14 18:38:32 +08:00
2a05d821d5
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-11-14 18:36:33 +08:00
d95ed3f067
Text Rendering WIP
2022-11-14 18:36:26 +08:00
5ccd2263c7
Documentation files are now generated for projects
2022-11-14 18:35:52 +08:00
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
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
77cab3e4c5
Merge branch 'main' into SP3-6-c-scripting
2022-11-14 17:08:50 +08:00
9e8674859c
Fixed script serialization for objects with no default values set
2022-11-14 17:05:54 +08:00
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
ac17721363
Merge branch 'main' into SP3-1-Rendering
2022-11-14 15:38:33 +08:00
9515fcca4f
Renames & Bugfixes
...
Renamed BoundingBox & BoundingSphere to Box & Sphere
Forces are forcefully cleared
2022-11-14 15:35:02 +08:00
eb32e87387
Camera Orthographic projection
2022-11-14 15:10:23 +08:00
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
898b7fbf2c
Text Rendering WIP
2022-11-14 10:11:47 +08:00
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
ab869348f1
Added code that only renders objects which are active
2022-11-14 00:59:21 +08:00
3c61b7519b
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-14 00:25:52 +08:00
fe1b9d14f5
Partial implementation of syncing SHADE and ReactPhysics active states
2022-11-14 00:25:24 +08:00
d36d70e3eb
Added a forced update to the physics system
2022-11-14 00:20:54 +08:00
73a5d5e4b9
References path for csproj generated file is now dynamically generated
2022-11-13 22:29:04 +08:00
a8d4f9c756
On building of asset file directory, check for recognised assets without meta file and generate
2022-11-13 19:51:19 +08:00
c98693c6bc
missing change from last commit
2022-11-13 17:57:46 +08:00
c953931f4f
Merge branch 'main' into SP3-2-Physics
2022-11-13 17:57:30 +08:00
277a3ca011
Fixed deletion bugs
2022-11-13 17:42:48 +08:00
eed950f26f
Merge branch 'main' into SP3-4-Editor
2022-11-13 17:26:56 +08:00
895eb56cc0
Integrate cam arm
2022-11-13 17:26:21 +08:00
3512ed3397
AHHHHHH
...
i want to pull my hair out
2022-11-13 15:50:03 +08:00
86ca047c88
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-13 14:49:44 +08:00
66dbd7df93
Merge branch 'main' into SP3-4-Editor
2022-11-13 13:55:57 +08:00
276e0806fa
Can now undo/redo entity deletion (working afaik)
2022-11-13 13:55:30 +08:00
a83a38eba8
Fixed bin and obj folders respawning and causing engine crashes
2022-11-13 13:07:49 +08:00
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
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
efed33ce94
Added code to test EditorCameraArm.
2022-11-13 05:45:43 +08:00
922d5b0996
Merge branch 'main' into SP3-141-Camera-System
2022-11-13 05:31:34 +08:00
258c07e857
Added helper functions to check if Scene nodes are active
2022-11-13 05:31:18 +08:00
4d0598a7f5
Added Editor Camera Arm function
2022-11-13 05:19:46 +08:00
cf60210b4a
Merge branch 'main' into SP3-6-ArraySerialization
2022-11-13 02:43:12 +08:00
e2bcb0bbbb
play pause stop bound to F5 F6 F7
2022-11-12 23:57:12 +08:00
69ac074926
change entity active to scene node active
2022-11-12 18:38:57 +08:00
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
3402992189
dont draw gizmos on play
2022-11-12 18:09:55 +08:00
f8bbcdd909
Small fixes
2022-11-12 17:28:49 +08:00
4ad23a605f
Fixed compilation issues from merge
2022-11-12 17:04:09 +08:00
3faf3804aa
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-12 16:57:45 +08:00
45e549f9f1
.....small restructure....
2022-11-12 16:56:58 +08:00
24dcd77f32
Added tooltip and range attribute support for lists in scripts
2022-11-12 12:17:11 +08:00
6dbda12f30
Adjusted design of list on scripts and all numbers now use sliders
2022-11-12 03:53:30 +08:00
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
e96db99ee3
Merge branch 'main' into SP3-4-Editor
2022-11-11 20:41:14 +08:00
153f040c40
Refresh
2022-11-11 20:41:05 +08:00
c9db3b283d
asset browser
2022-11-11 14:00:51 +08:00
3b22f95e29
Added font identifiers
2022-11-11 13:21:22 +08:00
ed3694bde1
Merge branch 'main' into SP3-6-ArraySerialization
2022-11-11 12:07:40 +08:00
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
94b64e92dd
Initialise files to not compiled
2022-11-11 10:55:19 +08:00
9fe5dc385b
Implemented check for raw asset if compiled
2022-11-11 10:52:57 +08:00
6df3f3d417
Fixed get type from extension bug in asset handler
2022-11-11 10:47:03 +08:00
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
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
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
d17a83ab77
From last commit. Whoops.
2022-11-11 00:02:18 +08:00
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
5875107ce2
Merge branch 'main' into SP3-6-ArraySerialization
2022-11-10 23:44:07 +08:00
d93ea8e49b
Child caches are now updated when scene hierarchy changes
2022-11-10 23:34:53 +08:00
aad83d9e32
Revert "Asset browser is wonky now"
...
This reverts commit 2fdff77420
2022-11-10 23:02:29 +08:00
Kah Wei