Diren D Bharwani
fe1b9d14f5
Partial implementation of syncing SHADE and ReactPhysics active states
2022-11-14 00:25:24 +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
Kah Wei
8670b419d0
Merge branch 'main' into SP3-6-c-scripting
2022-11-10 22:25:58 +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
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