admin/RaindropViewer
1
0
Fork 0
mirror of https://github.com/RaindropViewer/RaindropViewer.git synced 2026-07-27 22:11:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Imagesharp dlls... I forget this existed.

Browse Source
This commit is contained in:
alexiscatnip
2022-01-19 23:07:16 +08:00
parent 8c9247e7a2
commit d9b9db64ca
20 changed files with 500 additions and 55575 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/InitTestScene637782234512083174.unity
+454
View File
@@ -0,0 +1,454 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 9
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.3731193, g: 0.38073996, b: 0.35872698, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 12
m_GIWorkflowMode: 1
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
m_IndirectOutputScale: 1
m_AlbedoBoost: 1
m_EnvironmentLightingMode: 0
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 12
m_Resolution: 2
m_BakeResolution: 40
m_AtlasSize: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAmbientOcclusion: 0
m_Padding: 2
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_FinalGather: 0
m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 256
m_ReflectionCompression: 2
m_MixedBakeMode: 2
m_BakeBackend: 1
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 512
m_PVRBounces: 2
m_PVREnvironmentSampleCount: 256
m_PVREnvironmentReferencePointCount: 2048
m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1
m_PVRDenoiserTypeAO: 1
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVREnvironmentMIS: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 2
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
minRegionArea: 2
manualCellSize: 0
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!114 &13552111
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d44e6804bc58be84ea71a619b468f150, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1748150895
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 68f09f0f82599b5448579854e622a4c1, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1795491018
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f3e1b3cbf3fac6a459b1a602167ad311, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2144958774
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2144958777}
- component: {fileID: 2144958776}
- component: {fileID: 2144958775}
m_Layer: 0
m_Name: Code-based tests runner
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &2144958775
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2144958774}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3cf5cb9e1ef590c48b1f919f2a7bd895, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &2144958776
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2144958774}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 102e512f651ee834f951a2516c1ea3b8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_AssembliesWithTests:
- Tests
- UnityEngine.TestRunner
testStartedEvent:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2144958775}
m_TargetAssemblyTypeName: UnityEngine.TestTools.TestRunner.Callbacks.PlayModeRunnerCallback,
UnityEngine.TestRunner
m_MethodName: TestStarted
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 13552111}
m_TargetAssemblyTypeName: UnityEditor.TestTools.TestRunner.TestRunnerCallback,
UnityEditor.TestRunner
m_MethodName: TestStarted
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1795491018}
m_TargetAssemblyTypeName: UnityEditor.TestTools.TestRunner.Api.CallbacksDelegatorListener,
UnityEditor.TestRunner
m_MethodName: TestStarted
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1748150895}
m_TargetAssemblyTypeName: UnityEngine.TestRunner.Utils.TestRunCallbackListener,
UnityEngine.TestRunner
m_MethodName: TestStarted
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
testFinishedEvent:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2144958775}
m_TargetAssemblyTypeName: UnityEngine.TestTools.TestRunner.Callbacks.PlayModeRunnerCallback,
UnityEngine.TestRunner
m_MethodName: TestFinished
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 13552111}
m_TargetAssemblyTypeName: UnityEditor.TestTools.TestRunner.TestRunnerCallback,
UnityEditor.TestRunner
m_MethodName: TestFinished
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1795491018}
m_TargetAssemblyTypeName: UnityEditor.TestTools.TestRunner.Api.CallbacksDelegatorListener,
UnityEditor.TestRunner
m_MethodName: TestFinished
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1748150895}
m_TargetAssemblyTypeName: UnityEngine.TestRunner.Utils.TestRunCallbackListener,
UnityEngine.TestRunner
m_MethodName: TestFinished
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
runStartedEvent:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2144958775}
m_TargetAssemblyTypeName: UnityEngine.TestTools.TestRunner.Callbacks.PlayModeRunnerCallback,
UnityEngine.TestRunner
m_MethodName: RunStarted
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 13552111}
m_TargetAssemblyTypeName: UnityEditor.TestTools.TestRunner.TestRunnerCallback,
UnityEditor.TestRunner
m_MethodName: RunStarted
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1795491018}
m_TargetAssemblyTypeName: UnityEditor.TestTools.TestRunner.Api.CallbacksDelegatorListener,
UnityEditor.TestRunner
m_MethodName: RunStarted
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1748150895}
m_TargetAssemblyTypeName: UnityEngine.TestRunner.Utils.TestRunCallbackListener,
UnityEngine.TestRunner
m_MethodName: RunStarted
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
runFinishedEvent:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2144958775}
m_TargetAssemblyTypeName: UnityEngine.TestTools.TestRunner.Callbacks.PlayModeRunnerCallback,
UnityEngine.TestRunner
m_MethodName: RunFinished
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 13552111}
m_TargetAssemblyTypeName: UnityEditor.TestTools.TestRunner.TestRunnerCallback,
UnityEditor.TestRunner
m_MethodName: RunFinished
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1795491018}
m_TargetAssemblyTypeName: UnityEditor.TestTools.TestRunner.Api.CallbacksDelegatorListener,
UnityEditor.TestRunner
m_MethodName: RunFinished
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1748150895}
m_TargetAssemblyTypeName: UnityEngine.TestRunner.Utils.TestRunCallbackListener,
UnityEngine.TestRunner
m_MethodName: RunFinished
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
settings:
filters:
- assemblyNames: []
groupNames: []
categoryNames:
- Benchmark
- Network
- Uncategorized
testNames:
- Raindrop.Tests.RaindropIntegrationTests.AbleToAssertPass
synchronousOnly: 0
sceneBased: 0
originalScene: Assets/Scenes/MainScene.unity
bootstrapScene: Assets/InitTestScene637782234512083174.unity
--- !u!4 &2144958777
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2144958774}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Assets/Plugins/SixLabors.ImageSharp.xml.meta → Assets/InitTestScene637782234512083174.unity.meta
+2 -2
View File
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 99f5cc8619b01a842843bb4267ceec9a
TextScriptImporter:
guid: 1bd9b9bf47585124193048462fae649f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
Assets/Plugins/LibreMetaverse/Assets/AssetTypes/AssetTexture.cs
+11 -8
View File
@@ -97,14 +97,17 @@ namespace OpenMetaverse.Assets
this.Components = 0;
using (var reader = new OpenJpegDotNet.IO.Reader(AssetData))
{
// *hack: decode from ManagedImage directly or better yet, get rid of ManagedImage entirely!
if (!reader.ReadHeader()) { return false; }
throw new NotImplementedException();
// Image = new ManagedImage(reader.DecodeToBitmap());
}
// using (var reader = new OpenJpegDotNet.IO.Reader(AssetData))
var texture = Imaging.T2D.LoadT2DWithoutMipMaps(AssetData);
Image = new ManagedImage(texture);
// using (var reader = new OpenJpegDotNet.IO.Reader(AssetData))
// {
// // *hack: decode from ManagedImage directly or better yet, get rid of ManagedImage entirely!
// if (!reader.ReadHeader()) { return false; }
//
// throw new NotImplementedException();
// // Image = new ManagedImage(reader.DecodeToBitmap());
// }
if ((Image.Channels & ManagedImage.ImageChannels.Color) != 0)
Components += 3;
Assets/Plugins/LibreMetaverse/Imaging/T2D.cs
+20
View File
@@ -0,0 +1,20 @@
using UnityEngine;
namespace OpenMetaverse.Imaging
{
public class T2D
{
public static Texture2D LoadT2DWithoutMipMaps(byte[] thebytes)
{
var texture = new Texture2D(1, 1, TextureFormat.ARGB32, false); // impt there is a jobs bug here
var loaderSettings = AsyncImageLoader.LoaderSettings.Default;
loaderSettings.generateMipmap = false; // impt there is a bug here
// Use hacky LoaderSettings
var loadSuccess = AsyncImageLoader.LoadImage(texture, thebytes, loaderSettings);
return texture;
}
}
}
Assets/Plugins/LibreMetaverse/Imaging/T2D.cs.meta
+3
View File
@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: f9c2c34c726b49d19d8ebab6f2ef6778
timeCreated: 1642600846
Assets/Plugins/LibreMetaverse/LibreMetaverseAssembly.asmdef
+3 -1
View File
@@ -1,7 +1,9 @@
{
"name": "LibreMetaverseAssembly",
"rootNamespace": "",
"references": [],
"references": [
"GUID:a8cf6376c8aac1e43b688324ad3f22de"
],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": true,
Assets/Plugins/LibreMetaverse/PrimMesher/SculptMesh.cs
-1
View File
@@ -28,7 +28,6 @@
using System;
using System.Collections.Generic;
//using System.Drawing;
using SixLabors;
using System.IO;
//using Catnip.Drawing;
using UnityEngine;
Assets/Plugins/OpenJpegDotNet.dll
BIN
View File
Binary file not shown.
Assets/Plugins/OpenJpegDotNet.dll.meta
-33
View File
@@ -1,33 +0,0 @@
fileFormatVersion: 2
guid: b40d6b883361a0d40921720d88966596
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Any:
second:
enabled: 1
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
- first:
Windows Store Apps: WindowsStoreApps
second:
enabled: 0
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
Assets/Plugins/OpenJpegDotNet.xml
-1487
View File
File diff suppressed because it is too large Load Diff
Assets/Plugins/OpenJpegDotNet.xml.meta
-7
View File
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: ef87fb698153618479434b8b658dc0a4
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Plugins/SixLabors.ImageSharp.dll
BIN
View File
Binary file not shown.
Assets/Plugins/SixLabors.ImageSharp.dll.meta
-33
View File
@@ -1,33 +0,0 @@
fileFormatVersion: 2
guid: 81d0e422082f1cd49b757b2ee2a69ad5
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Any:
second:
enabled: 1
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
- first:
Windows Store Apps: WindowsStoreApps
second:
enabled: 0
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:
Assets/Plugins/SixLabors.ImageSharp.xml
-53972
View File
File diff suppressed because it is too large Load Diff
Assets/Raindrop/Core/IMTextManager.cs
-1
View File
@@ -31,7 +31,6 @@ using Newtonsoft.Json;
//using System.Web.Script.Serialization;
using System.Collections.Generic;
using UnityEngine;
using Color = SixLabors.ImageSharp.Color;
namespace Raindrop
{
Assets/Raindrop/Core/Settings.cs
-7
View File
@@ -39,8 +39,6 @@ using OpenMetaverse.StructuredData;
//using System.Web.Script.Serialization;
using Newtonsoft.Json;
using System.ComponentModel;
using SixLabors.ImageSharp;
using Color = SixLabors.ImageSharp.Color;
using Formatting = System.Xml.Formatting;
//using Font = Catnip.Drawing.Font;
using Logger = OpenMetaverse.Logger;
@@ -163,11 +161,6 @@ namespace Raindrop
//[JsonIgnore]
//public Font Font;
[JsonIgnore]
public Color ForeColor;
[JsonIgnore]
public Color BackColor;
public String Name;
Assets/Raindrop/Disk/ReadWrite.cs
+1 -8
View File
@@ -1,5 +1,4 @@
using SixLabors.ImageSharp;
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
@@ -77,12 +76,6 @@ namespace Raindrop.Disk
public static bool SaveTextureToFile(Image image)
{
//image.Save(outputStream, format);
return true;
}
}
}
Assets/Raindrop/Imaging.cs
-11
View File
@@ -4,16 +4,5 @@ namespace Raindrop
{
static public class Imaging
{
public static Texture2D LoadT2DWithoutMipMaps(byte[] thebytes)
{
var texture = new Texture2D(1, 1, TextureFormat.ARGB32, false); // impt there is a jobs bug here
var loaderSettings = AsyncImageLoader.LoaderSettings.Default;
loaderSettings.generateMipmap = false; // impt there is a bug here
// Use hacky LoaderSettings
var loadSuccess = AsyncImageLoader.LoadImage(texture, thebytes, loaderSettings);
return texture;
}
}
}
Assets/Raindrop/Render/TerrainSplat.cs
+1 -1
View File
@@ -386,7 +386,7 @@ namespace Raindrop.Rendering
if (state == TextureRequestState.Finished && assetTexture?.AssetData != null)
{
Texture2D img;
img = Imaging.LoadT2DWithoutMipMaps(assetTexture.AssetData);
img = T2D.LoadT2DWithoutMipMaps(assetTexture.AssetData);
detailTexture[i] = (Texture2D)img;
}
textureDone.Set();
Assets/Tests/ImagingTests/ImagingTests.cs
+5 -3
View File
@@ -3,6 +3,7 @@ using System.Collections;
using System.Collections.Generic;
using System.IO;
using NUnit.Framework;
using OpenMetaverse.Imaging;
using UnityEditor;
using UnityEngine;
using UnityEngine.TestTools;
@@ -46,11 +47,12 @@ namespace Raindrop.Tests.ImagingTests
[Test]
public void readBytes_ImagePath()
{
Assert.True(BetterStreamingAssets.FileExists(_inputImageSubPath));
BetterStreamingAssets.Initialize(); //fuck, this is easy to forget.
Assert.True(BetterStreamingAssets.FileExists(_inputImageSubPath), "SA file not exist : \n " + _inputImageSubPath);
byte[] thebytes = BetterStreamingAssets.ReadAllBytes(_inputImageSubPath);
Assert.True(thebytes.Length > 0);
Assert.True(thebytes.Length > 0, "File is empty size");
}
//can read and decode the jp2 from streamingassets. then save to local caching directory.
@@ -67,7 +69,7 @@ namespace Raindrop.Tests.ImagingTests
Assert.True(thebytes.Length > 0);
var texture = Raindrop.Imaging.LoadT2DWithoutMipMaps(thebytes);
var texture = T2D.LoadT2DWithoutMipMaps(thebytes);
Assert.True(texture.height > 5); //todo so arbitrary