studio/blender-studio-tools
14
30
Fork 19
Code Issues 21 Pull Requests 4 Projects Releases 1 Activity

Blender Kitsu: Update Render Review GPU shader code to new syntax that works on Metal #305

Merged
Sebastian Parborg merged 1 commits from tone-watson/blender-studio-pipeline:bugfix/rr-gpu-shader into main 2024-06-04 16:14:13 +02:00
Conversation 3 Commits 1 Files Changed 1 +20 -32
1 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
scripts-blender/addons/blender_kitsu/render_review/draw.py
View File

@ -26,35 +26,36 @@ import typing
import bpy import bpy
import gpu import gpu
from gpu_extras.batch import batch_for_shader
APPROVED_COLOR = (0.24, 1, 0.139, 0.7) APPROVED_COLOR = (0.24, 1, 0.139, 0.7)
PUSHED_TO_EDIT_COLOR = (0.8, .8, 0.1, 0.5) PUSHED_TO_EDIT_COLOR = (0.8, .8, 0.1, 0.5)
# Glsl. # Shader code for "class LineDrawer"
gpu_vertex_shader = """ shader_info = gpu.types.GPUShaderCreateInfo()
uniform mat4 ModelViewProjectionMatrix; shader_info.push_constant('MAT4', "viewProjectionMatrix")
shader_info.push_constant('VEC4', "lineColor")
layout (location = 0) in vec2 pos; shader_info.vertex_in(0, 'VEC2', "pos")
layout (location = 1) in vec4 color; shader_info.fragment_out(0, 'VEC4', "fragColor")
out vec4 lineColor; // output to the fragment shader
shader_info.vertex_source("""
void main() void main()
{ {
gl_Position = ModelViewProjectionMatrix * vec4(pos.x, pos.y, 0.0, 1.0); gl_Position = viewProjectionMatrix * vec4(pos.x, pos.y, 0.0, 1.0);
lineColor = color;
} }
""" """
)
gpu_fragment_shader = """ shader_info.fragment_source("""
out vec4 fragColor;
in vec4 lineColor;
void main() void main()
{ {
fragColor = lineColor; fragColor = lineColor;
} }
""" """
)
line_drawer_shader = gpu.shader.create_from_info(shader_info)
del shader_info
Float2 = typing.Tuple[float, float] Float2 = typing.Tuple[float, float]
Float3 = typing.Tuple[float, float, float] Float3 = typing.Tuple[float, float, float]
@ -63,17 +64,6 @@ LINE_WIDTH = 6
class LineDrawer: class LineDrawer:
def __init__(self):
self._format = gpu.types.GPUVertFormat()
self._pos_id = self._format.attr_add(
id="pos", comp_type="F32", len=2, fetch_mode="FLOAT"
)
self._color_id = self._format.attr_add(
id="color", comp_type="F32", len=4, fetch_mode="FLOAT"
)
self.shader = gpu.types.GPUShader(gpu_vertex_shader, gpu_fragment_shader)
def draw(self, coords: typing.List[Float2], colors: typing.List[Float4]): def draw(self, coords: typing.List[Float2], colors: typing.List[Float4]):
global LINE_WIDTH global LINE_WIDTH
@ -82,14 +72,12 @@ class LineDrawer:
gpu.state.blend_set("ALPHA") gpu.state.blend_set("ALPHA")
gpu.state.line_width_set(LINE_WIDTH) gpu.state.line_width_set(LINE_WIDTH)
vbo = gpu.types.GPUVertBuf(len=len(coords), format=self._format) matrix = bpy.context.region_data.perspective_matrix
vbo.attr_fill(id=self._pos_id, data=coords) line_drawer_shader.uniform_float("viewProjectionMatrix", matrix)
vbo.attr_fill(id=self._color_id, data=colors) line_drawer_shader.uniform_float("lineColor", colors[0]) # Assuming same color for all lines for simplicity
batch = gpu.types.GPUBatch(type="LINES", buf=vbo)
batch.program_set(self.shader)
batch.draw()
batch = batch_for_shader(line_drawer_shader, 'LINES', {"pos": coords})
batch.draw(line_drawer_shader)
def get_strip_rectf(strip) -> Float4: def get_strip_rectf(strip) -> Float4:
# Get x and y in terms of the grid's frames and channels. # Get x and y in terms of the grid's frames and channels.