Merge pull request #320 from sensics/distortion-mesh-size-in-config-file

Enable specification of the number of desired triangles in the genera…
sensics · Nov 14, 2017 · 15a4b27 · 15a4b27
2 parents 60b6f3e + 7aacbd2
commit 15a4b27
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/osvr/RenderKit/DistortionParameters.cpp b/osvr/RenderKit/DistortionParameters.cpp
@@ -35,6 +35,7 @@ namespace osvr {
     OSVR_RENDERMANAGER_EXPORT DistortionParameters::DistortionParameters(
       OSVRDisplayConfiguration& osvrParams,
       size_t eye) : DistortionParameters() {
+      m_desiredTriangles = osvrParams.getDesiredDistortionTriangleCount();
       if (osvrParams.getDistortionType() ==
         OSVRDisplayConfiguration::RGB_SYMMETRIC_POLYNOMIALS) {
         m_type = rgb_symmetric_polynomials;

diff --git a/osvr/RenderKit/RenderManagerBase.cpp b/osvr/RenderKit/RenderManagerBase.cpp
@@ -2311,7 +2311,6 @@ namespace renderkit {
         // @todo Remove once we get a general polynomial from Core.
         for (size_t i = 0; i < p.m_displayConfiguration->getEyes().size(); i++) {
           DistortionParameters distortion(*p.m_displayConfiguration, i);
-          distortion.m_desiredTriangles = 200 * 64;
           p.m_distortionParameters.push_back(distortion);
         }
 

diff --git a/osvr/RenderKit/osvr_display_configuration.cpp b/osvr/RenderKit/osvr_display_configuration.cpp
@@ -532,6 +532,11 @@ void OSVRDisplayConfiguration::parse(const std::string& display_description) {
     {
         auto const& distortion = hmd["distortion"];
 
+        /// Find out how many desired triangles, if this is specified.
+        /// If not specified, set to a default.
+        m_distortionDesiredTriangleCount =
+          distortion.get("desired_triangle_count", 200 * 64).asInt();
+
         /// We will detect distortion type based on either the explicitly
         /// specified string or the presence of essential object members.
         m_distortionTypeString = distortion["type"].asString();
@@ -790,6 +795,11 @@ OSVRDisplayConfiguration::getDistortionPolynomalBlue() const {
     return m_distortionPolynomialBlue;
 }
 
+int OSVR_RENDERMANAGER_EXPORT
+OSVRDisplayConfiguration::getDesiredDistortionTriangleCount() const {
+    return m_distortionDesiredTriangleCount;
+}
+
 std::vector<OSVRDisplayConfiguration::EyeInfo> const&
 OSVRDisplayConfiguration::getEyes() const {
     return m_eyes;

diff --git a/osvr/RenderKit/osvr_display_configuration.h b/osvr/RenderKit/osvr_display_configuration.h
@@ -133,6 +133,9 @@ class OSVRDisplayConfiguration {
     std::vector<float> const& getDistortionPolynomalBlue() const;
     ///@}
 
+    /// Returns the desired number of triangles in the constructed distortion mesh.
+    int OSVR_RENDERMANAGER_EXPORT getDesiredDistortionTriangleCount() const;
+
     /// Structure holding the information for one eye.
     class EyeInfo {
       public:
@@ -192,6 +195,7 @@ class OSVRDisplayConfiguration {
     std::vector<float> m_distortionPolynomialRed;
     std::vector<float> m_distortionPolynomialGreen;
     std::vector<float> m_distortionPolynomialBlue;
+    int m_distortionDesiredTriangleCount;
 
     // Rendering
     double m_rightRoll = 0.;