Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-09 12:29:23 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix PreviewFaceRenderer for Unity-2017

Browse Source
This commit is contained in:
ousttrue
2018-04-08 03:15:07 +09:00
parent 84c34d2710
commit 1b32d4f377
3 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Scripts/BlendShape/Editor/BlendShapeClipEditor.cs
View File

@@ -106,7 +106,7 @@ namespace VRM
public override void OnInspectorGUI()
{
m_prefab = (GameObject)EditorGUILayout.ObjectField("prefab", m_prefab, typeof(GameObject), false);
Prefab = (GameObject)EditorGUILayout.ObjectField("prefab", Prefab, typeof(GameObject), false);
serializedObject.Update();
@@ -147,16 +147,18 @@ namespace VRM
if (m_renderer != null && m_scene != null)
{
var image = m_renderer.Render(r, background, m_scene);
if (image != null)
var texture = m_renderer.Render(r, background, m_scene);
if (texture != null)
{
// draw the RenderTexture in the ObjectPreview pane
GUI.DrawTexture(r, image, ScaleMode.StretchToFill, false);
GUI.DrawTexture(r, texture, ScaleMode.StretchToFill, false);
}
}
}
EditorGUI.DropShadowLabel(new Rect(r.x, r.y, r.width, 40f),
BlendShapeKey.CreateFrom((BlendShapeClip)target).ToString());
public override string GetInfoString()
{
return BlendShapeKey.CreateFrom((BlendShapeClip)target).ToString();
}
}
}

35
Scripts/BlendShape/Editor/PreviewFaceRenderer.cs
View File

@@ -33,16 +33,36 @@ namespace VRM
public PreviewFaceRenderer()
{
m_previewUtility = new PreviewRenderUtility();
m_previewUtility.lights[0].intensity = 1.4f;
m_previewUtility.lights[0].transform.rotation = Quaternion.Euler(40f, 190f, 0);
m_previewUtility.lights[1].intensity = 1.4f;
m_previewUtility.ambientColor = new Color(.1f, .1f, .1f, 0);
}
class FogScope : IDisposable
{
bool fog;
public FogScope()
{
bool fog = RenderSettings.fog; // ... let's remember the current fog setting...
// we are technically rendering everything in the scene, so scene fog might affect it...
Unsupported.SetRenderSettingsUseFogNoDirty(false); // ... and then temporarily turn it off
}
public void Dispose()
{
Unsupported.SetRenderSettingsUseFogNoDirty(fog);
}
}
public Texture Render(Rect r, GUIStyle background, PreviewSceneManager scene)
{
if (scene == null) return null;
// we are technically rendering everything in the scene, so scene fog might affect it...
bool fog = RenderSettings.fog; // ... let's remember the current fog setting...
Unsupported.SetRenderSettingsUseFogNoDirty(false); // ... and then temporarily turn it off
try
using (var fog = new FogScope())
{
m_previewUtility.BeginPreview(r, background); // set up the PreviewRenderUtility's mini internal scene
@@ -65,13 +85,10 @@ namespace VRM
// VERY IMPORTANT: this manually tells the camera to render and produce the render texture
PreviewCamera.Render();
//m_previewUtility.Render(false, false);
// reset the scene's fog from before
return m_previewUtility.EndPreview(); // grab the RenderTexture resulting from DoRenderPreview() > RenderMeshPreview() > PreviewRenderUtility.m_Camera.Render()
}
finally
{
Unsupported.SetRenderSettingsUseFogNoDirty(fog);
return m_previewUtility.EndPreview();
}
}