Reverse the local resource logic

Author: einarf

demosys/effect_templates/cube_simple/effect.py

@@ -7,7 +7,7 @@
 class SimpleCubeEffect(effect.Effect):
     """Generated default effect"""
     def __init__(self):
-        self.shader = self.get_shader("cube_plain.glsl")
+        self.shader = self.get_shader("cube_plain.glsl", local=True)
         self.cube = geometry.cube(4.0, 4.0, 4.0)
 
     @effect.bind_target

demosys/effect_templates/sphere_textured/effect.py

@@ -7,9 +7,9 @@
 class TexturedSphere(effect.Effect):
     """Generated default effect"""
     def __init__(self):
-        self.shader = self.get_shader("default.glsl")
+        self.shader = self.get_shader("default.glsl", local=True)
         self.sphere = geometry.sphere(4.0, sectors=32, rings=16)
-        self.texture = self.get_texture("wood.jpg")
+        self.texture = self.get_texture("wood.jpg", local=True)
 
     @effect.bind_target
     def draw(self, time, frametime, target):

demosys/effects/effect.py

@@ -29,10 +29,8 @@ def local_path(func):
     def local_wrapper(*args, **kwargs):
         use_local = kwargs.get('local')
 
-        # If use_local is True or None we assume local loading
-        if use_local is not False:
-            # Don't mess with the path if path starts with local dir
-            if not args[1].startswith("{}/".format(args[0].effect_name)):
+        # If use_local is True prepend the package name to the path
+        if use_local is True:
                 path = args[1]
                 path = os.path.join(args[0].effect_name, path)
 
@@ -87,7 +85,7 @@ def draw(self, time, frametime, target):
     # Methods for getting resources
 
     @local_path
-    def get_shader(self, path, local=True):
+    def get_shader(self, path, local=False):
         """
         Get a shader or schedule the shader for loading.
         If the resource is not loaded yet, an empty shader object
@@ -100,7 +98,7 @@ def get_shader(self, path, local=True):
         return resources.shaders.get(path, create=True)
 
     @local_path
-    def get_texture(self, path, local=True, **kwargs):
+    def get_texture(self, path, local=False, **kwargs):
         """
         Get a shader or schedule the texture for loading.
         If the resource is not loaded yet, an empty texture object
@@ -113,7 +111,7 @@ def get_texture(self, path, local=True, **kwargs):
         return resources.textures.get(path, create=True, **kwargs)
 
     @local_path
-    def get_track(self, name, local=True):
+    def get_track(self, name, local=False):
         """
         Get or create a rocket track. This only makes sense when using rocket timers.
         If the resource is not loaded yet, an empty track object
@@ -126,7 +124,7 @@ def get_track(self, name, local=True):
         return resources.tracks.get(name)
 
     @local_path
-    def get_scene(self, path, local=True, **kwargs):
+    def get_scene(self, path, local=False, **kwargs):
         """
         Get or create a scene.
         :param path: Path to the scene