d95ed3f067
Text Rendering WIP
2022-11-14 18:36:26 +08:00
ac17721363
Merge branch 'main' into SP3-1-Rendering
2022-11-14 15:38:33 +08:00
898b7fbf2c
Text Rendering WIP
2022-11-14 10:11:47 +08:00
45e549f9f1
.....small restructure....
2022-11-12 16:56:58 +08:00
3efecd64e7
Added box & sphere debug draw for physics
2022-11-10 14:30:30 +08:00
99f41e947f
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-10 02:16:42 +08:00
4731df28f0
Skeleton for Reworked Physics Debug Draw
2022-11-10 02:16:33 +08:00
7ac910149e
Merge pull request #185 from SHADE-DP/SP3-6-CSharpLights
...
Add interface for C# light class and modified Color to match Unity's interface
2022-11-08 21:51:04 +08:00
e89f5b4b9e
Added OnDrawGizmos for debug draw for scripts
2022-11-08 20:49:07 +08:00
8fbd32a144
Added Relative Sizes to Shapes
2022-11-08 00:46:09 +08:00
70dcad1313
Changed Collider to CollisionShape for improved clarity
2022-11-07 18:19:39 +08:00
b86f092f52
Merge branch 'main' into SP3-305-configurationsMerge
2022-11-04 18:37:19 +08:00
f2b589071c
Merge branch 'main' into SP3-13-Assets-Manager
2022-11-04 17:49:43 +08:00
6d0089ee12
Merge branch 'main' into SP3-13-Assets-Manager
2022-11-04 17:49:13 +08:00
be16fbed19
added item script in the scene
2022-11-04 17:35:09 +08:00
9ef956029e
Changed name check for hardcoded racoon mesh
2022-11-04 17:20:52 +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
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
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
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
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
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
dc8ed48be3
Fixed debug draw system cube rendering
2022-11-01 21:49:57 +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
6e604fe7e9
Fixed bug with relative collider sizes
2022-10-31 23:18:20 +08:00
acf52c77ce
Merge branch 'main' into SP3-141-Camera-System
2022-10-31 16:55:56 +08:00
86e8415845
Merge branch 'main' into SP3-4-Editor
2022-10-30 11:28:01 +08:00
d3b44f9c22
Merge branch 'main' into SP3-13-Assets-Manager
2022-10-30 03:08:36 +08:00
7c5a24b8e1
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-30 00:00:17 +08:00
70533b1712
Changed Application exit call to asset manager
2022-10-29 15:53:15 +08:00
f9f818b49c
Merge branch 'main' into SP3-4-Editor
2022-10-28 20:31:51 +08:00
ade24b904f
Merge pull request #127 from SHADE-DP/SP3-2-Physics
...
SP3-2 Colliders use relative size
NEW
Colliders have materials. The material system is intended to emulate Unity's physics materials.
UPDATE
Colliders now show relative size on the Editor. This change has not been reflected in Scripting.
Colliders will deep copy the shape in case it was not already doing so.
If this doesn't compile, beat me. I swear I just compiled, ran and tested for functionality.
2022-10-28 16:38:44 +08:00
d4f775843c
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-28 14:08:18 +08:00
621dae4c40
All Vec3 and Vec4s in materials are now automatically set to full 1.0 vectors
2022-10-28 13:32:13 +08:00
e733cd2e1c
Fixed bug where changes to meshes were not saved by batching system
2022-10-27 23:18:02 +08:00
09c5843cdb
Ambient lighting added
2022-10-27 19:02:55 +08:00
a354928e0d
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-27 17:41:01 +08:00
b0f28f98c5
WIP camera arm component
2022-10-27 15:01:18 +08:00
b5a1d5ea88
SP3-282 Restructured loaders and compilers
...
Completed shader compiling and loading
2022-10-27 12:54:58 +08:00
2108d9e1f6
Added triple buffering to SHDebugDrawSystem
2022-10-27 10:12:30 +08:00
371ffc52da
Colliders now use relative sizes
2022-10-27 03:14:46 +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
57027da80b
Integrated into SBApplication and accounted for case where number of points to draw is 0.
2022-10-26 16:27:58 +08:00
51489ecb3b
Merge branch 'main' into SP3-4-editor_fix
2022-10-26 16:07:01 +08:00
Brandon Mak