xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity
1,793 Commits 81 Branches 9 Tags 86 MiB
Commit Graph

1180 Commits

Author SHA1 Message Date
Diren D Bharwani c18d58cba3 Fixed various physics bugs 
Fixed bug where world was prebuilt and entity IDs were wrongly synced
Fixed collider properties not being synced in the first frame during mass property computations
Fixed static objects being wrongly updated post world update
 2022-11-22 19:26:17 +08:00
Kah Wei 9964d5dfce Fixed missing comments for SHEditorUI 2022-11-22 18:17:24 +08:00
Kah Wei 1bd19b90a8 Merge branch 'main' into SP3-6-c-scripting 2022-11-22 18:11:17 +08:00
Kah Wei 4478b6db62 Added editor support for FontAsset, MeshAsset and MaterialAsset. 2022-11-22 17:48:01 +08:00
Kah Wei 7d692061fb Reworked how Materials are handled on C# 2022-11-22 17:23:50 +08:00
Kah Wei 719d29dec3 Renamed Mesh and Font structs in Managed to MeshAsset and FontAsset and reworked them to be a abstraction for asset IDs 2022-11-22 16:51:07 +08:00
Glence 71e8ba6044 doing up the main menu 2022-11-22 16:18:16 +08:00
Kah Wei a78b3c0123 Reworked NativeAsset system 2022-11-22 15:52:55 +08:00
Xiao Qi 681e7f3506 Added invalid Asset ID Macro 2022-11-22 14:26:10 +08:00
maverickdgg 5d04149797 buttons WIP 2022-11-22 14:02:45 +08:00
Xiao Qi 5024956c04 Merge branch 'main' into SP3-13-Assets-Manager 2022-11-22 13:54:40 +08:00
maverickdgg cf10724f3a Update SHSerialization.cpp 2022-11-22 13:17:45 +08:00
maverickdgg 3e4ebaab7b Merge branch 'main' into SP3-20-UI-System 2022-11-22 13:16:04 +08:00
maverickdgg 080c2c70d5 Added canvas to serialization 2022-11-22 13:09:40 +08:00
XiaoQiDigipen 437cb075d3
Merge pull request #242 from SHADE-DP/SP3-141-Camera-System 
FIxed major crashes caused by main camera retrieval and entity destroy
 2022-11-22 12:55:17 +08:00
maverickdgg 858e200fb3 Bug fixes 2022-11-22 11:32:19 +08:00
Brandon Mak cf0b94e97d Merge branch 'main' into SP3-1-Rendering 2022-11-22 10:50:04 +08:00
Brandon Mak dfe86ce7db Fixed resizing bug 2022-11-22 10:43:59 +08:00
Brandon Mak 4377972315 Added functionality for graphics system to render to swapchain image 
- Added functionality for graphics system to render to swapchain image when SHEDITOR is disabled. This is done via rendering a simple quad on screen and using an input attachment as a texture to the shader.
 2022-11-22 10:10:26 +08:00
Brandon Mak 964b375ccd Write to swapchain image without SHEDITOR defined WIP 2022-11-22 09:05:56 +08:00
Diren D Bharwani 23bae3d515 Fixed bug with Bounciness failing to serialise 2022-11-22 00:46:32 +08:00
Diren D Bharwani f1ac689bb0 Added Physics Materials to Inspector 2022-11-22 00:37:09 +08:00
Kah Wei af2ad6cc80 Merge branch 'main' into SP3-6-c-scripting 2022-11-21 20:59:08 +08:00
Kah Wei 4172362790 Renamed SHTextRenderer to SHTextRenderable 2022-11-21 20:35:31 +08:00
Brandon Mak cd6edeeee4 Merge branch 'main' into SP3-1-Rendering 2022-11-21 20:29:10 +08:00
XiaoQiDigipen 6d8fba8e05
Merge pull request #238 from SHADE-DP/Fix-BatchPersistence 
Fixed ghosts of a renderable being rendered when a material is changed
 2022-11-21 20:27:48 +08:00
Xiao Qi 1ed0181c9e Reverted premake changes 2022-11-21 20:27:38 +08:00
XiaoQiDigipen 81043a5927
Merge pull request #237 from SHADE-DP/SP3-2-Physics 
Added more debug drawing & Fixed Physics running without SHEDITOR
 2022-11-21 20:24:05 +08:00
Kah Wei 9cc008eaf4 Fixed ghosts of a renderable being rendered when a material is changed 2022-11-21 20:21:08 +08:00
Diren D Bharwani 3baedd8ffa Merge branch 'main' into SP3-2-Physics 2022-11-21 20:15:58 +08:00
Diren D Bharwani 1d692d3301 Physics works without SHEDITOR defines. Mass is temporarily auto computed. 2022-11-21 19:59:32 +08:00
Kah Wei e3c573baa7 Added support for enabling and disabling scripts 
OnEnable and OnDisable are not called on GameObject active toggling for now but will be added in future
 2022-11-21 17:16:16 +08:00
