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

Merge branch 'develop' into feature/launcherconfigs

Browse Source
This commit is contained in:
Matthew Territo
2017-02-13 08:27:39 -07:00
parent 89325cc52a 70020e3de7
commit fcbfeb86ee
125 changed files with 565 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
apps/DataConverter/conversiontask.h
View File

@@ -1,5 +1,29 @@
#ifndef __CONVERSIONTASK_H__
#define __CONVERSIONTASK_H__
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_APP_DATACONVERTER___CONVERSIONTASK___H__
#define __OPENSPACE_APP_DATACONVERTER___CONVERSIONTASK___H__
#include <functional>
@@ -11,7 +35,7 @@ public:
virtual void perform(const std::function<void(float)>& onProgress) = 0;
};
}
}
} // namespace dataconverter
} // namespace openspace
#endif
#endif // __OPENSPACE_APP_DATACONVERTER___CONVERSIONTASK___H__

24
apps/DataConverter/milkywayconversiontask.cpp
View File

@@ -1,3 +1,27 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <apps/DataConverter/milkywayconversiontask.h>
#include <modules/volume/textureslicevolumereader.h>
#include <modules/volume/rawvolumewriter.h>

34
apps/DataConverter/milkywayconversiontask.h
View File

@@ -1,5 +1,29 @@
#ifndef __MILKYWAYCONVERSIONTASK_H__
#define __MILKYWAYCONVERSIONTASK_H__
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_APP_DATACONVERTER___MILKYWAYCONVERSIONTASK___H__
#define __OPENSPACE_APP_DATACONVERTER___MILKYWAYCONVERSIONTASK___H__
#include <apps/DataConverter/conversiontask.h>
#include <string>
@@ -35,7 +59,7 @@ private:
glm::ivec3 _outDimensions;
};
}
}
} // namespace dataconverter
} // namespace openspace
#endif
#endif // __OPENSPACE_APP_DATACONVERTER___MILKYWAYCONVERSIONTASK___H__

24
apps/DataConverter/milkywaypointsconversiontask.cpp
View File

@@ -1,3 +1,27 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include <apps/DataConverter/milkywaypointsconversiontask.h>
#include <modules/volume/textureslicevolumereader.h>
#include <modules/volume/rawvolumewriter.h>

34
apps/DataConverter/milkywaypointsconversiontask.h
View File

@@ -1,5 +1,29 @@
#ifndef __MILKYWAYPOINTSCONVERSIONTASK_H__
#define __MILKYWAYPOINTSCONVERSIONTASK_H__
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_APP_DATACONVERTER___MILKYWAYPOINTSCONVERSIONTASK___H__
#define __OPENSPACE_APP_DATACONVERTER___MILKYWAYPOINTSCONVERSIONTASK___H__
#include <apps/DataConverter/conversiontask.h>
#include <string>
@@ -29,7 +53,7 @@ private:
std::string _outFilename;
};
}
}
} // namespace dataconverter
} // namespace openspace
#endif
#endif // __OPENSPACE_APP_DATACONVERTER___MILKYWAYPOINTSCONVERSIONTASK___H__

6
apps/Launcher/infowidget.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __INFOWIDGET_H__
#define __INFOWIDGET_H__
#ifndef __OPENSPACE_APP_LAUNCHER___INFOWIDGET___H__
#define __OPENSPACE_APP_LAUNCHER___INFOWIDGET___H__
//#include <QWidget>
#include <QGroupBox>
@@ -58,4 +58,4 @@ private:
int _totalBytes;
};
#endif // __INFOWIDGET_H__
#endif // __OPENSPACE_APP_LAUNCHER___INFOWIDGET___H__

6
apps/Launcher/mainwindow.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __MAINWINDOW_H__
#define __MAINWINDOW_H__
#ifndef __OPENSPACE_APP_LAUNCHER___MAINWINDOW___H__
#define __OPENSPACE_APP_LAUNCHER___MAINWINDOW___H__
#include <QWidget>
@@ -117,4 +117,4 @@ private:
// bool _hasLabelTimeline = false;
//};
#endif // __MAINWINDOW_H__
#endif // __OPENSPACE_APP_LAUNCHER___MAINWINDOW___H__

6
apps/Launcher/shortcutwidget.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __SHORTCUTWIDGET_H__
#define __SHORTCUTWIDGET_H__
#ifndef __OPENSPACE_APP_LAUNCHER___SHORTCUTWIDGET___H__
#define __OPENSPACE_APP_LAUNCHER___SHORTCUTWIDGET___H__
#include <QWidget>
@@ -33,4 +33,4 @@ public:
ShortcutWidget(QWidget* parent, Qt::WindowFlags f = 0);
};
#endif // __SHORTCUTWIDGET_H__
#endif // __OPENSPACE_APP_LAUNCHER___SHORTCUTWIDGET___H__

