Skip to content

Get json save and load Materials #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
J4m3s00 wants to merge 21 commits into
base: main
Choose a base branch
from
Open

Get json save and load Materials #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
22baa5c
Got first material to write to json
J4m3s00 Dec 18, 2019
5f7cf68
ref
J4m3s00 Dec 18, 2019
761f92d
ref
J4m3s00 Dec 20, 2019
1caec55
ref
J4m3s00 Dec 22, 2019
288a3f4
Got the render bug.
J4m3s00 Dec 22, 2019
8e9248a
Got the shader reload bug
J4m3s00 Dec 22, 2019
cd31d31
Got pbr object in code
J4m3s00 Dec 22, 2019
5091b5b
ref
J4m3s00 Dec 22, 2019
cb86afb
ref
J4m3s00 Dec 22, 2019
9b80b78
had a little fun and made a little very simple ray marching shader an…
J4m3s00 Dec 28, 2019
2e27231
ref
J4m3s00 Dec 28, 2019
5440295
Update RayMarching.shader
J4m3s00 Dec 29, 2019
b1ac679
Resources
J4m3s00 Jan 8, 2020
2cb1029
Shader reload and texture serialization
J4m3s00 Jan 13, 2020
837eb76
No clue what that is
J4m3s00 Feb 15, 2020
cf42acc
ref
J4m3s00 Mar 3, 2020
79f3926
Update Application.cpp
J4m3s00 Mar 3, 2020
d2ea1ba
Starting object streucturew
J4m3s00 Mar 5, 2020
03be512
Add More js
J4m3s00 Mar 5, 2020
4fef34c
DId lot. but its crashing
J4m3s00 Mar 6, 2020
d51ff0c
re
J4m3s00 Aug 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Infinit/Infinit.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@
<ClCompile Include="src\Core\ECS\Component\Component.cpp" />
<ClCompile Include="src\Core\ECS\Component\MeshComponent.cpp" />
<ClCompile Include="src\Core\ECS\GameObject.cpp" />
<ClCompile Include="src\Core\ECS\Object.cpp" />
<ClCompile Include="src\Core\ECS\Scene.cpp" />
<ClCompile Include="src\Core\ImGui\ImGuiBuild.cpp" />
<ClCompile Include="src\Core\ImGui\ImGuiHelper.cpp" />
Expand All @@ -171,8 +172,12 @@
<ClCompile Include="src\Core\Layer\LayerStack.cpp" />
<ClCompile Include="src\Core\Log.cpp" />
<ClCompile Include="src\Core\Material.cpp" />
<ClCompile Include="src\Core\Property\JsonHelper.cpp" />
<ClCompile Include="src\Core\Property\Property.cpp" />
<ClCompile Include="src\Core\Resource.cpp" />
<ClCompile Include="src\Core\ResourceLoader.cpp" />
<ClCompile Include="src\Core\Transform.cpp" />
<ClCompile Include="src\Core\UUID.cpp" />
<ClCompile Include="src\graphics\Buffer.cpp" />
<ClCompile Include="src\graphics\Camera.cpp" />
<ClCompile Include="src\graphics\FrameBuffer.cpp" />
Expand Down Expand Up @@ -260,6 +265,7 @@
<ClInclude Include="src\Core\ECS\Component\Components.h" />
<ClInclude Include="src\Core\ECS\Component\MeshComponent.h" />
<ClInclude Include="src\Core\ECS\GameObject.h" />
<ClInclude Include="src\Core\ECS\Object.h" />
<ClInclude Include="src\Core\ECS\Scene.h" />
<ClInclude Include="src\Core\ImGui\ImGuiHelper.h" />
<ClInclude Include="src\Core\Input.h" />
Expand All @@ -270,9 +276,12 @@
<ClInclude Include="src\Core\Light.h" />
<ClInclude Include="src\Core\Log.h" />
<ClInclude Include="src\Core\Material.h" />
<ClInclude Include="src\Core\Property\JsonHelper.h" />
<ClInclude Include="src\Core\Property\Property.h" />
<ClInclude Include="src\Core\Resource.h" />
<ClInclude Include="src\Core\ResourceLoader.h" />
<ClInclude Include="src\Core\Transform.h" />
<ClInclude Include="src\Core\UUID.h" />
<ClInclude Include="src\Events\AppEvents.h" />
<ClInclude Include="src\Events\Event.h" />
<ClInclude Include="src\Events\Events.h" />
Expand Down Expand Up @@ -300,6 +309,7 @@
<ClInclude Include="src\Platform\OpenGL\OpenGLShader.h" />
<ClInclude Include="src\Platform\OpenGL\OpenGLTexture.h" />
<ClInclude Include="src\Platform\OpenGL\OpenGLVertexArray.h" />
<ClInclude Include="src\Serialization\Serializable.h" />
<ClInclude Include="src\Util\StringUtil.h" />
<ClInclude Include="vendor\Glad\include\glad\glad.h" />
<ClInclude Include="vendor\Glad\include\KHR\khrplatform.h" />
Expand Down
47 changes: 32 additions & 15 deletions Infinit/imgui.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@ Size=1270,720
Collapsed=0

