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

618 Commits

Author SHA1 Message Date
Glence 152007e810 adding audio for the rest of the level 
setting player position so it doesnt fall through the floor
 2022-11-23 16:57:32 +08:00
Glence 33bab64f12 Merge branch 'main' into PlayerController 2022-11-23 14:00:28 +08:00
XiaoQiDigipen 6d2591331b
Merge pull request #257 from SHADE-DP/SP3-6-c-scripting 
Fixed bug where rendering inspectors for scripts that contain uninitialized List<T>s causes crashes
 2022-11-23 13:49:42 +08:00
Glence 5356cd0800 added item model and setting the main game scene 2022-11-23 13:44:03 +08:00
Xiao Qi 8ad46afc22 Removed spaces from UI Test scene to stop regenerating of asset meta 2022-11-23 13:06:50 +08:00
Xiao Qi 0edd2f24e3 Added VS and FS shaders to tile singular textures 
Added shader stage flag bit for vertex shaders
 2022-11-23 13:02:33 +08:00
Kah Wei 67db744856 Uninitialized List<> will no longer cause crashes with the script inspector 2022-11-23 10:08:48 +08:00
Glence 4cacbb3300 adding main/lose/win scene 2022-11-23 00:44:27 +08:00
Glence 332d0a846d Merge branch 'main' into PlayerController 2022-11-22 22:13:52 +08:00
maverickdgg 7c36886669 Fix for Canvas scaler 2022-11-22 21:03:53 +08:00
maverickdgg 142f025692 Added check for editor camera. 2022-11-22 20:54:16 +08:00
Diren D Bharwani 053c3e04fd Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-22 19:26:47 +08:00
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 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
Glence c91897f46a made changescene a public in sceneManager.hxx 
added a main menu scene 
added some new texture
 2022-11-22 17:28:48 +08:00
Glence f1c7f42e13 Merge branch 'main' into PlayerController 2022-11-22 16:21:28 +08:00
Glence 71e8ba6044 doing up the main menu 2022-11-22 16:18:16 +08:00
XiaoQiDigipen 1ca216801f
Merge pull request #245 from SHADE-DP/SP3-1-Rendering 
Updated SSAO shader
 2022-11-22 16:01:11 +08:00
Brandon Mak 780c716199 Updated SSAO shader 2022-11-22 16:00:05 +08:00
Glence 81d44e6c59 small changes to the scene 2022-11-22 14:59:46 +08:00
Glence 219d5025f3 adding in the env and world 2022-11-22 14:14:55 +08:00
Xiao Qi 3b6d1c815d Merge branch 'main' into SP3-17-animation-system 2022-11-22 13:55:17 +08:00
Glence 6c4ec7c807 Merge branch 'main' into PlayerController 2022-11-22 13:44:27 +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 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
Glence 56e7f73bbb adding var audios into scripting 2022-11-21 21:01:44 +08:00
Kah Wei 1ff8c9715d Merge branch 'main' into SP3-17-animation-system 2022-11-21 12:15:57 +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
Brandon Mak 5d3603ac7d Text Renderer Component serialization 2022-11-20 22:24:24 +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 5871f32547 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-20 17:23:38 +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
Diren D Bharwani a0f4f3b00a Added collision tag names file 2022-11-20 15:32:33 +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
Kah Wei 841948b82c Added support for Bone Weights and Bone Indices vertex attributes for meshes 2022-11-20 01:33:55 +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
Brandon Mak 798803cf81 UI WIP 2022-11-18 22:03:21 +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 03ce142137 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-11-18 16:37:06 +08:00
Glence 7d2435131f added game manager along with scoring zones for item to be thrown in 2022-11-17 12:54:08 +08:00
Glence e4f23dc6c3 added a game manager along with some player controller changes 2022-11-17 00:23:38 +08:00
Glence df9cb11446 add to vel instead of setting it 2022-11-16 22:28:08 +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 3affaf426d WIP Runtime Material Editing support 2022-11-16 09:06:29 +08:00
Glence 3f3770f74f now hard sets the vel instead of adding force 2022-11-15 18:52:46 +08:00
Xiao Qi 96cb832e81 Font meta file and line in application to manually trigger font load 2022-11-15 13:48:54 +08:00
Brandon Mak 4eb5fa64e0 Text Rendering WIP 2022-11-14 19:31:26 +08:00
Glence 37bbf22779 added changes 2022-11-14 19:05:48 +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
Glence 22da6e237d Merge branch 'main' into PlayerController 2022-11-14 16:17:03 +08:00
Brandon Mak ac17721363 Merge branch 'main' into SP3-1-Rendering 2022-11-14 15:38:33 +08:00
Glence bba85c3d1f removing the constructor for c# 2022-11-14 15:20:58 +08:00
Glence 04273620a6 Merge branch 'main' into PlayerController 2022-11-14 15:03:04 +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
Glence d9beeda7e0 adding the base for fsm for player 2022-11-13 21:56:28 +08:00
Xiao Qi e3d2515740 Modular house part asset test 2022-11-13 20:49:31 +08:00
Xiao Qi d0bcd4869f Removed unused raw asset files 2022-11-13 20:19:26 +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 c953931f4f Merge branch 'main' into SP3-2-Physics 2022-11-13 17:57:30 +08:00
Sri Sham Haran eed950f26f Merge branch 'main' into SP3-4-Editor 2022-11-13 17:26:56 +08:00
Sri Sham Haran b1c004771c Gave the damn entities names cuz i was going crazy 2022-11-13 17:26:35 +08:00
Kah Wei 4dc8527395 Reworked scripts to no longer need definition of constructors 2022-11-13 16:29:25 +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
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
Kah Wei 24dcd77f32 Added tooltip and range attribute support for lists in scripts 2022-11-12 12:17:11 +08:00
Kah Wei 4c01d68f95 Added list editor tests 2022-11-12 02:33:12 +08:00
Glence fbec2bf866 Auto stash before merge of "main" and "origin/main" 2022-11-11 14:17:47 +08:00
Glence 4f9015995c Merge branch 'main' into PlayerController 2022-11-11 09:21:36 +08:00
Kah Wei 8670b419d0 Merge branch 'main' into SP3-6-c-scripting 2022-11-10 22:25:58 +08:00
Brandon Mak 9d367a359a Text Rendering WIP 2022-11-10 16:59:26 +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
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
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 f8417f6116 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-08 15:22:28 +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
Sri Sham Haran de38b29f25 small fixes for ms2 submission 2022-11-05 18:15:18 +08:00
Sri Sham Haran ab17d57756 Asset browser now recurses down subassets 2022-11-04 23:32:29 +08:00
Sri Sham Haran b30da7e495 Fixes 2022-11-04 19:16:32 +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 04113a0480 Shifted assets and generated new assets 2022-11-04 17:17:24 +08:00
Xiao Qi 4eecc0c08d Removed old mesh and meta files 2022-11-04 16:23:13 +08:00
Sri Sham Haran 4ee0294977 Scene loads correctly now 2022-11-04 14:44:18 +08:00
Kah Wei eea35600d3 Switched shaders to use multiply colour instead of additive 2022-11-04 14:04:59 +08:00
Glence 5fe10ce8d1 Changes to main for presentation 
Change TestCube_FS.glsl
Change debugdraw Key input to F10
TestScene changes
AI waypoint changed
playercontroller camera axis change
 2022-11-03 01:50:02 +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
