Final shader improvements (reopened) by RealEdwardS · Pull Request #2932 · f3d-app/f3d

RealEdwardS · 2026-03-11T12:02:42Z

Describe your changes

Added time elapsed from the app start as a uniform property for final shader application.

Issue ticket number and link if any

Checklist for finalizing the PR

I have performed a self-review of my code
I have added tests for new features and bugfixes
I have added documentation for new features
If it is a modifying the libf3d API, I have updated bindings
If it is a modifying the .github/workflows/versions.json, I have updated docker_timestamp

Continuous integration

Please write a comment to run CI, eg: \ci fast.
See here for more info.

github-actions · 2026-03-11T12:02:51Z

You are modifying libf3d public API! ⚠️Please update bindings accordingly⚠️!
You can find them in their respective directories: c, python, java, webassembly.

mwestphal · 2026-03-11T16:08:06Z

Still not ok ^^

mwestphal · 2026-03-12T06:20:00Z

I can take care of it if you want.

RealEdwardS · 2026-03-12T06:58:54Z

I can take care of it if you want.

Yes please

mwestphal · 2026-03-12T07:29:39Z

here it is: #2935

Please next time you want to merge/rebase on master, please reach out on discord and I will assist.

mwestphal · 2026-03-22T12:28:01Z

Still working on this @RealEdwardS ?

RealEdwardS · 2026-03-23T08:26:06Z

Still working on this @RealEdwardS ?

I think it's ready for review, unless there's something I'm missing?

mwestphal · 2026-03-23T10:06:47Z

I think it's ready for review, unless there's something I'm missing?

You need to ask for review if you want a review :)

mwestphal · 2026-03-23T10:07:24Z

Well, first you have to recover the branch I provided to you here: #2935, do you need help with that ?

RealEdwardS · 2026-03-24T01:21:20Z

Well, first you have to recover the branch I provided to you here: #2935, do you need help with that ?

I think I was able to fix everything?

mwestphal · 2026-03-24T07:00:41Z

vtkext/private/module/vtkF3DUserRenderPass.cxx

+#include "vtkF3DRenderer.h"
+#include <vtkRendererCollection.h>


Suggested change

#include "vtkF3DRenderer.h"

#include <vtkRendererCollection.h>

#include "vtkF3DRenderer.h"

#include <vtkRendererCollection.h>

mwestphal · 2026-03-24T07:01:06Z

vtkext/private/module/vtkF3DUserRenderPass.cxx

 #include "vtkObjectFactory.h"
 #include "vtkOpenGLError.h"
 #include "vtkOpenGLFramebufferObject.h"
 #include "vtkOpenGLQuadHelper.h"
 #include "vtkOpenGLRenderUtilities.h"
 #include "vtkOpenGLRenderWindow.h"
 #include "vtkOpenGLShaderCache.h"
 #include "vtkOpenGLState.h"
 #include "vtkRenderState.h"
 #include "vtkRenderer.h"
 #include "vtkShaderProgram.h"
 #include "vtkTextureObject.h"
+#include "vtkF3DRenderer.h"


vtk includes should be moved down and <>.

mwestphal · 2026-03-24T07:01:47Z

application/testing/tests.features.cmake

 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)\\\\\\\;}")


there is no time steps in cow.vtp, so im not sure this test is the right one ?

mwestphal · 2026-03-24T07:02:48Z

vtkext/private/module/vtkF3DRenderer.h

+  /**
+   * Set/Get the total animation time (cumulative time of each frame being rendered) in seconds
+   */
+  vtkSetMacro(TotalTime, double);


im not sure this is the right name for this property.

mwestphal · 2026-03-24T07:03:15Z

vtkext/private/module/vtkF3DUserRenderPass.cxx

  vtkRenderer* r = s->GetRenderer();
  vtkOpenGLRenderWindow* renWin = static_cast<vtkOpenGLRenderWindow*>(r->GetRenderWindow());
  vtkOpenGLState* ostate = renWin->GetState();
+  vtkF3DRenderer* ren = vtkF3DRenderer::SafeDownCast(renWin->GetRenderers()->GetFirstRenderer());


Suggested change

vtkF3DRenderer* ren = vtkF3DRenderer::SafeDownCast(renWin->GetRenderers()->GetFirstRenderer());

vtkF3DRenderer* ren = vtkF3DRenderer::SafeDownCast(r);

mwestphal · 2026-03-24T07:03:25Z

vtkext/private/module/vtkF3DUserRenderPass.cxx

@@ -25,6 +27,7 @@
  vtkRenderer* r = s->GetRenderer();


Suggested change

vtkRenderer* r = s->GetRenderer();

vtkRenderer* ren = s->GetRenderer();

mwestphal

changes needed, but a review from meak too.

RealEdwardS force-pushed the final-shader-improvements branch from 0de55a3 to 9ab0a67 Compare March 11, 2026 19:47

mwestphal self-requested a review March 23, 2026 10:06

Added time as uniform for final shader

c405724

RealEdwardS force-pushed the final-shader-improvements branch from 51ed6ae to f3e61bb Compare March 24, 2026 00:23

.

7d500b7

RealEdwardS force-pushed the final-shader-improvements branch from f3e61bb to 3d2d934 Compare March 24, 2026 00:32

RealEdwardS added 2 commits March 23, 2026 17:48

?

784d927

Removed duplicate array elements

2212000

RealEdwardS force-pushed the final-shader-improvements branch 5 times, most recently from 90c3272 to 58d6baa Compare March 24, 2026 01:18

.

5c2722c

RealEdwardS force-pushed the final-shader-improvements branch from 58d6baa to 5c2722c Compare March 24, 2026 02:19

mwestphal reviewed Mar 24, 2026

View reviewed changes

mwestphal requested changes Mar 24, 2026

View reviewed changes

mwestphal requested a review from Meakk March 24, 2026 07:03

		#include "vtkF3DRenderer.h"
		#include <vtkRendererCollection.h>

	vtkF3DRenderer* ren = vtkF3DRenderer::SafeDownCast(renWin->GetRenderers()->GetFirstRenderer());
	vtkF3DRenderer* ren = vtkF3DRenderer::SafeDownCast(r);

	vtkRenderer* r = s->GetRenderer();
	vtkRenderer* ren = s->GetRenderer();

Uh oh!

Conversation

RealEdwardS commented Mar 11, 2026

Describe your changes

Issue ticket number and link if any

Checklist for finalizing the PR

Continuous integration

Uh oh!

github-actions bot commented Mar 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mwestphal commented Mar 11, 2026

Uh oh!

mwestphal commented Mar 12, 2026

Uh oh!

RealEdwardS commented Mar 12, 2026

Uh oh!

mwestphal commented Mar 12, 2026

Uh oh!

mwestphal commented Mar 22, 2026

Uh oh!

RealEdwardS commented Mar 23, 2026

Uh oh!

mwestphal commented Mar 23, 2026

Uh oh!

mwestphal commented Mar 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

RealEdwardS commented Mar 24, 2026

Uh oh!

mwestphal Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

mwestphal Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

mwestphal Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

mwestphal Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

mwestphal Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

mwestphal Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

mwestphal left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

github-actions bot commented Mar 11, 2026 •

edited

Loading

mwestphal commented Mar 23, 2026 •

edited

Loading