浏览代码

update for lottie

/siyaoH-1.17-PlatformMessage
siyao 4 年前
当前提交
1ca2ee1c
共有 7 个文件被更改,包括 82 次插入13 次删除
  1. 67
      Samples/UIWidgetsSamples_2019_4/Assets/CountDemo.unity
  2. 10
      com.unity.uiwidgets/Runtime/engine2/AndroidUnpackStreamingAsset.cs
  3. 2
      com.unity.uiwidgets/Runtime/engine2/UIWidgetsPanelWrapper.cs
  4. 2
      engine/src/assets/directory_asset_bundle.cc
  5. 8
      engine/src/lib/ui/painting/skottie.cc
  6. 2
      engine/src/shell/platform/unity/android_unpack_streaming_asset.cc
  7. 4
      engine/src/shell/platform/unity/android_unpack_streaming_asset.h

67
Samples/UIWidgetsSamples_2019_4/Assets/CountDemo.unity


m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!28 &1096042013
Texture2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 2
m_Width: 0
m_Height: 0
m_CompleteImageSize: 0
m_TextureFormat: 0
m_MipCount: 1
m_IsReadable: 1
m_IgnoreMasterTextureLimit: 0
m_IsPreProcessed: 0
m_StreamingMipmaps: 0
m_StreamingMipmapsPriority: 0
m_AlphaIsTransparency: 0
m_ImageCount: 0
m_TextureDimension: 2
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 0
m_WrapV: 0
m_WrapW: 0
m_LightmapFormat: 0
m_ColorSpace: 0
image data: 0
_typelessdata:
m_StreamData:
offset: 0
size: 0
path:
--- !u!1 &1344837310
GameObject:
m_ObjectHideFlags: 0

devicePixelRatioOverride: 0
hardwareAntiAliasing: 0
fonts: []
m_ShowDebugLog: 0
--- !u!114 &1777874944
MonoBehaviour:
m_ObjectHideFlags: 0

m_GameObject: {fileID: 1777874940}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bcb4984097885463dbe58d12837993ce, type: 3}
m_Script: {fileID: 11500000, guid: 0817e3443c80cb943a03dcf7b120bd2e, type: 3}
panel: {fileID: 0}
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 1096042013}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
devicePixelRatioOverride: 0
hardwareAntiAliasing: 0
fonts:
- family: CupertinoIcons
fonts:
- asset: CupertinoIcons.ttf
weight: 0

10
com.unity.uiwidgets/Runtime/engine2/AndroidUnpackStreamingAsset.cs


[DllImport(NativeBindings.dllName)]
internal static extern void InitUnpackFile(UnpackFileCallback unpack);
internal delegate bool UnpackFileCallback(string file);
internal delegate string UnpackFileCallback(string file);
internal static bool unpackFile(string file) {
internal static string unpackFile(string file) {
if (Application.platform == RuntimePlatform.Android) {
var dir = Application.temporaryCachePath + "/";
if (!File.Exists(dir + file)) {

Debug.Log("Error unpacking 'jar:file://" + Application.dataPath + "!/assets/" + file +
"'");
dir = "";
return false;
return dir + file;
return true;
return dir + file;
return false;
return "";
}
public static void OnEnable()

2
com.unity.uiwidgets/Runtime/engine2/UIWidgetsPanelWrapper.cs


void _enableUIWidgetsPanel(string font_settings) {
UIWidgetsPanel_onEnable(_ptr, _renderTexture.GetNativeTexturePtr(),
_width, _height, devicePixelRatio, Application.streamingAssetsPath, font_settings);
_width, _height, devicePixelRatio, Application.temporaryCachePath, font_settings);
}
void _resizeUIWidgetsPanel() {

2
engine/src/assets/directory_asset_bundle.cc


}
#if __ANDROID__
bool success = AndroidUnpackStreamingAsset::Unpack(asset_name.c_str());
const char* file = AndroidUnpackStreamingAsset::Unpack(asset_name.c_str());
#endif
auto mapping = std::make_unique<fml::FileMapping>(fml::OpenFile(

8
engine/src/lib/ui/painting/skottie.cc


#include "skottie.h"
#include "lib/ui/ui_mono_state.h"
#include "shell/platform/unity/android_unpack_streaming_asset.h"
#if __ANDROID__
std::string pthstr = std::string(path);
int id = pthstr.find("assets/") + 7;
std::string file = pthstr.substr(id);
const char* fileOut = AndroidUnpackStreamingAsset::Unpack(file.c_str());
path = (char*)fileOut;
#endif
sk_sp<skottie::Animation> animation_ = skottie::Animation::MakeFromFile(path);
return fml::MakeRefCounted<Skottie>(animation_);
}

2
engine/src/shell/platform/unity/android_unpack_streaming_asset.cc


namespace uiwidgets {
bool AndroidUnpackStreamingAsset::Unpack(const char* file) {
const char* AndroidUnpackStreamingAsset::Unpack(const char* file) {
return _unpack(file);
}

4
engine/src/shell/platform/unity/android_unpack_streaming_asset.h


namespace uiwidgets {
typedef bool (*UnpackFileCallback)(const char* file);
typedef const char* (*UnpackFileCallback)(const char* file);
class AndroidUnpackStreamingAsset{

static bool Unpack(const char* file);
static const char* Unpack(const char* file);
};
} // namespace uiwidgets
正在加载...
取消
保存