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

1199 Commits

Author SHA1 Message Date
Brandon Mak 25841c6899 Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering 2022-11-11 02:40:14 +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 71619d0159 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.
 2022-11-11 02:38:05 +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
Brandon Mak 9d367a359a Text Rendering WIP 2022-11-10 16:59:26 +08:00
Brandon Mak be6a11c629 Text Rendering WIP 2022-11-10 08:28:44 +08:00
Brandon Mak 67f7d0ea2e Text Rendering WIP 2022-11-10 00:19:38 +08:00
Brandon Mak 572700fbb3 Text Rendering WIP 2022-11-08 10:57:07 +08:00
Brandon Mak 1165b9fa47 Text Rendering WIP 2022-11-07 19:38:08 +08:00
Brandon Mak 6a6785d296 Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering 2022-11-07 11:11:56 +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
Brandon Mak 1eb6bc5ef2 Merge branch 'main' into SP3-1-Rendering 2022-11-05 21:48:31 +08:00
XiaoQiDigipen 7e1a909709
Merge pull request #179 from SHADE-DP/FixesForMs2Submission 
small fixes for ms2 submission - delete this branch
 2022-11-05 18:18:40 +08:00
Sri Sham Haran de38b29f25 small fixes for ms2 submission 2022-11-05 18:15:18 +08:00
XiaoQiDigipen 5506d14f84
Merge pull request #178 from SHADE-DP/PlayerController 
made rb a properties
 2022-11-05 17:46:16 +08:00
Glence b9996c7b51 made rb a properties 2022-11-05 17:44:34 +08:00
XiaoQiDigipen a5c0456eb7
Merge pull request #177 from SHADE-DP/SP3-6-c-scripting 
Scenes are now reloaded and scripts are no longer lost when building scripts
 2022-11-05 15:36:05 +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
Brandon Mak 09f1b152e8 Merge branch 'main' into SP3-1-Rendering 2022-11-05 15:10:50 +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
Xiao Qi 81d94c0a29 Merge remote-tracking branch 'origin/main' into main 2022-11-05 00:13:29 +08:00
Xiao Qi 7bfe459c02 Called assimp git pull from root bat directly instead of calling bat inside dependency 2022-11-05 00:13:24 +08:00
Kah Wei 40422a6d23 Added built-in primitives 2022-11-05 00:10:54 +08:00
XiaoQiDigipen 841a73b712
Merge pull request #175 from SHADE-DP/SP3-4-Editor 
Asset browser now recurses down subassets
 2022-11-04 23:35:41 +08:00
Sri Sham Haran ab17d57756 Asset browser now recurses down subassets 2022-11-04 23:32:29 +08:00
XiaoQiDigipen 740c144565
Merge pull request #174 from SHADE-DP/SP3-305-configurationsMerge 
Scenes now load from file based on application config starting scene id
Added application config
Load starting scene from application config
Pressing play saves the scene
Pressing stop reloads the scene
 2022-11-04 19:21:42 +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
XiaoQiDigipen 378e4a67ce
Merge pull request #173 from SHADE-DP/SP3-13-Assets-Manager 
Support for External Model Compiler and Model/Mesh sub assets
Compiling of external files (.gltf, .fbx) done by externally built exe
Models recognised as whole assets, contained meshes recognises and individual assets as well but saved into one file
Structured control paths for assets with and without sub assets for loading
 2022-11-04 17:53:04 +08:00
Xiao Qi f2b589071c Merge branch 'main' into SP3-13-Assets-Manager 2022-11-04 17:49:43 +08:00
XiaoQiDigipen 6ad6db7997
Merge pull request #172 from SHADE-DP/PlayerController 
additional changes for player controller
added itemweight to affect player jump
small bug fix to player throw
player caught will now reset its location
 2022-11-04 17:49:25 +08:00
Xiao Qi 6d0089ee12 Merge branch 'main' into SP3-13-Assets-Manager 2022-11-04 17:49:13 +08:00
Glence be16fbed19 added item script in the scene 2022-11-04 17:35:09 +08:00
Glence d6804c09f4 fixed player throwing 
added item script 
player jump is now affected by item weight
 2022-11-04 17:31:53 +08:00
Xiao Qi 9ef956029e Changed name check for hardcoded racoon mesh 2022-11-04 17:20:52 +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
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
XiaoQiDigipen 3b90c84a85
Merge pull request #171 from SHADE-DP/SP3-4-Editor 
Fix drag-drop parenting issue
Users can now drop onto empty space in hierarchy panel to unparent
 2022-11-04 16:11:38 +08:00
XiaoQiDigipen c7f6ded5ae
Merge pull request #170 from SHADE-DP/Fix-MultiplyShader 
Switched shaders to use multiply colour instead of additive
 2022-11-04 16:11:12 +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
Kah Wei eea35600d3 Switched shaders to use multiply colour instead of additive 2022-11-04 14:04:59 +08:00
XiaoQiDigipen 74b9882024
Merge pull request #169 from SHADE-DP/ScriptingAI 
AI Capture Mechanic
AI will set player's state to 'CAUGHT' if close enough. This threshold distance can be set in the editor.
 2022-11-04 10:34:50 +08:00