Skip to content

Commit 4e33cdb

Browse files
committed
effects = effect_packages
1 parent 6386425 commit 4e33cdb

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

demosys/effects/registry.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def __init__(self, name):
9393

9494
self.dependencies_module = None
9595
self.resources = []
96-
self.effects = []
96+
self.effect_packages = []
9797

9898
def runnable_effects(self) -> List[Type[Effect]]:
9999
"""Returns the first runnable effect in the package"""
@@ -187,16 +187,16 @@ def load_resource_module(self):
187187
if not isinstance(self.resources, list):
188188
raise EffectError(
189189
"Effect dependencies module '{}' has a 'resources' attribute of type {} instead of a list".format(name, type(self.resources)))
190-
190+
191191
# Fetch the effect class list
192192
try:
193-
self.effects = getattr(self.dependencies_module, 'effects')
193+
self.effect_packages = getattr(self.dependencies_module, 'effect_packages')
194194
except AttributeError:
195-
raise EffectError("Effect dependencies module '{}' has 'effects' attribute".format(name))
195+
raise EffectError("Effect dependencies module '{}' has 'effect_packages' attribute".format(name))
196196

197-
if not isinstance(self.effects, list):
197+
if not isinstance(self.effect_packages, list):
198198
raise EffectError(
199-
"Effect dependencies module '{}' has an 'effects' attribute of type {} instead of a list".format(name, type(self.effects)))
199+
"Effect dependencies module '{}' has an 'effect_packages' attribute of type {} instead of a list".format(name, type(self.effects)))
200200

201201

202202
class EffectError(Exception):

examples/cubes/dependencies.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from demosys.resources.meta import TextureDescription, ProgramDescription
22

3-
effects = []
3+
effect_packages = []
44

55
resources = [
66
ProgramDescription(path="cubes/cube_plain.glsl", label="plain"),

examples/feedback/dependencies.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from demosys.resources.meta import ProgramDescription, TextureDescription
22

3-
effects = []
3+
effect_packages = []
44

55
resources = [
66
ProgramDescription(label="transform", path="feedback/transform.glsl"),

examples/geocubes/dependencies.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from demosys.resources.meta import ProgramDescription, TextureDescription
22

3-
effects = []
3+
effect_packages = []
44

55
resources = [
66
ProgramDescription(label="cube_multi_fade", path='geocubes/cube_multi_fade.glsl'),

examples/minecraft/dependencies.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from demosys.resources.meta import SceneDescription, ProgramDescription
22

3-
effects = []
3+
effect_packages = []
44

55
resources = [
66
ProgramDescription(label="minecraft", path='minecraft/minecraft.glsl'),

examples/raymarching/dependencies.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from demosys.resources.meta import ProgramDescription
22

3-
effects = []
3+
effect_packages = []
44

55
resources = [
66
ProgramDescription(label="raymarching_simple", path="raymarching/raymarching_simple.glsl")

examples/sponza/dependencies.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from demosys.resources.meta import SceneDescription
22

3-
effects = []
3+
effect_packages = []
44

55
resources = [
66
SceneDescription(label="sponza", path="sponza/Sponza/glTF/Sponza.gltf"),

examples/warpspeed/dependencies.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from demosys.resources.meta import TextureDescription, ProgramDescription
22

3-
effects = []
3+
effect_packages = []
44

55
resources = [
66
ProgramDescription(label="shader", path="warpspeed/shader.glsl"),

0 commit comments

Comments
 (0)