diff --git a/CMakeLists.txt b/CMakeLists.txt
index f49269a8c2825e1736005e0c25df8ec93ddb0cf5..72a245b0a77c4ebe81720bffcd75974d3b04f6de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -190,7 +190,7 @@ add_library(lava.base STATIC
target_include_directories(lava.base PUBLIC
# Since the encoder is written against a specific version of the vulkan headers, the required version of the headers has to be added to the project.
# $<BUILD_INTERFACE:${LIBLAVA_EXT_DIR}/Vulkan-Headers/include>
- $<BUILD_INTERFACE:${LIBLAVA_INC_DIR}/vulkan_headers>
+ $<BUILD_INTERFACE:${LIBLAVA_INC_DIR}/vulkan_headers>
$<BUILD_INTERFACE:${LIBLAVA_EXT_DIR}/VulkanMemoryAllocator/include>
$<BUILD_INTERFACE:${LIBLAVA_EXT_DIR}/volk>
)
@@ -717,8 +717,8 @@ message("=======================================================================
${SRC_DIR}/utility/extern_fence.hpp ${SRC_DIR}/utility/extern_fence.cpp
${SRC_DIR}/utility/frame_capture.hpp ${SRC_DIR}/utility/frame_capture.cpp
${SRC_DIR}/utility/geometry_buffer.hpp ${SRC_DIR}/utility/geometry_buffer.cpp
- ${SRC_DIR}/utility/indirect_cache.hpp ${SRC_DIR}/utility/indirect_cache.cpp
- ${SRC_DIR}/utility/latency.hpp ${SRC_DIR}/utility/latency.cpp
+ ${SRC_DIR}/utility/indirect_cache.hpp ${SRC_DIR}/utility/indirect_cache.cpp
+ ${SRC_DIR}/utility/latency.hpp ${SRC_DIR}/utility/latency.cpp
${SRC_DIR}/utility/pass_timer.hpp ${SRC_DIR}/utility/pass_timer.cpp
${SRC_DIR}/utility/shadow_cache.hpp ${SRC_DIR}/utility/shadow_cache.cpp
${SRC_DIR}/utility/statistic.hpp ${SRC_DIR}/utility/statistic.cpp
@@ -756,21 +756,21 @@ message("=======================================================================
utility/deferred_lighting.vert
utility/deferred_lighting.frag
utility/deferred_lighting_shadow.frag
- utility/deferred_lighting_indirect.frag
- utility/deferred_lighting_indirect_shadow.frag
-
- utility/indirect_capture.vert
- utility/indirect_capture.frag
-
- utility/indirect_geometry.vert
- utility/indirect_geometry.geom
- utility/indirect_geometry.frag
-
- utility/indirect_injection.vert
- utility/indirect_injection.geom
- utility/indirect_injection.frag
-
- utility/indirect_propagation.comp
+ utility/deferred_lighting_indirect.frag
+ utility/deferred_lighting_indirect_shadow.frag
+
+ utility/indirect_capture.vert
+ utility/indirect_capture.frag
+
+ utility/indirect_geometry.vert
+ utility/indirect_geometry.geom
+ utility/indirect_geometry.frag
+
+ utility/indirect_injection.vert
+ utility/indirect_injection.geom
+ utility/indirect_injection.frag
+
+ utility/indirect_propagation.comp
utility/shadow.vert
utility/shadow.geom
diff --git a/res/dpr/data/mesh_data.inc b/res/dpr/data/mesh_data.inc
index d45aa5728a9d28106d45a84e9f8064fa3ac1e899..c39ba8232a4686852e188d937bf36396a126d716 100644
--- a/res/dpr/data/mesh_data.inc
+++ b/res/dpr/data/mesh_data.inc
@@ -5,9 +5,9 @@
struct MeshData
{
mat4 localToWorldSpace;
- mat4 vectorToWorldSpace;
- mat4 padding1;
- mat4 padding2;
+ mat4 vectorToWorldSpace;
+ mat4 padding1;
+ mat4 padding2;
};
#endif
\ No newline at end of file
diff --git a/res/dpr/utility/indirect_geometry.frag b/res/dpr/utility/indirect_geometry.frag
index 13f593f00ce2f8f747de63db3791684cd2030e98..d1caf51c919b95e12bf54fe046f0d6ac74272d91 100644
--- a/res/dpr/utility/indirect_geometry.frag
+++ b/res/dpr/utility/indirect_geometry.frag
@@ -26,7 +26,7 @@ layout(location = 1) in vec3 inNormal;
uint previous_value = 0; \
uint current_value = 0; \
\
- while((current_value = imageAtomicCompSwap(image, coord, previous_value, new_value)) != previous_value) \
+ while ((current_value = imageAtomicCompSwap(image, coord, previous_value, new_value)) != previous_value) \
{ \
previous_value = current_value; \
new_value = packHalf2x16(value + unpackHalf2x16(current_value)); \
@@ -43,12 +43,12 @@ void main()
vec3 coverage = vec3(indirect_domain.geometry_resolution) / vec3(voxel_resolution);
float opacity = 0.0;
- if(gl_ViewportIndex == 0)
+ if (gl_ViewportIndex == 0)
{
opacity = coverage.y * coverage.z;
}
- else if(gl_ViewportIndex == 1)
+ else if (gl_ViewportIndex == 1)
{
opacity = coverage.x * coverage.z;
}
diff --git a/res/dpr/utility/indirect_geometry.geom b/res/dpr/utility/indirect_geometry.geom
index 1227568cf0eec0284736944132414eb74c867d4c..5e81eae402716e6b66f8bb78d0b059c56e6fa059 100644
--- a/res/dpr/utility/indirect_geometry.geom
+++ b/res/dpr/utility/indirect_geometry.geom
@@ -33,7 +33,7 @@ void main()
vec3 normal_abs = abs(cross(position2 - position1, position3 - position1));
float normal_max = max(normal_abs.x, max(normal_abs.y, normal_abs.z));
- if(normal_abs.x == normal_max)
+ if (normal_abs.x == normal_max)
{
screen_coord1 = coord1.yz;
screen_coord2 = coord2.yz;
@@ -42,7 +42,7 @@ void main()
gl_ViewportIndex = 0;
}
- else if(normal_abs.y == normal_max)
+ else if (normal_abs.y == normal_max)
{
screen_coord1 = coord1.xz;
screen_coord2 = coord2.xz;
diff --git a/res/dpr/utility/indirect_propagation.comp b/res/dpr/utility/indirect_propagation.comp
index 8ed550f60eaf449524420c47eff444b64486cc93..de51124febb9a627322a554271f155e3fd9a0524 100644
--- a/res/dpr/utility/indirect_propagation.comp
+++ b/res/dpr/utility/indirect_propagation.comp
@@ -92,7 +92,7 @@ void propagate_neighbour(ivec3 cell_coord, uint neighbour, inout vec4 red_distri
ivec3 neighbour_coord = cell_coord + neighbour_offsets[neighbour];
mat3 neighbour_orientation = neighbour_orientations[neighbour];
- if(!check_bounds(neighbour_coord))
+ if (!check_bounds(neighbour_coord))
{
return;
}
@@ -112,7 +112,7 @@ void propagate_neighbour(ivec3 cell_coord, uint neighbour, inout vec4 red_distri
vec4 neighbour_green_distribution = imageLoad(image_src_green_distribution, neighbour_coord);
vec4 neighbour_blue_distribution = imageLoad(image_src_blue_distribution, neighbour_coord);
- for(uint side = 0; side < 4; side++)
+ for (uint side = 0; side < 4; side++)
{
vec3 eval_direction = neighbour_orientation * side_eval_directions[side];
vec3 emit_direction = neighbour_orientation * side_emit_directions[side];
@@ -150,7 +150,7 @@ void main()
{
ivec3 cell_coord = ivec3(gl_GlobalInvocationID);
- if(!check_bounds(cell_coord))
+ if (!check_bounds(cell_coord))
{
return;
}
@@ -159,7 +159,7 @@ void main()
vec4 green_distribution = vec4(0.0);
vec4 blue_distribution = vec4(0.0);
- for(uint neighbour = 0; neighbour < 6; neighbour++)
+ for (uint neighbour = 0; neighbour < 6; neighbour++)
{
propagate_neighbour(cell_coord, neighbour, red_distribution, green_distribution, blue_distribution);
}
diff --git a/src/headset/remote_headset.cpp b/src/headset/remote_headset.cpp
index f6a04ea23c7ccedfeb7a6c1536722875958d873c..03fdc9bd6dfb651a14830e3322100e6387d867cc 100644
--- a/src/headset/remote_headset.cpp
+++ b/src/headset/remote_headset.cpp
@@ -27,9 +27,9 @@ bool RemoteHeadset::on_setup_instance(lava::frame_config& config)
bool RemoteHeadset::on_setup_device(lava::device::create_param& parameters)
{
if (!setup_extern_fence(this->get_application()->get_instance(), parameters.extensions))
- {
+ {
return false;
- }
+ }
if (!setup_encoder(parameters))
{
@@ -64,21 +64,21 @@ bool RemoteHeadset::on_create()
lava::log()->debug("Waiting for connection");
- if (!this->transport->wait_connect())
- {
+ if (!this->transport->wait_connect())
+ {
lava::log()->error("Remote Headset: Incomplete setup handshake!");
return false;
- }
+ }
this->update_values();
- if (!this->create_framebuffers())
- {
+ if (!this->create_framebuffers())
+ {
lava::log()->error("Remote Headset: Can't create framebuffers!");
return false;
- }
+ }
if (!this->create_encoders())
{
@@ -588,8 +588,8 @@ void RemoteHeadset::on_transport_error()
bool RemoteHeadset::convert_strategy(StereoStrategyType strategy_type, PacketStereoStrategyId& strategy_id)
{
- switch (strategy_type)
- {
+ switch (strategy_type)
+ {
case STEREO_STRATEGY_TYPE_NATIVE_FORWARD:
strategy_id = STEREO_STRATEGY_ID_NATIVE_STEREO;
break;
@@ -602,7 +602,7 @@ bool RemoteHeadset::convert_strategy(StereoStrategyType strategy_type, PacketSte
default:
lava::log()->error("Remote Headset: Unkown strategy type!");
return false;
- }
+ }
- return true;
+ return true;
}
\ No newline at end of file
diff --git a/src/utility/indirect_cache.cpp b/src/utility/indirect_cache.cpp
index a4faa39bedd29ffee48492e66a91e8ea89652099..a62f0212495a02a4e4aa5cccad13df5127b9487a 100644
--- a/src/utility/indirect_cache.cpp
+++ b/src/utility/indirect_cache.cpp
@@ -12,10 +12,10 @@ bool IndirectCache::create(Scene::Ptr scene, const IndirectCacheSettings& settin
{
lava::device_ptr device = scene->get_light_descriptor()->get_device();
- this->scene = scene;
+ this->scene = scene;
this->settings = settings;
- if(!this->compute_domain(scene, settings))
+ if (!this->compute_domain(scene, settings))
{
return false;
}