Encapsulate identifier, guiName, and description into a PropertyInfo struct

This commit is contained in:
Alexander Bock
2017-07-22 17:36:03 -04:00
parent b584f0197e
commit 04bac9293b
76 changed files with 422 additions and 539 deletions
+19 -54
View File
@@ -74,134 +74,99 @@ namespace openspace {
TouchInteraction::TouchInteraction()
: properties::PropertyOwner("TouchInteraction")
, _origin("origin", "Origin", "") // @TODO Missing documentation
, _origin({ "origin", "Origin", "" }) // @TODO Missing documentation
, _unitTest(
"Click to take a unit test",
"Take a unit test saving the LM data into file",
"", // @TODO Missing documentation
{ "Click to take a unit test", "Take a unit test saving the LM data into file", "" }, // @TODO Missing documentation
false
)
, _touchActive(
"TouchEvents",
"True if we have a touch event",
"", // @TODO Missing documentation
false,
properties::Property::Visibility::Hidden
{ "TouchEvents", "True if we have a touch event", "", properties::Property::Visibility::Hidden }, // @TODO Missing documentation
false
)
, _reset(
"Default Values",
"Reset all properties to default",
"", // @TODO Missing documentation
{ "Default Values", "Reset all properties to default", "" }, // @TODO Missing documentation
false
)
, _maxTapTime(
"Max Tap Time",
"Max tap delay (in ms) for double tap",
"", // @TODO Missing documentation
{ "Max Tap Time", "Max tap delay (in ms) for double tap", "" }, // @TODO Missing documentation
300,
10,
1000
)
, _deceleratesPerSecond(
"Decelerates per second",
"Number of times velocity is decelerated per second",
"", // @TODO Missing documentation
{ "Decelerates per second", "Number of times velocity is decelerated per second", "" }, // @TODO Missing documentation
240,
60,
300
)
, _touchScreenSize(
"TouchScreenSize",
"Touch Screen size in inches",
"", // @TODO Missing documentation
{ "TouchScreenSize", "Touch Screen size in inches", "" }, // @TODO Missing documentation
55.0f,
5.5f,
150.0f
)
, _tapZoomFactor(
"Tap zoom factor",
"Scaling distance travelled on tap",
"", // @TODO Missing documentation
{ "Tap zoom factor", "Scaling distance travelled on tap", "" }, // @TODO Missing documentation
0.2f,
0.f,
0.5f
)
, _nodeRadiusThreshold(
"Activate direct-manipulation",
"Radius a planet has to have to activate direct-manipulation",
"", // @TODO Missing documentation
{ "Activate direct-manipulation", "Radius a planet has to have to activate direct-manipulation", "" }, // @TODO Missing documentation
0.2f,
0.0f,
1.0f
)
, _rollAngleThreshold(
"Interpret roll",
"Threshold for min angle for roll interpret",
"", // @TODO Missing documentation
{ "Interpret roll", "Threshold for min angle for roll interpret", "" }, // @TODO Missing documentation
0.025f,
0.f,
0.05f
)
, _orbitSpeedThreshold(
"Activate orbit spinning",
"Threshold to activate orbit spinning in direct-manipulation",
"", // @TODO Missing documentation
{ "Activate orbit spinning", "Threshold to activate orbit spinning in direct-manipulation", "" }, // @TODO Missing documentation
0.005f,
0.f,
0.01f
)
, _spinSensitivity(
"Sensitivity of spinning",
"Sensitivity of spinning in direct-manipulation",
"", // @TODO Missing documentation
{ "Sensitivity of spinning", "Sensitivity of spinning in direct-manipulation", "" }, // @TODO Missing documentation
1.f,
0.f,
2.f
)
, _inputStillThreshold(
"Input still",
"Threshold for interpreting input as still",
"", // @TODO Missing documentation
{ "Input still", "Threshold for interpreting input as still", "" }, // @TODO Missing documentation
0.0005f,
0.f,
0.001f
)
, _centroidStillThreshold(
"Centroid stationary",
"Threshold for stationary centroid",
"", // @TODO Missing documentation
{ "Centroid stationary", "Threshold for stationary centroid", "" }, // @TODO Missing documentation
0.0018f,
0.f,
0.01f
) // used to void wrongly interpreted roll interactions
, _interpretPan(
"Pan delta distance",
"Delta distance between fingers allowed for interpreting pan interaction",
"", // @TODO Missing documentation
{ "Pan delta distance", "Delta distance between fingers allowed for interpreting pan interaction", "" }, // @TODO Missing documentation
0.015f,
0.f,
0.1f
)
, _slerpTime(
"Time to slerp",
"Time to slerp in seconds to new orientation with new node picking",
"", // @TODO Missing documentation
{ "Time to slerp", "Time to slerp in seconds to new orientation with new node picking", "" }, // @TODO Missing documentation
3.f,
0.f,
5.f
)
, _guiButton(
"GUI Button",
"GUI button size in pixels",
"", // @TODO Missing documentation
{ "GUI Button", "GUI button size in pixels", "" }, // @TODO Missing documentation
glm::ivec2(32, 64),
glm::ivec2(8, 16),
glm::ivec2(128, 256)
)
, _friction(
"Friction",
"Friction for different interactions (orbit, zoom, roll, pan)",
"", // @TODO Missing documentation
{ "Friction", "Friction for different interactions (orbit, zoom, roll, pan)", "" }, // @TODO Missing documentation
glm::vec4(0.01f, 0.025f, 0.02f, 0.02f),
glm::vec4(0.f),
glm::vec4(0.2f)
+5 -7
View File
@@ -39,14 +39,12 @@ namespace openspace {
TouchMarker::TouchMarker()
: properties::PropertyOwner("TouchMarker")
, _visible("TouchMarkers visible", "Toggle visibility of markers", "", true) // @TODO Missing documentation
, _radiusSize("Marker size", "Marker radius", "", 30.f, 0.f, 100.f) // @TODO Missing documentation
, _transparency("Transparency of marker", "Marker transparency", "", 0.8f, 0.f, 1.f) // @TODO Missing documentation
, _thickness("Thickness of marker", "Marker thickness", "", 2.f, 0.f, 4.f) // @TODO Missing documentation
, _visible({ "TouchMarkers visible", "Toggle visibility of markers", "" }, true) // @TODO Missing documentation
, _radiusSize({ "Marker size", "Marker radius", "" }, 30.f, 0.f, 100.f) // @TODO Missing documentation
, _transparency({ "Transparency of marker", "Marker transparency", "" }, 0.8f, 0.f, 1.f) // @TODO Missing documentation
, _thickness({ "Thickness of marker", "Marker thickness", "" }, 2.f, 0.f, 4.f) // @TODO Missing documentation
, _color(
"MarkerColor",
"Marker color",
"", // @TODO Missing documentation
{ "MarkerColor", "Marker color", "" }, // @TODO Missing documentation
glm::vec3(204.f / 255.f, 51.f / 255.f, 51.f / 255.f),
glm::vec3(0.f),
glm::vec3(1.f)