fix mono runtime and debug error ,rollback to the old version, now will using mono's compiler and manager
This commit is contained in:
@ -343,7 +343,7 @@ namespace Prism
|
||||
{
|
||||
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(10, 10));
|
||||
|
||||
auto& albedoColor = materialInstance->Get<glm::vec3>("u_AlbedoColor");
|
||||
auto& albedoColor = materialInstance->Get<glm::vec4>("u_AlbedoColor");
|
||||
bool useAlbedoMap = materialInstance->Get<float>("u_AlbedoTexToggle");
|
||||
Ref<Texture2D> albedoMap = materialInstance->TryGetResource<Texture2D>("u_AlbedoTexture");
|
||||
|
||||
@ -387,7 +387,7 @@ namespace Prism
|
||||
|
||||
ImGui::EndGroup();
|
||||
ImGui::SameLine();
|
||||
if (ImGui::ColorEdit3("Color##Albedo", glm::value_ptr(albedoColor), ImGuiColorEditFlags_NoInputs))
|
||||
if (ImGui::ColorEdit4("Color##Albedo", glm::value_ptr(albedoColor), ImGuiColorEditFlags_NoInputs))
|
||||
{
|
||||
meshComponent.UpdateMaterials(selectedMaterialIndex);
|
||||
shouldUpdate = true;
|
||||
|
||||
@ -145,7 +145,7 @@ uniform float u_BloomThreshold;
|
||||
uniform float u_EnvMapRotation;
|
||||
|
||||
// baseColor
|
||||
uniform vec3 u_AlbedoColor;
|
||||
uniform vec4 u_AlbedoColor;
|
||||
uniform float u_Metalness;
|
||||
uniform float u_Roughness;
|
||||
|
||||
@ -420,7 +420,7 @@ float ComputeShadow(vec4 fragPosLightSpace, float NdotL)
|
||||
|
||||
void main()
|
||||
{
|
||||
m_Params.Albedo = u_AlbedoTexToggle > 0.5 ? texture(u_AlbedoTexture, vs_Input.TexCoord) : vec4(u_AlbedoColor, 1.0);
|
||||
m_Params.Albedo = u_AlbedoTexToggle > 0.5 ? texture(u_AlbedoTexture, vs_Input.TexCoord) : u_AlbedoColor;
|
||||
m_Params.Metalness = u_MetalnessTexToggle > 0.5 ? texture(u_MetalnessTexture, vs_Input.TexCoord).r : u_Metalness;
|
||||
m_Params.Roughness = u_RoughnessTexToggle > 0.5 ? texture(u_RoughnessTexture, vs_Input.TexCoord).r : u_Roughness;
|
||||
m_Params.Roughness = max(m_Params.Roughness, 0.05);
|
||||
|
||||
@ -132,7 +132,7 @@ uniform float u_BloomThreshold;
|
||||
uniform float u_EnvMapRotation;
|
||||
|
||||
// baseColor
|
||||
uniform vec3 u_AlbedoColor;
|
||||
uniform vec4 u_AlbedoColor;
|
||||
uniform float u_Metalness;
|
||||
uniform float u_Roughness;
|
||||
|
||||
@ -405,7 +405,7 @@ float ComputeShadow(vec4 fragPosLightSpace, float NdotL)
|
||||
|
||||
void main()
|
||||
{
|
||||
m_Params.Albedo = u_AlbedoTexToggle > 0.5 ? texture(u_AlbedoTexture, vs_Input.TexCoord) : vec4(u_AlbedoColor, 1.0f);
|
||||
m_Params.Albedo = u_AlbedoTexToggle > 0.5 ? texture(u_AlbedoTexture, vs_Input.TexCoord) : u_AlbedoColor;
|
||||
m_Params.Metalness = u_MetalnessTexToggle > 0.5 ? texture(u_MetalnessTexture, vs_Input.TexCoord).r : u_Metalness;
|
||||
m_Params.Roughness = u_RoughnessTexToggle > 0.5 ? texture(u_RoughnessTexture, vs_Input.TexCoord).r : u_Roughness;
|
||||
m_Params.Roughness = max(m_Params.Roughness, 0.05);
|
||||
|
||||
BIN
Editor/library/mono/4.5/Facades/Microsoft.Win32.Primitives.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/Microsoft.Win32.Primitives.dll
Normal file
Binary file not shown.
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/Microsoft.Win32.Registry.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/Microsoft.Win32.Registry.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.AppContext.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.AppContext.dll
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Collections.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Collections.dll
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.ComponentModel.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.ComponentModel.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Console.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Console.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Data.Common.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Data.Common.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Data.SqlClient.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Data.SqlClient.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Diagnostics.Contracts.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Diagnostics.Contracts.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Diagnostics.Debug.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Diagnostics.Debug.dll
Normal file
Binary file not shown.
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Diagnostics.Process.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Diagnostics.Process.dll
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Diagnostics.Tools.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Diagnostics.Tools.dll
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Diagnostics.Tracing.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Diagnostics.Tracing.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Drawing.Primitives.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Drawing.Primitives.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Dynamic.Runtime.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Dynamic.Runtime.dll
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Globalization.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Globalization.dll
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.IO.FileSystem.Watcher.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.IO.FileSystem.Watcher.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.IO.FileSystem.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.IO.FileSystem.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.IO.IsolatedStorage.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.IO.IsolatedStorage.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.IO.MemoryMappedFiles.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.IO.MemoryMappedFiles.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.IO.Pipes.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.IO.Pipes.dll
Normal file
Binary file not shown.
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.IO.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.IO.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Linq.Expressions.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Linq.Expressions.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Linq.Parallel.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Linq.Parallel.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Linq.Queryable.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Linq.Queryable.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Linq.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Linq.dll
Normal file
Binary file not shown.
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Net.Cache.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Net.Cache.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Net.Http.Rtc.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Net.Http.Rtc.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Net.HttpListener.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Net.HttpListener.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Net.Mail.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Net.Mail.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Net.NameResolution.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Net.NameResolution.dll
Normal file
Binary file not shown.
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Net.Ping.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Net.Ping.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Net.Primitives.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Net.Primitives.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Net.Requests.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Net.Requests.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Net.Security.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Net.Security.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Net.ServicePoint.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Net.ServicePoint.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Net.Sockets.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Net.Sockets.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Net.Utilities.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Net.Utilities.dll
Normal file
Binary file not shown.
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Net.WebSockets.Client.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Net.WebSockets.Client.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Net.WebSockets.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Net.WebSockets.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.ObjectModel.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.ObjectModel.dll
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Reflection.Emit.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Reflection.Emit.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Reflection.Extensions.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Reflection.Extensions.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Reflection.Primitives.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Reflection.Primitives.dll
Normal file
Binary file not shown.
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Reflection.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Reflection.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Resources.Reader.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Resources.Reader.dll
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Resources.Writer.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Resources.Writer.dll
Normal file
Binary file not shown.
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Runtime.Extensions.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Runtime.Extensions.dll
Normal file
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Runtime.Handles.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Runtime.Handles.dll
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Runtime.Numerics.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Runtime.Numerics.dll
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Runtime.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Runtime.dll
Normal file
Binary file not shown.
Binary file not shown.
BIN
Editor/library/mono/4.5/Facades/System.Security.Claims.dll
Normal file
BIN
Editor/library/mono/4.5/Facades/System.Security.Claims.dll
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user