.

Author: RealEdwardS

application/testing/CMakeLists.txt

@@ -442,6 +442,7 @@ f3d_test(NAME TestFinalShaderNegative DATA cow.vtp ARGS --final-shader "vec4 pix
 f3d_test(NAME TestFinalShaderNegativeFileName DATA cow.vtp ARGS --filename --final-shader "vec4 pixel(vec2 uv){return vec4(vec3(1.0) - texture(source, uv).rgb, 1.0)\\\\\\\;}" UI)
 f3d_test(NAME TestFinalShaderUndefined DATA cow.vtp ARGS --final-shader "undefined" REGEXP "Final shader must define a function" NO_BASELINE)
 f3d_test(NAME TestFinalShaderCompilationFailure DATA cow.vtp ARGS --final-shader "vec4 pixel(vec2 uv){}" --verbose REGEXP " build the shader program" NO_BASELINE)
+f3d_test(NAME TestFinalShaderTimeUniform DATA cow.vtp ARGS --final-shader "vec4 pixel(vec2 uv){return vec4(texture(source, uv).rgb * (0.5 + 0.5*cos(time+uv.xyx+vec3(0,2,4))), 1.0)\\\\\\\;}")
 
 ## Command Script
 f3d_test(NAME TestCommandScriptBasic SCRIPT DATA dragon.vtu) # roll_camera 90;toggle ui.scalar_bar;print_scene_info;increase_light_intensity

application/testing/tests.features.cmake

@@ -172,15 +172,9 @@ class interactor_impl::internals
     double fwd[3];
     vtkMath::Cross(right, up, fwd);
     const double m[9] = {
-      right[0],
-      right[1],
-      right[2], //
-      fwd[0],
-      fwd[1],
-      fwd[2], //
-      up[0],
-      up[1],
-      up[2], //
+      right[0], right[1], right[2], //
+      fwd[0], fwd[1], fwd[2],       //
+      up[0], up[1], up[2],          //
     };
     transform->DeepCopy(m);
   }
@@ -630,7 +624,7 @@ class interactor_impl::internals
     vtkRenderWindow* renWin = this->Window.GetRenderWindow();
     vtkF3DRenderer* ren = vtkF3DRenderer::SafeDownCast(renWin->GetRenderers()->GetFirstRenderer());
     ren->SetUIDeltaTime(deltaTime);
-    ren->SetTime(ren->GetTime() + deltaTime);
+    ren->SetTotalTime(ren->GetTotalTime() + deltaTime);
 
     // Determine if we need a full render or just a UI render
     // At the moment, only TAA requires a full render each frame

library/src/interactor_impl.cxx

@@ -816,22 +816,10 @@ void vtkF3DRenderer::ConfigureGridUsingCurrentActors()
 
     vtkNew<vtkMatrix4x4> upMatrix;
     const double m[16] = {
-      right[0],
-      right[1],
-      right[2],
-      0, //
-      up[0],
-      up[1],
-      up[2],
-      0, //
-      front[0],
-      front[1],
-      front[2],
-      0, //
-      0,
-      0,
-      0,
-      1, //
+      right[0], right[1], right[2], 0, //
+      up[0], up[1], up[2], 0,          //
+      front[0], front[1], front[2], 0, //
+      0, 0, 0, 1,                      //
     };
     upMatrix->DeepCopy(m);
     vtkNew<vtkMatrix4x4> upMatrixInv;
@@ -967,22 +955,10 @@ void vtkF3DRenderer::ConfigureGridAxesUsingCurrentActors()
 
     vtkNew<vtkMatrix4x4> upMatrix;
     const double m[16] = {
-      right[0],
-      right[1],
-      right[2],
-      0, //
-      up[0],
-      up[1],
-      up[2],
-      0, //
-      front[0],
-      front[1],
-      front[2],
-      0, //
-      0,
-      0,
-      0,
-      1, //
+      right[0], right[1], right[2], 0, // 
+      up[0], up[1], up[2], 0,          // 
+      front[0], front[1], front[2], 0, // 
+      0, 0, 0, 1,                      //
     };
     upMatrix->DeepCopy(m);
     vtkNew<vtkMatrix4x4> upMatrixInv;

vtkext/private/module/vtkF3DRenderer.cxx

@@ -518,14 +518,10 @@ class vtkF3DRenderer : public vtkOpenGLRenderer
   void SetUIDeltaTime(double time);
 
   /**
-   * Add to the total animation time (cumulative time of each frame being rendered) in seconds
+   * Set/Get the total animation time (cumulative time of each frame being rendered) in seconds
    */
-  void AddTime(double time);
-
-  /**
-   * Gets total time of render
-   */
-  double GetTime();
+  vtkSetMacro(TotalTime, double);
+  vtkGetMacro(TotalTime, double);
 
   /**
    * Set console badge enabled status

vtkext/private/module/vtkF3DRenderer.h

@@ -74,7 +74,7 @@ void vtkF3DUserRenderPass::Render(const vtkRenderState* s)
     vtkShaderProgram::Substitute(FSSource, "//VTK::FSQ::Decl",
       "uniform sampler2D source;\n"
       "uniform ivec2 resolution;\n"
-      "uniform double time;\n"
+      "uniform float time;\n"
       "//VTK::FSQ::Decl");
 
     vtkShaderProgram::Substitute(FSSource, "//VTK::FSQ::Decl", this->UserShader);