diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/189d97f5-fce9-47b2-9a01-0cc61090a898.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/189d97f5-fce9-47b2-9a01-0cc61090a898.vsidx deleted file mode 100644 index a1ded9dd..00000000 Binary files a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/189d97f5-fce9-47b2-9a01-0cc61090a898.vsidx and /dev/null differ diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/3038ddc6-7b2a-40c2-8818-f8dc83f5bdc9.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/3038ddc6-7b2a-40c2-8818-f8dc83f5bdc9.vsidx deleted file mode 100644 index c27a45ed..00000000 Binary files a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/3038ddc6-7b2a-40c2-8818-f8dc83f5bdc9.vsidx and /dev/null differ diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/6d5c2602-c8bb-46ad-adbb-b63b3da5e63e.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/6d5c2602-c8bb-46ad-adbb-b63b3da5e63e.vsidx new file mode 100644 index 00000000..ddd7b8ea Binary files /dev/null and b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/6d5c2602-c8bb-46ad-adbb-b63b3da5e63e.vsidx differ diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/71dd939d-32fd-4c59-a6f1-7d9af45119db.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/71dd939d-32fd-4c59-a6f1-7d9af45119db.vsidx new file mode 100644 index 00000000..ef971f11 Binary files /dev/null and b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/71dd939d-32fd-4c59-a6f1-7d9af45119db.vsidx differ diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/73f65834-ae82-43dc-8385-0a65b8f81124.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/73f65834-ae82-43dc-8385-0a65b8f81124.vsidx deleted file mode 100644 index dbc2eab0..00000000 Binary files a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/73f65834-ae82-43dc-8385-0a65b8f81124.vsidx and /dev/null differ diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/a48dc248-9a42-4111-b78f-9136fab9b8c1.vsidx b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/a48dc248-9a42-4111-b78f-9136fab9b8c1.vsidx new file mode 100644 index 00000000..0d99117d Binary files /dev/null and b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/FileContentIndex/a48dc248-9a42-4111-b78f-9136fab9b8c1.vsidx differ diff --git a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/v17/.suo b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/v17/.suo index 322a121c..3281d579 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/v17/.suo and b/源代码/.Net Framework/Stg_Sharp/.vs/Stg_Sharp/v17/.suo differ diff --git a/源代码/.Net Framework/Stg_Sharp/Debug/Program.cs b/源代码/.Net Framework/Stg_Sharp/Debug/Program.cs index 8b4845c5..5a90c643 100644 --- a/源代码/.Net Framework/Stg_Sharp/Debug/Program.cs +++ b/源代码/.Net Framework/Stg_Sharp/Debug/Program.cs @@ -1,12 +1,6 @@ using OpenTK; -using OpenTK.Graphics.ES10; -using OpenTK.Graphics.ES11; -using OpenTK.Graphics.ES20; -using OpenTK.Graphics.ES30; -using OpenTK.Graphics.OpenGL; -using OpenTK.Graphics.OpenGL4; using StgSharp; -using StgSharp.Geometry; +using StgSharp.Geometries; using System; using System.Collections.Generic; using System.Data; @@ -18,7 +12,20 @@ namespace Debug { internal class Program { + public static void Main() + { + float[] a= new float[10]; + for (int i = 0; i < 10; i++) + { + a[i] = i; + } + + ref float b = ref a[5]; + + float c = 100; + Console.WriteLine(c==b); + } } diff --git a/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/Debug.exe b/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/Debug.exe index 3180021f..13295269 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/Debug.exe and b/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/Debug.exe differ diff --git a/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/Debug.pdb b/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/Debug.pdb index 16900ffd..26c77b06 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/Debug.pdb and b/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/Debug.pdb differ diff --git a/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/StgSharp.dll b/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/StgSharp.dll index 73858266..a6a41f08 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/StgSharp.dll and b/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/StgSharp.dll differ diff --git a/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/StgSharp.pdb b/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/StgSharp.pdb index 53218d5e..b039a3db 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/StgSharp.pdb and b/源代码/.Net Framework/Stg_Sharp/Debug/bin/Debug/StgSharp.pdb differ diff --git a/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.csproj.AssemblyReference.cache b/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.csproj.AssemblyReference.cache index 882d2ba1..50cfa113 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.csproj.AssemblyReference.cache and b/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.csproj.AssemblyReference.cache differ diff --git a/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.csproj.CoreCompileInputs.cache b/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.csproj.CoreCompileInputs.cache index abad03eb..04247141 100644 --- a/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.csproj.CoreCompileInputs.cache +++ b/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -c03a58d914d1f5e5175f5a6d1301ee4540a0996a +51fe2eeb4772cba64a34f22d94343e2e81185c5d diff --git a/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.exe b/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.exe index 3180021f..13295269 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.exe and b/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.exe differ diff --git a/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.pdb b/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.pdb index 16900ffd..26c77b06 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.pdb and b/源代码/.Net Framework/Stg_Sharp/Debug/obj/Debug/Debug.pdb differ diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Change.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Change.cs index cd1e55cc..eb40a2a7 100644 --- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Change.cs +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Change.cs @@ -20,5 +20,8 @@ namespace StgSharp.Control { } + + + } } diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Create.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Create.cs index 1c090b00..20d42bd8 100644 --- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Create.cs +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Control/Create.cs @@ -1,5 +1,5 @@ -using StgSharp.Entity; -using StgSharp.Geometry; +using StgSharp.Entities; +using StgSharp.Geometries; using StgSharp.Logic; using System; using System.Collections.Generic; diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Entities/Bullet.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Entities/Bullet.cs index 6e93b207..0e7b5684 100644 --- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Entities/Bullet.cs +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Entities/Bullet.cs @@ -1,4 +1,4 @@ -using StgSharp.Geometry; +using StgSharp.Geometries; using StgSharp.Logic; using System; using System.Collections.Generic; diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Entities/Player.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Entities/Player.cs index 98f4af72..5a1ecc3c 100644 --- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Entities/Player.cs +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Entities/Player.cs @@ -1,4 +1,5 @@ using OpenTK.Input; +using StgSharp.Control; using System; using System.Collections.Generic; using System.Linq; @@ -15,6 +16,11 @@ namespace StgSharp.Entities private readonly float _velocityHigh; private readonly float _vHighCorner; + private float topBoarder; + private float bottomBoarder; + private float leftBoarder; + private float rightBoarder; + public float VelocityHigh { get { return _velocityHigh; } @@ -80,7 +86,8 @@ namespace StgSharp.Entities //进行移动和射击 - if (_keyboardState.IsKeyDown(Key.ShiftLeft)) + if (_keyboardState.IsKeyDown(Key.ShiftLeft)|| + _keyboardState.IsKeyDown(Key.ShiftRight)) { FastShoot(); FastMove(); @@ -131,7 +138,9 @@ namespace StgSharp.Entities this._y -= _velocityLow; } - } + + + } } diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Entities/RenderedGeometry.cs b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Entities/RenderedGeometry.cs index f1003134..98fe554b 100644 --- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Entities/RenderedGeometry.cs +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/Entities/RenderedGeometry.cs @@ -1,4 +1,5 @@ -using System; +using StgSharp.Geometries; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -8,8 +9,8 @@ namespace StgSharp.Entities { public class RenderedGeometry { - internal Geometry.Geometry route; - public Geometry.Geometry Route + internal Geometry route; + public Geometry Route { get { return route; } set { route = value; } diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/bin/Debug/StgSharp.dll b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/bin/Debug/StgSharp.dll index 73858266..a6a41f08 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/bin/Debug/StgSharp.dll and b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/bin/Debug/StgSharp.dll differ diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/bin/Debug/StgSharp.pdb b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/bin/Debug/StgSharp.pdb index 53218d5e..b039a3db 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/bin/Debug/StgSharp.pdb and b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/bin/Debug/StgSharp.pdb differ diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.csproj.CoreCompileInputs.cache b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.csproj.CoreCompileInputs.cache index b410cf98..dc830c75 100644 --- a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.csproj.CoreCompileInputs.cache +++ b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d816afe95034b978cb250201fa492ddd20eb00e6 +78a3e5543c41d207f29c2854071e8291080d2b4f diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.dll b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.dll index 73858266..a6a41f08 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.dll and b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.dll differ diff --git a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.pdb b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.pdb index 53218d5e..b039a3db 100644 Binary files a/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.pdb and b/源代码/.Net Framework/Stg_Sharp/Stg_Sharp/obj/Debug/StgSharp.pdb differ