4eecc0c08d
Removed old mesh and meta files
2022-11-04 16:23:13 +08:00
4ee0294977
Scene loads correctly now
2022-11-04 14:44:18 +08:00
eea35600d3
Switched shaders to use multiply colour instead of additive
2022-11-04 14:04:59 +08:00
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
86254a5bf3
Merge branch 'main' into SP3-4-Editor
2022-11-02 21:41:38 +08:00
e609b5634a
Material Inspector
...
Can set material
2022-11-02 21:31:27 +08:00
ebc94225e7
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-11-02 17:04:31 +08:00
73be299aae
new SHMETA
2022-11-02 15:05:34 +08:00
eb569a4263
Shader updates
2022-11-02 14:21:27 +08:00
b0d08d27fd
SSAO is fully implemented
2022-11-01 20:10:59 +08:00
78545889da
SHSHSHAO
2022-11-01 12:47:50 +08:00
53fc1fce95
WIP
2022-11-01 12:10:15 +08:00
5852c409e6
SSAO WIP
2022-11-01 11:57:08 +08:00
54a36e1476
SSAO WIP
2022-11-01 02:32:14 +08:00
53b9c8f746
SSAO WIP
2022-10-31 23:28:46 +08:00
441207260b
shmeta
2022-10-31 20:49:49 +08:00
2bd3b45ba0
SSAO sort of working
2022-10-31 20:49:28 +08:00
797f4bfd75
Fixed shader changes
2022-10-31 17:35:52 +08:00
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
647182241e
Fixed a buy with view space lighting calculations
2022-10-30 19:21:02 +08:00
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
39b5ac0774
LIGHTING NOW DONE IN VIEW SPACE
2022-10-30 16:52:40 +08:00
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
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
5db9299699
Reverted back to old asset IDs
2022-10-30 00:07:02 +08:00
7c5a24b8e1
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-30 00:00:17 +08:00
e4394b6170
Generalised SHResourceManager
2022-10-28 21:32:05 +08:00
fa6e3cf1df
Light Component Serialization & Inspector
2022-10-28 17:58:16 +08:00
0cab0107b2
Fixed minimizing by resetting command pools and fences
2022-10-27 19:37:05 +08:00
b5a1d5ea88
SP3-282 Restructured loaders and compilers
...
Completed shader compiling and loading
2022-10-27 12:54:58 +08:00
5154b579d7
Re-restructured compilers to be more self contained
...
Loaders only load internal binary asset files
2022-10-26 23:07:01 +08:00
7c0bcd8a3e
Delete UserLayout.ini
...
@Xenosas1337 stop pushing this please
2022-10-26 16:09:54 +08:00
43ea33cabf
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-26 15:26:41 +08:00
5016600397
Lights WIP
2022-10-25 23:39:35 +08:00
534aeba06b
Latest Default Layout
2022-10-25 20:59:32 +08:00
8fb0eddcc1
Lights WIP
2022-10-25 00:00:22 +08:00
26eb4ad18c
Fix command registrations and mouse pick polling when using transform gizmo
2022-10-24 16:18:18 +08:00
4019b4914c
Merge branch 'main' into SP3-13-Assets-Manager
2022-10-23 17:08:37 +08:00
982f2de286
Merge remote-tracking branch 'origin/main' into Rendering-Camera-Integration
2022-10-23 16:36:22 +08:00
d4fe63722a
WIP (TODO: remember to change commit message)
2022-10-23 15:05:31 +08:00
459d9dd9fd
Merge branch 'main' into SP3-13-Assets-Manager
2022-10-22 00:08:43 +08:00
44833d22c6
Merge branch 'main' into SP3-13-Assets-Manager
2022-10-21 20:52:28 +08:00
99a69b0020
tweaks + add new ui font
2022-10-21 20:45:03 +08:00
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
c252e4ce4b
Some restructuring with render graph storage.
...
Lesser parameters passed around.
2022-10-21 07:01:51 +08:00
736d7b652b
Added camera turning
2022-10-20 03:21:42 +08:00
6051b7ded5
Tfm gizmo wip
2022-10-19 20:42:38 +08:00
603470eeb6
Fixed some camera resizing issues
2022-10-19 17:06:37 +08:00
d9136de134
Integrated Daniel's camera
...
Still need to integrate camera directors
2022-10-19 16:53:45 +08:00
284ee12205
Broken Camera
2022-10-19 15:32:07 +08:00
82637b620d
Delete UserLayout.ini
2022-10-18 19:36:49 +08:00
da99a5559e
Merge branch 'main' into RenderingEditorVPIntegration
2022-10-18 19:09:08 +08:00
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
033ba48304
Editor changes to support viewport integration
2022-10-18 15:04:25 +08:00
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
c82d01631c
SP3-237 Texture load/compile successfully
2022-10-01 13:27:51 +08:00
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
363e09bd55
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-28 20:39:42 +08:00
658562bdc4
Merge branch 'main' into SP3-129-AudioSystem
2022-09-28 17:51:40 +08:00
bed6a144f8
banks curr working
2022-09-28 17:25:14 +08:00
7fcac5e0eb
god knows whats diff but audio is sort of working ish
2022-09-27 23:57:11 +08:00
70940534e1
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-27 20:07:29 +08:00
b7adf8815b
Fixed camera. Can see texture now
2022-09-27 19:18:45 +08:00
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
ee7cb36896
added the banks for testing
2022-09-27 14:11:04 +08:00
caab2c37ab
Added GLTF extension recognisation
2022-09-26 19:10:12 +08:00
de8c2ce630
Merge branch 'main' into SP3-4-editor_fix
2022-09-26 15:59:38 +08:00
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
335c19cfc7
Editor
2022-09-25 22:33:07 +08:00
a0a57e7c29
Added test assets
...
Test line to call asset manager temporary load
2022-09-25 00:13:17 +08:00
Xiao Qi