Revert "Move OTTUtils to a submodule"

This reverts commit 989d3d5.

Author: drewc5131

.gitmodules

@@ -0,0 +1,20 @@
+"""
+Helpers and such for Open Toontown Tools
+"""
+from direct.task.TaskManagerGlobal import taskMgr
+
+
+def sleep(duration: float):
+    """
+    Breaks for a number of seconds. Returns an awaitable.
+    @LittleToonCat
+
+    :param duration: Duration of sleep
+    """
+
+    def __task(task):
+        if task.time > duration:
+            return task.done
+        return task.cont
+
+    return taskMgr.add(__task)

ott/OTTUtil.py

@@ -0,0 +1,87 @@
+"""
+OpenTTTools Settings
+Slight override of a typical dict to make the file auto save when a change is made
+"""
+
+import collections
+import json
+import os
+
+
+class Settings(collections.MutableMapping):
+
+    def __init__(self, filename: str):
+        """
+        :param filename: File path to json file
+        """
+        self.filename = filename
+
+        self.data = {}
+
+        # Make sure the file exists
+        if os.path.exists(self.filename):
+            try:
+                with open(self.filename, 'r') as f:
+                    self.data = json.load(f)
+            except:
+                # Something went wrong with the file, probable corruption, make a new one
+                self.save()
+        # If not, create it
+        else:
+            self.save()
+
+    def save(self):
+        """
+        Write settings changes to the json file
+        """
+        with open(self.filename, 'w') as jsonFile:
+            json.dump(self.data, jsonFile, indent = 4)
+            print('Saved settings')
+
+    ''' Overrides '''
+
+    def __getitem__(self, key: str):
+        """
+        x = settings['setting'] override
+
+        :param key: Setting Key
+        :return: Setting value
+        """
+        return self.data[key]
+
+    def __setitem__(self, key: str, value: str):
+        """
+        settings['setting'] = 'value' override
+
+        :param key: Setting Key
+        :param value: The value to set the setting to
+        """
+        self.data[key] = value
+        # Save the file
+        self.save()
+
+    def __delitem__(self, key: str):
+        """
+        del settings['setting'] override
+
+        :param key: Setting Key to remove
+        """
+        del self.data[key]
+        # Save the file
+        self.save()
+
+    def __iter__(self):
+        """
+        iteration override (e.g. for x in settings)
+
+        :return: Iterable of settings
+        """
+        return iter(self.data)
+
+    def __len__(self) -> int:
+        """
+        len(settings) Override
+
+        :return: Number of settings as integer
+        """
+        return len(self.data)

ott/Settings.py

@@ -0,0 +1,67 @@
+"""
+    Shader Registry - drewcification 111420
+    Static class to register and get shaders
+
+    Shaders are registered at the games initialization
+        from ott.ShaderRegistry import ShaderRegistry
+        ShaderRegistry.register('render:black_and_white',
+                                frag = 'phase_3/shaders/tt_sha_render_bandw.frag',
+                                vert = 'phase_3/shaders/tt_sha_render_bandw.vert')
+
+    They can be retrieved at any point during runtime
+        from ott.ShaderRegistry import ShaderRegistry
+        render.setShader(ShaderRegistry.get('render:black_and_white'))
+"""
+
+from panda3d.core import Shader
+
+
+class ShaderRegistry:
+    # Static shader dictionary
+    shaders = {}
+
+    @staticmethod
+    def register(identifier: str, frag: str, vert: str):
+        """
+        Register shader
+
+        All shaders must be in GLSL with separate .frag and .vert files!
+
+        Shader identifiers should be formatted by where they are used
+
+        e.g.:
+            Full scene render effects are prefixed with 'render:'
+            CheesyEffects are prefixed with  'ce:'
+            Make-A-Toon shaders are prefixed with 'mat:'
+            etc.
+
+        :param identifier: Identifier string
+        :param frag: Fragment shader file path
+        :param vert: Vertex shader file path
+        """
+        shader = Shader.load(Shader.SL_GLSL, fragment = frag, vertex = vert)
+        ShaderRegistry.shaders[identifier] = shader
+        print(f'Registered shader {identifier}')
+
+    @staticmethod
+    def get(identifier: str) -> Shader:
+        """
+        Returns loaded shader
+
+        :param identifier:
+        :return: Shader
+        """
+
+        # Raise an exception if we load a shader we haven't registered yet
+        if identifier not in ShaderRegistry.shaders:
+            raise NotInRegistryError(identifier)
+
+        return ShaderRegistry.shaders.get(identifier)
+
+
+class NotInRegistryError(Exception):
+    def __init__(self, identifier: str):
+        self.identifier = identifier
+
+    def __str__(self):
+        return f'identifier {self.identifier} not in registry'

ott/ShaderRegistry.py

@@ -0,0 +1 @@
+""" Universal classes for all OTT Projects """

ott/__init__.py

@@ -3,7 +3,7 @@
 from direct.interval.IntervalGlobal import *
 from direct.directnotify import DirectNotifyGlobal
 
-from ottutil.ShaderRegistry import ShaderRegistry
+from ott.ShaderRegistry import ShaderRegistry
 
 from toontown.toonbase import ToontownGlobals
 from toontown.hood import ZoneUtil

ottutil

@@ -13,7 +13,7 @@
 from .LevelEditorGlobals import *
 from .LESceneGraphExplorer import *
 
-from ottutil.ShaderRegistry import ShaderRegistry
+from ott.ShaderRegistry import ShaderRegistry
 
 from toontown.fixes import VectorWidgets
 

toontown/hood/GenericAnimatedProp.py

@@ -12,8 +12,8 @@
 from panda3d.core import loadPrcFile, loadPrcFileData
 from tkinter import Tk, messagebox
 
-from ottutil.Settings import Settings
-from ottutil.ShaderRegistry import ShaderRegistry
+from ott.Settings import Settings
+from ott.ShaderRegistry import ShaderRegistry
 
 from toontown.toonbase import ToontownGlobals