Kah Wei 0a9dea1c83 Disabled xmldoc generation warnings for SHADE projects 2022-11-21 12:14:07 +08:00
Brandon Mak 485b60c6d8 Added debug check in SHGraphicsSystem to compile assets only in debug 2022-11-21 00:39:13 +08:00
Xiao Qi 1666a0113b Removed test lines for shader compile in graphics system 2022-11-21 00:29:46 +08:00
XiaoQiDigipen e10c1f518f
Merge pull request #234 from SHADE-DP/SP3-1-Rendering 
Implemented serialization and editor inspector display for text renderer component
 2022-11-20 22:41:06 +08:00
Brandon Mak 5d3603ac7d Text Renderer Component serialization 2022-11-20 22:24:24 +08:00
Diren D Bharwani d4ad60ea79 Fix compile error with collision tags 2022-11-20 20:12:20 +08:00
Brandon Mak c686954c77 Implemented Text Rendering 
- The Text Renderer Component serialization and reflection onto inspector is not in yet, but there is basic functionality.
- Updated shaders
- Topology for text rendering is changed to triangle fan. Front facing for primitives is clockwise. Vertex state has both the positionOffset and glyphIndex attribute set as instanced.
-  Freetype instance is now initialized in InitBoilerplate
- SHCamera no longer calling SetPerspective/Ortho inside HandleResize
- Font Geometry is now loaded in SHFontLoader into SHFontAsset fontGeometry variable.
 2022-11-20 19:03:12 +08:00
Diren D Bharwani cada3acb8a Collision tags should be referenced by pointers 2022-11-20 18:30:18 +08:00
Diren D Bharwani 5871f32547 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-20 17:23:38 +08:00
Diren D Bharwani 4ebc16564a Added collision matrix for configurating individual collision tags 2022-11-20 17:23:28 +08:00
XiaoQiDigipen 788ba22e0a
Merge pull request #232 from SHADE-DP/UI_Integration 
Added UI functionality to the Graphics System
 2022-11-20 15:43:34 +08:00
XiaoQiDigipen a355d9911a
Merge pull request #231 from SHADE-DP/SP3-4-Editor 
Fix not being able to disable/enable Rigidbody freeze rotation through editor inspector panel
 2022-11-20 15:36:02 +08:00
Diren D Bharwani 4198310b7a Missing implementation for updating all tag names through the physics system 2022-11-20 15:34:34 +08:00
Diren D Bharwani a0f4f3b00a Added collision tag names file 2022-11-20 15:32:33 +08:00
Sri Sham Haran 2b41394a74 Fix not being able to disable/enable Rigidbody freeze rotation through editor inspector panel 2022-11-20 15:30:14 +08:00
Diren D Bharwani 7226ccf279 Tested Collision Tags 2022-11-20 03:16:49 +08:00
Diren D Bharwani b8530dfc89 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-20 02:35:12 +08:00
Diren D Bharwani 62433d1a53 Added Collision Tags 2022-11-20 02:35:02 +08:00
Brandon Mak 575132c4bb Added UI Component check in SHBatch 
- UI Component shader changes
- Fixed picking issue
 2022-11-20 01:45:14 +08:00
Brandon Mak b323735ba8 Merge remote-tracking branch 'origin/SP3-1-VertexSwitch' into UI_Integration 2022-11-19 23:27:06 +08:00
Kah Wei a988c45d52 Vertex shader can now be modified in the material inspector 2022-11-19 23:22:54 +08:00
Brandon Mak d55adcdfe4 Merge remote-tracking branch 'origin/main' into UI_Integration 2022-11-19 22:08:16 +08:00
Brandon Mak 6d1f30e05b Merge branch 'SP3-1-Rendering' into UI_Integration 2022-11-19 21:45:21 +08:00
Brandon Mak 223276dd87 Created partial functionality to render a texture to swapchain image 2022-11-19 21:44:41 +08:00
Xiao Qi 5fb51511f6 Merge branch 'main' into SP3-13-Assets-Manager 2022-11-19 19:59:24 +08:00
Kah Wei 92b1c6676b Merge branch 'main' into Fix-BatchCrash 2022-11-19 18:26:37 +08:00
Kah Wei b2dc440d03 Fixed bug where moving objects stopped moving after chanigng their material's shader 2022-11-19 18:26:11 +08:00
Kah Wei 58e6a3c4c2 Re-aded ability to change shaders 
Bugged, replacing shaders results in object being rendered in the old position
 2022-11-19 17:30:48 +08:00
