mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-21 01:59:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removing Clang on MacOS warnings. No longer create external control that doesn't work anymore

Browse Source
This commit is contained in:
Alexander Bock
2020-12-08 00:24:24 +01:00
parent 86bb19d81c
commit d95c6c4a47
11 changed files with 13 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
+2 -2
View File
@@ -477,9 +477,9 @@ RenderableBillboardsCloud::RenderableBillboardsCloud(const ghoul::Dictionary& di
, _billboardMinSize(BillboardMinSizeInfo, 0.f, 0.f, 100.f)
, _correctionSizeEndDistance(CorrectionSizeEndDistanceInfo, 17.f, 12.f, 25.f)
, _correctionSizeFactor(CorrectionSizeFactorInfo, 8.f, 0.f, 20.f)
, _renderOption(RenderOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
, _setRangeFromData(SetRangeFromData)
, _useLinearFiltering(UseLinearFiltering, false)
, _setRangeFromData(SetRangeFromData)
, _renderOption(RenderOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
{
documentation::testSpecificationAndThrow(
Documentation(),
modules/globebrowsing/src/tiletextureinitdata.cpp
+1 -1
View File
@@ -197,7 +197,7 @@ TileTextureInitData TileTextureInitData::operator=(TileTextureInitData&& rhs) {
return *this;
}
return rhs;
return std::move(rhs);
}
} // namespace openspace::globebrowsing
modules/imgui/src/guiiswacomponent.cpp
+1 -1
View File
@@ -185,7 +185,7 @@ void GuiIswaComponent::render() {
const std::map<int, std::shared_ptr<CygnetInfo>>& map =
IswaManager::ref().cygnetInformation();
for (const std::pair<int, std::shared_ptr<CygnetInfo>>& cygnetInfo : map) {
for (const std::pair<const int, std::shared_ptr<CygnetInfo>>& cygnetInfo : map) {
int id = cygnetInfo.first;
CygnetInfo& info = *cygnetInfo.second;
modules/iswa/util/iswamanager.cpp
+1 -5
View File
@@ -268,10 +268,8 @@ std::string IswaManager::iswaUrl(int id, double timestamp, const std::string& ty
"window=-1&cygnetId="+ std::to_string(id) +"&timestamp=";
}
//std::string t = Time::ref().currentTimeUTC();
std::string_view t = SpiceManager::ref().dateFromEphemerisTime(timestamp);
std::stringstream ss;
ss << t;
ss << SpiceManager::ref().dateFromEphemerisTime(timestamp);;
std::string token;
std::getline(ss, token, ' ');
@@ -483,8 +481,6 @@ std::string IswaManager::jsonSphereToLuaTable(MetadataFuture& data) {
float updateTime = j["output_time_interval"];
float radius = j["radius"];
glm::vec4 spatialScale(6.371f, 6.371f, 6.371f, 6);
glm::vec3 max(
j["x"]["actual_max"],
j["y"]["actual_max"],
modules/multiresvolume/rendering/renderablemultiresvolume.cpp
-8
View File
@@ -61,19 +61,11 @@ namespace {
constexpr const char* _loggerCat = "RenderableMultiresVolume";
constexpr const char* KeyDataSource = "Source";
constexpr const char* KeyErrorHistogramsSource = "ErrorHistogramsSource";
constexpr const char* KeyHints = "Hints";
constexpr const char* KeyTransferFunction = "TransferFunction";
constexpr const char* KeyVolumeName = "VolumeName";
constexpr const char* KeyBrickSelector = "BrickSelector";
constexpr const char* KeyStartTime = "StartTime";
constexpr const char* KeyEndTime = "EndTime";
constexpr const char* GlslHelpersPath =
"${MODULES}/multiresvolume/shaders/helpers_fs.glsl";
constexpr const char* GlslHelperPath =
"${MODULES}/multiresvolume/shaders/helper.glsl";
constexpr const char* GlslHeaderPath =
"${MODULES}/multiresvolume/shaders/header.glsl";
constexpr openspace::properties::Property::PropertyInfo StepSizeCoefficientInfo = {
"StepSizeCoefficient",
modules/multiresvolume/rendering/renderablemultiresvolume.h
-4
View File
@@ -126,12 +126,8 @@ private:
std::shared_ptr<TransferFunction> _transferFunction;
float _spatialTolerance;
float _temporalTolerance;
std::shared_ptr<TSP> _tsp;
std::vector<int> _brickIndices;
int _atlasMapSize = 0;
std::shared_ptr<AtlasManager> _atlasManager;
modules/touch/include/touchinteraction.h
+1 -3
View File
@@ -47,7 +47,7 @@ namespace openspace {
class Camera;
class SceneGraphNode;
//Class used for keeping track of the recent average frame time
// Class used for keeping track of the recent average frame time
class FrameTimeAverage {
public:
//Update the circular buffer with the most recent frame time
@@ -59,7 +59,6 @@ private:
static const int TotalSamples = 10;
int _nSamples = 0;
double _samples[TotalSamples];
double _runningTotal = 0.0;
int _index = 0;
};
@@ -205,7 +204,6 @@ private:
double _currentRadius = 1.0;
double _slerpdT = 10001.0;
double _timeSlack = 0.0;
int _numOfTests = 0;
std::chrono::milliseconds _time;
bool _directTouchMode = false;
bool _wasPrevModeDirectTouch = false;
modules/touch/src/touchinteraction.cpp
+2 -8
View File
@@ -217,12 +217,6 @@ namespace {
"" // @TODO Missing documentation
};
constexpr openspace::properties::Property::PropertyInfo PickingRadiusInfo = {
"PickingRadiusMinimum",
"Minimum radius for picking in NDC coordinates",
"" // @TODO Missing documentation
};
constexpr openspace::properties::Property::PropertyInfo ZoomOutLimitInfo = {
"ZoomOutLimit",
"Zoom Out Limit",
@@ -278,13 +272,13 @@ TouchInteraction::TouchInteraction()
0.25f
)
, _zoomBoundarySphereMultiplier(ZoomBoundarySphereMultiplierInfo, 1.001f, 1.f, 1.01f)
, _zoomInLimit(ZoomInLimitInfo, -1.0, 0.0, std::numeric_limits<double>::max())
, _zoomOutLimit(
ZoomOutLimitInfo,
std::numeric_limits<double>::max(),
1000.0,
std::numeric_limits<double>::max()
)
, _zoomInLimit(ZoomInLimitInfo, -1.0, 0.0, std::numeric_limits<double>::max())
, _inputStillThreshold(InputSensitivityInfo, 0.0005f, 0.f, 0.001f)
// used to void wrongly interpreted roll interactions
, _centroidStillThreshold(StationaryCentroidInfo, 0.0018f, 0.f, 0.01f)
@@ -303,10 +297,10 @@ TouchInteraction::TouchInteraction()
0.f,
1.f
)
, _constTimeDecay_secs(ConstantTimeDecaySecsInfo, 1.75f, 0.1f, 4.0f)
, _pinchInputs({ TouchInput(0, 0, 0.0, 0.0, 0.0), TouchInput(0, 0, 0.0, 0.0, 0.0) })
, _vel{ glm::dvec2(0.0), 0.0, 0.0, glm::dvec2(0.0) }
, _sensitivity{ glm::dvec2(0.08, 0.045), 12.0, 2.75, glm::dvec2(0.08, 0.045) }
, _constTimeDecay_secs(ConstantTimeDecaySecsInfo, 1.75f, 0.1f, 4.0f)
// calculated with two vectors with known diff in length, then
// projDiffLength/diffLength.
{
modules/webbrowser/src/screenspacebrowser.cpp
-1
View File
@@ -34,7 +34,6 @@
#include <ghoul/opengl/texture.h>
namespace {
constexpr const char* KeyIdentifier = "Indentifier";
constexpr const char* _loggerCat = "ScreenSpaceBrowser";
const openspace::properties::Property::PropertyInfo DimensionsInfo = {
modules/webgui/webguimodule.cpp
+5 -3
View File
@@ -194,8 +194,10 @@ void WebGuiModule::internalInitialize(const ghoul::Dictionary& configuration) {
_servedDirectories.onChange([this]() {
std::unordered_map<std::string, std::string> newEndpoints;
std::vector<std::string> list = _servedDirectories.value();
for (int i = 0; i < list.size() - 1; i += 2) {
newEndpoints[list[i]] = newEndpoints[list[i + 1]];
if (!list.empty()) {
for (size_t i = 0; i < list.size() - 1; i += 2) {
newEndpoints[list[i]] = newEndpoints[list[i + 1]];
}
}
for (const std::pair<const std::string, std::string>& e : _endpoints) {
if (newEndpoints.find(e.first) == newEndpoints.end()) {
@@ -221,7 +223,7 @@ void WebGuiModule::internalInitialize(const ghoul::Dictionary& configuration) {
void WebGuiModule::notifyEndpointListeners(const std::string& endpoint, bool exists) {
using K = CallbackHandle;
using V = EndpointCallback;
for (const std::pair<const K, V>& it : _endpointChangeCallbacks) {
for (const std::pair<K, V>& it : _endpointChangeCallbacks) {
it.second(endpoint, exists);
}
}
scripts/configuration_helper.lua
-1
View File
@@ -345,7 +345,6 @@ function generateCluster(arg)
<?xml version="1.0" ?>
<Cluster
masterAddress="localhost"
externalControlPort="20500"
debug="]] .. tostring(arg["sgctDebug"]) .. [["
>
]] .. (arg["settings"] or "") .. [[