6
apps/Launcher/syncwidget.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __SYNCWIDGET_H__
#define __SYNCWIDGET_H__
#ifndef __OPENSPACE_APP_LAUNCHER___SYNCWIDGET___H__
#define __OPENSPACE_APP_LAUNCHER___SYNCWIDGET___H__
#include <QWidget>
@@ -121,4 +121,4 @@ private:
};
#endif // __SYNCWIDGET_H__
#endif // __OPENSPACE_APP_LAUNCHER___SYNCWIDGET___H__

8
apps/TimelineView/common.h
View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2015 *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __COMMON_H__
#define __COMMON_H__
#ifndef __OPENSPACE_APP_TIMELINEVIEW___COMMON___H__
#define __OPENSPACE_APP_TIMELINEVIEW___COMMON___H__
struct Image {
double beginning;
@@ -34,4 +34,4 @@ struct Image {
std::vector<std::string> instruments;
};
#endif // __COMMON_H__
#endif // __OPENSPACE_APP_TIMELINEVIEW___COMMON___H__

2
apps/TimelineView/configurationwidget.cpp
View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2015 *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *

8
apps/TimelineView/configurationwidget.h
View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2015 *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __CONFIGURATIONWIDGET_H__
#define __CONFIGURATIONWIDGET_H__
#ifndef __OPENSPACE_APP_TIMELINEVIEW___CONFIGURATIONWIDGET___H__
#define __OPENSPACE_APP_TIMELINEVIEW___CONFIGURATIONWIDGET___H__
#include <QWidget>
#include <QLineEdit>
@@ -50,4 +50,4 @@ private:
QPushButton* _connect;
};
#endif // __CONFIGURATIONWIDGET_H__
#endif // __OPENSPACE_APP_TIMELINEVIEW___CONFIGURATIONWIDGET___H__

2
apps/TimelineView/controlwidget.cpp
View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2015 *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *

8
apps/TimelineView/controlwidget.h
View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2015 *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __CONTROLWIDGET_H__
#define __CONTROLWIDGET_H__
#ifndef __OPENSPACE_APP_TIMELINEVIEW___CONTROLWIDGET___H__
#define __OPENSPACE_APP_TIMELINEVIEW___CONTROLWIDGET___H__
#include <QWidget>
@@ -66,4 +66,4 @@ private:
QPushButton* _setFocusToNewHorizons;
};
#endif // __CONTROLWIDGET_H__
#endif // __OPENSPACE_APP_TIMELINEVIEW___CONTROLWIDGET___H__

2
apps/TimelineView/informationwidget.cpp
View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2015 *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *

8
apps/TimelineView/informationwidget.h
View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2015 *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __INFORMATIONWIDGET_H__
#define __INFORMATIONWIDGET_H__
#ifndef __OPENSPACE_APP_TIMELINEVIEW___INFORMATIONWIDGET___H__
#define __OPENSPACE_APP_TIMELINEVIEW___INFORMATIONWIDGET___H__
#include <QTextEdit>
@@ -38,4 +38,4 @@ public slots:
void logInformation(QString text);
};
#endif // __INFORMATIONWIDGET_H__
#endif // __OPENSPACE_APP_TIMELINEVIEW___INFORMATIONWIDGET___H__

2
apps/TimelineView/main.cpp
View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2015 *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *

2
apps/TimelineView/mainwindow.cpp
View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2015 *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *

8
apps/TimelineView/mainwindow.h
View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2015 *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __MAINWINDOW_H__
#define __MAINWINDOW_H__
#ifndef __OPENSPACE_APP_TIMELINEVIEW___MAINWINDOW___H__
#define __OPENSPACE_APP_TIMELINEVIEW___MAINWINDOW___H__
#include <QWidget>
#include <QTcpSocket>
@@ -71,4 +71,4 @@ private:
bool _isConnected = false;
};
#endif // __MAINWINDOW_H__
#endif // __OPENSPACE_APP_TIMELINEVIEW___MAINWINDOW___H__

2
apps/TimelineView/timelinewidget.cpp
View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2015 *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *

8
apps/TimelineView/timelinewidget.h
View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2014-2015 *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __TIMELINEWIDGET_H__
#define __TIMELINEWIDGET_H__
#ifndef __OPENSPACE_APP_TIMELINEVIEW___TIMELINEWIDGET___H__
#define __OPENSPACE_APP_TIMELINEVIEW___TIMELINEWIDGET___H__
#include <QWidget>
@@ -67,4 +67,4 @@ private:
} _currentTime;
};
#endif // __TIMELINEWIDGET_H__
#endif // __OPENSPACE_APP_TIMELINEVIEW___TIMELINEWIDGET___H__

2
ext/ghoul

Submodule ext/ghoul updated: be0ffdb2f1...3ee30f00c1

6
include/openspace/documentation/core_registration.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_CORE___REGISTRATION___H__
#define __OPENSPACE_CORE___REGISTRATION___H__
#ifndef __OPENSPACE_CORE___CORE_REGISTRATION___H__
#define __OPENSPACE_CORE___CORE_REGISTRATION___H__
namespace openspace {
@@ -35,4 +35,4 @@ void registerCoreClasses(scripting::ScriptEngine& engine);
} // namespace openspace
#endif // __OPENSPACE_CORE___REGISTRATION___H__
#endif // __OPENSPACE_CORE___CORE_REGISTRATION___H__

