fixing lenticular flag

patriciogonzalezvivo · Nov 23, 2023 · c642119 · c642119
1 parent 23481b3
commit c642119
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/deps/lygia b/deps/lygia
diff --git a/deps/vera b/deps/vera
diff --git a/src/core/sandbox.cpp b/src/core/sandbox.cpp
@@ -814,11 +814,11 @@ void Sandbox::commandsInit(CommandList &_commands ) {
 
         std::vector<std::string> values = vera::split(_line,',');
         if (values.size() == 2) {
-            uniforms.activeCamera->setFOV( vera::toFloat(values[1]) );
+            uniforms.activeCamera->setFOV( glm::radians(vera::toFloat(values[1])) );
             return true;
         }
         else {
-            std::cout << uniforms.activeCamera->getFOV() << std::endl;
+            std::cout << glm::degrees(uniforms.activeCamera->getFOV()) << std::endl;
             return true;
         }
         return false;

diff --git a/src/core/uniforms.cpp b/src/core/uniforms.cpp
@@ -88,7 +88,7 @@ Uniforms::Uniforms() : m_frame(0), m_play(true), m_change(false) {
     //
     functions["u_iblLuminance"] = UniformFunction("float", [this](vera::Shader& _shader) {
         if (activeCamera)
-            _shader.setUniform("u_iblLuminance", 30000.0f * activeCamera->getExposure());
+            _shader.setUniform("u_iblLuminance", float(30000.0 * activeCamera->getExposure()));
     },
     [this]() { 
         if (activeCamera)
@@ -150,7 +150,7 @@ Uniforms::Uniforms() : m_frame(0), m_play(true), m_change(false) {
 
     functions["u_cameraExposure"] = UniformFunction("float", [this](vera::Shader& _shader) {
         if (activeCamera)
-            _shader.setUniform("u_cameraExposure", activeCamera->getExposure());
+            _shader.setUniform("u_cameraExposure", float(activeCamera->getExposure()));
     },
     [this]() { 
         if (activeCamera)

diff --git a/src/main.cpp b/src/main.cpp
@@ -409,8 +409,7 @@ int main(int argc, char **argv) {
                     argument == "-headless" || argument == "--headless"     || 
                     argument == "-help"     || argument == "--help"         ||
                     argument == "-msaa"     || argument == "--msaa"         || 
-                    argument == "-undecorated"  || argument == "--undecorated" || 
-                    argument == "-lenticular"   || argument == "--lenticular") {
+                    argument == "-undecorated"  || argument == "--undecorated") {
         }
 
         // Change internal states with no second parameter
@@ -469,10 +468,14 @@ int main(int argc, char **argv) {
             std::string calibration_file = "default";
             if (i+1 < argc) {
                 calibration_file = std::string(argv[i+1]);
-                if (vera::urlExists(calibration_file) && vera::haveExt(calibration_file,"json")) i++;
-                else calibration_file = "default";
-            } else
+                if (vera::urlExists(calibration_file) && vera::haveExt(calibration_file,"json")) 
+                    i++;
+                else 
+                    calibration_file = "default";
+            } 
+            else
                 std::cout << "Argument '" << argument << "' should be followed by a path to calibration JSON file" << std::endl;
+
             sandbox.lenticular = calibration_file;
             if (sandbox.quilt == -1) 
                 sandbox.quilt = 0;
+6 −6		include/vera/types/camera.h
+2 −2		src/ops/draw.cpp
+2 −3		src/types/camera.cpp
+1 −2		src/xr/holoPlay.cpp