XiaoQiDigipen bd3b643c19
Merge pull request #228 from SHADE-DP/Fix-BatchCrash 
Fixed crash caused when loading more than one graphics pipeline
 2022-11-19 16:26:37 +08:00
XiaoQiDigipen 51d663ab14
Merge pull request #226 from SHADE-DP/SP3-2-Physics 
Added in Raycasting through Physics
 2022-11-19 16:24:50 +08:00
Kah Wei f3a44d2ead Fixed crash caused when loading more than one graphics pipeline 2022-11-19 16:11:07 +08:00
Diren D Bharwani 6ad05d306f Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-19 04:21:58 +08:00
Diren D Bharwani 411c4a4e56 Added C# Interface for Raycasting 
Untested with Scripts, tested engine side.
 2022-11-19 04:21:46 +08:00
Brandon Mak 798803cf81 UI WIP 2022-11-18 22:03:21 +08:00
Kah Wei 27413c380e Renderables now no longer render if disabled 2022-11-18 21:59:18 +08:00
Kah Wei 5ec8475842 Merge branch 'main' into SP3-1-RenderOnlyActive 2022-11-18 21:34:28 +08:00
Diren D Bharwani a4e5a1c269 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-18 18:31:38 +08:00
Diren D Bharwani 6b5b0387a9 Fixed bug where pausing then playing crashes physics 2022-11-18 18:31:07 +08:00
Diren D Bharwani 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
Glence a77740db51 Merge branch 'main' into PlayerController 2022-11-18 17:16:04 +08:00
Glence 0551b1fb8a added the new banks 
added onplay/onpause/onstop for audiosytem
 2022-11-18 17:04:06 +08:00
Brandon Mak 09249cf9e8 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-11-18 16:48:09 +08:00
maverickdgg a181d7b896 Added Canvas and UI to editor 2022-11-18 16:37:33 +08:00
Brandon Mak 03ce142137 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-11-18 16:37:06 +08:00
Brandon Mak 66f33554a3 Tested adding text component to entities 2022-11-18 16:35:49 +08:00
maverickdgg 36a1a1c696 Merge branch 'main' into SP3-20-UI-System 2022-11-18 12:24:24 +08:00
maverickdgg 0b5ec34b00 Merge branch 'main' into SP3-141-Camera-System 2022-11-18 09:38:52 +08:00
maverickdgg 9ac1c01008 Merge branch 'main' into SP3-20-UI-System 2022-11-18 09:38:42 +08:00
maverickdgg d997cd4da6 Added canvas ID to UI Component 2022-11-18 09:38:31 +08:00
XiaoQiDigipen 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
Kah Wei e8bd33ec9e Scripts are now always built on engine launch 2022-11-17 17:36:35 +08:00
XiaoQiDigipen 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
XiaoQiDigipen e31f868257
Merge pull request #217 from SHADE-DP/SP3-2-Physics 
Fixed various Physics bugs
 2022-11-17 17:13:01 +08:00
