Commit Graph

1152 Commits

Author SHA1 Message Date
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
Sri Sham Haran 93cded6ed9 Added serialization of component isActive 2022-11-15 17:04:52 +08:00
Sri Sham Haran 0e4d97da81 tooltip now reflects the correct keys 2022-11-15 16:28:46 +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
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 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
Diren D Bharwani e93eea6381 Cleaned up tools folder. Added debug only logging macros with _D suffix 2022-11-15 03:03:37 +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
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
Kah Wei 6673e6f266 Merge branch 'main' into SP3-6-c-scripting 2022-11-14 19:08:46 +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
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
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
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
maverickdgg eb32e87387 Camera Orthographic projection 2022-11-14 15:10:23 +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
Kah Wei 73a5d5e4b9 References path for csproj generated file is now dynamically generated 2022-11-13 22:29:04 +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
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
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 895eb56cc0 Integrate cam arm 2022-11-13 17:26:21 +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 86ca047c88 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-13 14:49:44 +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 a83a38eba8 Fixed bin and obj folders respawning and causing engine crashes 2022-11-13 13:07:49 +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
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 cf60210b4a Merge branch 'main' into SP3-6-ArraySerialization 2022-11-13 02:43:12 +08:00
Sri Sham Haran e2bcb0bbbb play pause stop bound to F5 F6 F7 2022-11-12 23:57:12 +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
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
Sri Sham Haran c9db3b283d asset browser 2022-11-11 14:00:51 +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
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
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 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 2fdff77420 Asset browser is wonky now
Refresh asset browser
Compile asset
2022-11-10 23:01:09 +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
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 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
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
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
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 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
Kah Wei da12db6726 Merge branch 'main' into S3-6-Gizmos 2022-11-09 14:45:31 +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
Diren D Bharwani f8417f6116 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-08 15:22:28 +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 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
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
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 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
Sri Sham Haran de38b29f25 small fixes for ms2 submission 2022-11-05 18:15:18 +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
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
Kah Wei 40422a6d23 Added built-in primitives 2022-11-05 00:10:54 +08:00
Sri Sham Haran ab17d57756 Asset browser now recurses down subassets 2022-11-04 23:32:29 +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
Xiao Qi 6d0089ee12 Merge branch 'main' into SP3-13-Assets-Manager 2022-11-04 17:49:13 +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
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
Xiao Qi 544716547e Added preprocessor check for debug to turn off renderdoc 2022-11-03 02:37:38 +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
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
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
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
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
Kah Wei 93c684fbb1 Merge branch 'main' into SP3-6-c-scripting 2022-11-02 13:42:41 +08:00
Kah Wei 82e0e4df5c Added editor gridlines and cardinal axes 2022-11-02 10:33:17 +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
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
Diren D Bharwani 07bfb2f485 Merge remote-tracking branch 'origin/main' into SP3-16-Math 2022-11-02 00:22:36 +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
Sri Sham Haran 26591e8c24 material inspector 2022-11-01 19:03:08 +08:00
Diren D Bharwani 40be8a7962 Merge branch 'main' into SP3-12-SceneGraph 2022-11-01 19:00:12 +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 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
Diren D Bharwani e0dcf9e13e Added Editor State Change events 2022-11-01 15:32:01 +08:00
Diren D Bharwani 4dcd60f239 Added rotation offsets to colliders 2022-11-01 15:10:47 +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
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
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
Brandon Mak 5852c409e6 SSAO WIP 2022-11-01 11:57:08 +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 da690e4395 Simplified RigidBody Implementation 2022-11-01 02:41:08 +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
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
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
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 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 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
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
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
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
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
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
maverickdgg 65013969a8 Added Camera LookAt and CameraArmComponent works now 2022-10-31 16:39:06 +08:00
Kah Wei a9b9695155 Merge branch 'main' into SP3-1-SerialisedRenderable 2022-10-31 16:31:22 +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
Kah Wei 42a80bfc3b Merge branch 'main' into SP3-1-SerialisedRenderable 2022-10-31 15:31:38 +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
maverickdgg f5f9b80490 Added GetEntityByName to EntityManager 2022-10-31 15:06:08 +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