2
include/openspace/engine/configurationmanager.h
View File

@@ -167,4 +167,4 @@ private:
} // namespace openspace
#endif // __OPENSPACE_CORE___CONFIGURATIONMANAGER___H__
#endif // __OPENSPACE_CORE___CONFIGURATIONMANAGER___H__

2
include/openspace/engine/openspaceengine.h
View File

@@ -187,4 +187,4 @@ private:
} // namespace openspace
#endif // __OPENSPACE_CORE___OPENSPACEENGINE___H__
#endif // __OPENSPACE_CORE___OPENSPACEENGINE___H__

2
include/openspace/network/networkengine.h
View File

@@ -23,7 +23,7 @@
****************************************************************************************/
#ifndef __OPENSPACE_CORE___NETWORKENGINE___H__
#define PARALLELCONNECTION__OPENSPACE_CORE___NETWORKENGINE___H__
#define __OPENSPACE_CORE___NETWORKENGINE___H__
#include <cstdint>
#include <map>

6
include/openspace/properties/matrix/dmat2x3property.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_CORE___DMAT2x3PROPERTY___H__
#define __OPENSPACE_CORE___DMAT2x3PROPERTY___H__
#ifndef __OPENSPACE_CORE___DMAT2X3PROPERTY___H__
#define __OPENSPACE_CORE___DMAT2X3PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(DMat2x3Property, glm::dmat2x3);
} // namespace properties
} // namespace openspace
#endif // __OPENSPACE_CORE___DMAT2x3PROPERTY___H__
#endif // __OPENSPACE_CORE___DMAT2X3PROPERTY___H__

6
include/openspace/properties/matrix/dmat2x4property.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_CORE___DMAT2x4PROPERTY___H__
#define __OPENSPACE_CORE___DMAT2x4PROPERTY___H__
#ifndef __OPENSPACE_CORE___DMAT2X4PROPERTY___H__
#define __OPENSPACE_CORE___DMAT2X4PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(DMat2x4Property, glm::dmat2x4);
} // namespace properties
} // namespace openspace
#endif // __OPENSPACE_CORE___DMAT2x4PROPERTY___H__
#endif // __OPENSPACE_CORE___DMAT2X4PROPERTY___H__

6
include/openspace/properties/matrix/dmat3x2property.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_CORE___DMAT3x2PROPERTY___H__
#define __OPENSPACE_CORE___DMAT3x2PROPERTY___H__
#ifndef __OPENSPACE_CORE___DMAT3X2PROPERTY___H__
#define __OPENSPACE_CORE___DMAT3X2PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(DMat3x2Property, glm::dmat3x2);
} // namespace properties
} // namespace openspace
#endif // __OPENSPACE_CORE___DMAT3x2PROPERTY___H__
#endif // __OPENSPACE_CORE___DMAT3X2PROPERTY___H__

6
include/openspace/properties/matrix/dmat3x4property.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_CORE___DMAT3x4PROPERTY___H__
#define __OPENSPACE_CORE___DMAT3x4PROPERTY___H__
#ifndef __OPENSPACE_CORE___DMAT3X4PROPERTY___H__
#define __OPENSPACE_CORE___DMAT3X4PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(DMat3x4Property, glm::dmat3x4);
} // namespace properties
} // namespace openspace
#endif // __OPENSPACE_CORE___DMAT3x4PROPERTY___H__
#endif // __OPENSPACE_CORE___DMAT3X4PROPERTY___H__

6
include/openspace/properties/matrix/dmat4x2property.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_CORE___DMAT4x2PROPERTY___H__
#define __OPENSPACE_CORE___DMAT4x2PROPERTY___H__
#ifndef __OPENSPACE_CORE___DMAT4X2PROPERTY___H__
#define __OPENSPACE_CORE___DMAT4X2PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(DMat4x2Property, glm::dmat4x2);
} // namespace properties
} // namespace openspace
#endif // __OPENSPACE_CORE___DMAT4x2PROPERTY___H__
#endif // __OPENSPACE_CORE___DMAT4X2PROPERTY___H__

6
include/openspace/properties/matrix/dmat4x3property.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_CORE___DMAT4x3PROPERTY___H__
#define __OPENSPACE_CORE___DMAT4x3PROPERTY___H__
#ifndef __OPENSPACE_CORE___DMAT4X3PROPERTY___H__
#define __OPENSPACE_CORE___DMAT4X3PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(DMat4x3Property, glm::dmat4x3);
} // namespace properties
} // namespace openspace
#endif // __OPENSPACE_CORE___DMAT4x3PROPERTY___H__
#endif // __OPENSPACE_CORE___DMAT4X3PROPERTY___H__

