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

Apply changes in directory structure to properties

Browse Source
This commit is contained in:
Alexander Bock
2014-04-03 11:21:11 -04:00
parent 0f2585abdf
commit 47c3656b04
19 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/properties/matrixproperty.h → include/openspace/properties/matrixproperty.h
+1 -1
View File
@@ -25,7 +25,7 @@
#ifndef __MATRIXPROPERTY_H__
#define __MATRIXPROPERTY_H__
#include "properties/numericalproperty.h"
#include "openspace/properties/numericalproperty.h"
#include <ghoul/glm.h>
src/properties/numericalproperty.h → include/openspace/properties/numericalproperty.h
+2 -2
View File
@@ -25,7 +25,7 @@
#ifndef __NUMERICALPROPERTY_H__
#define __NUMERICALPROPERTY_H__
#include "properties/templateproperty.h"
#include "openspace/properties/templateproperty.h"
namespace openspace {
namespace properties {
@@ -103,6 +103,6 @@ protected:
return DEFAULT_STEPPING; \
}
#include "properties/numericalproperty.inl"
#include "openspace/properties/numericalproperty.inl"
#endif // __NUMERICALPROPERTY_H__
src/properties/numericalproperty.inl → include/openspace/properties/numericalproperty.inl
+10 -10
View File
@@ -33,19 +33,19 @@ template <typename T>
NumericalProperty<T>::NumericalProperty(const std::string& identifier,
const std::string& guiName)
: NumericalProperty<T>(identifier, guiName,
PropertyDelegate<NumericalProperty<T>>::defaultValue<T>(),
PropertyDelegate<NumericalProperty<T>>::defaultMinimumValue<T>(),
PropertyDelegate<NumericalProperty<T>>::defaultMaximumValue<T>(),
PropertyDelegate<NumericalProperty<T>>::defaultStepping<T>())
PropertyDelegate<NumericalProperty<T>>::template defaultValue<T>(),
PropertyDelegate<NumericalProperty<T>>::template defaultMinimumValue<T>(),
PropertyDelegate<NumericalProperty<T>>::template defaultMaximumValue<T>(),
PropertyDelegate<NumericalProperty<T>>::template defaultStepping<T>())
{}
template <typename T>
NumericalProperty<T>::NumericalProperty(const std::string& identifier,
const std::string& guiName, const T& value)
: NumericalProperty<T>(identifier, guiName, value,
PropertyDelegate<NumericalProperty<T>>::defaultMinimumValue<T>(),
PropertyDelegate<NumericalProperty<T>>::defaultMaximumValue<T>(),
PropertyDelegate<NumericalProperty<T>>::defaultValue<T>())
PropertyDelegate<NumericalProperty<T>>::template defaultMinimumValue<T>(),
PropertyDelegate<NumericalProperty<T>>::template defaultMaximumValue<T>(),
PropertyDelegate<NumericalProperty<T>>::template defaultValue<T>())
{}
template <typename T>
@@ -53,8 +53,8 @@ NumericalProperty<T>::NumericalProperty(const std::string& identifier,
const std::string& guiName, const T& value,
const T& minimumValue)
: NumericalProperty<T>(identifier, guiName, value, minimumValue,
PropertyDelegate<NumericalProperty<T>>::defaultMaximumValue<T>(),
PropertyDelegate<NumericalProperty<T>>::defaultValue<T>())
PropertyDelegate<NumericalProperty<T>>::template defaultMaximumValue<T>(),
PropertyDelegate<NumericalProperty<T>>::template defaultValue<T>())
{}
template <typename T>
@@ -62,7 +62,7 @@ NumericalProperty<T>::NumericalProperty(const std::string& identifier,
const std::string& guiName, const T& value,
const T& minimumValue, const T& maximumValue)
: NumericalProperty<T>(identifier, guiName, value, minimumValue, maximumValue,
PropertyDelegate<NumericalProperty<T>>::defaultValue<T>())
PropertyDelegate<NumericalProperty<T>>::template defaultValue<T>())
{}
src/properties/property.h → include/openspace/properties/property.h
+1 -1
View File
@@ -25,7 +25,7 @@
#ifndef __PROPERTY_H__
#define __PROPERTY_H__
#include "properties/propertydelegate.h"
#include "openspace/properties/propertydelegate.h"
#include <boost/any.hpp>
#include <string>
src/properties/propertydelegate.h → include/openspace/properties/propertydelegate.h
+1 -1
View File
@@ -51,6 +51,6 @@ public:
} // namespace properties
} // namespace openspace
#include "properties/propertydelegate.inl"
#include "openspace/properties/propertydelegate.inl"
#endif // __PROPERTYDELEGATE_H__
src/properties/propertydelegate.inl → include/openspace/properties/propertydelegate.inl
+8 -8
View File
@@ -31,36 +31,36 @@ namespace properties {
template <typename T>
std::string PropertyDelegate<T>::className() {
static_assert(false, "Unimplemented PropertyDelegate::className specialization");
// static_assert(false, "Unimplemented PropertyDelegate::className specialization");
}
template <typename T>
template <typename U>
U PropertyDelegate<T>::defaultValue() {
static_assert(false, "Unimplemented PropertyDelegate::defaultValue specialization");
// static_assert(false, "Unimplemented PropertyDelegate::defaultValue specialization");
}
template <typename T>
template <typename U>
U PropertyDelegate<T>::defaultMinimumValue() {
static_assert(false,
"Unimplemented PropertyDelegate::defaultMinimumValue specialization");
// static_assert(false,
// "Unimplemented PropertyDelegate::defaultMinimumValue specialization");
}
template <typename T>
template <typename U>
U PropertyDelegate<T>::defaultMaximumValue() {
static_assert(false,
"Unimplemented PropertyDelegate::defaultMaximumValue specialization");
// static_assert(false,
// "Unimplemented PropertyDelegate::defaultMaximumValue specialization");
}
template <typename T>
template <typename U>
U PropertyDelegate<T>::defaultStepping() {
static_assert(false,
"Unimplemented PropertyDelegate::defaultStepping specialization");
// static_assert(false,
// "Unimplemented PropertyDelegate::defaultStepping specialization");
}
src/properties/scalarproperty.h → include/openspace/properties/scalarproperty.h
+1 -1
View File
@@ -25,7 +25,7 @@
#ifndef __SCALARPROPERTY_H__
#define __SCALARPROPERTY_H__
#include "properties/numericalproperty.h"
#include "openspace/properties/numericalproperty.h"
namespace openspace {
namespace properties {
src/properties/templateproperty.h → include/openspace/properties/templateproperty.h
+2 -2
View File
@@ -25,7 +25,7 @@
#ifndef __TEMPLATEPROPERTY_H__
#define __TEMPLATEPROPERTY_H__
#include "properties/property.h"
#include "openspace/properties/property.h"
namespace openspace {
namespace properties {
@@ -67,6 +67,6 @@ protected:
return DEFAULT_VALUE; \
}
#include "properties/templateproperty.inl"
#include "openspace/properties/templateproperty.inl"
#endif // __TEMPLATEPROPERTY_H__
src/properties/templateproperty.inl → include/openspace/properties/templateproperty.inl
+2 -1
View File
@@ -25,11 +25,12 @@
namespace openspace {
namespace properties {
// check!
template <typename T>
TemplateProperty<T>::TemplateProperty(const std::string& identifier,
const std::string& guiName)
: TemplateProperty<T>(identifier, guiName,
PropertyDelegate<TemplateProperty<T>>::defaultValue<T>())
PropertyDelegate<TemplateProperty<T>>::template defaultValue<T>())
{}
src/properties/vectorproperty.h → include/openspace/properties/vectorproperty.h
+1 -1
View File
@@ -25,7 +25,7 @@
#ifndef __VECTORPROPERTY_H__
#define __VECTORPROPERTY_H__
#include "properties/numericalproperty.h"
#include "openspace/properties/numericalproperty.h"
#include <ghoul/glm.h>
include/openspace/tests/test_scenegraph.inl
+2
View File
@@ -97,6 +97,7 @@ TEST_F(SceneGraphTest, Loading) {
// Existing scenegraph should load
EXPECT_TRUE(_scenegraph->loadFromModulePath(absPath("${TESTDIR}/ScenegraphTest")));
// TODO need to check for correctness
// This loading should fail regardless of existing or not since the
// scenegraph is already loaded
@@ -112,6 +113,7 @@ TEST_F(SceneGraphTest, Reinitializing) {
// Existing scenegraph should load
EXPECT_TRUE(_scenegraph->loadFromModulePath(absPath("${TESTDIR}/ScenegraphTest")));
// TODO need to check for correctness
}
src/CMakeLists.txt
+1 -1
View File
@@ -55,7 +55,7 @@ source_group(Interaction\\ExternalControl FILES ${INTERACTION_EXTERNALCONTROL_SO
file(GLOB PROPERTY_SOURCE_CPP ${SOURCE_ROOT_DIR}/properties/*.cpp)
file(GLOB PROPERTY_SOURCE_C ${SOURCE_ROOT_DIR}/properties/*.c)
set(OPENSPACE_SOURCE ${OPENSPACE_SOURCE} ${PROPERTY_SOURCE_CPP} ${PROPERTY_SOURCE_C})
file(GLOB PROPERTY_HEADER ${HEADER_ROOT_DIR}/properties/*.h)
file(GLOB PROPERTY_HEADER ${HEADER_ROOT_DIR}/openspace/properties/*.h)
set(OPENSPACE_HEADER ${OPENSPACE_HEADER} ${PROPERTY_HEADER})
source_group(Properties FILES ${PROPERTY_SOURCE_CPP} ${PROPERTY_SOURCE_C} ${PROPERTY_HEADER})
src/properties/matrixproperty.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include "properties/matrixproperty.h"
#include "openspace/properties/matrixproperty.h"
#include <limits>
src/properties/numericalproperty.cpp
+1 -1
View File
@@ -22,5 +22,5 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include "properties/numericalproperty.h"
#include "openspace/properties/numericalproperty.h"
src/properties/property.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include "properties/property.h"
#include "openspace/properties/property.h"
namespace openspace {
namespace properties {
src/properties/propertydelegate.cpp
+1 -1
View File
@@ -22,5 +22,5 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include "properties/propertydelegate.h"
#include "openspace/properties/propertydelegate.h"
src/properties/scalarproperty.cpp
+17 -17
View File
@@ -22,7 +22,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include "properties/scalarproperty.h"
#include "openspace/properties/scalarproperty.h"
#include <limits>
@@ -44,39 +44,39 @@ REGISTER_NUMERICALPROPERTY_SOURCE(CharProperty, char, char(0),
// numeric_limits<char32_t>::lowest(), numeric_limits<char32_t>::max(), char32_t(1));
REGISTER_NUMERICALPROPERTY_SOURCE(WCharProperty, wchar_t, wchar_t(0),
numeric_limits<wchar_t>::lowest(), numeric_limits<wchar_t>::max(), wchar_t(1));
REGISTER_NUMERICALPROPERTY_SOURCE(SignedCharProperty, signed char, signed char(0),
REGISTER_NUMERICALPROPERTY_SOURCE(SignedCharProperty, signed char, (signed char)(0),
numeric_limits<signed char>::lowest(), numeric_limits<signed char>::max(),
signed char(0));
REGISTER_NUMERICALPROPERTY_SOURCE(UCharProperty, unsigned char, unsigned char(0),
(signed char)0);
REGISTER_NUMERICALPROPERTY_SOURCE(UCharProperty, unsigned char, (unsigned char)0,
numeric_limits<unsigned char>::lowest(), numeric_limits<unsigned char>::max(),
unsigned char(1));
(unsigned char)1);
REGISTER_NUMERICALPROPERTY_SOURCE(ShortProperty, short, short(0),
numeric_limits<short>::lowest(), numeric_limits<short>::max(), short(1));
REGISTER_NUMERICALPROPERTY_SOURCE(UShortProperty, unsigned short, unsigned short(0),
REGISTER_NUMERICALPROPERTY_SOURCE(UShortProperty, unsigned short, (unsigned short)(0),
numeric_limits<unsigned short>::lowest(), numeric_limits<unsigned short>::max(),
unsigned short(1));
(unsigned short)1);
REGISTER_NUMERICALPROPERTY_SOURCE(IntProperty, int, int(0),
numeric_limits<int>::lowest(), numeric_limits<int>::max(), int(1));
REGISTER_NUMERICALPROPERTY_SOURCE(UIntProperty, unsigned int, unsigned int(0),
REGISTER_NUMERICALPROPERTY_SOURCE(UIntProperty, unsigned int, (unsigned int)0,
numeric_limits<unsigned int>::lowest(), numeric_limits<unsigned int>::max(),
unsigned int(1));
(unsigned int)1);
REGISTER_NUMERICALPROPERTY_SOURCE(LongProperty, long, long(0),
numeric_limits<long>::lowest(), numeric_limits<long>::max(), long(1));
REGISTER_NUMERICALPROPERTY_SOURCE(ULongProperty, unsigned long, unsigned long(0),
REGISTER_NUMERICALPROPERTY_SOURCE(ULongProperty, unsigned long, (unsigned long)0,
numeric_limits<unsigned long>::lowest(), numeric_limits<unsigned long>::max(),
unsigned long(1));
REGISTER_NUMERICALPROPERTY_SOURCE(LongLongProperty, long long, long long(0),
numeric_limits<long long>::lowest(), numeric_limits<long long>::max(), long long(1));
(unsigned long)1);
REGISTER_NUMERICALPROPERTY_SOURCE(LongLongProperty, long long, (long long)0,
numeric_limits<long long>::lowest(), numeric_limits<long long>::max(), (long long)1);
REGISTER_NUMERICALPROPERTY_SOURCE(ULongLongProperty, unsigned long long,
unsigned long long(1), numeric_limits<unsigned long long>::lowest(),
numeric_limits<unsigned long long>::max(), unsigned long long(1));
(unsigned long long)1, numeric_limits<unsigned long long>::lowest(),
numeric_limits<unsigned long long>::max(), (unsigned long long)1);
REGISTER_NUMERICALPROPERTY_SOURCE(FloatProperty, float, 0.f,
numeric_limits<float>::lowest(), numeric_limits<float>::max(), 0.01f);
REGISTER_NUMERICALPROPERTY_SOURCE(DoubleProperty, double, 0.0,
numeric_limits<double>::lowest(), numeric_limits<double>::max(), 0.01);
REGISTER_NUMERICALPROPERTY_SOURCE(LongDoubleProperty, long double, long double(0),
REGISTER_NUMERICALPROPERTY_SOURCE(LongDoubleProperty, long double, (long double)0,
numeric_limits<long double>::lowest(), numeric_limits<long double>::max(),
long double(0.01f));
(long double)0.01f);
} // namespace properties
} // namespace openspace
src/properties/templateproperty.cpp
+1 -1
View File
@@ -22,5 +22,5 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include "properties/templateproperty.h"
#include "openspace/properties/templateproperty.h"
src/properties/vectorproperty.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#include "properties/vectorproperty.h"
#include "openspace/properties/vectorproperty.h"
#include <limits>