From 571c848068c378985e27066ff261b584fda09173 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sat, 8 Sep 2018 08:46:55 +0800
Subject: *update

---
 bin/Jin.exe                      | Bin 1416192 -> 1418752 bytes
 bin/jin.exe                      | Bin 1416192 -> 1418752 bytes
 build/vc++/jin.rc                | Bin 3272 -> 3340 bytes
 build/vc++/jin.vcxproj           |   2 +-
 build/vc++/libjin/libjin.vcxproj |   2 +-
 src/libjin/Graphics/Color.h      |  11 +++++++++++
 src/libjin/Graphics/Drawable.h   |   1 +
 src/libjin/Graphics/Font.h       |   1 +
 src/libjin/Graphics/Shader.h     |   1 +
 src/libjin/Graphics/Window.h     |   2 ++
 10 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/bin/Jin.exe b/bin/Jin.exe
index 9651439..5f8b6a3 100644
Binary files a/bin/Jin.exe and b/bin/Jin.exe differ
diff --git a/bin/jin.exe b/bin/jin.exe
index 9651439..5f8b6a3 100644
Binary files a/bin/jin.exe and b/bin/jin.exe differ
diff --git a/build/vc++/jin.rc b/build/vc++/jin.rc
index 216f2ca..5a3a57f 100644
Binary files a/build/vc++/jin.rc and b/build/vc++/jin.rc differ
diff --git a/build/vc++/jin.vcxproj b/build/vc++/jin.vcxproj
index 35fb1fe..bc26439 100644
--- a/build/vc++/jin.vcxproj
+++ b/build/vc++/jin.vcxproj
@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{A3E35ECA-62EB-45CE-8152-674FBC7F7A3B}</ProjectGuid>
     <RootNamespace>jin</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
     <ProjectName>jin(min version)</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/build/vc++/libjin/libjin.vcxproj b/build/vc++/libjin/libjin.vcxproj
index d7676a9..fe5bdb6 100644
--- a/build/vc++/libjin/libjin.vcxproj
+++ b/build/vc++/libjin/libjin.vcxproj
@@ -22,7 +22,7 @@
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{9EE02090-C15E-4520-9C05-C435E45EF2FC}</ProjectGuid>
     <RootNamespace>libjin</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
     <ProjectName>libjin(min version)</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/src/libjin/Graphics/Color.h b/src/libjin/Graphics/Color.h
index 786abde..3b8989c 100644
--- a/src/libjin/Graphics/Color.h
+++ b/src/libjin/Graphics/Color.h
@@ -25,6 +25,7 @@ namespace graphics
         static const Color MAGENTA;
 
         Color() { r = g = b = a = 0; };
+        
         Color(unsigned char _r
             , unsigned char _g
             , unsigned char _b
@@ -35,10 +36,20 @@ namespace graphics
             b = _b; 
             a = _a;
         }
+        
+        Color(const Color& c)
+        {
+            r = c.r;
+            g = c.g;
+            b = c.b;
+            a = c.a;
+        }
+
         bool operator == (const Color& c)
         {
             return r == c.r && g == c.g && b == c.b && a == c.a;
         }
+        
         bool operator != (const Color& c)
         {
             return !(r == c.r && g == c.g && b == c.b && a == c.a);
diff --git a/src/libjin/Graphics/Drawable.h b/src/libjin/Graphics/Drawable.h
index 8bc528e..1539053 100644
--- a/src/libjin/Graphics/Drawable.h
+++ b/src/libjin/Graphics/Drawable.h
@@ -16,6 +16,7 @@ namespace graphics
     public:
         Drawable(int w = 0, int h = 0);
         virtual ~Drawable();
+
         void setAnchor(int x, int y); 
         void draw(int x, int y, float sx, float sy, float r);
         inline int getWidth() const { return size.w; }
diff --git a/src/libjin/Graphics/Font.h b/src/libjin/Graphics/Font.h
index d805d1c..97104ef 100644
--- a/src/libjin/Graphics/Font.h
+++ b/src/libjin/Graphics/Font.h
@@ -16,6 +16,7 @@ namespace graphics
     {
     public: 
         Font(); 
+
         void loadFile(const char* file); 
         void loadMemory(const unsigned char* data);
         void render(
diff --git a/src/libjin/Graphics/Shader.h b/src/libjin/Graphics/Shader.h
index 2e6ae16..ad484db 100644
--- a/src/libjin/Graphics/Shader.h
+++ b/src/libjin/Graphics/Shader.h
@@ -24,6 +24,7 @@ namespace graphics
         static void unuse();
 
         virtual ~JSLProgram();
+
         void use(); 
         void sendFloat(const char* name, float number);
         void sendTexture(const char*  name, const Texture* image);
diff --git a/src/libjin/Graphics/Window.h b/src/libjin/Graphics/Window.h
index 2ecd7e4..6bbec8b 100644
--- a/src/libjin/Graphics/Window.h
+++ b/src/libjin/Graphics/Window.h
@@ -35,7 +35,9 @@ namespace graphics
 
     private:
         SINGLETON(Window);
+
         Window() {};
+
         virtual ~Window() {};
         bool initSystem(const SettingBase* setting) override;
         void quitSystem() override;
-- 
cgit v1.1-26-g67d0