fatiao/ro-webgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Workaround the compile errors. We'll need to regenerate the Lua wrapper later.

Browse Source
This commit is contained in:
Liang Zhao 2021-12-21 17:03:35 +08:00
parent e71d454418
commit 267389d065
8 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Editor/ExportTerrain/ExportTerrain.cs
View File

@ -64,8 +64,8 @@ public class ExportTerrain : EditorWindow
void Export() void Export()
{ {
string fileName = EditorUtility.SaveFilePanel("Export .obj file", "", "Terrain", "obj"); string fileName = EditorUtility.SaveFilePanel("Export .obj file", "", "Terrain", "obj");
int w = terrain.heightmapWidth; int w = terrain.heightmapResolution;
int h = terrain.heightmapHeight; int h = terrain.heightmapResolution;
Vector3 meshScale = terrain.size; Vector3 meshScale = terrain.size;
int tRes = (int)Mathf.Pow(2, (int)saveResolution); int tRes = (int)Mathf.Pow(2, (int)saveResolution);
meshScale = new Vector3(meshScale.x / (w - 1) * tRes, meshScale.y, meshScale.z / (h - 1) * tRes); meshScale = new Vector3(meshScale.x / (w - 1) * tRes, meshScale.y, meshScale.z / (h - 1) * tRes);

2
Assets/Editor/RolePreview/RolePreviewWindow.cs
View File

@ -5,7 +5,7 @@ using UnityEngine;
using UnityEditor; using UnityEditor;
using UnityEditor.Callbacks; using UnityEditor.Callbacks;
using UnityEditor.Compilation; using UnityEditor.Compilation;
using UnityEditor.Experimental.UIElements.GraphView; using UnityEditor.Experimental.GraphView;
using LuaInterface; using LuaInterface;
namespace RO.Editor namespace RO.Editor

6
Assets/Src/ThirdPlugins/uHyperText/Common/DrawObject.cs
View File

@ -280,6 +280,12 @@ namespace WXB
canvasRenderer.DisableRectClipping(); canvasRenderer.DisableRectClipping();
} }
public virtual void SetClipSoftness(Vector2 clipSoftness)
{
}
public virtual void Rebuild(CanvasUpdate executing) public virtual void Rebuild(CanvasUpdate executing)
{ {

8
Assets/T4M/Editor/T4MSC.cs
View File

@ -3519,8 +3519,8 @@ public class T4MSC : EditorWindow
AssetDatabase.Refresh(); AssetDatabase.Refresh();
terrain = CurrentSelect.GetComponent<Terrain>().terrainData; terrain = CurrentSelect.GetComponent<Terrain>().terrainData;
int w = terrain.heightmapWidth; int w = terrain.heightmapResolution;
int h = terrain.heightmapHeight; int h = terrain.heightmapResolution;
Vector3 meshScale = terrain.size; Vector3 meshScale = terrain.size;
meshScale = new Vector3(meshScale.x / (h - 1) * tRes, meshScale.y, meshScale.z / (w - 1) * tRes); meshScale = new Vector3(meshScale.x / (h - 1) * tRes, meshScale.y, meshScale.z / (w - 1) * tRes);
Vector2 uvScale = new Vector2((float)(1.0 / (w - 1)), (float)(1.0 / (h - 1))); Vector2 uvScale = new Vector2((float)(1.0 / (w - 1)), (float)(1.0 / (h - 1)));
@ -3960,8 +3960,8 @@ public class T4MSC : EditorWindow
void GetHeightmap() void GetHeightmap()
{ {
terrainDat = CurrentSelect.GetComponent<Terrain>().terrainData; terrainDat = CurrentSelect.GetComponent<Terrain>().terrainData;
HeightmapWidth = terrainDat.heightmapWidth; HeightmapWidth = terrainDat.heightmapResolution;
HeightmapHeight = terrainDat.heightmapHeight; HeightmapHeight = terrainDat.heightmapResolution;
} }
void UpdateProgress() void UpdateProgress()

4
Assets/ToLua/Editor/Custom/CustomSettings.cs
View File

@ -150,7 +150,7 @@ public static class CustomSettings
_GT (typeof (QualitySettings)), _GT (typeof (QualitySettings)),
_GT (typeof (RenderSettings)), _GT (typeof (RenderSettings)),
_GT (typeof (BlendWeights)), _GT (typeof (SkinWeights)),
_GT (typeof (RenderTexture)), _GT (typeof (RenderTexture)),
_GT (typeof (RenderTextureDescriptor)), _GT (typeof (RenderTextureDescriptor)),
_GT (typeof (RenderTextureFormat)), _GT (typeof (RenderTextureFormat)),
@ -360,7 +360,7 @@ public static class CustomSettings
typeof (AnimationClip), typeof (AnimationClip),
typeof (AnimationState), typeof (AnimationState),
typeof (BlendWeights), typeof (SkinWeights),
typeof (RenderTexture), typeof (RenderTexture),
typeof (Rigidbody), typeof (Rigidbody),
}; };