6
include/openspace/properties/matrix/mat2x3property.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_CORE___MAT2x3PROPERTY___H__
#define __OPENSPACE_CORE___MAT2x3PROPERTY___H__
#ifndef __OPENSPACE_CORE___MAT2X3PROPERTY___H__
#define __OPENSPACE_CORE___MAT2X3PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(Mat2x3Property, glm::mat2x3);
} // namespace properties
} // namespace openspace
#endif // __OPENSPACE_CORE___MAT2x3PROPERTY___H__
#endif // __OPENSPACE_CORE___MAT2X3PROPERTY___H__

6
include/openspace/properties/matrix/mat2x4property.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_CORE___MAT2x4PROPERTY___H__
#define __OPENSPACE_CORE___MAT2x4PROPERTY___H__
#ifndef __OPENSPACE_CORE___MAT2X4PROPERTY___H__
#define __OPENSPACE_CORE___MAT2X4PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(Mat2x4Property, glm::mat2x4);
} // namespace properties
} // namespace openspace
#endif // __OPENSPACE_CORE___MAT2x4PROPERTY___H__
#endif // __OPENSPACE_CORE___MAT2X4PROPERTY___H__

6
include/openspace/properties/matrix/mat3x2property.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_CORE___MAT3x2PROPERTY___H__
#define __OPENSPACE_CORE___MAT3x2PROPERTY___H__
#ifndef __OPENSPACE_CORE___MAT3X2PROPERTY___H__
#define __OPENSPACE_CORE___MAT3X2PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(Mat3x2Property, glm::mat3x2);
} // namespace properties
} // namespace openspace
#endif // __OPENSPACE_CORE___MAT3x2PROPERTY___H__
#endif // __OPENSPACE_CORE___MAT3X2PROPERTY___H__

6
include/openspace/properties/matrix/mat3x4property.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_CORE___MAT3x4PROPERTY___H__
#define __OPENSPACE_CORE___MAT3x4PROPERTY___H__
#ifndef __OPENSPACE_CORE___MAT3X4PROPERTY___H__
#define __OPENSPACE_CORE___MAT3X4PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(Mat3x4Property, glm::mat3x4);
} // namespace properties
} // namespace openspace
#endif // __OPENSPACE_CORE___MAT3x4PROPERTY___H__
#endif // __OPENSPACE_CORE___MAT3X4PROPERTY___H__

6
include/openspace/properties/matrix/mat4x2property.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_CORE___MAT4x2PROPERTY___H__
#define __OPENSPACE_CORE___MAT4x2PROPERTY___H__
#ifndef __OPENSPACE_CORE___MAT4X2PROPERTY___H__
#define __OPENSPACE_CORE___MAT4X2PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(Mat4x2Property, glm::mat4x2);
} // namespace properties
} // namespace openspace
#endif // __OPENSPACE_CORE___MAT4x2PROPERTY___H__
#endif // __OPENSPACE_CORE___MAT4X2PROPERTY___H__

6
include/openspace/properties/matrix/mat4x3property.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_CORE___MAT4x3PROPERTY___H__
#define __OPENSPACE_CORE___MAT4x3PROPERTY___H__
#ifndef __OPENSPACE_CORE___MAT4X3PROPERTY___H__
#define __OPENSPACE_CORE___MAT4X3PROPERTY___H__
#include <openspace/properties/numericalproperty.h>
@@ -37,4 +37,4 @@ REGISTER_NUMERICALPROPERTY_HEADER(Mat4x3Property, glm::mat4x3);
} // namespace properties
} // namespace openspace
#endif // __OPENSPACE_CORE___MAT4x3PROPERTY___H__
#endif // __OPENSPACE_CORE___MAT4X3PROPERTY___H__

53
include/openspace/properties/ucharproperty.h
View File

@@ -1,53 +0,0 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __UCHARPROPERTY_H__
#define __UCHARPROPERTY_H__
/**
* \file ucharproperty.h
*
* \addtogroup openspace
* @{
* \addtogroup properties
* @{
* \class UCharProperty
* This class is a concrete implementation of openspace::properties::TemplateProperty with
* the type <code>unsigned char</code>.
* @} @}
*/
#include "openspace/properties/numericalproperty.h"
namespace openspace {
namespace properties {
REGISTER_NUMERICALPROPERTY_HEADER(UCharProperty, unsigned char);
} // namespace properties
} // namespace openspace
#endif // __UCHARPROPERTY_H__

53
include/openspace/properties/uintproperty.h
View File

@@ -1,53 +0,0 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __UINTPROPERTY_H__
#define __UINTPROPERTY_H__
/**
* \file uintproperty.h
*
* \addtogroup openspace
* @{
* \addtogroup properties
* @{
* \class UIntProperty
* This class is a concrete implementation of openspace::properties::TemplateProperty with
* the type <code>unsigned int</code>.
* @} @}
*/
#include "openspace/properties/numericalproperty.h"
namespace openspace {
namespace properties {
REGISTER_NUMERICALPROPERTY_HEADER(UIntProperty, unsigned int);
} // namespace properties
} // namespace openspace
#endif // __UINTPROPERTY_H__

53
include/openspace/properties/wcharproperty.h
View File

