Skip to content

Commit

Permalink
forgot to add some files
Browse files Browse the repository at this point in the history
  • Loading branch information
i-saint committed May 9, 2017
1 parent 1031d6b commit d5d10e8
Show file tree
Hide file tree
Showing 6 changed files with 63 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ _Hidden/
_Hidden.meta
obj/
libs/
Plugin/_build_*

openh264-*
FrameCapturer/*.csproj
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
using UnityEngine;
using UnityEditor;

namespace UTJ.FrameCapturer
{
[CustomPropertyDrawer(typeof(MovieEncoderConfigs))]
class MovieEncoderConfigsDrawer : PropertyDrawer
{
public override float GetPropertyHeight(SerializedProperty property, GUIContent label)
{
return 0.0f;
}

public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
{
var type = property.FindPropertyRelative("format");
EditorGUILayout.PropertyField(type);
EditorGUI.indentLevel++;
switch ((MovieEncoder.Type)type.intValue)
{
case MovieEncoder.Type.Png:
EditorGUILayout.PropertyField(property.FindPropertyRelative("pngEncoderSettings"), true);
break;
case MovieEncoder.Type.Exr:
EditorGUILayout.PropertyField(property.FindPropertyRelative("exrEncoderSettings"), true);
break;
case MovieEncoder.Type.Gif:
EditorGUILayout.PropertyField(property.FindPropertyRelative("gifEncoderSettings"), true);
break;
case MovieEncoder.Type.WebM:
EditorGUILayout.PropertyField(property.FindPropertyRelative("webmEncoderSettings"), true);
break;
case MovieEncoder.Type.MP4:
EditorGUILayout.PropertyField(property.FindPropertyRelative("mp4EncoderSettings"), true);
break;
}
EditorGUI.indentLevel--;
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions FrameCapturer/Assets/UTJ/FrameCapturer/Scripts/Encoder.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Plugin/fccore/Encoder/fcGifContext.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "fcGifContext.h"

#ifdef fcSupportGIF
#include "external/jo_gif.cpp"
#include "jo_gif.cpp"

typedef jo_gif_frame_t fcGifFrame;

Expand Down
File renamed without changes.

0 comments on commit d5d10e8

Please sign in to comment.