b30da7e495
Fixes
2022-11-04 19:16:32 +08:00
b86f092f52
Merge branch 'main' into SP3-305-configurationsMerge
2022-11-04 18:37:19 +08:00
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
6d0089ee12
Merge branch 'main' into SP3-13-Assets-Manager
2022-11-04 17:49:13 +08:00
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
6984653b64
Renamed and restructured model asset members
...
Added mesh asset vector for model asset to contain
2022-11-04 17:18:40 +08:00
608b204f88
Changed premake to copy model compiler exe
2022-11-04 17:17:48 +08:00
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
4ee0294977
Scene loads correctly now
2022-11-04 14:44:18 +08:00
544716547e
Added preprocessor check for debug to turn off renderdoc
2022-11-03 02:37:38 +08:00
f24346a6fd
Revert "TEMPORARY Push with all relative paths changed for building exe"
...
This reverts commit 0979ee93e6
2022-11-03 00:11:56 +08:00
0979ee93e6
TEMPORARY Push with all relative paths changed for building exe
2022-11-02 22:44:27 +08:00
02e9df4df7
Merge pull request #164 from SHADE-DP/SP3-10-input-management
...
Zero out arrays in input manager
Properly zero out arrays in input manager so that it works in Release Mode, where arrays are not zeroed-out to save time.
2022-11-02 22:35:57 +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
d1f624b2eb
Removed SHMeshData declaration/definition in graphics middle end
...
Renamed some data members in SHMeshData
Replaced calls and references to mesh data in Primitive Generator
2022-11-02 21:09:53 +08:00
2beae24924
Removed Original mesh compiler, rewriting mesh loader to reflect ModelCompiler format
2022-11-02 20:50:51 +08:00
c68c5adc0d
Added GetTextureHandle() to SHGraphicsSystem
2022-11-02 17:51:07 +08:00
4721a133e1
Added a way to retrieve texture handles from texture indices
2022-11-02 17:43:28 +08:00
4f70b543b2
Merge branch 'main' into PlayerController
2022-11-02 17:36:04 +08:00
fc56973645
added getright in camera.cxx/.hxx
...
PickandThrow is done
adjusted thirdPersonCamera and PlayerController to work with each other
2022-11-02 17:31:57 +08:00
976c220145
Deserialization of SHMaterialSpec will return an empty SHMaterialSpec on failure now instead
2022-11-02 17:19:18 +08:00
53397e884d
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-11-02 17:18:44 +08:00
ebc94225e7
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-11-02 17:04:31 +08:00
d207042fec
Reworked SHMaterialSpec and SHMaterial loading system
2022-11-02 16:56:38 +08:00
8495175bd8
Merge pull request #163 from SHADE-DP/SP3-2-Physics
...
SP3-2 Integrated some Debug Draw, Added Trigger checkbox
NEW
Debug Draw can be toggled for colliders. Hardcoded to space for now in Application until I have a menu to toggle it. (Feel free to change or remove it).
Trigger Checkbox added to Collider Inspector View
2022-11-02 16:31:26 +08:00
3175d4c3a4
Merge pull request #162 from SHADE-DP/SP3-1-DebugDraw2
...
Added editor gridlines and fixed SHDebugDraw::DrawPoly()
2022-11-02 16:30:53 +08:00
6ab6cc15a9
Zero out arrays for input manager
2022-11-02 16:14:26 +08:00
27526dfd92
Fixed relative size for sphere colliders
2022-11-02 16:12:47 +08:00
02c79b4cc4
Added Debug Drawing for Colliders (wonk) and Trigger checkbox to Colldiers
...
Press space to toggle debug draw. Does not work until you press play, then it can be toggled on and off.
2022-11-02 15:44:24 +08:00
d818adf2a2
Fixed DrawPoly()
2022-11-02 15:34:35 +08:00
f0ef9fc0cf
Fixed validation errors due to debug draw
2022-11-02 15:13:12 +08:00
93c684fbb1
Merge branch 'main' into SP3-6-c-scripting
2022-11-02 13:42:41 +08:00
82e0e4df5c
Added editor gridlines and cardinal axes
2022-11-02 10:33:17 +08:00
41e1f01f29
Added support for persistent debug draw
2022-11-02 10:11:13 +08:00
1371302a40
Generalised Draw functions in SHDebugDrawSystem for potentially any number of draw queues
2022-11-02 09:34:36 +08:00
5f7b28e8a0
Added SHDebugDraw convenience static class for debug drawing
2022-11-02 01:11:28 +08:00
ed446002aa
Merge branch 'SP3-16-Math' into SP3-1-DebugDraw2
2022-11-02 01:05:29 +08:00
b9ada6a5be
Reworked SHColour to be compatible with SHVec4
2022-11-02 00:47:19 +08:00
07bfb2f485
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-11-02 00:22:36 +08:00
dc8ed48be3
Fixed debug draw system cube rendering
2022-11-01 21:49:57 +08:00
129f92e4b6
mat inspector properties handling (WIP)
2022-11-01 21:49:42 +08:00
904d6be6b0
Merge branch 'main' into SP3-1-DebugDraw2
...
# Conflicts:
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.h
2022-11-01 21:00:55 +08:00
e2778da955
WIP Rewrite flow from compiling to loading to recognising assets
2022-11-01 20:54:51 +08:00
0096bc4975
Debug Draw fixes
2022-11-01 20:32:35 +08:00
674b4d5155
Fixed extra # appearing on all names of script variables
2022-11-01 20:29:03 +08:00
b0d08d27fd
SSAO is fully implemented
2022-11-01 20:10:59 +08:00
26591e8c24
material inspector
2022-11-01 19:03:08 +08:00
40be8a7962
Merge branch 'main' into SP3-12-SceneGraph
2022-11-01 19:00:12 +08:00
8afe8c1a79
GameObjects on scripts can now be edited in the inspector and are serialized
2022-11-01 17:24:20 +08:00
Sri Sham Haran