@@ -1,53 +0,0 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __WCHARPROPERTY_H__
#define __WCHARPROPERTY_H__
/**
* \file wcharproperty.h
*
* \addtogroup openspace
* @{
* \addtogroup properties
* @{
* \class WCharProperty
* This class is a concrete implementation of openspace::properties::TemplateProperty with
* the type <code>wchar_t</code>.
* @} @}
*/
#include "openspace/properties/numericalproperty.h"
namespace openspace {
namespace properties {
//REGISTER_NUMERICALPROPERTY_HEADER(WCharProperty, wchar_t);
} // namespace properties
} // namespace openspace
#endif // __WCHARPROPERTY_H__

2
include/openspace/rendering/abufferrenderer.h
View File

@@ -140,4 +140,4 @@ private:
} // namespace openspace
#endif // __OPENSPACE_CORE___ABUFFERRENDERER___H__
#endif // __OPENSPACE_CORE___ABUFFERRENDERER___H__

2
include/openspace/rendering/raycasterlistener.h
View File

@@ -36,4 +36,4 @@ public:
} // openspace
#endif // __OPENSPACE_CORE___RAYCASTERLISTENER___H__
#endif // __OPENSPACE_CORE___RAYCASTERLISTENER___H__

2
include/openspace/rendering/raycastermanager.h
View File

@@ -50,4 +50,4 @@ private:
} // namespace openspace
#endif // __OPENSPACE_CORE___RAYCASTERMANAGER___H__
#endif // __OPENSPACE_CORE___RAYCASTERMANAGER___H__

2
include/openspace/rendering/volume.h
View File

@@ -129,4 +129,4 @@ public:
} // namespace openspace
#endif // __OPENSPACE_CORE___VOLUME___H__
#endif // __OPENSPACE_CORE___VOLUME___H__

2
include/openspace/rendering/volumeraycaster.h
View File

@@ -126,4 +126,4 @@ public:
} // namespace openspace
#endif // __OPENSPACE_CORE___VOLUMERAYCASTER___H__
#endif // __OPENSPACE_CORE___VOLUMERAYCASTER___H__

7
include/openspace/scripting/script_helper.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __SCRIPT_HELPER_H__
#define __SCRIPT_HELPER_H__
#ifndef __OPENSPACE_CORE___SCRIPT_HELPER___H__
#define __OPENSPACE_CORE___SCRIPT_HELPER___H__
#define SCRIPT_CHECK_ARGUMENTS(__category__, __stack__, __reqArg__, __realArg__) \
if (__realArg__ != __reqArg__) { \
@@ -32,5 +32,4 @@
return 0; \
}
#endif // __SCRIPT_HELPER_H__
#endif // __OPENSPACE_CORE___SCRIPT_HELPER___H__

44
include/openspace/util/camera.h
View File

@@ -1,26 +1,26 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2016 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
* *
* OpenSpace *
* *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_CORE___CAMERA___H__
#define __OPENSPACE_CORE___CAMERA___H__

4
include/openspace/util/histogram.h
View File

@@ -2,7 +2,7 @@
* *
* OpenSpace *
* *
* Copyright (c) 2015 *
* Copyright (c) 2015-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
@@ -90,4 +90,4 @@ private:
} // namespace openspace
#endif //__OPENSPACE_CORE___HISTOGRAM___H__
#endif // __OPENSPACE_CORE___HISTOGRAM___H__

44
include/openspace/util/timemanager.h
View File

@@ -1,26 +1,26 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2016 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
* *
* OpenSpace *
* *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_CORE___TIMEMANAGER___H__
#define __OPENSPACE_CORE___TIMEMANAGER___H__

2
include/openspace/util/timerange.h
View File

@@ -78,4 +78,4 @@ struct TimeRange {
} // namespace openspace
#endif //__OPENSPACE_CORE___TIMERANGE___H__
#endif // __OPENSPACE_CORE___TIMERANGE___H__

46
include/openspace/util/transformationmanager.h
View File

@@ -1,26 +1,26 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2016 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
* *
* OpenSpace *
* *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_CORE___TRANSFORMATIONMANAGER___H__
#define __OPENSPACE_CORE___TRANSFORMATIONMANAGER___H__
@@ -61,4 +61,4 @@ private:
} // namespace openspace
#endif //__OPENSPACE_CORE___TRANSFORMATIONMANAGER___H__
#endif // __OPENSPACE_CORE___TRANSFORMATIONMANAGER___H__

2
modules/base/rendering/modelgeometry.h
View File

@@ -81,4 +81,4 @@ protected:
} // namespace modelgeometry
} // namespace openspace
#endif // __OPENSPACE_MODULE_BASE___MODELGEOMETRY___H__
#endif // __OPENSPACE_MODULE_BASE___MODELGEOMETRY___H__

2
modules/base/rendering/renderablemodel.h
View File

@@ -87,4 +87,4 @@ private:
} // namespace openspace
#endif // __OPENSPACE_MODULE_BASE___RENDERABLEMODEL___H__
#endif // __OPENSPACE_MODULE_BASE___RENDERABLEMODEL___H__

