@@ -156,7 +156,7 @@ public AssetExternal GetExtAsset(AssetsFileInstance relativeTo, int fileId, long
156156 AssetsFileInstance dep = relativeTo . dependencies [ fileId - 1 ] ;
157157 ext . info = dep . table . GetAssetInfo ( pathId ) ;
158158 if ( ! onlyGetInfo )
159- ext . instance = GetATI ( dep . file , ext . info , forceFromCldb ) ;
159+ ext . instance = GetTypeInstance ( dep . file , ext . info , forceFromCldb ) ;
160160 else
161161 ext . instance = null ;
162162 ext . file = dep ;
@@ -165,7 +165,7 @@ public AssetExternal GetExtAsset(AssetsFileInstance relativeTo, int fileId, long
165165 {
166166 ext . info = relativeTo . table . GetAssetInfo ( pathId ) ;
167167 if ( ! onlyGetInfo )
168- ext . instance = GetATI ( relativeTo . file , ext . info , forceFromCldb ) ;
168+ ext . instance = GetTypeInstance ( relativeTo . file , ext . info , forceFromCldb ) ;
169169 else
170170 ext . instance = null ;
171171 ext . file = relativeTo ;
@@ -180,7 +180,25 @@ public AssetExternal GetExtAsset(AssetsFileInstance relativeTo, AssetTypeValueFi
180180 return GetExtAsset ( relativeTo , fileId , pathId , onlyGetInfo , forceFromCldb ) ;
181181 }
182182
183+ public AssetTypeInstance GetTypeInstance ( AssetsFileInstance inst , AssetFileInfoEx info , bool forceFromCldb = false )
184+ {
185+ return GetTypeInstance ( inst . file , info , forceFromCldb ) ;
186+ }
187+
188+ public AssetTypeInstance GetTypeInstance ( AssetsFile file , AssetFileInfoEx info , bool forceFromCldb = false )
189+ {
190+ return new AssetTypeInstance ( GetTemplateBaseField ( file , info , forceFromCldb ) , file . reader , info . absoluteFilePos ) ;
191+ }
192+
193+ //this method was renamed for consistency/clarity
194+ //because it's used so much, I don't want to deprecate it right away
195+ //so I'll keep the old method here for a while
183196 public AssetTypeInstance GetATI ( AssetsFile file , AssetFileInfoEx info , bool forceFromCldb = false )
197+ {
198+ return GetTypeInstance ( file , info , forceFromCldb ) ;
199+ }
200+
201+ public AssetTypeTemplateField GetTemplateBaseField ( AssetsFile file , AssetFileInfoEx info , bool forceFromCldb = false )
184202 {
185203 ushort scriptIndex = AssetHelper . GetScriptIndex ( file , info ) ;
186204 uint fixedId = AssetHelper . FixAudioID ( info . curFileType ) ;
@@ -219,7 +237,7 @@ public AssetTypeInstance GetATI(AssetsFile file, AssetFileInfoEx info, bool forc
219237 }
220238 }
221239
222- return new AssetTypeInstance ( baseField , file . reader , info . absoluteFilePos ) ;
240+ return baseField ;
223241 }
224242
225243 public AssetTypeValueField GetMonoBaseFieldCached ( AssetsFileInstance inst , AssetFileInfoEx info , string managedPath )
0 commit comments