3
Assets/ToLua/Source/Generate/Cinemachine_CinemachineVirtualCameraBaseWrap.cs
View File

@ -89,7 +89,8 @@ public class Cinemachine_CinemachineVirtualCameraBaseWrap
Cinemachine.CinemachineVirtualCameraBase obj = (Cinemachine.CinemachineVirtualCameraBase)ToLua.CheckObject<Cinemachine.CinemachineVirtualCameraBase>(L, 1); Cinemachine.CinemachineVirtualCameraBase obj = (Cinemachine.CinemachineVirtualCameraBase)ToLua.CheckObject<Cinemachine.CinemachineVirtualCameraBase>(L, 1);
Cinemachine.ICinemachineCamera arg0 = (Cinemachine.ICinemachineCamera)ToLua.CheckObject<Cinemachine.ICinemachineCamera>(L, 2); Cinemachine.ICinemachineCamera arg0 = (Cinemachine.ICinemachineCamera)ToLua.CheckObject<Cinemachine.ICinemachineCamera>(L, 2);
bool arg1 = LuaDLL.luaL_checkboolean(L, 3); bool arg1 = LuaDLL.luaL_checkboolean(L, 3);
bool o = obj.IsLiveChild(arg0, arg1); // bool o = obj.IsLiveChild(arg0, arg1);
bool o = false;
LuaDLL.lua_pushboolean(L, o); LuaDLL.lua_pushboolean(L, o);
return 1; return 1;
} }

15
Assets/ToLua/Source/Generate/TMPro_TMP_TextWrap.cs
View File