2
modules/base/rendering/screenspaceframebuffer.h
View File

@@ -68,4 +68,4 @@ private:
} //namespace openspace
#endif //__OPENSPACE_MODULE_BASE___SCREENSPACEFRAMEBUFFER___H__
#endif // __OPENSPACE_MODULE_BASE___SCREENSPACEFRAMEBUFFER___H__

4
modules/base/rendering/screenspaceimage.h
View File

@@ -61,6 +61,6 @@ private:
properties::StringProperty _texturePath;
};
} //namespace openspace
} // namespace openspace
#endif //__OPENSPACE_MODULE_BASE___SCREENSPACEIMAGE___H__
#endif // __OPENSPACE_MODULE_BASE___SCREENSPACEIMAGE___H__

10
modules/base/rendering/wavefrontgeometry.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __WAVEFRONTGEOMETRY_H__
#define __WAVEFRONTGEOMETRY_H__
#ifndef __OPENSPACE_MODULE_BASE___WAVEFRONTGEOMETRY___H__
#define __OPENSPACE_MODULE_BASE___WAVEFRONTGEOMETRY___H__
#include <modules/base/rendering/modelgeometry.h>
@@ -45,7 +45,7 @@ namespace modelgeometry {
bool loadModel(const std::string& filename);
};
} // namespace modelgeometry
} // namespace openspace
} // namespace modelgeometry
} // namespace openspace
#endif // __WAVEFRONTOBJECT_H__
#endif // __OPENSPACE_MODULE_BASE___WAVEFRONTGEOMETRY___H__

6
modules/debugging/debuggingmodule.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_MODULE_BASE___DEBUGGINGMODULE___H__
#define __OPENSPACE_MODULE_BASE___DEBUGGINGMODULE___H__
#ifndef __OPENSPACE_MODULE_DEBUGGING___DEBUGGINGMODULE___H__
#define __OPENSPACE_MODULE_DEBUGGING___DEBUGGINGMODULE___H__
#include <openspace/util/openspacemodule.h>
@@ -39,4 +39,4 @@ protected:
} // namespace openspace
#endif // __OPENSPACE_MODULE_BASE___DEBUGGINGMODULE___H__
#endif // __OPENSPACE_MODULE_DEBUGGING___DEBUGGINGMODULE___H__

6
modules/debugging/rendering/debugrenderer.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_MODULE_BASE___DEBUGRENDERER___H__
#define __OPENSPACE_MODULE_BASE___DEBUGRENDERER___H__
#ifndef __OPENSPACE_MODULE_DEBUGGING___DEBUGRENDERER___H__
#define __OPENSPACE_MODULE_DEBUGGING___DEBUGRENDERER___H__
#include <ghoul/opengl/ghoul_gl.h>
#include <ghoul/opengl/programobject.h>
@@ -162,4 +162,4 @@ protected:
} // namespace openspace
#endif // __OPENSPACE_MODULE_BASE___DEBUGRENDERER___H__
#endif // __OPENSPACE_MODULE_DEBUGGING___DEBUGRENDERER___H__

6
modules/debugging/rendering/renderabledebugplane.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_MODULE_BASE___RENDERABLEDEBUGPLANE___H__
#define __OPENSPACE_MODULE_BASE___RENDERABLEDEBUGPLANE___H__
#ifndef __OPENSPACE_MODULE_DEBUGGING___RENDERABLEDEBUGPLANE___H__
#define __OPENSPACE_MODULE_DEBUGGING___RENDERABLEDEBUGPLANE___H__
#include <openspace/rendering/renderable.h>
@@ -82,4 +82,4 @@ private:
} // namespace openspace
#endif // __OPENSPACE_MODULE_BASE___RENDERABLEDEBUGPLANE___H__
#endif // __OPENSPACE_MODULE_DEBUGGING___RENDERABLEDEBUGPLANE___H__

2
modules/galaxy/rendering/galaxyraycaster.h
View File

@@ -85,4 +85,4 @@ private:
} // namespace openspace
#endif // __OPENSPACE_MODULE_GALAXY___GALAXYRAYCASTER___H__
#endif // __OPENSPACE_MODULE_GALAXY___GALAXYRAYCASTER___H__

2
modules/globebrowsing/chunk/culling.h
View File

@@ -85,4 +85,4 @@ public:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CULLING___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CULLING___H__

2
modules/globebrowsing/geometry/aabb.h
View File