[Window][Resources##ResourceManager]
Pos=198,549
Size=1072,171
Pos=205,549
Size=1065,171
Collapsed=0
DockId=0x00000006,0

[Window][Components##ComponentView]
Pos=1006,19
Size=264,176
Size=264,226
Collapsed=0
DockId=0x00000009,1

[Window][Material##MaterialWindow]
Pos=1006,197
Size=264,350
Pos=1006,247
Size=264,300
Collapsed=0
DockId=0x0000000A,0

Expand All @@ -45,26 +45,43 @@ DockId=0x00000007,0

[Window][Light]
Pos=0,549
Size=196,171
Size=203,171
Collapsed=0
DockId=0x00000004,0

[Window][GameObject##GameObject]
Pos=1006,19
Size=264,176
Size=264,226
Collapsed=0
DockId=0x00000009,0

[Window][Resource View##ResourceView]
Pos=179,19
Size=825,528
Collapsed=0
DockId=0x00000008,1

[Window][ResourceView##ResourceView]
Pos=384,149
Size=921,761
Collapsed=0

[Window][Dear ImGui Demo]
ViewportPos=261,183
ViewportId=0xE927CF2F
Size=550,671
Collapsed=0

[Docking][Data]
DockSpace ID=0xFA06BC56 Window=0x4647B76E Pos=140,708 Size=1270,701 Split=Y Selected=0xD1701B4D
DockSpace ID=0xFA06BC56 Window=0x4647B76E Pos=235,220 Size=1270,701 Split=Y Selected=0xD1701B4D
DockNode ID=0x00000002 Parent=0xFA06BC56 SizeRef=1357,528 Split=X
DockNode ID=0x00000001 Parent=0x00000002 SizeRef=1073,832 Split=X Selected=0xD1701B4D
DockNode ID=0x00000001 Parent=0x00000002 SizeRef=1004,832 Split=X Selected=0xD1701B4D
DockNode ID=0x00000007 Parent=0x00000001 SizeRef=177,713 Selected=0xDC69FC0B
DockNode ID=0x00000008 Parent=0x00000001 SizeRef=894,713 CentralNode=1 Selected=0xD1701B4D
DockNode ID=0x00000005 Parent=0x00000002 SizeRef=282,832 Split=Y Selected=0xB99A80B2
DockNode ID=0x00000009 Parent=0x00000005 SizeRef=399,251 Selected=0x218375B5
DockNode ID=0x0000000A Parent=0x00000005 SizeRef=399,499 Selected=0xCF42C293
DockNode ID=0x00000008 Parent=0x00000001 SizeRef=825,713 CentralNode=1 Selected=0xD1701B4D
DockNode ID=0x00000005 Parent=0x00000002 SizeRef=264,832 Split=Y Selected=0xB99A80B2
DockNode ID=0x00000009 Parent=0x00000005 SizeRef=399,226 Selected=0x218375B5
DockNode ID=0x0000000A Parent=0x00000005 SizeRef=399,300 Selected=0xCF42C293
DockNode ID=0x00000003 Parent=0xFA06BC56 SizeRef=1357,171 Split=X Selected=0x8D26C4BE
DockNode ID=0x00000004 Parent=0x00000003 SizeRef=209,117 Selected=0xAADB73F3
DockNode ID=0x00000006 Parent=0x00000003 SizeRef=1146,117 Selected=0x8D26C4BE
DockNode ID=0x00000004 Parent=0x00000003 SizeRef=203,117 Selected=0xAADB73F3
DockNode ID=0x00000006 Parent=0x00000003 SizeRef=1065,117 Selected=0x8D26C4BE

92 changes: 92 additions & 0 deletions Infinit/pretty.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
{
"ParameterPresets": [
{
"Name": "u_ViewProjectionMatrix",
"Type": 11
},
{
"Name": "u_ModelMatrix",
"Type": 11
},
{
"Name": "lights.Direction",
"Type": 3
},
{
"Name": "lights.Radiance",
"Type": 3
},
{
"Name": "u_CameraPosition",
"Type": 3
},
{
"Name": "u_AlbedoTexture",
"Type": 9
},
{
"Name": "u_NormalTexture",
"Type": 9
},
{
"Name": "u_MetalnessTexture",
"Type": 9
},
{
"Name": "u_RoughnessTexture",
"Type": 9
},
{
"Name": "u_EnvRadianceTex",
"Type": 10
},
{
"Name": "u_EnvIrradianceTex",
"Type": 10
},
{
"Name": "u_BRDFLUTTexture",
"Type": 9
},
{
"Name": "u_AlbedoColor",
"Type": 3
},
{
"Name": "u_Metalness",
"Type": 1
},
{
"Name": "u_Roughness",
"Type": 1
},
{
"Name": "u_EnvMapRotation",
"Type": 1
},
{
"Name": "u_RadiancePrefilter",
"Type": 1
},
{
"Name": "u_AlbedoTexToggle",
"Type": 8
},
{
"Name": "u_NormalTexToggle",
"Type": 8
},
{
"Name": "u_MetalnessTexToggle",
"Type": 8
},
{
"Name": "u_RoughnessTexToggle",
"Type": 8
}
],
"Shader": {
"Name": "res/shaders/pbr.shader",
"Path": "res/shaders/pbr.shader"
}
}
Loading