Kah Wei 6efbea54e1 Fixed issue where scripts of Entities destroyed during scene unloading are not properly disposed 2022-11-17 15:43:35 +08:00
Sri Sham Haran 920e977232 Merge branch 'main' into SP3-4-Editor 2022-11-17 13:34:34 +08:00
Sri Sham Haran e170a5fca8 Added controls to editor viewport menu bar to adjust movement speed and turn speed for editor camera 2022-11-17 13:33:22 +08:00
Diren D Bharwani b3fbfce56f FIxed debug draw for offset colliders 2022-11-17 12:58:01 +08:00
Diren D Bharwani 360c55fa2b Disabled automass on rigid bodies 2022-11-17 12:27:00 +08:00
Diren D Bharwani 18218443ec Fixed a bug 2022-11-17 12:20:28 +08:00
Diren D Bharwani c967f9355f Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-17 10:42:53 +08:00
Diren D Bharwani 7288894507 Fixed bug where adding colliders would fail to maintain previous collider sizes 2022-11-17 10:42:45 +08:00
maverickdgg ad30f150d1 UI component and UI System prep 2022-11-17 07:12:38 +08:00
maverickdgg 0bb97413ef Added Canvas and UI Components 2022-11-17 05:39:55 +08:00
maverickdgg 7d71390d43 separated ortho and proj matrix in camera comp 2022-11-17 05:29:11 +08:00
maverickdgg 6b80a4baa9 Merge branch 'main' into SP3-141-Camera-System 2022-11-17 04:56:04 +08:00
maverickdgg c80a819b6e Guard Find entity by name function 2022-11-17 04:55:46 +08:00
Diren D Bharwani 8f9fedff41 Added sleeping debug info to Rigidbody Inspector 2022-11-17 01:39:05 +08:00
Diren D Bharwani 503f32c3a6 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-17 00:21:18 +08:00
Diren D Bharwani 39a8ca131f Fixed Collision & Trigger Messages not being cleared on deactivating objects 2022-11-17 00:11:55 +08:00
Kah Wei b129a68680 Disabled setting of shader for now as it is buggy 2022-11-16 23:19:25 +08:00
Kah Wei 19bc90845f Added additional checks for SetProperty() of Material and MaterialInstance 2022-11-16 21:01:51 +08:00
Kah Wei 8869b42db2 Fixed memory corruption in SHSubpass 2022-11-16 21:00:27 +08:00
Kah Wei fe91f58d28 Fixed material inspector saving not saving the correct texture ID into the runtime material 2022-11-16 19:25:17 +08:00
Kah Wei c5bca4111b Fixed validation error caused by deleting empty batches 2022-11-16 19:23:26 +08:00
Kah Wei f0c09817ce EnsureBufferAndCopy utility functions now avoid resizes if new size is smaller or equal 2022-11-16 17:49:11 +08:00
Kah Wei 29b4465dfd Split pre-rendering tasks to a PrepareRenderRoutine 2022-11-16 17:48:15 +08:00
Sri Sham Haran edd44604f1 Merge branch 'main' into SP3-4-Editor 2022-11-16 17:47:36 +08:00
Sri Sham Haran 37e845336b Fix line draws for asset browser 2022-11-16 17:46:48 +08:00
Kah Wei 506b8836fe Materials now keep track of their modified state and associated MaterialInstances keep track of changes to their base 2022-11-16 17:46:36 +08:00
Sri Sham Haran 1bd7183231 Added validation for Renderable drag drop fields 2022-11-16 17:30:19 +08:00
Brandon Mak f991e7b227 Fixed some text shaders and changed some image parameters 
- SHApplication has a font compiler exe call to test compiling a sample font
- SHVkImage now takes in a vector instead of a span for mip offsets (fuck it, copy the mip offset. The RAM can cry about it).
- Removed font data descriptor set layouts from graphics global data
- FONT_DATA set index is changed to 4 instead. This clashes with Render graph resource set index but it won't matter. 
- Added entity ID render graph resource to scene render graph
- SHFont format for images is now R8G8B8A8UNorm
 2022-11-16 16:57:08 +08:00
Kah Wei 760c0386a9 Merge branch 'SP3-1-MaterialUpdate' into SP3-1-MaterialEditSupport 
# Conflicts:
#	SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHMaterial.h
 2022-11-16 16:45:22 +08:00
Kah Wei db7c4a6d38 Merge branch 'main' into SP3-1-MaterialUpdate 2022-11-16 16:40:15 +08:00
Kah Wei acae84d12c Fixed bug where creation of custom material instance for Renderables are not updated on the GPU 2022-11-16 16:38:04 +08:00
Kah Wei 3e3a66f261 Fixed memory corruption issue caused by SHMaterialInstance::SetMaterial() 2022-11-16 16:32:12 +08:00
XiaoQiDigipen 690ebef77d
Merge pull request #213 from SHADE-DP/SP3-4-Editor 
Added Custom RigidBody Component View in Editor
 2022-11-16 15:33:38 +08:00
Kah Wei 3a6f1f852b SHMaterialInstance::GetProperty() will now retrieve a property from the base material if it was not overriden 2022-11-16 15:29:11 +08:00
Sri Sham Haran ba39c02f9f Changed formatting slightly for RigidBody component view 2022-11-16 15:28:42 +08:00
Kah Wei dc9291bc01 Added Audio class for playing audio from C# 2022-11-16 15:00:56 +08:00
Kah Wei 3affaf426d WIP Runtime Material Editing support 2022-11-16 09:06:29 +08:00
Diren D Bharwani a9f77d666c Fixed compile error 2022-11-16 00:04:56 +08:00
Diren D Bharwani f172ccb744 Added Automass and Sleep check for Rigidbodies 2022-11-15 23:58:08 +08:00
Sri Sham Haran 37aad49406 Added requested rigidbody component view with debug information 
Changed DragVec controls to not push commands if ImGuiSliderFlags_ReadOnly is enabled
 2022-11-15 21:09:24 +08:00
Brandon Mak 292fdf4ee2 Fixed some bugs but SHFont constructor still breaks 
the vkImage is not loading correctly
 2022-11-15 20:40:43 +08:00
Diren D Bharwani a3d2f95aa0 Merge remote-tracking branch 'origin/main' into SP3-16-Math 2022-11-15 18:41:16 +08:00
Brandon Mak b6bae850bf Merge remote-tracking branch 'origin/main' into FontIntegration 2022-11-15 18:25:40 +08:00
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