Brandon Mak ebc94225e7 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-11-02 17:04:31 +08:00
Brandon Mak 73be299aae new SHMETA 2022-11-02 15:05:34 +08:00
Brandon Mak eb569a4263 Shader updates 2022-11-02 14:21:27 +08:00
Brandon Mak b0d08d27fd SSAO is fully implemented 2022-11-01 20:10:59 +08:00
Brandon Mak 78545889da SHSHSHAO 2022-11-01 12:47:50 +08:00
Brandon Mak 53fc1fce95 WIP 2022-11-01 12:10:15 +08:00
Brandon Mak 5852c409e6 SSAO WIP 2022-11-01 11:57:08 +08:00
Brandon Mak 54a36e1476 SSAO WIP 2022-11-01 02:32:14 +08:00
Brandon Mak 53b9c8f746 SSAO WIP 2022-10-31 23:28:46 +08:00
Brandon Mak 441207260b shmeta 2022-10-31 20:49:49 +08:00
Brandon Mak 2bd3b45ba0 SSAO sort of working 2022-10-31 20:49:28 +08:00
Kah Wei 797f4bfd75 Fixed shader changes 2022-10-31 17:35:52 +08:00
Brandon Mak 94a57219da Created CPU and GPU data for SSAO 
Renderpass for SSAO not yet done (that's next)
 2022-10-31 10:32:32 +08:00
Brandon Mak 647182241e Fixed a buy with view space lighting calculations 2022-10-30 19:21:02 +08:00
Kah Wei b1a933a2c3 Merge branch 'main' into SP3-1-SerialisedRenderable 
# Conflicts:
#	Assets/Shaders/TestCube_FS.shshaderb
#	Assets/Shaders/TestCube_VS.shshaderb
#	SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
 2022-10-30 17:14:28 +08:00
Brandon Mak 39b5ac0774 LIGHTING NOW DONE IN VIEW SPACE 2022-10-30 16:52:40 +08:00
Brandon Mak 4711a131eb Shifted the lighting system run outside the viewport loop. 
- Since lighting is only calculated in the world render graph for now, this will do just fine
- Renderer takes in a view and projection matrix and does the transpose of the multiplication in the renderer
 2022-10-30 16:35:55 +08:00
Brandon Mak b46b6b0b85 CompileAll uncommented and asset manager metadata writes commented 
SHmeta files should now be identical to what's on main
Shaders themselves have some changes (binaries also updated)
 2022-10-30 00:25:49 +08:00
Brandon Mak 5db9299699 Reverted back to old asset IDs 2022-10-30 00:07:02 +08:00
Brandon Mak 7c5a24b8e1 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-10-30 00:00:17 +08:00
Kah Wei e4394b6170 Generalised SHResourceManager 2022-10-28 21:32:05 +08:00
Sri Sham Haran fa6e3cf1df Light Component Serialization & Inspector 2022-10-28 17:58:16 +08:00
Brandon Mak 0cab0107b2 Fixed minimizing by resetting command pools and fences 2022-10-27 19:37:05 +08:00
Xiao Qi b5a1d5ea88 SP3-282 Restructured loaders and compilers 
Completed shader compiling and loading
 2022-10-27 12:54:58 +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
Sri Sham Haran 7c0bcd8a3e
Delete UserLayout.ini 
@Xenosas1337 stop pushing this please
 2022-10-26 16:09:54 +08:00
Brandon Mak 43ea33cabf Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-10-26 15:26:41 +08:00
Brandon Mak 5016600397 Lights WIP 2022-10-25 23:39:35 +08:00
Sri Sham Haran 534aeba06b Latest Default Layout 2022-10-25 20:59:32 +08:00
Brandon Mak 8fb0eddcc1 Lights WIP 2022-10-25 00:00:22 +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 4019b4914c Merge branch 'main' into SP3-13-Assets-Manager 2022-10-23 17:08:37 +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 d4fe63722a WIP (TODO: remember to change commit message) 2022-10-23 15:05:31 +08:00
Xiao Qi 459d9dd9fd Merge branch 'main' into SP3-13-Assets-Manager 2022-10-22 00:08:43 +08:00
Xiao Qi 44833d22c6 Merge branch 'main' into SP3-13-Assets-Manager 2022-10-21 20:52:28 +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
Brandon Mak c252e4ce4b Some restructuring with render graph storage. 
Lesser parameters passed around.
 2022-10-21 07:01:51 +08:00
maverickdgg 736d7b652b Added camera turning 2022-10-20 03:21:42 +08:00
Sri Sham Haran 6051b7ded5 Tfm gizmo wip 2022-10-19 20:42:38 +08:00
Brandon Mak 603470eeb6 Fixed some camera resizing issues 2022-10-19 17:06:37 +08:00
Brandon Mak d9136de134 Integrated Daniel's camera 
Still need to integrate camera directors
 2022-10-19 16:53:45 +08:00
Brandon Mak 284ee12205 Broken Camera 2022-10-19 15:32:07 +08:00
Sri Sham Haran 82637b620d
Delete UserLayout.ini 2022-10-18 19:36:49 +08:00
Sri Sham Haran da99a5559e Merge branch 'main' into RenderingEditorVPIntegration 2022-10-18 19:09:08 +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
Brandon Mak 033ba48304 Editor changes to support viewport integration 2022-10-18 15:04:25 +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
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
Brandon Mak 363e09bd55 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-09-28 20:39:42 +08:00
Glence 658562bdc4 Merge branch 'main' into SP3-129-AudioSystem 2022-09-28 17:51:40 +08:00
Glence bed6a144f8 banks curr working 2022-09-28 17:25:14 +08:00
Glence 7fcac5e0eb god knows whats diff but audio is sort of working ish 2022-09-27 23:57:11 +08:00
Brandon Mak 70940534e1 Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering 2022-09-27 20:07:29 +08:00
Brandon Mak b7adf8815b Fixed camera. Can see texture now 2022-09-27 19:18:45 +08:00
XiaoQiDigipen 4c23151a14
Merge pull request #57 from SHADE-DP/SP3-13-Assets-Manager 
SP3-13 Assets Management

Changed texture struct to contain pre processed information ready for buffer
 2022-09-27 14:27:28 +08:00
Glence ee7cb36896 added the banks for testing 2022-09-27 14:11:04 +08:00
Xiao Qi caab2c37ab Added GLTF extension recognisation 2022-09-26 19:10:12 +08:00
Sri Sham Haran de8c2ce630 Merge branch 'main' into SP3-4-editor_fix 2022-09-26 15:59:38 +08:00
Xiao Qi 99534c1613 SP3-103 SP3-104 Separated mesh and texture loading 
Added in lines in SBApplication to load racoon fbx and dds textures

Racoon shows up in renderdoc hehe
 2022-09-26 14:38:12 +08:00
Sri Sham Haran 335c19cfc7 Editor 2022-09-25 22:33:07 +08:00
Xiao Qi a0a57e7c29 Added test assets 
Test line to call asset manager temporary load
 2022-09-25 00:13:17 +08:00