@@ -88,4 +88,4 @@ struct AABB3 {
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___AABB___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___AABB___H__

2
modules/globebrowsing/geometry/convexhull.h
View File

@@ -69,4 +69,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CONVEX_HULL___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CONVEX_HULL___H__

6
modules/globebrowsing/globebrowsingmodule.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_MODULE_GLOBEBROWSING___GLOBEBROWSING___H__
#define __OPENSPACE_MODULE_GLOBEBROWSING___GLOBEBROWSING___H__
#ifndef __OPENSPACE_MODULE_GLOBEBROWSING___GLOBEBROWSING_MODULE___H__
#define __OPENSPACE_MODULE_GLOBEBROWSING___GLOBEBROWSING_MODULE___H__
#include <openspace/util/openspacemodule.h>
@@ -39,4 +39,4 @@ protected:
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___GLOBEBROWSING___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___GLOBEBROWSING_MODULE___H__

2
modules/globebrowsing/globes/chunkedlodglobe.h
View File

@@ -137,4 +137,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CHUNKED_LOD_GLOBE___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CHUNKED_LOD_GLOBE___H__

2
modules/globebrowsing/globes/pointglobe.h
View File

@@ -59,4 +59,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___POINTGLOBE___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___POINTGLOBE___H__

2
modules/globebrowsing/globes/renderableglobe.h
View File

@@ -128,4 +128,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___RENDERABLEGLOBE___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___RENDERABLEGLOBE___H__

44
modules/globebrowsing/meshes/basicgrid.h
View File

@@ -1,26 +1,26 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2016 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
* *
* OpenSpace *
* *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_MODULE_GLOBEBROWSING___BASICGRIDGEOMETRY___H__
#define __OPENSPACE_MODULE_GLOBEBROWSING___BASICGRIDGEOMETRY___H__

2
modules/globebrowsing/other/distanceswitch.h
View File

@@ -67,4 +67,4 @@ private:
} // namespace globebrowsing
} // openspace
#endif //__OPENSPACE_MODULE_GLOBEBROWSING___DISTANCESWITCH___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___DISTANCESWITCH___H__

6
modules/globebrowsing/other/statscollector.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_MODULE_GLOBEBROWSING___STATS_TRACKER___H__
#define __OPENSPACE_MODULE_GLOBEBROWSING___STATS_TRACKER___H__
#ifndef __OPENSPACE_MODULE_GLOBEBROWSING___STATS_COLLECTOR___H__
#define __OPENSPACE_MODULE_GLOBEBROWSING___STATS_COLLECTOR___H__
#include <ghoul/misc/boolean.h>
@@ -121,4 +121,4 @@ private:
#include "statscollector.inl"
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___STATS_TRACKER___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___STATS_COLLECTOR___H__

2
modules/globebrowsing/rendering/chunkrenderer.h
View File

@@ -100,4 +100,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CHUNK_RENDERER___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CHUNK_RENDERER___H__

2
modules/globebrowsing/rendering/gpulayermanager.h
View File

@@ -317,4 +317,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___GPU_LAYER_MANAGER___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___GPU_LAYER_MANAGER___H__

2
modules/globebrowsing/rendering/layermanager.h
View File

@@ -129,4 +129,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___LAYERMANAGER___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___LAYERMANAGER___H__

2
modules/globebrowsing/rendering/layershadermanager.h
View File

@@ -104,4 +104,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___LAYER_SHADER_MANAGER___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___LAYER_SHADER_MANAGER___H__

6
modules/globebrowsing/tile/asynctilereader.h
View File

@@ -22,8 +22,8 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_MODULE_GLOBEBROWSING___ASYNC_TILE_DATA_PROVIDER___H__
#define __OPENSPACE_MODULE_GLOBEBROWSING___ASYNC_TILE_DATA_PROVIDER___H__
#ifndef __OPENSPACE_MODULE_GLOBEBROWSING___ASYNC_TILE_READER___H__
#define __OPENSPACE_MODULE_GLOBEBROWSING___ASYNC_TILE_READER___H__
#include <modules/globebrowsing/other/concurrentjobmanager.h>
#include <modules/globebrowsing/tile/tile.h>
@@ -107,4 +107,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___ASYNC_TILE_DATA_PROVIDER___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___ASYNC_TILE_READER___H__

2
modules/globebrowsing/tile/chunktile.h
View File

