From 904e78d568bae0afe87d20cb412bdce38d550c1a Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Tue, 22 May 2018 18:21:45 +0800
Subject: =?UTF-8?q?=E6=9B=B4=E6=96=B0audio=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/jin.exe                      | Bin 1459712 -> 1458688 bytes
 build/vs2015/jin.vcxproj         |   1 +
 build/vs2015/jin.vcxproj.filters |   3 +++
 src/libjin/audio/audio.h         |   4 ++--
 src/libjin/physics/rigid.h       |   0
 src/libjin/render/color.h        |   2 +-
 src/libjin/render/jsl.h          |   1 +
 src/libjin/utils/macros.h        |   2 ++
 src/libjin/utils/utils.h         |   2 +-
 9 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 src/libjin/physics/rigid.h

diff --git a/bin/jin.exe b/bin/jin.exe
index a8c1010..a470cac 100644
Binary files a/bin/jin.exe and b/bin/jin.exe differ
diff --git a/build/vs2015/jin.vcxproj b/build/vs2015/jin.vcxproj
index 9a9e3b7..6ccfda0 100644
--- a/build/vs2015/jin.vcxproj
+++ b/build/vs2015/jin.vcxproj
@@ -281,6 +281,7 @@
     <ClInclude Include="..\..\src\libjin\math\quad.h" />
     <ClInclude Include="..\..\src\libjin\math\vector.h" />
     <ClInclude Include="..\..\src\libjin\physics\physics.h" />
+    <ClInclude Include="..\..\src\libjin\physics\rigid.h" />
     <ClInclude Include="..\..\src\libjin\render\render.h" />
     <ClInclude Include="..\..\src\libjin\tilemap\tilemap.h" />
     <ClInclude Include="..\..\src\lua\embed\debug.lua.h" />
diff --git a/build/vs2015/jin.vcxproj.filters b/build/vs2015/jin.vcxproj.filters
index a901768..baf3df7 100644
--- a/build/vs2015/jin.vcxproj.filters
+++ b/build/vs2015/jin.vcxproj.filters
@@ -623,6 +623,9 @@
     <ClInclude Include="..\..\src\libjin\common\data.h">
       <Filter>src\libjin\common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\libjin\physics\rigid.h">
+      <Filter>src\libjin\physics</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\3rdparty\lua51\Makefile">
diff --git a/src/libjin/audio/audio.h b/src/libjin/audio/audio.h
index c0b0e1e..81f933b 100644
--- a/src/libjin/audio/audio.h
+++ b/src/libjin/audio/audio.h
@@ -29,11 +29,11 @@ namespace audio
 
     };
 
-    class Audio : public Subsystem, IAudio
+    class Audio : public Subsystem, implement IAudio
     {
 
     public:
-
+        
         Audio() {};
         virtual ~Audio() {};
 
diff --git a/src/libjin/physics/rigid.h b/src/libjin/physics/rigid.h
new file mode 100644
index 0000000..e69de29
diff --git a/src/libjin/render/color.h b/src/libjin/render/color.h
index 856cd48..2d1ba1c 100644
--- a/src/libjin/render/color.h
+++ b/src/libjin/render/color.h
@@ -22,6 +22,6 @@ namespace render
     };
 
 }
-} 
+}
 
 #endif
diff --git a/src/libjin/render/jsl.h b/src/libjin/render/jsl.h
index fc1aa48..8bb2deb 100644
--- a/src/libjin/render/jsl.h
+++ b/src/libjin/render/jsl.h
@@ -15,6 +15,7 @@ namespace render
 
     class JSLProgram
     {
+
     public:
 
         JSLProgram(const char* program);
diff --git a/src/libjin/utils/macros.h b/src/libjin/utils/macros.h
index cdec403..5f0b3b8 100644
--- a/src/libjin/utils/macros.h
+++ b/src/libjin/utils/macros.h
@@ -2,6 +2,8 @@
 #define __JIN_MACROS_H
 #include <cstring>
 
+#define implement // 实现接口
+
 #define shared // 声明类的方法
 
 #define CallOnce(func) static char __dummy__=(func, 1) // 只会调用一次
diff --git a/src/libjin/utils/utils.h b/src/libjin/utils/utils.h
index 3b8e9dd..d597c83 100644
--- a/src/libjin/utils/utils.h
+++ b/src/libjin/utils/utils.h
@@ -5,6 +5,6 @@
 #include "macros.h"
 #include "endian.h"
 
-#define UNITTEST 0
+#define UNITTEST 1
 
 #endif
\ No newline at end of file
-- 
cgit v1.1-26-g67d0