@ -379,7 +379,7 @@ public class TMPro_TMP_TextWrap
int[] arg0 = ToLua.ToNumberArray<int>(L, 2); int[] arg0 = ToLua.ToNumberArray<int>(L, 2);
int arg1 = (int)LuaDLL.lua_tonumber(L, 3); int arg1 = (int)LuaDLL.lua_tonumber(L, 3);
int arg2 = (int)LuaDLL.lua_tonumber(L, 4); int arg2 = (int)LuaDLL.lua_tonumber(L, 4);
obj.SetCharArray(arg0, arg1, arg2); // obj.SetCharArray(arg0, arg1, arg2);
return 0; return 0;
} }
else else
@ -948,7 +948,8 @@ public class TMPro_TMP_TextWrap
{ {
o = ToLua.ToObject(L, 1); o = ToLua.ToObject(L, 1);
TMPro.TMP_Text obj = (TMPro.TMP_Text)o; TMPro.TMP_Text obj = (TMPro.TMP_Text)o;
float ret = obj.fontScale; // float ret = obj.fontScale;
float ret = 1.0f;
LuaDLL.lua_pushnumber(L, ret); LuaDLL.lua_pushnumber(L, ret);
return 1; return 1;
} }
@ -1347,7 +1348,8 @@ public class TMPro_TMP_TextWrap
{ {
o = ToLua.ToObject(L, 1); o = ToLua.ToObject(L, 1);
TMPro.TMP_Text obj = (TMPro.TMP_Text)o; TMPro.TMP_Text obj = (TMPro.TMP_Text)o;
bool ret = obj.isLinkedTextComponent; // bool ret = obj.isLinkedTextComponent;
bool ret = false;
LuaDLL.lua_pushboolean(L, ret); LuaDLL.lua_pushboolean(L, ret);
return 1; return 1;
} }
@ -1518,7 +1520,8 @@ public class TMPro_TMP_TextWrap
{ {
o = ToLua.ToObject(L, 1); o = ToLua.ToObject(L, 1);
TMPro.TMP_Text obj = (TMPro.TMP_Text)o; TMPro.TMP_Text obj = (TMPro.TMP_Text)o;
bool ret = obj.ignoreRectMaskCulling; // bool ret = obj.ignoreRectMaskCulling;
bool ret = false;
LuaDLL.lua_pushboolean(L, ret); LuaDLL.lua_pushboolean(L, ret);
return 1; return 1;
} }
@ -2868,7 +2871,7 @@ public class TMPro_TMP_TextWrap
o = ToLua.ToObject(L, 1); o = ToLua.ToObject(L, 1);
TMPro.TMP_Text obj = (TMPro.TMP_Text)o; TMPro.TMP_Text obj = (TMPro.TMP_Text)o;
bool arg0 = LuaDLL.luaL_checkboolean(L, 2); bool arg0 = LuaDLL.luaL_checkboolean(L, 2);
obj.isLinkedTextComponent = arg0; // obj.isLinkedTextComponent = arg0;
return 0; return 0;
} }
catch(Exception e) catch(Exception e)
@ -3020,7 +3023,7 @@ public class TMPro_TMP_TextWrap
o = ToLua.ToObject(L, 1); o = ToLua.ToObject(L, 1);
TMPro.TMP_Text obj = (TMPro.TMP_Text)o; TMPro.TMP_Text obj = (TMPro.TMP_Text)o;
bool arg0 = LuaDLL.luaL_checkboolean(L, 2); bool arg0 = LuaDLL.luaL_checkboolean(L, 2);
obj.ignoreRectMaskCulling = arg0; // obj.ignoreRectMaskCulling = arg0;
return 0; return 0;
} }
catch(Exception e) catch(Exception e)

6
Assets/ToLua/Source/Generate/UnityEngine_CameraWrap.cs
View File

@ -666,7 +666,8 @@ public class UnityEngine_CameraWrap
ToLua.CheckArgsCount(L, 2); ToLua.CheckArgsCount(L, 2);
float arg0 = (float)LuaDLL.luaL_checknumber(L, 1); float arg0 = (float)LuaDLL.luaL_checknumber(L, 1);
float arg1 = (float)LuaDLL.luaL_checknumber(L, 2); float arg1 = (float)LuaDLL.luaL_checknumber(L, 2);
float o = UnityEngine.Camera.FocalLengthToFOV(arg0, arg1); // float o = UnityEngine.Camera.FocalLengthToFOV(arg0, arg1);
float o = 1.0f;
LuaDLL.lua_pushnumber(L, o); LuaDLL.lua_pushnumber(L, o);
return 1; return 1;
} }
@ -684,7 +685,8 @@ public class UnityEngine_CameraWrap
ToLua.CheckArgsCount(L, 2); ToLua.CheckArgsCount(L, 2);
float arg0 = (float)LuaDLL.luaL_checknumber(L, 1); float arg0 = (float)LuaDLL.luaL_checknumber(L, 1);
float arg1 = (float)LuaDLL.luaL_checknumber(L, 2); float arg1 = (float)LuaDLL.luaL_checknumber(L, 2);
float o = UnityEngine.Camera.FOVToFocalLength(arg0, arg1); // float o = UnityEngine.Camera.FOVToFocalLength(arg0, arg1);
float o = 1.0f;
LuaDLL.lua_pushnumber(L, o); LuaDLL.lua_pushnumber(L, o);
return 1; return 1;
} }