From 0731022fc16869c9b751a857a8cffc7bc7bc2522 Mon Sep 17 00:00:00 2001 From: VLLindqvist Date: Sun, 11 Jun 2023 23:22:25 +0200 Subject: [PATCH] Remove logging and stuff that is not needed for SI --- data/assets/examples/pointscloud.asset | 23 -------------------- src/engine/syncengine.cpp | 5 ----- src/scene/scene_lua.inl | 30 +------------------------- unistd.h | 0 4 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 data/assets/examples/pointscloud.asset delete mode 100644 unistd.h diff --git a/data/assets/examples/pointscloud.asset b/data/assets/examples/pointscloud.asset deleted file mode 100644 index d573e9e9fc..0000000000 --- a/data/assets/examples/pointscloud.asset +++ /dev/null @@ -1,23 +0,0 @@ --- This asset requires OpenSpace to be built with the OPENSPACE_MODULE_SPOUT enabled - -local assetHelper = asset.require("util/asset_helper") - -local RenderablePointsCloud = { - Identifier = "RenderablePointsCloud", - Renderable = { - Type = "RenderablePointsCloud", - Color = {0.0, 0.0, 0.0}, - Data = {{0.0, 0.0, 0.0}, {0.0, 0.0, 0.0}, {0.0, 0.0, 0.0}}, - Luminosity = {0.0, 0.0, 0.0}, - Opacity = 0.0, - Size = 0.0, - Velocity = {0.0, 0.0, 0.0} - }, - GUI = { - Name = "Points Cloud", - Path = "/Examples" - } -} - -local objects = { RenderablePointsCloud } -assetHelper.registerSceneGraphNodesAndExport(asset, objects) diff --git a/src/engine/syncengine.cpp b/src/engine/syncengine.cpp index 518b62b703..5815645218 100644 --- a/src/engine/syncengine.cpp +++ b/src/engine/syncengine.cpp @@ -28,7 +28,6 @@ #include #include #include -// #include namespace openspace { @@ -45,10 +44,6 @@ std::vector SyncEngine::encodeSyncables() { } std::vector data = _syncBuffer.data(); - - // std::string msg = "_syncBuffer.size() (encodeSyncables):" + std::to_string(_syncBuffer.data().size()); - // LWARNING(msg); - _syncBuffer.reset(); return data; } diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl index 25e9984cb5..96b2fb93c7 100644 --- a/src/scene/scene_lua.inl +++ b/src/scene/scene_lua.inl @@ -225,8 +225,7 @@ void applyRegularExpression(lua_State* L, const std::string& regex, fmt::format( "{}: Property '{}' does not accept input of type '{}'. Requested " "type: '{}'", - errorLocation(L), - prop->fullyQualifiedIdentifier(), + errorLocation(L), prop->fullyQualifiedIdentifier(), luaTypeToString(type), luaTypeToString(prop->typeLua()) ) ); @@ -300,33 +299,6 @@ int setPropertyCallSingle(properties::Property& prop, const std::string& uri, const int type = lua_type(L, -1); if (type != prop.typeLua()) { - std::string propValue; - prop.getStringValue(propValue); - std::string propDescription = prop.description(); - std::string propGuiName = prop.guiName(); - std::string_view propTypeLua = luaTypeToString(prop.typeLua()); - int propTypeLuaInt = prop.typeLua(); - // lua_State l_state = *L; - // std::string propTypeLua = prop.getLuaValue - - LERRORC( - "property_setValue(1))", - fmt::format( - "{}: Property '{}' does not accept input of type '{}'. Requested " - "type: '{}'" - "description: {}" - "propGuiName: {}" - "propTypeLua: {}" - "propTypeLuaInt: {}", - errorLocation(L), - propValue, - propDescription, - propGuiName, - propTypeLua, - propTypeLuaInt - ) - ); - LERRORC( "property_setValue", fmt::format( diff --git a/unistd.h b/unistd.h deleted file mode 100644 index e69de29bb2..0000000000