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
2fdff77420
Asset browser is wonky now
...
Refresh asset browser
Compile asset
2022-11-10 23:01:09 +08:00
c95a6a2492
Added open modes for ofstream when building csharp project
2022-11-10 17:37:59 +08:00
ed1bc7c62d
Changed scripting project relative path to managed and csharp dlls
2022-11-10 17:34:33 +08:00
03f9c593b6
Function to call to refresh asset directory
2022-11-10 17:09:55 +08:00
9d367a359a
Text Rendering WIP
2022-11-10 16:59:26 +08:00
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
bdc7297937
Converted macros for script field inspectors to use templates
2022-11-10 16:20:04 +08:00
901c007cb2
Added Transform Matrix method to SHMatrix
2022-11-10 14:55:28 +08:00
c40992b48c
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-10 14:44:18 +08:00
3efecd64e7
Added box & sphere debug draw for physics
2022-11-10 14:30:30 +08:00
e4e4894610
Canvas Component
...
Added a canvas component. No functionality added yet
2022-11-10 13:01:31 +08:00
35bcdc5239
Missed out path for config
2022-11-10 11:14:40 +08:00
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
578f384808
Removed redundant overloads to restrict potential bad function calls
2022-11-10 10:24:09 +08:00
08b3cbafcd
Added IsChildOf method to SceneGraph
2022-11-10 10:20:54 +08:00
ac217ffe97
Added Add and Remove Child Events to SceneGraph
2022-11-10 09:06:38 +08:00
be6a11c629
Text Rendering WIP
2022-11-10 08:28:44 +08:00
eeab3494ba
Reworked SceneGraph Interface
2022-11-10 03:30:02 +08:00
99f41e947f
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-10 02:16:42 +08:00
4731df28f0
Skeleton for Reworked Physics Debug Draw
2022-11-10 02:16:33 +08:00
67f7d0ea2e
Text Rendering WIP
2022-11-10 00:19:38 +08:00
da12db6726
Merge branch 'main' into S3-6-Gizmos
2022-11-09 14:45:31 +08:00
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
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
41b7cb842c
Added C# Gizmos class interface
2022-11-08 21:31:53 +08:00
e89f5b4b9e
Added OnDrawGizmos for debug draw for scripts
2022-11-08 20:49:07 +08:00
f8417f6116
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-08 15:22:28 +08:00
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
1f4a530dcc
Fixed compile error in Release
2022-11-08 14:06:01 +08:00
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
572700fbb3
Text Rendering WIP
2022-11-08 10:57:07 +08:00
ddd93a85f4
Added support for null GameObjects (loading is buggy)
2022-11-08 00:53:47 +08:00
8fbd32a144
Added Relative Sizes to Shapes
2022-11-08 00:46:09 +08:00
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
0b813d769a
Added WIP Compute Pipelines labeling
2022-11-07 19:41:19 +08:00
1165b9fa47
Text Rendering WIP
2022-11-07 19:38:08 +08:00
d302d7e07d
Added labels for more buffers, images, imageviews, frames, semaphores and more
2022-11-07 19:32:12 +08:00
70dcad1313
Changed Collider to CollisionShape for improved clarity
2022-11-07 18:19:39 +08:00
4e02f64133
Fixed bug where duplicate triggers were caught due to swapped entity IDs
2022-11-07 18:06:43 +08:00
44ae6d0a8f
Removed unused descriptor sets in SHGraphicsGlobalData
2022-11-07 17:28:03 +08:00
0bda3d5151
Added labels for resources of Mesh and Texture libraries
2022-11-07 14:08:19 +08:00
fb37742ee0
Staging Buffers are now labeled
2022-11-07 13:28:49 +08:00
782db1e2a4
Added debug labels for Renderpasses
2022-11-07 13:22:16 +08:00
4bd9f0817a
Buffers are now tagged as buffers for debug labels
2022-11-07 13:21:17 +08:00
37c765d5cd
Merge branch 'main' into SP3-1-DebugLabels
2022-11-07 11:24:18 +08:00
cc5c764307
Text Rendering WIP
2022-11-07 02:32:38 +08:00
88530e9909
Text Rendering WIP
2022-11-07 00:10:57 +08:00
de38b29f25
small fixes for ms2 submission
2022-11-05 18:15:18 +08:00
04e2c255b0
Build script options are now disabled when in play or pause mode
2022-11-05 15:34:56 +08:00
06afd384af
Scenes are now reloaded and scripts are no longer lost when building scripts
2022-11-05 14:56:52 +08:00
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
40422a6d23
Added built-in primitives
2022-11-05 00:10:54 +08:00
ab17d57756
Asset browser now recurses down subassets
2022-11-04 23:32:29 +08:00
b5bc64456c
Added debug names for some SHVkBuffers
2022-11-04 19:16:57 +08:00
b30da7e495
Fixes
2022-11-04 19:16:32 +08:00
d8ee991213
Steps in the rendering process are now highlighted and named for debugging tools
2022-11-04 18:39:45 +08:00
b86f092f52
Merge branch 'main' into SP3-305-configurationsMerge
2022-11-04 18:37:19 +08:00
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
6d0089ee12
Merge branch 'main' into SP3-13-Assets-Manager
2022-11-04 17:49:13 +08:00
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
6984653b64
Renamed and restructured model asset members
...
Added mesh asset vector for model asset to contain
2022-11-04 17:18:40 +08:00
608b204f88
Changed premake to copy model compiler exe
2022-11-04 17:17:48 +08:00
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
4ee0294977
Scene loads correctly now
2022-11-04 14:44:18 +08:00
544716547e
Added preprocessor check for debug to turn off renderdoc
2022-11-03 02:37:38 +08:00
f24346a6fd
Revert "TEMPORARY Push with all relative paths changed for building exe"
...
This reverts commit 0979ee93e6
2022-11-03 00:11:56 +08:00
0979ee93e6
TEMPORARY Push with all relative paths changed for building exe
2022-11-02 22:44:27 +08:00
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
86254a5bf3
Merge branch 'main' into SP3-4-Editor
2022-11-02 21:41:38 +08:00
e609b5634a
Material Inspector
...
Can set material
2022-11-02 21:31:27 +08:00
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
2beae24924
Removed Original mesh compiler, rewriting mesh loader to reflect ModelCompiler format
2022-11-02 20:50:51 +08:00
c68c5adc0d
Added GetTextureHandle() to SHGraphicsSystem
2022-11-02 17:51:07 +08:00
4721a133e1
Added a way to retrieve texture handles from texture indices
2022-11-02 17:43:28 +08:00
4f70b543b2
Merge branch 'main' into PlayerController
2022-11-02 17:36:04 +08:00
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
976c220145
Deserialization of SHMaterialSpec will return an empty SHMaterialSpec on failure now instead
2022-11-02 17:19:18 +08:00
53397e884d
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-11-02 17:18:44 +08:00
ebc94225e7
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-11-02 17:04:31 +08:00
d207042fec
Reworked SHMaterialSpec and SHMaterial loading system
2022-11-02 16:56:38 +08:00
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
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
6ab6cc15a9
Zero out arrays for input manager
2022-11-02 16:14:26 +08:00
27526dfd92
Fixed relative size for sphere colliders
2022-11-02 16:12:47 +08:00
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
Brandon Mak