ScreenShot ( overlayApi.takeScreenShot ) feature and UXUI Update

.editorconfig

@@ -0,0 +1,81 @@
+# https://github.com/dotnet/roslyn/blob/master/.editorconfig
+# EditorConfig is awesome:http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Don't use tabs for indentation.
+[*]
+indent_style = space
+# (Please don't specify an indent_size here; that has too many unintended consequences.)
+
+# Code files
+[*.{cs,csx,vb,vbx}]
+indent_size = 4
+insert_final_newline = true
+charset = utf-8-bom
+
+# Xml project files
+[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
+indent_size = 2
+
+# Xml config files
+[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
+indent_size = 2
+
+# JSON files
+[*.json]
+indent_size = 2
+
+# Dotnet code style settings:
+[*.{cs,vb}]
+# Sort using and Import directives with System.* appearing first
+dotnet_sort_system_directives_first = true
+# Avoid "this." and "Me." if not necessary
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_event = false:suggestion
+
+# Use language keywords instead of framework type names for type references
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+dotnet_style_predefined_type_for_member_access = true:suggestion
+
+# Suggest more modern language features when available
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+
+# CSharp code style settings:
+[*.cs]
+# Prefer "var" everywhere
+csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+csharp_style_var_elsewhere = true:suggestion
+
+# Prefer method-like constructs to have a block body
+csharp_style_expression_bodied_methods = false:none
+csharp_style_expression_bodied_constructors = false:none
+csharp_style_expression_bodied_operators = false:none
+
+# Prefer property-like constructs to have an expression-body
+csharp_style_expression_bodied_properties = true:none
+csharp_style_expression_bodied_indexers = true:none
+csharp_style_expression_bodied_accessors = true:none
+
+# Suggest more modern language features when available
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+csharp_style_throw_expression = true:suggestion
+csharp_style_conditional_delegate_call = true:suggestion
+
+# Newline settings
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true

.gitattributes

@@ -0,0 +1,63 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+###############################################################################
+# Set default behavior for command prompt diff.
+#
+# This is need for earlier builds of msysgit that does not have it on by
+# default for csharp files.
+# Note: This is only used by command line
+###############################################################################
+#*.cs     diff=csharp
+
+###############################################################################
+# Set the merge driver for project and solution files
+#
+# Merging from the command prompt will add diff markers to the files if there
+# are conflicts (Merging from VS is not affected by the settings below, in VS
+# the diff markers are never inserted). Diff markers may cause the following 
+# file extensions to fail to load in VS. An alternative would be to treat
+# these files as binary and thus will always conflict and require user
+# intervention with every merge. To do so, just uncomment the entries below
+###############################################################################
+#*.sln       merge=binary
+#*.csproj    merge=binary
+#*.vbproj    merge=binary
+#*.vcxproj   merge=binary
+#*.vcproj    merge=binary
+#*.dbproj    merge=binary
+#*.fsproj    merge=binary
+#*.lsproj    merge=binary
+#*.wixproj   merge=binary
+#*.modelproj merge=binary
+#*.sqlproj   merge=binary
+#*.wwaproj   merge=binary
+
+###############################################################################
+# behavior for image files
+#
+# image files are treated as binary by default.
+###############################################################################
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary
+
+###############################################################################
+# diff behavior for common document formats
+# 
+# Convert binary document formats to text before diffing them. This feature
+# is only available from the command line. Turn it on by uncommenting the 
+# entries below.
+###############################################################################
+#*.doc   diff=astextplain
+#*.DOC   diff=astextplain
+#*.docx  diff=astextplain
+#*.DOCX  diff=astextplain
+#*.dot   diff=astextplain
+#*.DOT   diff=astextplain
+#*.pdf   diff=astextplain
+#*.PDF   diff=astextplain
+#*.rtf   diff=astextplain
+#*.RTF   diff=astextplain

.gitignore

@@ -25,6 +25,10 @@ bld/
 [Oo]bj/
 [Bb]uildX86/
 [Bb]uildX64/
+[Rr]eleasex64/
+[Rr]eleasex86/
+[Rr]elease_x86/
+[Rr]elease_x64/
 
 # Roslyn cache directories
 *.ide/
@@ -189,4 +193,5 @@ UpgradeLog*.htm
 *.bim_*.settings
 
 # Microsoft Fakes
-FakesAssemblies/
+FakesAssemblies/
+.vscode/settings.json

AddonExample/AddonExample.csproj

@@ -96,4 +96,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

AddonExample/Properties/AssemblyInfo.cs

@@ -33,4 +33,4 @@
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

HtmlRenderer/App.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Xilium.CefGlue;
+using Xilium.CefGlue;
 
 namespace RainbowMage.HtmlRenderer
 {

HtmlRenderer/Args/BroadcastMessageEventArgs.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace RainbowMage.HtmlRenderer
+{
+    public class BroadcastMessageEventArgs : EventArgs
+    {
+        public string Message { get; private set; }
+
+        public BroadcastMessageEventArgs(string message)
+        {
+            this.Message = message;
+        }
+    }
+}

HtmlRenderer/Args/EndEncounterEventArgs.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace RainbowMage.HtmlRenderer
+{
+    public class EndEncounterEventArgs : EventArgs
+    {
+        public EndEncounterEventArgs()
+        {
+
+        }
+    }
+}

HtmlRenderer/Args/SendMessageEventArgs.cs

@@ -0,0 +1,16 @@
+using System;
+
+namespace RainbowMage.HtmlRenderer
+{
+    public class SendMessageEventArgs : EventArgs
+    {
+        public string Target { get; private set; }
+        public string Message { get; private set; }
+
+        public SendMessageEventArgs(string target, string message)
+        {
+            this.Target = target;
+            this.Message = message;
+        }
+    }
+}

HtmlRenderer/Args/TakeScreenshotEventArgs.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace RainbowMage.HtmlRenderer
+{
+    public class TakeScreenshotEventArgs : EventArgs
+    {
+        public string Message { get; private set; }
+
+        public TakeScreenshotEventArgs(string message)
+        {
+            this.Message = message;
+        }
+    }
+}

HtmlRenderer/Client.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Xilium.CefGlue;
+using Xilium.CefGlue;
 
 namespace RainbowMage.HtmlRenderer
 {

HtmlRenderer/BuiltinFunctionHandler.cs → HtmlRenderer/Handlers/BuiltinFunctionHandler.cs

@@ -1,19 +1,17 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Xilium.CefGlue;
 
 namespace RainbowMage.HtmlRenderer
 {
-    class BuiltinFunctionHandler : CefV8Handler 
+    class BuiltinFunctionHandler : CefV8Handler
     {
+        public event EventHandler<TakeScreenshotEventArgs> TakeScreenshot;
         public event EventHandler<BroadcastMessageEventArgs> BroadcastMessage;
         public event EventHandler<SendMessageEventArgs> SendMessage;
         public event EventHandler<SendMessageEventArgs> OverlayMessage;
         public event EventHandler<EndEncounterEventArgs> EndEncounter;
 
+        public const string TakeScreenshotFunctionName = "takeScreenshot";
         public const string BroadcastMessageFunctionName = "broadcastMessage";
         public const string SendMessageFunctionName = "sendMessage";
         public const string OverlayMessageFunctionName = "overlayMessage";
@@ -24,14 +22,15 @@ protected override bool Execute(string name, CefV8Value obj, CefV8Value[] argume
             exception = "";
             returnValue = CefV8Value.CreateUndefined();
 
-            if (name == BroadcastMessageFunctionName)
+            if (name == EndEncounterFunctionName)
+            {
+                EndEncounter?.Invoke(obj, new EndEncounterEventArgs());
+            }
+            else if (name == TakeScreenshotFunctionName)
             {
                 if (arguments.Length > 0)
                 {
-                    if (BroadcastMessage != null)
-                    {
-                        BroadcastMessage(obj, new BroadcastMessageEventArgs(arguments[0].GetStringValue()));
-                    }
+                    TakeScreenshot?.Invoke(obj, new TakeScreenshotEventArgs(arguments[0].GetStringValue()));
                 }
                 else
                 {
@@ -40,14 +39,11 @@ protected override bool Execute(string name, CefV8Value obj, CefV8Value[] argume
 
                 return true;
             }
-            else if (name == SendMessageFunctionName)
+            else if (name == BroadcastMessageFunctionName)
             {
-                if (arguments.Length > 1)
+                if (arguments.Length > 0)
                 {
-                    if (SendMessage != null)
-                    {
-                        SendMessage(obj, new SendMessageEventArgs(arguments[0].GetStringValue(), arguments[1].GetStringValue()));
-                    }
+                    BroadcastMessage?.Invoke(obj, new BroadcastMessageEventArgs(arguments[0].GetStringValue()));
                 }
                 else
                 {
@@ -56,14 +52,11 @@ protected override bool Execute(string name, CefV8Value obj, CefV8Value[] argume
 
                 return true;
             }
-            else if (name == OverlayMessageFunctionName)
+            else if (name == SendMessageFunctionName)
             {
                 if (arguments.Length > 1)
                 {
-                    if (OverlayMessage != null)
-                    {
-                        OverlayMessage(obj, new SendMessageEventArgs(arguments[0].GetStringValue(), arguments[1].GetStringValue()));
-                    }
+                    SendMessage?.Invoke(obj, new SendMessageEventArgs(arguments[0].GetStringValue(), arguments[1].GetStringValue()));
                 }
                 else
                 {
@@ -72,45 +65,21 @@ protected override bool Execute(string name, CefV8Value obj, CefV8Value[] argume
 
                 return true;
             }
-            else if (name == EndEncounterFunctionName)
+            else if (name == OverlayMessageFunctionName)
             {
-                if (EndEncounter != null)
+                if (arguments.Length > 1)
                 {
-                    EndEncounter(obj, new EndEncounterEventArgs());
+                    OverlayMessage?.Invoke(obj, new SendMessageEventArgs(arguments[0].GetStringValue(), arguments[1].GetStringValue()));
                 }
+                else
+                {
+                    exception = "Invalid argument count.";
+                }
+
+                return true;
             }
 
             return false;
         }
     }
-
-    public class BroadcastMessageEventArgs : EventArgs
-    {
-        public string Message { get; private set; }
-
-        public BroadcastMessageEventArgs(string message)
-        {
-            this.Message = message;
-        }
-    }
-
-    public class SendMessageEventArgs : EventArgs
-    {
-        public string Target { get; private set; }
-        public string Message { get; private set; }
-
-        public SendMessageEventArgs(string target, string message)
-        {
-            this.Target = target;
-            this.Message = message;
-        }
-    }
-
-    public class EndEncounterEventArgs : EventArgs
-    {
-        public EndEncounterEventArgs()
-        {
-
-        }
-    }
 }