Commit Graph

1597 Commits

Author SHA1 Message Date
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
XiaoQiDigipen 3c7346885f
Merge pull request #236 from SHADE-DP/SP3-6-c-scripting
Added GameObject.Null and Enabling/Disabling of Scripts
2022-11-21 20:21:48 +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 819607925f Added GameObject.Null for setting GameObjects to null. 2022-11-21 15:41:15 +08:00
XiaoQiDigipen fdaa9984da
Merge pull request #235 from SHADE-DP/SP3-6-c-scripting
Disabled xmldoc generation warnings for SHADE projects
2022-11-21 12:15:55 +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
Glence 293cc586d1 aiming is done in player 2022-11-21 00:12:09 +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
XiaoQiDigipen 9553c19b80
Merge pull request #233 from SHADE-DP/SP3-2-Physics
Added Collision Tags
2022-11-20 22:40:53 +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
Glence 8107c92754 Merge branch 'main' into PlayerController 2022-11-20 16:53:12 +08:00
Glence 875657cfde added playerstate scripts
added sub folders for player
remove unneeded scripts
2022-11-20 16:27:39 +08:00
Brandon Mak 85f0b67f67 Merge branch 'main' into SP3-1-Rendering 2022-11-20 15:44:31 +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
XiaoQiDigipen 2a74690e16
Merge pull request #230 from SHADE-DP/SP3-1-VertexSwitch
Vertex shader can now be modified in the material inspector
2022-11-20 15:33:55 +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 c566d065c8 Merge remote-tracking branch 'origin/UI_Integration' into UI_Integration 2022-11-20 01:45:27 +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 6bb27414e2 Added UI Component check in SHBatch
- UI Component shader changes
2022-11-20 01:38:26 +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
XiaoQiDigipen 61acbdc34e
Merge pull request #229 from SHADE-DP/Fix-BatchCrash
Re-aded ability to change shaders
2022-11-19 18:49:48 +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
Diren D Bharwani b1179d02c2 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-19 17:38:18 +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 06e8ee6b2d
Merge pull request #227 from SHADE-DP/SP3-6-c-scripting
Fixed premake bug where project configuration tag was missing for SHADE_CSharp
2022-11-19 16:25:32 +08:00