mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-22 19:29:04 -05:00
Merge branch 'master' into feature/gamma-correction
This commit is contained in:
@@ -59,7 +59,7 @@ class AtmosphereDeferredcaster : public Deferredcaster {
|
||||
public:
|
||||
AtmosphereDeferredcaster(float textureScale,
|
||||
std::vector<ShadowConfiguration> shadowConfigArray, bool saveCalculatedTextures);
|
||||
virtual ~AtmosphereDeferredcaster() = default;
|
||||
~AtmosphereDeferredcaster() override = default;
|
||||
|
||||
void initialize();
|
||||
void deinitialize();
|
||||
|
||||
@@ -37,7 +37,7 @@ public:
|
||||
constexpr static const char* Name = "Base";
|
||||
|
||||
BaseModule();
|
||||
virtual ~BaseModule() = default;
|
||||
~BaseModule() override = default;
|
||||
|
||||
std::vector<documentation::Documentation> documentations() const override;
|
||||
std::vector<scripting::LuaLibrary> luaLibraries() const override;
|
||||
|
||||
@@ -40,7 +40,7 @@ namespace documentation { struct Documentation; }
|
||||
class DashboardItemAngle : public DashboardTextItem {
|
||||
public:
|
||||
DashboardItemAngle(const ghoul::Dictionary& dictionary);
|
||||
virtual ~DashboardItemAngle() = default;
|
||||
~DashboardItemAngle() override = default;
|
||||
|
||||
void render(glm::vec2& penPosition) override;
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ namespace documentation { struct Documentation; }
|
||||
class DashboardItemDate : public DashboardTextItem {
|
||||
public:
|
||||
DashboardItemDate(const ghoul::Dictionary& dictionary);
|
||||
~DashboardItemDate() = default;
|
||||
~DashboardItemDate() override = default;
|
||||
|
||||
void render(glm::vec2& penPosition) override;
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ namespace documentation { struct Documentation; }
|
||||
class DashboardItemDistance : public DashboardTextItem {
|
||||
public:
|
||||
DashboardItemDistance(const ghoul::Dictionary& dictionary);
|
||||
virtual ~DashboardItemDistance() = default;
|
||||
~DashboardItemDistance() override = default;
|
||||
|
||||
void render(glm::vec2& penPosition) override;
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace documentation { struct Documentation; }
|
||||
class DashboardItemMission : public DashboardTextItem {
|
||||
public:
|
||||
DashboardItemMission(const ghoul::Dictionary& dictionary);
|
||||
virtual ~DashboardItemMission() = default;
|
||||
~DashboardItemMission() override = default;
|
||||
|
||||
void render(glm::vec2& penPosition) override;
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace documentation { struct Documentation; }
|
||||
class DashboardItemParallelConnection : public DashboardTextItem {
|
||||
public:
|
||||
DashboardItemParallelConnection(const ghoul::Dictionary& dictionary);
|
||||
virtual ~DashboardItemParallelConnection() = default;
|
||||
~DashboardItemParallelConnection() override = default;
|
||||
|
||||
void render(glm::vec2& penPosition) override;
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ namespace documentation { struct Documentation; }
|
||||
class DashboardItemPropertyValue : public DashboardTextItem {
|
||||
public:
|
||||
DashboardItemPropertyValue(const ghoul::Dictionary& dictionary);
|
||||
~DashboardItemPropertyValue() = default;
|
||||
~DashboardItemPropertyValue() override = default;
|
||||
|
||||
void render(glm::vec2& penPosition) override;
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ namespace documentation { struct Documentation; }
|
||||
class DashboardItemSimulationIncrement : public DashboardTextItem {
|
||||
public:
|
||||
DashboardItemSimulationIncrement(const ghoul::Dictionary& dictionary);
|
||||
virtual ~DashboardItemSimulationIncrement() = default;
|
||||
~DashboardItemSimulationIncrement() override = default;
|
||||
|
||||
void render(glm::vec2& penPosition) override;
|
||||
glm::vec2 size() const override;
|
||||
|
||||
@@ -36,7 +36,7 @@ namespace documentation { struct Documentation; }
|
||||
class DashboardItemSpacing : public DashboardItem {
|
||||
public:
|
||||
DashboardItemSpacing(const ghoul::Dictionary& dictionary);
|
||||
virtual ~DashboardItemSpacing() = default;
|
||||
~DashboardItemSpacing() override = default;
|
||||
|
||||
void render(glm::vec2& penPosition) override;
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ namespace documentation { struct Documentation; }
|
||||
class DashboardItemText : public DashboardTextItem {
|
||||
public:
|
||||
DashboardItemText(const ghoul::Dictionary& dictionary);
|
||||
virtual ~DashboardItemText() = default;
|
||||
~DashboardItemText() override = default;
|
||||
|
||||
void render(glm::vec2& penPosition) override;
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ namespace documentation { struct Documentation; }
|
||||
class DashboardItemVelocity : public DashboardTextItem {
|
||||
public:
|
||||
DashboardItemVelocity(const ghoul::Dictionary& dictionary);
|
||||
virtual ~DashboardItemVelocity() = default;
|
||||
~DashboardItemVelocity() override = default;
|
||||
|
||||
void render(glm::vec2& penPosition) override;
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ namespace openspace {
|
||||
class RenderableRadialGrid : public Renderable {
|
||||
public:
|
||||
RenderableRadialGrid(const ghoul::Dictionary& dictionary);
|
||||
~RenderableRadialGrid() = default;
|
||||
~RenderableRadialGrid() override = default;
|
||||
|
||||
void initializeGL() override;
|
||||
void deinitializeGL() override;
|
||||
|
||||
@@ -41,7 +41,7 @@ namespace openspace {
|
||||
class RenderableSphericalGrid : public Renderable {
|
||||
public:
|
||||
RenderableSphericalGrid(const ghoul::Dictionary& dictionary);
|
||||
~RenderableSphericalGrid() = default;
|
||||
~RenderableSphericalGrid() override = default;
|
||||
|
||||
void initializeGL() override;
|
||||
void deinitializeGL() override;
|
||||
|
||||
@@ -43,7 +43,7 @@ namespace openspace {
|
||||
class RenderableCartesianAxes : public Renderable {
|
||||
public:
|
||||
RenderableCartesianAxes(const ghoul::Dictionary& dictionary);
|
||||
~RenderableCartesianAxes() = default;
|
||||
~RenderableCartesianAxes() override = default;
|
||||
|
||||
void initializeGL() override;
|
||||
void deinitializeGL() override;
|
||||
|
||||
@@ -57,7 +57,7 @@ namespace documentation { struct Documentation; }
|
||||
class RenderableModel : public Renderable {
|
||||
public:
|
||||
RenderableModel(const ghoul::Dictionary& dictionary);
|
||||
~RenderableModel() = default;
|
||||
~RenderableModel() override = default;
|
||||
|
||||
void initialize() override;
|
||||
void initializeGL() override;
|
||||
|
||||
@@ -46,7 +46,7 @@ class Translation;
|
||||
class RenderableNodeLine : public Renderable {
|
||||
public:
|
||||
RenderableNodeLine(const ghoul::Dictionary& dictionary);
|
||||
~RenderableNodeLine() = default;
|
||||
~RenderableNodeLine() override = default;
|
||||
|
||||
static documentation::Documentation Documentation();
|
||||
|
||||
|
||||
@@ -91,7 +91,7 @@ struct Appearance : properties::PropertyOwner {
|
||||
properties::OptionProperty renderingModes;
|
||||
};
|
||||
|
||||
~RenderableTrail() = default;
|
||||
virtual ~RenderableTrail() override = default;
|
||||
|
||||
void initializeGL() override;
|
||||
void deinitializeGL() override;
|
||||
|
||||
@@ -43,7 +43,7 @@ namespace scripting { struct LuaLibrary; }
|
||||
class ScreenSpaceDashboard: public ScreenSpaceFramebuffer {
|
||||
public:
|
||||
ScreenSpaceDashboard(const ghoul::Dictionary& dictionary);
|
||||
~ScreenSpaceDashboard() = default;
|
||||
virtual ~ScreenSpaceDashboard() override = default;
|
||||
|
||||
bool initializeGL() override;
|
||||
bool deinitializeGL() override;
|
||||
|
||||
@@ -51,7 +51,7 @@ public:
|
||||
using RenderFunction = std::function<void()>;
|
||||
|
||||
ScreenSpaceFramebuffer(const ghoul::Dictionary& dictionary = ghoul::Dictionary());
|
||||
~ScreenSpaceFramebuffer();
|
||||
virtual ~ScreenSpaceFramebuffer() override;
|
||||
|
||||
bool initializeGL() override;
|
||||
bool deinitializeGL() override;
|
||||
|
||||
@@ -39,7 +39,7 @@ namespace documentation { struct Documentation; }
|
||||
class ScreenSpaceImageOnline : public ScreenSpaceRenderable {
|
||||
public:
|
||||
ScreenSpaceImageOnline(const ghoul::Dictionary& dictionary);
|
||||
~ScreenSpaceImageOnline();
|
||||
virtual ~ScreenSpaceImageOnline() override;
|
||||
|
||||
bool deinitializeGL() override;
|
||||
|
||||
|
||||
@@ -239,8 +239,8 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration)
|
||||
ZoneScopedN("CefWebGuiModule")
|
||||
|
||||
if (_endpointCallback != -1) {
|
||||
WebGuiModule* webGuiModule = global::moduleEngine->module<WebGuiModule>();
|
||||
webGuiModule->removeEndpointChangeCallback(_endpointCallback);
|
||||
WebGuiModule* m = global::moduleEngine->module<WebGuiModule>();
|
||||
m->removeEndpointChangeCallback(_endpointCallback);
|
||||
_endpointCallback = -1;
|
||||
}
|
||||
_enabled = false;
|
||||
|
||||
@@ -32,7 +32,7 @@ namespace openspace {
|
||||
class GUIKeyboardHandler : public WebKeyboardHandler {
|
||||
public:
|
||||
GUIKeyboardHandler();
|
||||
virtual ~GUIKeyboardHandler() = default;
|
||||
~GUIKeyboardHandler() override = default;
|
||||
};
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
@@ -37,7 +37,7 @@ namespace openspace {
|
||||
class GUIRenderHandler : public WebRenderHandler {
|
||||
public:
|
||||
GUIRenderHandler();
|
||||
virtual ~GUIRenderHandler();
|
||||
~GUIRenderHandler() override;
|
||||
|
||||
void draw() override;
|
||||
void render() override;
|
||||
|
||||
@@ -48,7 +48,7 @@ struct UpdateStructure;
|
||||
class RenderableDebugPlane : public Renderable {
|
||||
public:
|
||||
RenderableDebugPlane(const ghoul::Dictionary& dictionary);
|
||||
~RenderableDebugPlane() = default;
|
||||
~RenderableDebugPlane() override = default;
|
||||
|
||||
void initializeGL() override;
|
||||
void deinitializeGL() override;
|
||||
|
||||
@@ -37,7 +37,7 @@ public:
|
||||
constexpr static const char* Name = "DigitalUniverse";
|
||||
|
||||
DigitalUniverseModule();
|
||||
virtual ~DigitalUniverseModule() = default;
|
||||
~DigitalUniverseModule() override = default;
|
||||
std::vector<documentation::Documentation> documentations() const override;
|
||||
|
||||
static ghoul::opengl::ProgramObjectManager ProgramObjectManager;
|
||||
|
||||
@@ -56,7 +56,7 @@ namespace documentation { struct Documentation; }
|
||||
class RenderableBillboardsCloud : public Renderable {
|
||||
public:
|
||||
explicit RenderableBillboardsCloud(const ghoul::Dictionary& dictionary);
|
||||
~RenderableBillboardsCloud() = default;
|
||||
~RenderableBillboardsCloud() override = default;
|
||||
|
||||
void initialize() override;
|
||||
void initializeGL() override;
|
||||
|
||||
@@ -53,7 +53,7 @@ namespace documentation { struct Documentation; }
|
||||
class RenderableDUMeshes : public Renderable {
|
||||
public:
|
||||
explicit RenderableDUMeshes(const ghoul::Dictionary& dictionary);
|
||||
~RenderableDUMeshes() = default;
|
||||
~RenderableDUMeshes() override = default;
|
||||
|
||||
void initializeGL() override;
|
||||
void deinitializeGL() override;
|
||||
|
||||
@@ -57,7 +57,7 @@ namespace documentation { struct Documentation; }
|
||||
class RenderablePlanesCloud : public Renderable {
|
||||
public:
|
||||
explicit RenderablePlanesCloud(const ghoul::Dictionary& dictionary);
|
||||
~RenderablePlanesCloud() = default;
|
||||
~RenderablePlanesCloud() override = default;
|
||||
|
||||
void initialize() override;
|
||||
void initializeGL() override;
|
||||
|
||||
@@ -52,7 +52,7 @@ namespace documentation { struct Documentation; }
|
||||
class RenderablePoints : public Renderable {
|
||||
public:
|
||||
explicit RenderablePoints(const ghoul::Dictionary& dictionary);
|
||||
~RenderablePoints() = default;
|
||||
~RenderablePoints() override = default;
|
||||
|
||||
void initialize() override;
|
||||
void initializeGL() override;
|
||||
|
||||
@@ -39,7 +39,7 @@ public:
|
||||
constexpr static const char* Name = "Exoplanets";
|
||||
|
||||
ExoplanetsModule();
|
||||
virtual ~ExoplanetsModule() = default;
|
||||
~ExoplanetsModule() override = default;
|
||||
|
||||
bool hasDataFiles() const;
|
||||
std::string exoplanetsDataPath() const;
|
||||
@@ -61,6 +61,7 @@ public:
|
||||
protected:
|
||||
void internalInitialize(const ghoul::Dictionary& dict) override;
|
||||
|
||||
properties::BoolProperty _enabled;
|
||||
properties::StringProperty _exoplanetsDataFolder;
|
||||
properties::StringProperty _bvColorMapPath;
|
||||
properties::StringProperty _starTexturePath;
|
||||
@@ -74,8 +75,6 @@ protected:
|
||||
properties::BoolProperty _useOptimisticZone;
|
||||
|
||||
properties::FloatProperty _habitableZoneOpacity;
|
||||
|
||||
properties::BoolProperty _enabled;
|
||||
};
|
||||
|
||||
} // namespace openspace
|
||||
|
||||
@@ -36,7 +36,7 @@ public:
|
||||
constexpr static const char* Name = "Gaia";
|
||||
|
||||
GaiaModule();
|
||||
virtual ~GaiaModule() = default;
|
||||
~GaiaModule() override = default;
|
||||
|
||||
std::vector<documentation::Documentation> documentations() const override;
|
||||
scripting::LuaLibrary luaLibrary() const override;
|
||||
|
||||
@@ -53,7 +53,7 @@ namespace documentation { struct Documentation; }
|
||||
class RenderableGaiaStars : public Renderable {
|
||||
public:
|
||||
explicit RenderableGaiaStars(const ghoul::Dictionary& dictionary);
|
||||
virtual ~RenderableGaiaStars() = default;
|
||||
~RenderableGaiaStars() override = default;
|
||||
|
||||
void initializeGL() override;
|
||||
void deinitializeGL() override;
|
||||
|
||||
@@ -38,7 +38,7 @@ namespace documentation { struct Documentation; }
|
||||
class ConstructOctreeTask : public Task {
|
||||
public:
|
||||
ConstructOctreeTask(const ghoul::Dictionary& dictionary);
|
||||
virtual ~ConstructOctreeTask() = default;
|
||||
~ConstructOctreeTask() override = default;
|
||||
|
||||
std::string description() override;
|
||||
void perform(const Task::ProgressCallback& onProgress) override;
|
||||
|
||||
@@ -48,7 +48,7 @@ struct ReadFileJob : public Job<std::vector<std::vector<float>>> {
|
||||
int lastRow, size_t nDefaultCols, int nValuesPerStar,
|
||||
std::shared_ptr<FitsFileReader> fitsReader);
|
||||
|
||||
~ReadFileJob() = default;
|
||||
~ReadFileJob() override = default;
|
||||
|
||||
void execute() override;
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ namespace documentation { struct Documentation; }
|
||||
class ReadFitsTask : public Task {
|
||||
public:
|
||||
ReadFitsTask(const ghoul::Dictionary& dictionary);
|
||||
virtual ~ReadFitsTask() = default;
|
||||
~ReadFitsTask() override = default;
|
||||
|
||||
std::string description() override;
|
||||
void perform(const Task::ProgressCallback& onProgress) override;
|
||||
|
||||
@@ -37,7 +37,7 @@ namespace documentation { struct Documentation; }
|
||||
class ReadSpeckTask : public Task {
|
||||
public:
|
||||
ReadSpeckTask(const ghoul::Dictionary& dictionary);
|
||||
virtual ~ReadSpeckTask() = default;
|
||||
~ReadSpeckTask() override = default;
|
||||
|
||||
std::string description() override;
|
||||
void perform(const Task::ProgressCallback& onProgress) override;
|
||||
|
||||
@@ -46,8 +46,8 @@ struct RaycastData;
|
||||
class GalaxyRaycaster : public VolumeRaycaster {
|
||||
public:
|
||||
GalaxyRaycaster(ghoul::opengl::Texture& texture);
|
||||
|
||||
virtual ~GalaxyRaycaster() = default;
|
||||
~GalaxyRaycaster() override = default;
|
||||
|
||||
void initialize();
|
||||
|
||||
void renderEntryPoints(const RenderData& data,
|
||||
|
||||
@@ -45,7 +45,7 @@ struct RenderData;
|
||||
class RenderableGalaxy : public Renderable {
|
||||
public:
|
||||
explicit RenderableGalaxy(const ghoul::Dictionary& dictionary);
|
||||
virtual ~RenderableGalaxy() = default;
|
||||
~RenderableGalaxy() override = default;
|
||||
|
||||
void initialize() override;
|
||||
void initializeGL() override;
|
||||
|
||||
@@ -41,7 +41,7 @@ namespace documentation { struct Documentation; }
|
||||
class MilkywayConversionTask : public Task {
|
||||
public:
|
||||
MilkywayConversionTask(const ghoul::Dictionary& dictionary);
|
||||
virtual ~MilkywayConversionTask() = default;
|
||||
~MilkywayConversionTask() override = default;
|
||||
std::string description() override;
|
||||
void perform(const Task::ProgressCallback& onProgress) override;
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ namespace documentation { struct Documentation; }
|
||||
class MilkywayPointsConversionTask : public Task {
|
||||
public:
|
||||
MilkywayPointsConversionTask(const ghoul::Dictionary& dictionary);
|
||||
virtual ~MilkywayPointsConversionTask() = default;
|
||||
~MilkywayPointsConversionTask() override = default;
|
||||
|
||||
std::string description() override;
|
||||
void perform(const Task::ProgressCallback& progressCallback) override;
|
||||
|
||||
@@ -41,7 +41,7 @@ namespace documentation { struct Documentation; }
|
||||
class DashboardItemGlobeLocation : public DashboardItem {
|
||||
public:
|
||||
DashboardItemGlobeLocation(const ghoul::Dictionary& dictionary);
|
||||
~DashboardItemGlobeLocation() = default;
|
||||
~DashboardItemGlobeLocation() override = default;
|
||||
|
||||
void render(glm::vec2& penPosition) override;
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ public:
|
||||
|
||||
private:
|
||||
GdalWrapper(size_t maximumCacheSize, size_t maximumMaximumCacheSize);
|
||||
~GdalWrapper() = default;
|
||||
~GdalWrapper() override = default;
|
||||
|
||||
void setGdalProxyConfiguration();
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@ namespace globebrowsing { class RenderableGlobe; }
|
||||
class GlobeLabelsComponent : public properties::PropertyOwner {
|
||||
public:
|
||||
GlobeLabelsComponent();
|
||||
~GlobeLabelsComponent() = default;
|
||||
~GlobeLabelsComponent() override = default;
|
||||
|
||||
void initialize(const ghoul::Dictionary& dictionary,
|
||||
globebrowsing::RenderableGlobe* globe);
|
||||
|
||||
@@ -39,7 +39,7 @@ namespace openspace::globebrowsing {
|
||||
class LayerAdjustment : public properties::PropertyOwner {
|
||||
public:
|
||||
LayerAdjustment();
|
||||
~LayerAdjustment() = default;
|
||||
~LayerAdjustment() override = default;
|
||||
|
||||
void setValuesFromDictionary(const ghoul::Dictionary& adjustmentDict);
|
||||
|
||||
|
||||
@@ -95,7 +95,7 @@ enum class ShadowCompType {
|
||||
class RenderableGlobe : public Renderable {
|
||||
public:
|
||||
RenderableGlobe(const ghoul::Dictionary& dictionary);
|
||||
~RenderableGlobe() = default;
|
||||
~RenderableGlobe() override = default;
|
||||
|
||||
void initializeGL() override;
|
||||
void deinitialize() override;
|
||||
|
||||
@@ -47,7 +47,7 @@ struct TileLoadJob : public Job<RawTile> {
|
||||
* Destroys the allocated data pointer if it has been allocated and the TileLoadJob
|
||||
* has ownership of it.
|
||||
*/
|
||||
~TileLoadJob();
|
||||
~TileLoadJob() override;
|
||||
|
||||
/**
|
||||
* If the TileLoadJob has been created using PBO, this is the address that the
|
||||
|
||||
@@ -65,7 +65,7 @@ private:
|
||||
|
||||
struct InterpolateTileProvider : public TileProvider {
|
||||
InterpolateTileProvider(const ghoul::Dictionary&);
|
||||
virtual ~InterpolateTileProvider();
|
||||
~InterpolateTileProvider() override;
|
||||
|
||||
Tile tile(const TileIndex& tileIndex) override final;
|
||||
Tile::Status tileStatus(const TileIndex& index) override final;
|
||||
|
||||
@@ -32,7 +32,7 @@ namespace openspace::globebrowsing {
|
||||
class TextTileProvider : public TileProvider {
|
||||
public:
|
||||
TextTileProvider(TileTextureInitData initData, size_t fontSize = 48);
|
||||
virtual ~TextTileProvider();
|
||||
~TextTileProvider() override;
|
||||
|
||||
void reset() override;
|
||||
|
||||
|
||||
@@ -80,7 +80,7 @@ struct TileProvider : public properties::PropertyOwner {
|
||||
static void deinitializeDefaultTile();
|
||||
|
||||
TileProvider();
|
||||
virtual ~TileProvider() = default;
|
||||
~TileProvider() override = default;
|
||||
|
||||
void initialize();
|
||||
void deinitialize();
|
||||
|
||||
@@ -52,70 +52,6 @@ namespace {
|
||||
|
||||
constexpr const std::array<const char*, 2> UniformNames = { "tex", "ortho" };
|
||||
|
||||
void addScreenSpaceRenderableLocal(std::string identifier, std::string texturePath) {
|
||||
if (!std::filesystem::is_regular_file(absPath(texturePath))) {
|
||||
LWARNING(fmt::format("Could not find image '{}'", texturePath));
|
||||
return;
|
||||
}
|
||||
|
||||
std::string script;
|
||||
if (identifier.empty()) {
|
||||
script = fmt::format(
|
||||
"openspace.addScreenSpaceRenderable({{\
|
||||
Type = 'ScreenSpaceImageLocal',\
|
||||
TexturePath = openspace.absPath('{}')\
|
||||
}});",
|
||||
texturePath
|
||||
);
|
||||
}
|
||||
else {
|
||||
script = fmt::format(
|
||||
"openspace.addScreenSpaceRenderable({{\
|
||||
Type = 'ScreenSpaceImageLocal',\
|
||||
TexturePath = openspace.absPath('{0}'),\
|
||||
Identifier = '{1}',\
|
||||
Name = '{1}'\
|
||||
}});",
|
||||
texturePath, identifier
|
||||
);
|
||||
}
|
||||
|
||||
openspace::global::scriptEngine->queueScript(
|
||||
script,
|
||||
openspace::scripting::ScriptEngine::RemoteScripting::Yes
|
||||
);
|
||||
}
|
||||
|
||||
void addScreenSpaceRenderableOnline(std::string identifier, std::string texturePath) {
|
||||
std::string script;
|
||||
if (identifier.empty()) {
|
||||
script = fmt::format(
|
||||
"openspace.addScreenSpaceRenderable({{\
|
||||
Type = 'ScreenSpaceImageOnline',\
|
||||
URL = '{}'\
|
||||
}});",
|
||||
texturePath
|
||||
);
|
||||
}
|
||||
else {
|
||||
script = fmt::format(
|
||||
"openspace.addScreenSpaceRenderable({{\
|
||||
Type = 'ScreenSpaceImageOnline',\
|
||||
URL = '{0}',\
|
||||
Identifier = '{1}',\
|
||||
Name = '{1}'\
|
||||
}});",
|
||||
texturePath,
|
||||
identifier
|
||||
);
|
||||
}
|
||||
|
||||
openspace::global::scriptEngine->queueScript(
|
||||
script,
|
||||
openspace::scripting::ScriptEngine::RemoteScripting::Yes
|
||||
);
|
||||
}
|
||||
|
||||
constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
|
||||
"Enabled",
|
||||
"Is Enabled",
|
||||
|
||||
@@ -68,8 +68,8 @@ namespace {
|
||||
ImGui::Checkbox("Is Ready", &isReady);
|
||||
|
||||
Renderable::RenderBin bin = renderable->renderBin();
|
||||
std::string binStr = [](Renderable::RenderBin bin) {
|
||||
switch (bin) {
|
||||
std::string binStr = [](Renderable::RenderBin b) {
|
||||
switch (b) {
|
||||
case Renderable::RenderBin::Background:
|
||||
return "Background";
|
||||
case Renderable::RenderBin::Opaque:
|
||||
|
||||
@@ -42,7 +42,7 @@ public:
|
||||
const ghoul::Dictionary& dictionary);
|
||||
|
||||
ServerInterface(const ghoul::Dictionary& dictionary);
|
||||
~ServerInterface();
|
||||
virtual ~ServerInterface() override;
|
||||
|
||||
void initialize();
|
||||
void deinitialize();
|
||||
|
||||
@@ -34,7 +34,7 @@ class Connection;
|
||||
class BounceTopic : public Topic {
|
||||
public:
|
||||
BounceTopic() = default;
|
||||
virtual ~BounceTopic() = default;
|
||||
~BounceTopic() override = default;
|
||||
|
||||
void handleJson(const nlohmann::json& json) override;
|
||||
bool isDone() const override;
|
||||
|
||||
@@ -32,7 +32,7 @@ namespace openspace {
|
||||
class DocumentationTopic : public Topic {
|
||||
public:
|
||||
DocumentationTopic() = default;
|
||||
virtual ~DocumentationTopic() = default;
|
||||
~DocumentationTopic() override = default;
|
||||
|
||||
void handleJson(const nlohmann::json& json) override;
|
||||
bool isDone() const override;
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace openspace {
|
||||
class EngineModeTopic : public Topic {
|
||||
public:
|
||||
EngineModeTopic();
|
||||
virtual ~EngineModeTopic();
|
||||
~EngineModeTopic() override;
|
||||
|
||||
void handleJson(const nlohmann::json& json) override;
|
||||
bool isDone() const override;
|
||||
|
||||
@@ -39,7 +39,7 @@ namespace openspace {
|
||||
class FlightControllerTopic : public Topic {
|
||||
public:
|
||||
FlightControllerTopic();
|
||||
~FlightControllerTopic();
|
||||
~FlightControllerTopic() override;
|
||||
|
||||
void handleJson(const nlohmann::json& json) override;
|
||||
bool isDone() const override;
|
||||
|
||||
@@ -32,7 +32,7 @@ namespace openspace {
|
||||
class GetPropertyTopic : public Topic {
|
||||
public:
|
||||
GetPropertyTopic() = default;
|
||||
virtual ~GetPropertyTopic() = default;
|
||||
~GetPropertyTopic() override = default;
|
||||
|
||||
void handleJson(const nlohmann::json& json) override;
|
||||
bool isDone() const override;
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace openspace {
|
||||
class SessionRecordingTopic : public Topic {
|
||||
public:
|
||||
SessionRecordingTopic();
|
||||
virtual ~SessionRecordingTopic();
|
||||
~SessionRecordingTopic() override;
|
||||
|
||||
void handleJson(const nlohmann::json& json) override;
|
||||
bool isDone() const override;
|
||||
|
||||
@@ -32,7 +32,7 @@ namespace openspace {
|
||||
class SetPropertyTopic : public Topic {
|
||||
public:
|
||||
SetPropertyTopic() = default;
|
||||
virtual ~SetPropertyTopic() = default;
|
||||
~SetPropertyTopic() override = default;
|
||||
|
||||
void handleJson(const nlohmann::json& json) override;
|
||||
bool isDone() const override;
|
||||
|
||||
@@ -31,7 +31,7 @@ namespace openspace {
|
||||
|
||||
class ShortcutTopic : public Topic {
|
||||
public:
|
||||
virtual ~ShortcutTopic() = default;
|
||||
~ShortcutTopic() override = default;
|
||||
|
||||
void handleJson(const nlohmann::json& input) override;
|
||||
bool isDone() const override;
|
||||
|
||||
@@ -33,7 +33,7 @@ namespace openspace {
|
||||
class SkyBrowserTopic : public Topic {
|
||||
public:
|
||||
SkyBrowserTopic();
|
||||
virtual ~SkyBrowserTopic();
|
||||
~SkyBrowserTopic() override;
|
||||
|
||||
void handleJson(const nlohmann::json& json) override;
|
||||
bool isDone() const override;
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace openspace {
|
||||
class SubscriptionTopic : public Topic {
|
||||
public:
|
||||
SubscriptionTopic() = default;
|
||||
~SubscriptionTopic();
|
||||
~SubscriptionTopic() override;
|
||||
|
||||
void handleJson(const nlohmann::json& json) override;
|
||||
bool isDone() const override;
|
||||
|
||||
@@ -33,7 +33,7 @@ namespace openspace {
|
||||
class TimeTopic : public Topic {
|
||||
public:
|
||||
TimeTopic();
|
||||
virtual ~TimeTopic();
|
||||
~TimeTopic() override;
|
||||
|
||||
void handleJson(const nlohmann::json& json) override;
|
||||
bool isDone() const override;
|
||||
|
||||
@@ -32,7 +32,7 @@ namespace openspace {
|
||||
class TriggerPropertyTopic : public Topic {
|
||||
public:
|
||||
TriggerPropertyTopic() = default;
|
||||
virtual ~TriggerPropertyTopic() = default;
|
||||
~TriggerPropertyTopic() override = default;
|
||||
|
||||
void handleJson(const nlohmann::json& json) override;
|
||||
bool isDone() const override;
|
||||
|
||||
@@ -31,7 +31,7 @@ namespace openspace {
|
||||
|
||||
class VersionTopic : public Topic {
|
||||
public:
|
||||
virtual ~VersionTopic() = default;
|
||||
~VersionTopic() override = default;
|
||||
|
||||
void handleJson(const nlohmann::json& json) override;
|
||||
bool isDone() const override;
|
||||
|
||||
@@ -51,7 +51,7 @@ public:
|
||||
static constexpr const char* Name = "Server";
|
||||
|
||||
ServerModule();
|
||||
virtual ~ServerModule();
|
||||
virtual ~ServerModule() override;
|
||||
|
||||
ServerInterface* serverInterfaceByIdentifier(const std::string& identifier);
|
||||
|
||||
|
||||
@@ -21,6 +21,11 @@ must not be misrepresented as being the original software.
|
||||
distribution.
|
||||
*/
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wold-style-cast"
|
||||
#pragma GCC diagnostic ignored "-Wsuggest-override"
|
||||
#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
|
||||
|
||||
#include "tinyxml2.h"
|
||||
|
||||
#include <new> // yes, this one new style header, is in the Android SDK.
|
||||
@@ -2984,3 +2989,5 @@ bool XMLPrinter::Visit( const XMLUnknown& unknown )
|
||||
}
|
||||
|
||||
} // namespace tinyxml2
|
||||
|
||||
#pragma GCC diagnostic pop
|
||||
|
||||
@@ -38,7 +38,7 @@ namespace openspace {
|
||||
class ScreenSpaceSkyBrowser : public ScreenSpaceRenderable, public WwtCommunicator {
|
||||
public:
|
||||
explicit ScreenSpaceSkyBrowser(const ghoul::Dictionary& dictionary);
|
||||
~ScreenSpaceSkyBrowser();
|
||||
~ScreenSpaceSkyBrowser() override;
|
||||
|
||||
bool initializeGL() override;
|
||||
bool deinitializeGL() override;
|
||||
|
||||
@@ -199,11 +199,12 @@ glm::dmat4 incrementalAnimationMatrix(const glm::dvec3& start, const glm::dvec3&
|
||||
*/
|
||||
double sizeFromFov(double fov, glm::dvec3 worldPosition);
|
||||
|
||||
template<typename T>
|
||||
template <typename T>
|
||||
class Animation {
|
||||
public:
|
||||
Animation(T start, T goal, double time)
|
||||
: _start(start), _goal(goal)
|
||||
: _goal(std::move(goal))
|
||||
, _start(std::move(start))
|
||||
{
|
||||
_animationTime = std::chrono::milliseconds(static_cast<int>(time * 1000));
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ class WwtCommunicator : public Browser {
|
||||
public:
|
||||
explicit WwtCommunicator(const ghoul::Dictionary& dictionary);
|
||||
WwtCommunicator(const WwtCommunicator&) = default;
|
||||
~WwtCommunicator();
|
||||
~WwtCommunicator() override;
|
||||
|
||||
void update();
|
||||
|
||||
|
||||
@@ -25,11 +25,16 @@
|
||||
#ifndef __OPENSPACE_MODULE_SKYBROWSER___WWTDATAHANDLER___H__
|
||||
#define __OPENSPACE_MODULE_SKYBROWSER___WWTDATAHANDLER___H__
|
||||
|
||||
#include <modules/skybrowser/ext/tinyxml2/tinyxml2.h>
|
||||
#include <modules/space/speckloader.h>
|
||||
#include <openspace/documentation/documentation.h>
|
||||
#include <unordered_map>
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wsuggest-override"
|
||||
#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
|
||||
#include <modules/skybrowser/ext/tinyxml2/tinyxml2.h>
|
||||
#pragma GCC diagnostic pop
|
||||
|
||||
namespace openspace::documentation { struct Documentation; }
|
||||
|
||||
namespace openspace::wwt {
|
||||
|
||||
@@ -169,7 +169,7 @@ SkyBrowserModule::SkyBrowserModule()
|
||||
|
||||
// Set callback functions
|
||||
global::callback::mouseButton->emplace(global::callback::mouseButton->begin(),
|
||||
[&](MouseButton button, MouseAction action, KeyModifier) -> bool {
|
||||
[&](MouseButton, MouseAction action, KeyModifier) -> bool {
|
||||
if (action == MouseAction::Press) {
|
||||
_cameraRotation.stop();
|
||||
}
|
||||
@@ -218,7 +218,7 @@ SkyBrowserModule::SkyBrowserModule()
|
||||
// Trigger callbacks (should maybe have a check to see if update is needed)
|
||||
using K = CallbackHandle;
|
||||
using V = CallbackFunction;
|
||||
for (const std::pair<const K, V>& it : _preSyncCallbacks) {
|
||||
for (const std::pair<K, V>& it : _preSyncCallbacks) {
|
||||
it.second(); // call function
|
||||
}
|
||||
});
|
||||
|
||||
@@ -102,11 +102,11 @@ private:
|
||||
properties::BoolProperty _enabled;
|
||||
properties::BoolProperty _showTitleInGuiBrowser;
|
||||
properties::BoolProperty _allowCameraRotation;
|
||||
properties::BoolProperty _hideTargetsBrowsersWithGui;
|
||||
properties::BoolProperty _inverseZoomDirection;
|
||||
properties::DoubleProperty _cameraRotationSpeed;
|
||||
properties::DoubleProperty _targetAnimationSpeed;
|
||||
properties::DoubleProperty _browserAnimationSpeed;
|
||||
properties::BoolProperty _hideTargetsBrowsersWithGui;
|
||||
properties::BoolProperty _inverseZoomDirection;
|
||||
properties::DoubleProperty _spaceCraftAnimationTime;
|
||||
properties::StringProperty _wwtImageCollectionUrl;
|
||||
|
||||
|
||||
@@ -60,7 +60,7 @@ namespace {
|
||||
std::remove_if(
|
||||
str.begin(), str.end(),
|
||||
[](char c) {
|
||||
return c < 0 || c >= 128;
|
||||
return c < 0;
|
||||
}
|
||||
),
|
||||
str.end()
|
||||
@@ -553,8 +553,6 @@ namespace {
|
||||
using namespace openspace;
|
||||
|
||||
SkyBrowserModule* module = global::moduleEngine->module<SkyBrowserModule>();
|
||||
const ImageData& image = module->getWwtDataHandler()->getImage(imageIndex);
|
||||
|
||||
TargetBrowserPair* pair = module->pair(identifier);
|
||||
if (pair) {
|
||||
pair->removeSelectedImage(imageIndex);
|
||||
|
||||
@@ -80,13 +80,13 @@ void Browser::RenderHandler::setTexture(GLuint t) {
|
||||
}
|
||||
|
||||
Browser::Browser(const ghoul::Dictionary& dictionary)
|
||||
: _url(UrlInfo)
|
||||
, _browserPixeldimensions(
|
||||
: _browserPixeldimensions(
|
||||
DimensionsInfo,
|
||||
glm::vec2(500.f),
|
||||
glm::vec2(10.f),
|
||||
glm::vec2(3000.f)
|
||||
)
|
||||
, _url(UrlInfo)
|
||||
, _reload(ReloadInfo)
|
||||
{
|
||||
if (dictionary.hasValue<std::string>(UrlInfo.identifier)) {
|
||||
|
||||
@@ -123,7 +123,6 @@ ScreenSpaceSkyBrowser::ScreenSpaceSkyBrowser(const ghoul::Dictionary& dictionary
|
||||
_textureQuality.onChange([this]() { _textureDimensionsIsDirty = true; });
|
||||
|
||||
if (global::windowDelegate->isMaster()) {
|
||||
SkyBrowserModule* module = global::moduleEngine->module<SkyBrowserModule>();
|
||||
_borderColor = randomBorderColor();
|
||||
}
|
||||
|
||||
|
||||
@@ -44,8 +44,8 @@ namespace openspace {
|
||||
|
||||
TargetBrowserPair::TargetBrowserPair(SceneGraphNode* targetNode,
|
||||
ScreenSpaceSkyBrowser* browser)
|
||||
: _targetNode(targetNode)
|
||||
, _browser(browser)
|
||||
: _browser(browser)
|
||||
, _targetNode(targetNode)
|
||||
{
|
||||
ghoul_assert(browser, "Sky browser is null pointer");
|
||||
ghoul_assert(targetNode, "Sky target is null pointer");
|
||||
|
||||
@@ -268,7 +268,7 @@ int WwtDataHandler::nLoadedImages() const {
|
||||
}
|
||||
|
||||
const ImageData& WwtDataHandler::getImage(int i) const {
|
||||
ghoul_assert(i < _images.size(), "Index outside of image vector boundaries");
|
||||
ghoul_assert(i < static_cast<int>(_images.size()), "Index outside of vector size");
|
||||
return _images[i];
|
||||
}
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ public:
|
||||
);
|
||||
|
||||
PlanetGeometry();
|
||||
virtual ~PlanetGeometry() = default;
|
||||
~PlanetGeometry() override = default;
|
||||
virtual void initialize();
|
||||
virtual void deinitialize();
|
||||
virtual void render() = 0;
|
||||
|
||||
@@ -52,7 +52,7 @@ namespace documentation { struct Documentation; }
|
||||
class RenderableStars : public Renderable {
|
||||
public:
|
||||
explicit RenderableStars(const ghoul::Dictionary& dictionary);
|
||||
~RenderableStars();
|
||||
~RenderableStars() override;
|
||||
|
||||
void initializeGL() override;
|
||||
void deinitializeGL() override;
|
||||
|
||||
@@ -42,7 +42,7 @@ namespace openspace::planetgeometry {
|
||||
class SimpleSphereGeometry : public PlanetGeometry {
|
||||
public:
|
||||
SimpleSphereGeometry(const ghoul::Dictionary& dictionary);
|
||||
~SimpleSphereGeometry();
|
||||
~SimpleSphereGeometry() override;
|
||||
|
||||
void initialize() override;
|
||||
void deinitialize() override;
|
||||
|
||||
@@ -37,7 +37,7 @@ public:
|
||||
constexpr static const char* Name = "Space";
|
||||
|
||||
SpaceModule();
|
||||
virtual ~SpaceModule() = default;
|
||||
~SpaceModule() override = default;
|
||||
std::vector<documentation::Documentation> documentations() const override;
|
||||
|
||||
static ghoul::opengl::ProgramObjectManager ProgramObjectManager;
|
||||
|
||||
@@ -61,7 +61,7 @@ public:
|
||||
KeplerTranslation(const ghoul::Dictionary& dictionary);
|
||||
|
||||
/// Default destructor
|
||||
virtual ~KeplerTranslation() = default;
|
||||
~KeplerTranslation() override = default;
|
||||
|
||||
/**
|
||||
* Method returning the translation vector at a given time.
|
||||
|
||||
@@ -36,7 +36,7 @@ namespace openspace {
|
||||
class DashboardItemInstruments : public DashboardTextItem {
|
||||
public:
|
||||
DashboardItemInstruments(const ghoul::Dictionary& dictionary);
|
||||
~DashboardItemInstruments() = default;
|
||||
~DashboardItemInstruments() override = default;
|
||||
|
||||
void render(glm::vec2& penPosition) override;
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ struct UpdateData;
|
||||
class RenderableModelProjection : public Renderable {
|
||||
public:
|
||||
RenderableModelProjection(const ghoul::Dictionary& dictionary);
|
||||
~RenderableModelProjection();
|
||||
~RenderableModelProjection() override;
|
||||
|
||||
void initializeGL() override;
|
||||
void deinitializeGL() override;
|
||||
|
||||
@@ -46,7 +46,7 @@ struct UpdateData;
|
||||
class RenderablePlaneProjection : public Renderable {
|
||||
public:
|
||||
RenderablePlaneProjection(const ghoul::Dictionary& dictionary);
|
||||
~RenderablePlaneProjection();
|
||||
~RenderablePlaneProjection() override;
|
||||
|
||||
void initializeGL() override;
|
||||
void deinitializeGL() override;
|
||||
|
||||
@@ -44,7 +44,7 @@ namespace planetgeometry { class PlanetGeometry; }
|
||||
class RenderablePlanetProjection : public Renderable {
|
||||
public:
|
||||
RenderablePlanetProjection(const ghoul::Dictionary& dict);
|
||||
~RenderablePlanetProjection();
|
||||
~RenderablePlanetProjection() override;
|
||||
|
||||
void initializeGL() override;
|
||||
void deinitializeGL() override;
|
||||
|
||||
@@ -38,7 +38,7 @@ public:
|
||||
constexpr static const char* Name = "StateMachine";
|
||||
|
||||
StateMachineModule();
|
||||
~StateMachineModule() = default;
|
||||
~StateMachineModule() override = default;
|
||||
|
||||
void initializeStateMachine(const ghoul::Dictionary& states,
|
||||
const ghoul::Dictionary& transitions,
|
||||
|
||||
@@ -67,7 +67,7 @@ public:
|
||||
std::vector<std::string> synchronizationRepositories);
|
||||
|
||||
/// Destructor that will close the asynchronous file transfer, if it is still ongoing
|
||||
virtual ~HttpSynchronization();
|
||||
~HttpSynchronization() override;
|
||||
|
||||
/**
|
||||
* Returns the location to which files downloaded through this ResourceSynchronization
|
||||
|
||||
@@ -147,7 +147,7 @@ void UrlSynchronization::start() {
|
||||
std::vector<std::unique_ptr<HttpFileDownload>> downloads;
|
||||
|
||||
for (const std::string& url : _urls) {
|
||||
if (_filename.empty()) {
|
||||
if (_filename.empty() || _urls.size() > 1) {
|
||||
std::string name = std::filesystem::path(url).filename().string();
|
||||
|
||||
// We can not create filenames with question marks
|
||||
|
||||
@@ -57,7 +57,7 @@ public:
|
||||
std::filesystem::path synchronizationRoot);
|
||||
|
||||
/// Contructor that will terminate the synchronization thread if it is still running
|
||||
virtual ~UrlSynchronization();
|
||||
~UrlSynchronization() override;
|
||||
|
||||
/**
|
||||
* Returns the location to which files downloaded through this ResourceSynchronization
|
||||
|
||||
@@ -39,7 +39,7 @@ struct RenderData;
|
||||
class RenderableToyVolume : public Renderable {
|
||||
public:
|
||||
RenderableToyVolume(const ghoul::Dictionary& dictionary);
|
||||
~RenderableToyVolume();
|
||||
~RenderableToyVolume() override;
|
||||
|
||||
void initializeGL() override;
|
||||
void deinitializeGL() override;
|
||||
|
||||
@@ -44,7 +44,7 @@ struct RaycastData;
|
||||
class ToyVolumeRaycaster : public VolumeRaycaster {
|
||||
public:
|
||||
ToyVolumeRaycaster(glm::vec4 color);
|
||||
virtual ~ToyVolumeRaycaster() = default;
|
||||
~ToyVolumeRaycaster() override = default;
|
||||
|
||||
void initialize();
|
||||
void deinitialize();
|
||||
|
||||
@@ -53,7 +53,7 @@ public:
|
||||
std::shared_ptr<ghoul::opengl::Texture> texture,
|
||||
std::shared_ptr<openspace::TransferFunction> transferFunction,
|
||||
std::shared_ptr<VolumeClipPlanes> clipPlanes);
|
||||
virtual ~BasicVolumeRaycaster();
|
||||
~BasicVolumeRaycaster() override;
|
||||
|
||||
void initialize();
|
||||
void deinitialize();
|
||||
|
||||
@@ -50,7 +50,7 @@ class VolumeClipPlanes;
|
||||
class RenderableTimeVaryingVolume : public Renderable {
|
||||
public:
|
||||
RenderableTimeVaryingVolume(const ghoul::Dictionary& dictionary);
|
||||
~RenderableTimeVaryingVolume();
|
||||
~RenderableTimeVaryingVolume() override;
|
||||
|
||||
void initializeGL() override;
|
||||
void deinitializeGL() override;
|
||||
|
||||
@@ -37,7 +37,7 @@ namespace openspace::volume {
|
||||
class VolumeClipPlane : public properties::PropertyOwner {
|
||||
public:
|
||||
VolumeClipPlane(const ghoul::Dictionary& dictionary);
|
||||
virtual ~VolumeClipPlane() = default;
|
||||
~VolumeClipPlane() override = default;
|
||||
glm::vec3 normal() const;
|
||||
glm::vec2 offsets() const;
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ class VolumeClipPlane;
|
||||
class VolumeClipPlanes : public properties::PropertyOwner {
|
||||
public:
|
||||
VolumeClipPlanes(const ghoul::Dictionary& dictionary);
|
||||
virtual ~VolumeClipPlanes() = default;
|
||||
~VolumeClipPlanes() override = default;
|
||||
|
||||
void initialize();
|
||||
void deinitialize();
|
||||
|
||||
@@ -57,7 +57,7 @@ cmake_policy(SET CMP0074 NEW)
|
||||
# Specify the CEF distribution version.
|
||||
|
||||
# Release from 03/21/2022 verified to work on Windows.
|
||||
set(CEF_VERSION "91.1.23+g04c8d56+chromium-91.0.4472.164")
|
||||
set(CEF_VERSION "102.0.10+gf249b2e+chromium-102.0.5005.115")
|
||||
|
||||
# Removing - micahnyc 03/21/2022
|
||||
# 73.1.13 has an issue on MacOS: The GUI freezing upon interaction.
|
||||
@@ -107,6 +107,11 @@ add_subdirectory(${CEF_LIBCEF_DLL_WRAPPER_PATH} libcef_dll_wrapper)
|
||||
|
||||
mark_as_advanced(CEF_DEBUG_INFO_FLAG USE_ATL USE_OFFICIAL_BUILD_SANDBOX USE_SANDBOX)
|
||||
|
||||
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
|
||||
# The CEF DLL wrapper is raising a lot of warnings on GCC
|
||||
target_compile_options(libcef_dll_wrapper PRIVATE "-w")
|
||||
endif ()
|
||||
|
||||
##########################################################################################
|
||||
# Add CEF client files
|
||||
|
||||
@@ -281,7 +286,7 @@ list(APPEND deps "${CEF_RESOURCE_DIR}/${j}")
|
||||
endforeach()
|
||||
add_external_library_dependencies("${deps}")
|
||||
|
||||
if (UNIX)
|
||||
if (UNIX AND NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
|
||||
# Linux needs to have copies of CEF files in Resources/ in its build-type dir to avoid
|
||||
# the 'Couldn't mmap icu data file' runtime error
|
||||
file(COPY ${CEF_ROOT}/Resources/
|
||||
|
||||
@@ -63,7 +63,7 @@ class WebKeyboardHandler;
|
||||
class ScreenSpaceBrowser : public ScreenSpaceRenderable {
|
||||
public:
|
||||
ScreenSpaceBrowser(const ghoul::Dictionary& dictionary);
|
||||
virtual ~ScreenSpaceBrowser() = default;
|
||||
~ScreenSpaceBrowser() override = default;
|
||||
|
||||
bool initializeGL() override;
|
||||
bool deinitializeGL() override;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user