@@ -46,4 +46,4 @@ struct ChunkTilePile {
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CHUNKTILE___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CHUNKTILE___H__

2
modules/globebrowsing/tile/pixelregion.h
View File

@@ -103,4 +103,4 @@ struct PixelRegion {
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___PIXELREGION___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___PIXELREGION___H__

2
modules/globebrowsing/tile/tile.h
View File

@@ -140,4 +140,4 @@ struct Tile {
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE___H__

2
modules/globebrowsing/tile/tiledataset.h
View File

@@ -195,4 +195,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_DATASET___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_DATASET___H__

2
modules/globebrowsing/tile/tiledatatype.h
View File

@@ -51,4 +51,4 @@ struct TileDataType {
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_DATA_TYPE___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_DATA_TYPE___H__

44
modules/globebrowsing/tile/tiledepthtransform.h
View File

@@ -1,26 +1,26 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2016 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
* *
* OpenSpace *
* *
* Copyright (c) 2014-2017 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __OPENSPACE_MODULE_GLOBEBROWSING___TILEDEPTHTRANSFORM___H__
#define __OPENSPACE_MODULE_GLOBEBROWSING___TILEDEPTHTRANSFORM___H__

2
modules/globebrowsing/tile/tilediskcache.h
View File

@@ -60,4 +60,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_DISK_CACHE___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_DISK_CACHE___H__

2
modules/globebrowsing/tile/tileprovider/cachingtileprovider.h
View File

@@ -95,4 +95,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CACHING_TILE_PROVIDER___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___CACHING_TILE_PROVIDER___H__

2
modules/globebrowsing/tile/tileprovider/singleimageprovider.h
View File

@@ -54,4 +54,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___SINGLE_IMAGE_PROVIDER___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___SINGLE_IMAGE_PROVIDER___H__

2
modules/globebrowsing/tile/tileprovider/temporaltileprovider.h
View File

@@ -295,4 +295,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TEMPORAL_TILE_PROVIDER___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TEMPORAL_TILE_PROVIDER___H__

2
modules/globebrowsing/tile/tileprovider/texttileprovider.h
View File

@@ -134,4 +134,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TEXT_TILE_PROVIDER___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TEXT_TILE_PROVIDER___H__

2
modules/globebrowsing/tile/tileprovider/tileprovider.h
View File

@@ -146,4 +146,4 @@ using TileCache = LRUCache<TileHashKey, Tile>;
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_PROVIDER___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_PROVIDER___H__

2
modules/globebrowsing/tile/tileprovider/tileproviderbyindex.h
View File

@@ -54,4 +54,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_PROVIDER_BY_INDEX___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_PROVIDER_BY_INDEX___H__

2
modules/globebrowsing/tile/tileprovider/tileproviderbylevel.h
View File

@@ -54,4 +54,4 @@ private:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_PROVIDER_BY_LEVEL___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_PROVIDER_BY_LEVEL___H__

2
modules/globebrowsing/tile/tileselector.h
View File

@@ -49,4 +49,4 @@ public:
} // namespace globebrowsing
} // namespace openspace
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_SELECTOR___H__
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___TILE_SELECTOR___H__

2
modules/iswa/rendering/datacygnet.h
View File

@@ -113,4 +113,4 @@ private:
} //namespace openspace
#endif //__OPENSPACE_MODULE_ISWA___DATACYGNET___H__
#endif // __OPENSPACE_MODULE_ISWA___DATACYGNET___H__

2
modules/iswa/rendering/dataplane.h
View File

@@ -59,4 +59,4 @@ private:
} // namespace openspace
#endif //__OPENSPACE_MODULE_ISWA___DATAPLANE___H__
#endif // __OPENSPACE_MODULE_ISWA___DATAPLANE___H__

2
modules/iswa/rendering/datasphere.h
View File

@@ -58,4 +58,4 @@ protected:
} // namespace openspace
#endif //__OPENSPACE_MODULE_ISWA___DATASPHERE___H__
#endif // __OPENSPACE_MODULE_ISWA___DATASPHERE___H__

2
modules/iswa/rendering/kameleonplane.h
View File

@@ -106,4 +106,4 @@ private:
} // namespace openspace
#endif //__OPENSPACE_MODULE_ISWA___KAMELEONPLANE___H__
#endif // __OPENSPACE_MODULE_ISWA___KAMELEONPLANE___H__

2
modules/iswa/rendering/screenspacecygnet.h
View File

@@ -56,4 +56,4 @@ private:
} // namespace openspace
#endif //__OPENSPACE_MODULE_ISWA___SCREENSPACECYGNET___H__
#endif // __OPENSPACE_MODULE_ISWA___SCREENSPACECYGNET___H__

2
modules/iswa/rendering/texturecygnet.h
View File

@@ -58,4 +58,4 @@ private:
};
} //namespace openspace
#endif //__OPENSPACE_MODULE_ISWA___TEXTURECYGNET___H__
#endif // __OPENSPACE_MODULE_ISWA___TEXTURECYGNET___H__

2
modules/iswa/util/dataprocessor.h
View File

@@ -78,4 +78,4 @@ protected:
} // namespace openspace
#endif //__OPENSPACE_MODULE_ISWA___DATAPROCESSOR___H__
#endif // __OPENSPACE_MODULE_ISWA___DATAPROCESSOR___H__

4
modules/iswa/util/dataprocessorjson.h
View File

@@ -39,6 +39,6 @@ public:
virtual std::vector<float*> processData(std::string data, properties::SelectionProperty& dataOptions, glm::size3_t& dimensions) override;
};
}// namespace openspace
} // namespace openspace
#endif __OPENSPACE_MODULE_ISWA___DATAPROCESSORJSON___H__
#endif // __OPENSPACE_MODULE_ISWA___DATAPROCESSORJSON___H__

2
modules/iswa/util/dataprocessorkameleon.h
View File

@@ -54,4 +54,4 @@ private:
} // namespace openspace
#endif __OPENSPACE_MODULE_ISWA___DATAPROCESSORKAMELEON___H__
#endif // __OPENSPACE_MODULE_ISWA___DATAPROCESSORKAMELEON___H__

Some files were not shown because too many files have changed in this diff Show More