From 380e317f3423af2dd31507a48625c0901719497a Mon Sep 17 00:00:00 2001 From: sylvass Date: Tue, 22 Feb 2022 16:25:46 -0500 Subject: [PATCH] More cleanup before pull request --- data/assets/skyBrowserTargetPair.asset | 37 -------------------------- modules/space/speckloader.cpp | 2 -- 2 files changed, 39 deletions(-) delete mode 100644 data/assets/skyBrowserTargetPair.asset diff --git a/data/assets/skyBrowserTargetPair.asset b/data/assets/skyBrowserTargetPair.asset deleted file mode 100644 index 4facf93371..0000000000 --- a/data/assets/skyBrowserTargetPair.asset +++ /dev/null @@ -1,37 +0,0 @@ -local assetHelper = asset.require('util/asset_helper') - -local targetId= "SkyTarget0" -local browserId = "SkyBrowser0" -local serverUrl = "https://data.openspaceproject.com/dist/skybrowser/page/" ---local localHostUrl = "http://localhost:8000" - -local browser = { - Type = "ScreenSpaceSkyBrowser", - Identifier = browserId, - Name = "Sky Browser", - Url = serverUrl, - FaceCamera = false, - CartesianPosition = {-1.0, -0.5, -2.1}, - Dimensions = { 1000, 1000 }, -}; - -local target = { - Type = "ScreenSpaceSkyTarget", - Identifier = targetId, - Name = "Sky Target", - FaceCamera = false, -}; - -asset.onInitialize(function () - openspace.addScreenSpaceRenderable(browser) - openspace.addScreenSpaceRenderable(target) - openspace.skybrowser.addPairToSkyBrowserModule(targetId,browserId) - openspace.skybrowser.setSelectedBrowser(browserId) -end) - -asset.onDeinitialize(function () - openspace.removeScreenSpaceRenderable(browserId) - openspace.removeScreenSpaceRenderable(targetId) -end) - -asset.export("browser", {browser, target}) diff --git a/modules/space/speckloader.cpp b/modules/space/speckloader.cpp index 4d5f03d9d3..8327ada08f 100644 --- a/modules/space/speckloader.cpp +++ b/modules/space/speckloader.cpp @@ -333,8 +333,6 @@ Dataset loadFile(std::filesystem::path path, SkipAllZeroLines skipAllZeroLines) entry.comment = rest; } - int i = 0; - i += 1; res.entries.push_back(std::move(entry)); }