MyouProject/myou-engine
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Material: Make scene optional, fix typo, other minor changes.

Browse source
This commit is contained in:
Alberto Torres 2025-03-18 16:43:47 +01:00
parent fb50b3a018
commit 0b5cd6f8d2
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/graphics/material.nim
View file

@ -40,7 +40,7 @@ when defined(nimdoc):
# Forward declarations # Forward declarations
func add_line_numbers(s: string, first: int=1):string func add_line_numbers(s: string, first: int=1):string
proc newMaterial*(engine: MyouEngine, name: string, scene: Scene, proc newMaterial*(engine: MyouEngine, name: string, scene: Scene = nil,
vertex = "", vertex = "",
fragment = "", fragment = "",
textures = initOrderedTable[string, Texture](), textures = initOrderedTable[string, Texture](),
@ -122,7 +122,7 @@ func add_line_numbers(s: string, first: int=1):string =
lines[i] = $(i+first) & " " & line lines[i] = $(i+first) & " " & line
return lines.join("\n") return lines.join("\n")
proc newMaterial*(engine: MyouEngine, name: string, scene: Scene, proc newMaterial*(engine: MyouEngine, name: string, scene: Scene = nil,
vertex = "", vertex = "",
fragment = "", fragment = "",
textures = initOrderedTable[string, Texture](), textures = initOrderedTable[string, Texture](),
@ -166,7 +166,7 @@ proc newSolidMaterial*(engine: MyouEngine, name: string, color: Vec4): Material
}}""", }}""",
) )
proc newVertexColordMaterial*(engine: MyouEngine, name: string): Material = proc newVertexColorMaterial*(engine: MyouEngine, name = "vertex color"): Material =
newMaterial(engine, name, nil, newMaterial(engine, name, nil,
fragment = dedent """ fragment = dedent """
in vec4 vcol; in vec4 vcol;
@ -502,6 +502,8 @@ proc initShader*(self: Shader, engine: MyouEngine, material: Material,
# TODO: use KHR_parallel_shader_compile # TODO: use KHR_parallel_shader_compile
# TODO: identify unused uniforms (at least unused textures)
var ubo_names = newSeqOfCap[string](material.ubos.len) var ubo_names = newSeqOfCap[string](material.ubos.len)
self.ubos.setLen 0 self.ubos.setLen 0
for ubo in material.ubos & modifier_ubos: for ubo in material.ubos & modifier_ubos:
@ -551,5 +553,3 @@ proc use*(self: Shader): GLuint {.inline,discardable.} =
proc destroy*(self: Shader) = proc destroy*(self: Shader) =
self.program = 0.GPUProgram self.program = 0.GPUProgram