Commit Graph

919 Commits

Author SHA1 Message Date
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 96bd982e4c Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph 2022-10-29 14:51:48 +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
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 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
Xiao Qi 017cbf90c5 Changed filesystem interface in preparation for asset browser functionalities 2022-10-28 19:07:48 +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 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
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
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
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
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
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
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
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 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
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
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 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
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 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
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
Kah Wei c2e51dc603 Fixed deletion crash caused by Renderables 2022-10-25 14:31:28 +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
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
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 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
Xiao Qi 4019b4914c Merge branch 'main' into SP3-13-Assets-Manager 2022-10-23 17:08:37 +08:00
Diren D Bharwani 8559f7d27c Merge remote-tracking branch 'origin/main' into SP3-16-Math 2022-10-23 16:59:11 +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 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
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
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
mushgunAX 77aa5b8c7d Bindings and Controllers 2022-10-22 23:27:43 +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
Brandon Mak cc6e2189fa WIP 2022-10-21 20:56:14 +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 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
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 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
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
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
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
Sri Sham Haran a7e8320008 Copy/Paste Entities 2022-10-19 17:23:25 +08:00
Brandon Mak 603470eeb6 Fixed some camera resizing issues 2022-10-19 17:06:37 +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
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
maverickdgg efe8ba4f11 Added some editor camera controls 2022-10-19 10:32:52 +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
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
Kah Wei ceb4c6c4ca Added Range Attribute 2022-10-18 22:34:46 +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 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
Xiao Qi 013bb71325 Functions to retrieve mesh and texture data 2022-10-17 15:04:38 +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
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
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
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
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
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 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
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
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 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
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
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
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
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
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
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
XiaoQiDigipen 48413bdc1f
Merge pull request #75 from SHADE-DP/ProjectWarningDisables
Warning disables
2022-10-01 19:44:17 +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 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
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
Glence 0c78eca1bc added audiosystem back in
added a button for the audio
2022-10-01 15:09:26 +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
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
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
maverickdgg e4be5e0987 Added event manager include 2022-09-30 20:34:46 +08:00
maverickdgg 2d07fb0afc Added component added and removed events 2022-09-30 20:25:26 +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
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
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
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
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
Glence a96ef67ec4 change engine premake to copy fmod lib over 2022-09-28 18:53:53 +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