From 6f13bd834a2a2e5c14424110cd7b11485ffcd961 Mon Sep 17 00:00:00 2001 From: Marc Hernandez Date: Sun, 5 May 2024 08:40:35 -0700 Subject: [PATCH] Renames --- res/Resource.cs | 55 ++++++++++++------------------------------------- 1 file changed, 13 insertions(+), 42 deletions(-) diff --git a/res/Resource.cs b/res/Resource.cs index e65b784..4aef9a9 100644 --- a/res/Resource.cs +++ b/res/Resource.cs @@ -23,17 +23,17 @@ namespace res [Serializable] public class Ref : lib.I_Serialize { - public string Filename =>_filename; + public string Filename =>path; //For construction public Ref() { - _filename = "{UNSET_CONS}"; + path = "{UNSET_CONS}"; } public Ref( string filename ) { - _filename = filename; + path = filename; } virtual public void OnSerialize() @@ -53,7 +53,7 @@ namespace res } - protected string _filename = "{UNSET_INLINE}"; + private string path = "{UNSET_INLINE}"; } [Serializable] @@ -129,11 +129,10 @@ namespace res { public LoadHolder( Load fnLoad ) { - m_fnLoad = fnLoad; + _fnLoad = fnLoad; } - - public Load m_fnLoad; + public Load _fnLoad; internal override object load() { @@ -146,16 +145,11 @@ namespace res { public static T s_default = default; public static ImmutableDictionary> s_cache = ImmutableDictionary>.Empty; - - - } public class Mgr { - - static public void startup() { Resource.mgr = new Mgr(); @@ -172,6 +166,11 @@ namespace res //Register all subclasses of a particular type //???? Should we just always do this? + static public void registerSub() + { + registerSub( typeof(T) ); + } + static public void registerSub( Type baseType ) { log.info( $"Registering loader for {baseType.Name}" ); @@ -188,7 +187,7 @@ namespace res if( !baseType.IsAssignableFrom( t ) ) continue; - log.debug( $"Making a lodaer for {t.Name}" ); + log.debug( $"Making a loader for {t.Name}" ); typeParams[0] = t; var mi_ng = mi.MakeGenericMethod( typeParams ); @@ -216,40 +215,12 @@ namespace res static public Ref lookup( string filename ) where T : class { - /* - LoadHolder loader_gen; - Resource.mgr.m_loaders.TryGetValue( typeof( T ), out loader_gen ); - - var loaderHolder = loader_gen as LoadHolder; - - if( loaderHolder != null ) - { - var rf_raw = loaderHolder.dlgtLoad( filename ); - Ref rf = rf_raw as Ref; - return rf; - } - */ - return new Ref( filename ); } //* static public Ref lookup( string filename, Type t ) { - /* - LoadHolder loader_gen; - Resource.mgr.m_loaders.TryGetValue( t, out loader_gen ); - - var lhGenType = typeof(LoadHolder<>); - - - if( loaderHolder != null ) - { - var rf_raw = loaderHolder.load( filename ); - return rf_raw; - } - */ - return new Ref( filename ); } //*/ @@ -294,7 +265,7 @@ namespace res { var loader = loaderGen as LoadHolder; - var v = loader.m_fnLoad( filename ); + var v = loader._fnLoad( filename ); var weak = new WeakReference( v );