From 0035e0d47bbce8311d3a4e559e74b8cdc5209d47 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Wed, 27 Oct 2021 01:06:48 +0800
Subject: *load image

---
 .../Libraries/GameLab/Engine/Resource/init.lua     | 23 +++++++++++++++++++---
 Data/Scripts/EditorApplication.lua                 |  6 +++---
 Data/boot.lua                                      |  4 ++--
 3 files changed, 25 insertions(+), 8 deletions(-)

(limited to 'Data')

diff --git a/Data/DefaultContent/Libraries/GameLab/Engine/Resource/init.lua b/Data/DefaultContent/Libraries/GameLab/Engine/Resource/init.lua
index a407869..4942131 100644
--- a/Data/DefaultContent/Libraries/GameLab/Engine/Resource/init.lua
+++ b/Data/DefaultContent/Libraries/GameLab/Engine/Resource/init.lua
@@ -2,19 +2,36 @@ local m = GameLab.Engine.Resource or {}
 GameLab.Engine.Resource = m
 local import = GameLab.import(...)
 
--- classes
+----------------------------------------------------------------------------------
+-- native classes
+----------------------------------------------------------------------------------
+
+----------------------------------------------------------------------------------
+-- native methods
+----------------------------------------------------------------------------------
+-- LoadImageDataJob(path, callback)
 
+----------------------------------------------------------------------------------
+-- classes
+----------------------------------------------------------------------------------
 m.ImageDataRequest = import("ImageDataRequest")
 
+----------------------------------------------------------------------------------
 -- methods
-
+----------------------------------------------------------------------------------
 m.LoadImageDataAsync = function(path) 
     local request = GameLab.Engine.Resource.ImageDataRequest.New() 
-    m.ReadImageDataAsync(path, function(imgData) 
+    m.LoadImageDataJob(path, function(imgData) 
         request.isDone = true 
         request.imageData = imgData
     end)
     return request
 end
 
+m.LoadTexture = function(path, keepImgData, type, format, wrapMode, filterMode)
+    local imgData = GameLab.Engine.Resource.LoadImageData(path)
+    local tex = GameLab.Engine.Rendering.Texture.New(imgData, keepImgData, type, format, wrapMode, filterMode)
+    return tex
+end
+
 return m
\ No newline at end of file
diff --git a/Data/Scripts/EditorApplication.lua b/Data/Scripts/EditorApplication.lua
index 6b42175..36c701a 100644
--- a/Data/Scripts/EditorApplication.lua
+++ b/Data/Scripts/EditorApplication.lua
@@ -64,13 +64,13 @@ GameLab.IO.ReadFilesAsync(files, function()
 	Debug.Log("finished")
 end)
 
-local imgData = Rendering.LoadImage("./Resources/Images/brickwall.jpg")
+local imgData = Resource.LoadImageData("./Resources/Images/brickwall.jpg")
 Debug.Log(tostring(imgData:GetWidth()))
 Debug.Log(tostring(imgData:GetHeight()))
 
-local tex = Rendering.Texture.New(imgData, false)
+local tex = Resource.LoadTexture("./Resources/Images/brickwall.jpg")
 
-local requets = Resource.LoadImageDataAsync("./Resources/Images/brickwall.jpg")
+local request = Resource.LoadImageDataAsync("./Resources/Images/brickwall.jpg")
 
 while true do
 
diff --git a/Data/boot.lua b/Data/boot.lua
index ad8f4da..62b5d96 100644
--- a/Data/boot.lua
+++ b/Data/boot.lua
@@ -14,7 +14,7 @@ package.cpath=package.cpath .. ";" .. engineCLibs .. ";" .. editorCLibs
 
 -- debugging
 -- 在这里会报一个异常， 不知道为什么
---require("LuaPanda").start("127.0.0.1",8818)
+require("LuaPanda").start("127.0.0.1",8818)
 
 -- redirect
 if GAMELAB_DEBUG then 
@@ -32,7 +32,7 @@ require "GameLab.Editor"
 require "GameLab.Editor.GUI"
 
 -- debugging
-require("LuaPanda").start("127.0.0.1",8818)
+--require("LuaPanda").start("127.0.0.1",8818)
 
 -- launch editor
 dofile("./Scripts/EditorApplication.lua") 
-- 
cgit v1.1-26-g67d0