mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-05-03 17:30:04 -05:00
Feature/CMake (#1443)
General CMake cleanup/overhaul * Enable precompiled headers for all projects * Move specifications itto separate CMakeLists files * Add openspace-core as a subdirectory * Move handle_modules functionality into modules/CMakeLists.txt * Move handleapplications logic into apps/CMakeLists.txt * Introduce openspace-module-collection interface library to simplify inclusion of modules in applications * Turn module initialization into a two-step process to adapt to the new minimal dependency scenario * Compile time speedup * Remove circular dependencies between modules and core preventing multithreaded compilation on MSVC * Build Spice multithreaded and as static library * Remove dependency from core to module-webbrowser * Remove unused dependency from kameleon * Remove additional unnecessary dependencies * Cleanup volume/kameleon/kameleonvolume modules * Fix visibility issues. Restrict include paths * Compile kameleon in parallel * Other cleanup * Only copy CEF files from one target (hard-coded to OpenSpace right now) * Remove unused instrumentation code * Remove the ability to render AABB for globes as it caused a circular dependency between GlobeBrowsing and Debugging * Removing compiler and cppcheck warnings * Turn almost all includes into non-system includes * Don't warn on deprecrated copy * Updated submodules
This commit is contained in:
Alexander Bock
+114
-114
@@ -25,129 +25,129 @@
|
||||
include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
|
||||
|
||||
set(HEADER_FILES
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemangle.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemdate.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemdistance.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemframerate.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemmission.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemparallelconnection.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditempropertyvalue.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemsimulationincrement.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemspacing.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemtext.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemvelocity.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/lightsource/cameralightsource.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/lightsource/scenegraphlightsource.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/modelgeometry.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/multimodelgeometry.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/grids/renderableboxgrid.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/grids/renderablegrid.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/grids/renderableradialgrid.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/grids/renderablesphericalgrid.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablecartesianaxes.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablelabels.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemodel.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablenodeline.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplane.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneimagelocal.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneimageonline.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesphere.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrail.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrailorbit.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrailtrajectory.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspacedashboard.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceframebuffer.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimagelocal.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimageonline.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rotation/timelinerotation.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rotation/constantrotation.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rotation/fixedrotation.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rotation/luarotation.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rotation/staticrotation.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/scale/luascale.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/scale/nonuniformstaticscale.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/scale/staticscale.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/scale/timedependentscale.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/timeframe/timeframeinterval.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/timeframe/timeframeunion.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/translation/luatranslation.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/translation/statictranslation.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/translation/timelinetranslation.h
|
||||
dashboard/dashboarditemangle.h
|
||||
dashboard/dashboarditemdate.h
|
||||
dashboard/dashboarditemdistance.h
|
||||
dashboard/dashboarditemframerate.h
|
||||
dashboard/dashboarditemmission.h
|
||||
dashboard/dashboarditemparallelconnection.h
|
||||
dashboard/dashboarditempropertyvalue.h
|
||||
dashboard/dashboarditemsimulationincrement.h
|
||||
dashboard/dashboarditemspacing.h
|
||||
dashboard/dashboarditemtext.h
|
||||
dashboard/dashboarditemvelocity.h
|
||||
lightsource/cameralightsource.h
|
||||
lightsource/scenegraphlightsource.h
|
||||
rendering/modelgeometry.h
|
||||
rendering/multimodelgeometry.h
|
||||
rendering/grids/renderableboxgrid.h
|
||||
rendering/grids/renderablegrid.h
|
||||
rendering/grids/renderableradialgrid.h
|
||||
rendering/grids/renderablesphericalgrid.h
|
||||
rendering/renderablecartesianaxes.h
|
||||
rendering/renderablelabels.h
|
||||
rendering/renderablemodel.h
|
||||
rendering/renderablenodeline.h
|
||||
rendering/renderableplane.h
|
||||
rendering/renderableplaneimagelocal.h
|
||||
rendering/renderableplaneimageonline.h
|
||||
rendering/renderablesphere.h
|
||||
rendering/renderabletrail.h
|
||||
rendering/renderabletrailorbit.h
|
||||
rendering/renderabletrailtrajectory.h
|
||||
rendering/screenspacedashboard.h
|
||||
rendering/screenspaceframebuffer.h
|
||||
rendering/screenspaceimagelocal.h
|
||||
rendering/screenspaceimageonline.h
|
||||
rotation/timelinerotation.h
|
||||
rotation/constantrotation.h
|
||||
rotation/fixedrotation.h
|
||||
rotation/luarotation.h
|
||||
rotation/staticrotation.h
|
||||
scale/luascale.h
|
||||
scale/nonuniformstaticscale.h
|
||||
scale/staticscale.h
|
||||
scale/timedependentscale.h
|
||||
timeframe/timeframeinterval.h
|
||||
timeframe/timeframeunion.h
|
||||
translation/luatranslation.h
|
||||
translation/statictranslation.h
|
||||
translation/timelinetranslation.h
|
||||
|
||||
)
|
||||
source_group("Header Files" FILES ${HEADER_FILES})
|
||||
|
||||
set(SOURCE_FILES
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemangle.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemdate.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemdistance.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemframerate.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemmission.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemparallelconnection.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditempropertyvalue.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemsimulationincrement.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemspacing.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemtext.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemvelocity.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/lightsource/cameralightsource.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/lightsource/scenegraphlightsource.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/modelgeometry.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/multimodelgeometry.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/grids/renderableboxgrid.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/grids/renderablegrid.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/grids/renderableradialgrid.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/grids/renderablesphericalgrid.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablecartesianaxes.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablelabels.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemodel.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablenodeline.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplane.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneimagelocal.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneimageonline.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesphere.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrail.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrailorbit.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrailtrajectory.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspacedashboard.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceframebuffer.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimagelocal.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimageonline.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rotation/timelinerotation.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rotation/constantrotation.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rotation/fixedrotation.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rotation/luarotation.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/rotation/staticrotation.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/scale/luascale.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/scale/nonuniformstaticscale.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/scale/staticscale.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/scale/timedependentscale.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/timeframe/timeframeinterval.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/timeframe/timeframeunion.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/translation/luatranslation.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/translation/statictranslation.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/translation/timelinetranslation.cpp
|
||||
dashboard/dashboarditemangle.cpp
|
||||
dashboard/dashboarditemdate.cpp
|
||||
dashboard/dashboarditemdistance.cpp
|
||||
dashboard/dashboarditemframerate.cpp
|
||||
dashboard/dashboarditemmission.cpp
|
||||
dashboard/dashboarditemparallelconnection.cpp
|
||||
dashboard/dashboarditempropertyvalue.cpp
|
||||
dashboard/dashboarditemsimulationincrement.cpp
|
||||
dashboard/dashboarditemspacing.cpp
|
||||
dashboard/dashboarditemtext.cpp
|
||||
dashboard/dashboarditemvelocity.cpp
|
||||
lightsource/cameralightsource.cpp
|
||||
lightsource/scenegraphlightsource.cpp
|
||||
rendering/modelgeometry.cpp
|
||||
rendering/multimodelgeometry.cpp
|
||||
rendering/grids/renderableboxgrid.cpp
|
||||
rendering/grids/renderablegrid.cpp
|
||||
rendering/grids/renderableradialgrid.cpp
|
||||
rendering/grids/renderablesphericalgrid.cpp
|
||||
rendering/renderablecartesianaxes.cpp
|
||||
rendering/renderablelabels.cpp
|
||||
rendering/renderablemodel.cpp
|
||||
rendering/renderablenodeline.cpp
|
||||
rendering/renderableplane.cpp
|
||||
rendering/renderableplaneimagelocal.cpp
|
||||
rendering/renderableplaneimageonline.cpp
|
||||
rendering/renderablesphere.cpp
|
||||
rendering/renderabletrail.cpp
|
||||
rendering/renderabletrailorbit.cpp
|
||||
rendering/renderabletrailtrajectory.cpp
|
||||
rendering/screenspacedashboard.cpp
|
||||
rendering/screenspaceframebuffer.cpp
|
||||
rendering/screenspaceimagelocal.cpp
|
||||
rendering/screenspaceimageonline.cpp
|
||||
rotation/timelinerotation.cpp
|
||||
rotation/constantrotation.cpp
|
||||
rotation/fixedrotation.cpp
|
||||
rotation/luarotation.cpp
|
||||
rotation/staticrotation.cpp
|
||||
scale/luascale.cpp
|
||||
scale/nonuniformstaticscale.cpp
|
||||
scale/staticscale.cpp
|
||||
scale/timedependentscale.cpp
|
||||
timeframe/timeframeinterval.cpp
|
||||
timeframe/timeframeunion.cpp
|
||||
translation/luatranslation.cpp
|
||||
translation/statictranslation.cpp
|
||||
translation/timelinetranslation.cpp
|
||||
)
|
||||
source_group("Source Files" FILES ${SOURCE_FILES})
|
||||
|
||||
set(SHADER_FILES
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shaders/axes_fs.glsl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shaders/axes_vs.glsl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shaders/grid_vs.glsl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shaders/grid_fs.glsl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shaders/imageplane_fs.glsl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shaders/imageplane_vs.glsl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shaders/line_fs.glsl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shaders/line_vs.glsl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shaders/model_fs.glsl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shaders/model_vs.glsl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shaders/plane_fs.glsl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shaders/plane_vs.glsl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderabletrail_fs.glsl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderabletrail_vs.glsl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shaders/screenspace_fs.glsl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shaders/screenspace_vs.glsl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shaders/sphere_fs.glsl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/shaders/sphere_vs.glsl
|
||||
shaders/axes_fs.glsl
|
||||
shaders/axes_vs.glsl
|
||||
shaders/grid_vs.glsl
|
||||
shaders/grid_fs.glsl
|
||||
shaders/imageplane_fs.glsl
|
||||
shaders/imageplane_vs.glsl
|
||||
shaders/line_fs.glsl
|
||||
shaders/line_vs.glsl
|
||||
shaders/model_fs.glsl
|
||||
shaders/model_vs.glsl
|
||||
shaders/plane_fs.glsl
|
||||
shaders/plane_vs.glsl
|
||||
shaders/renderabletrail_fs.glsl
|
||||
shaders/renderabletrail_vs.glsl
|
||||
shaders/screenspace_fs.glsl
|
||||
shaders/screenspace_vs.glsl
|
||||
shaders/sphere_fs.glsl
|
||||
shaders/sphere_vs.glsl
|
||||
)
|
||||
source_group("Shader Files" FILES ${SHADER_FILES})
|
||||
|
||||
|
||||
@@ -353,7 +353,7 @@ void DashboardItemAngle::render(glm::vec2& penPosition) {
|
||||
const glm::dvec3 a = referenceInfo.first - sourceInfo.first;
|
||||
const glm::dvec3 b = destinationInfo.first - sourceInfo.first;
|
||||
|
||||
std::fill(_buffer.begin(), _buffer.end(), 0);
|
||||
std::fill(_buffer.begin(), _buffer.end(), char(0));
|
||||
if (glm::length(a) == 0.0 || glm::length(b) == 0) {
|
||||
char* end = fmt::format_to(
|
||||
_buffer.data(),
|
||||
|
||||
@@ -173,6 +173,7 @@ DashboardItemDistance::DashboardItemDistance(const ghoul::Dictionary& dictionary
|
||||
: DashboardTextItem(dictionary)
|
||||
, _doSimplification(SimplificationInfo, true)
|
||||
, _requestedUnit(RequestedUnitInfo, properties::OptionProperty::DisplayType::Dropdown)
|
||||
, _formatString(FormatStringInfo, "Distance from {} to {}: {:f} {}")
|
||||
, _source{
|
||||
properties::OptionProperty(
|
||||
SourceTypeInfo,
|
||||
@@ -189,7 +190,6 @@ DashboardItemDistance::DashboardItemDistance(const ghoul::Dictionary& dictionary
|
||||
properties::StringProperty(DestinationNodeNameInfo),
|
||||
nullptr
|
||||
}
|
||||
, _formatString(FormatStringInfo, "Distance from {} to {}: {:f} {}")
|
||||
{
|
||||
documentation::testSpecificationAndThrow(
|
||||
Documentation(),
|
||||
@@ -358,7 +358,7 @@ std::pair<glm::dvec3, std::string> DashboardItemDistance::positionAndLabel(
|
||||
return { mainComp.node->worldPosition(), mainComp.node->guiName() };
|
||||
case Type::NodeSurface:
|
||||
{
|
||||
glm::dvec3 otherPos = glm::dvec3(0.0);
|
||||
glm::dvec3 otherPos;
|
||||
if (otherComp.type == Type::NodeSurface) {
|
||||
// We are only interested in the direction, and we want to prevent
|
||||
// infinite recursion
|
||||
@@ -414,7 +414,7 @@ void DashboardItemDistance::render(glm::vec2& penPosition) {
|
||||
dist = { convertedD, nameForDistanceUnit(unit, convertedD != 1.0) };
|
||||
}
|
||||
|
||||
std::fill(_buffer.begin(), _buffer.end(), 0);
|
||||
std::fill(_buffer.begin(), _buffer.end(), char(0));
|
||||
try {
|
||||
char* end = fmt::format_to(
|
||||
_buffer.data(),
|
||||
|
||||
@@ -247,7 +247,7 @@ void DashboardItemFramerate::render(glm::vec2& penPosition) {
|
||||
|
||||
FrametimeType frametimeType = FrametimeType(_frametimeType.value());
|
||||
|
||||
std::fill(_buffer.begin(), _buffer.end(), 0);
|
||||
std::fill(_buffer.begin(), _buffer.end(), char(0));
|
||||
char* end = format(
|
||||
_buffer,
|
||||
frametimeType,
|
||||
|
||||
@@ -75,15 +75,14 @@ void DashboardItemParallelConnection::render(glm::vec2& penPosition) {
|
||||
if (status == ParallelConnection::Status::ClientWithHost ||
|
||||
status == ParallelConnection::Status::ClientWithoutHost)
|
||||
{
|
||||
constexpr const char* Singular = "You and {} more client are tuned in";
|
||||
constexpr const char* Plural = "You and {} more clients are tuned in";
|
||||
|
||||
connectionInfo += "\n";
|
||||
|
||||
if (nClients > 2) {
|
||||
constexpr const char* Plural = "You and {} more clients are tuned in";
|
||||
connectionInfo += fmt::format(Plural, nClients - 1);
|
||||
}
|
||||
else if (nClients == 2) {
|
||||
constexpr const char* Singular = "You and {} more client are tuned in";
|
||||
connectionInfo += fmt::format(Singular, nClients - 1);
|
||||
}
|
||||
else if (nClients == 1) {
|
||||
@@ -128,14 +127,13 @@ glm::vec2 DashboardItemParallelConnection::size() const {
|
||||
if (status == ParallelConnection::Status::ClientWithHost ||
|
||||
status == ParallelConnection::Status::ClientWithoutHost)
|
||||
{
|
||||
constexpr const char* Singular = "You and {} more client are tuned in";
|
||||
constexpr const char* Plural = "You and {} more clients are tuned in";
|
||||
|
||||
connectionInfo += "\n";
|
||||
if (nClients > 2) {
|
||||
constexpr const char* Plural = "You and {} more clients are tuned in";
|
||||
connectionInfo += fmt::format(Plural, nClients);
|
||||
}
|
||||
else if (nClients == 2) {
|
||||
constexpr const char* Singular = "You and {} more client are tuned in";
|
||||
connectionInfo += fmt::format(Singular, nClients - 1);
|
||||
}
|
||||
else if (nClients == 1) {
|
||||
|
||||
@@ -601,11 +601,6 @@ bool RenderableLabels::isReady() const {
|
||||
void RenderableLabels::initialize() {
|
||||
ZoneScoped
|
||||
|
||||
bool success = true;// loadData();
|
||||
if (!success) {
|
||||
throw ghoul::RuntimeError("Error loading objects labels data.");
|
||||
}
|
||||
|
||||
setRenderBin(Renderable::RenderBin::PreDeferredTransparent);
|
||||
}
|
||||
|
||||
|
||||
@@ -569,7 +569,11 @@ glm::dmat3 FixedRotation::matrix(const UpdateData&) const {
|
||||
{
|
||||
LWARNINGC(
|
||||
"FixedRotation",
|
||||
fmt::format("Near-collinear vectors detected: x ({}) y ({}) z ({})", x, y, z)
|
||||
fmt::format(
|
||||
"Near-collinear vectors detected: "
|
||||
"x ({}, {}, {}) y ({}, {}, {}) z ({}, {}, {})",
|
||||
x.x, x.y, x.z, y.x, y.y, y.z, z.x, z.y, z.z
|
||||
)
|
||||
);
|
||||
return glm::dmat3();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user