Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Johannes Braun
glare
Commits
51e164b6
Commit
51e164b6
authored
Aug 14, 2017
by
Johannes Braun
Browse files
Minor changes
parent
b36cf12a
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/libraries/imgui/imgui_glfw.cpp
View file @
51e164b6
...
...
@@ -278,16 +278,17 @@ namespace ImGui {
ImGuiStyle
*
style
=
&
ImGui
::
GetStyle
();
style
->
WindowPadding
=
ImVec2
(
15
,
15
);
style
->
WindowRounding
=
5
.0
f
;
style
->
WindowRounding
=
0
.0
f
;
style
->
FramePadding
=
ImVec2
(
5
,
5
);
style
->
FrameRounding
=
4
.0
f
;
style
->
ItemSpacing
=
ImVec2
(
12
,
8
);
style
->
ItemInnerSpacing
=
ImVec2
(
8
,
6
);
style
->
IndentSpacing
=
2
5.0
f
;
style
->
FrameRounding
=
0
.0
f
;
style
->
ItemSpacing
=
ImVec2
(
8
,
6
);
style
->
ItemInnerSpacing
=
ImVec2
(
4
,
3
);
style
->
IndentSpacing
=
1
5.0
f
;
style
->
ScrollbarSize
=
15.0
f
;
style
->
ScrollbarRounding
=
9.0
f
;
style
->
GrabMinSize
=
5.0
f
;
style
->
GrabRounding
=
3.0
f
;
style
->
ScrollbarRounding
=
0.0
f
;
style
->
GrabMinSize
=
6.0
f
;
style
->
GrabRounding
=
0.0
f
;
style
->
FramePadding
=
ImVec2
(
4.
f
,
4.
f
);
style
->
Colors
[
ImGuiCol_Text
]
=
ImVec4
(
0.80
f
,
0.80
f
,
0.83
f
,
1.00
f
);
style
->
Colors
[
ImGuiCol_TextDisabled
]
=
ImVec4
(
0.24
f
,
0.23
f
,
0.29
f
,
1.00
f
);
...
...
@@ -299,9 +300,11 @@ namespace ImGui {
style
->
Colors
[
ImGuiCol_FrameBg
]
=
ImVec4
(
0.10
f
,
0.09
f
,
0.12
f
,
1.00
f
);
style
->
Colors
[
ImGuiCol_FrameBgHovered
]
=
ImVec4
(
0.24
f
,
0.23
f
,
0.29
f
,
1.00
f
);
style
->
Colors
[
ImGuiCol_FrameBgActive
]
=
ImVec4
(
0.56
f
,
0.56
f
,
0.58
f
,
1.00
f
);
style
->
Colors
[
ImGuiCol_TitleBg
]
=
ImVec4
(
0.10
f
,
0.09
f
,
0.12
f
,
1.00
f
);
style
->
Colors
[
ImGuiCol_TitleBgCollapsed
]
=
ImVec4
(
1.00
f
,
0.98
f
,
0.95
f
,
0.75
f
);
style
->
Colors
[
ImGuiCol_TitleBgActive
]
=
ImVec4
(
0.07
f
,
0.07
f
,
0.09
f
,
1.00
f
);
style
->
Colors
[
ImGuiCol_MenuBarBg
]
=
ImVec4
(
0.10
f
,
0.09
f
,
0.12
f
,
1.00
f
);
style
->
Colors
[
ImGuiCol_ScrollbarBg
]
=
ImVec4
(
0.10
f
,
0.09
f
,
0.12
f
,
1.00
f
);
style
->
Colors
[
ImGuiCol_ScrollbarGrab
]
=
ImVec4
(
0.80
f
,
0.80
f
,
0.83
f
,
0.31
f
);
...
...
src/libraries/raytrace/tracer/pathtracer.cpp
View file @
51e164b6
...
...
@@ -171,7 +171,7 @@ namespace glare
m_render_shader
->
use
();
m_render_shader
->
uniform
(
"u_render_config.current_sample"
,
m_render_config
.
current_sample
);
m_render_shader
->
dispatch2d
(
width
,
4
,
height
,
4
);
m_render_shader
->
dispatch2d
(
width
,
16
,
height
,
16
);
++
m_render_config
.
current_sample
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment