From 140b573eb396082414e7d572f95ee56afeb2890e Mon Sep 17 00:00:00 2001 From: jpbruyere Date: Thu, 21 Jul 2016 06:43:51 +0200 Subject: [PATCH] put OpenTKCrowWin in game win --- Crow.csproj | 6 + Crow.sln | 6 - Images/Icons/crow.png | Bin 0 -> 8452 bytes Images/Icons/crow.svg | 108 ++++++++++ OTKCrow/OTKCrow.csproj | 60 ------ Tests/GLCrow.cs | 152 -------------- Tests/GOLIBTests.cs | 277 ------------------------- {OTKCrow => Tests}/OpenGL/Shader.cs | 0 {OTKCrow => Tests}/OpenGL/vaoMesh.cs | 0 Tests/OpenTK.dll.config | 17 -- {OTKCrow => Tests}/OpenTKGameWindow.cs | 0 Tests/Tests.csproj | 10 +- src/GraphicObjects/Window.cs | 2 +- 13 files changed, 118 insertions(+), 520 deletions(-) create mode 100644 Images/Icons/crow.png create mode 100644 Images/Icons/crow.svg delete mode 100644 OTKCrow/OTKCrow.csproj delete mode 100644 Tests/GLCrow.cs delete mode 100644 Tests/GOLIBTests.cs rename {OTKCrow => Tests}/OpenGL/Shader.cs (100%) rename {OTKCrow => Tests}/OpenGL/vaoMesh.cs (100%) delete mode 100644 Tests/OpenTK.dll.config rename {OTKCrow => Tests}/OpenTKGameWindow.cs (100%) diff --git a/Crow.csproj b/Crow.csproj index 722764a1..2933f844 100644 --- a/Crow.csproj +++ b/Crow.csproj @@ -142,15 +142,19 @@ $(SolutionDir)packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\cairo-sharp.dll + gtk-sharp-3.0 $(SolutionDir)packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\gdk-sharp.dll + gtk-sharp-2.0 $(SolutionDir)packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\gio-sharp.dll + gio-sharp-3.0 $(SolutionDir)packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\glib-sharp.dll + glib-sharp-3.0 @@ -247,6 +251,8 @@ + + diff --git a/Crow.sln b/Crow.sln index d24e6d4f..81c03617 100644 --- a/Crow.sln +++ b/Crow.sln @@ -5,18 +5,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Crow", "Crow.csproj", "{C29 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{74289092-9F70-4941-AFCB-DFD7BE2140B6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OTKCrow", "OTKCrow\OTKCrow.csproj", "{350D4F49-9901-4998-9903-BCA7D48DA58C}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {350D4F49-9901-4998-9903-BCA7D48DA58C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {350D4F49-9901-4998-9903-BCA7D48DA58C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {350D4F49-9901-4998-9903-BCA7D48DA58C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {350D4F49-9901-4998-9903-BCA7D48DA58C}.Release|Any CPU.Build.0 = Release|Any CPU {74289092-9F70-4941-AFCB-DFD7BE2140B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {74289092-9F70-4941-AFCB-DFD7BE2140B6}.Debug|Any CPU.Build.0 = Debug|Any CPU {74289092-9F70-4941-AFCB-DFD7BE2140B6}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/Images/Icons/crow.png b/Images/Icons/crow.png new file mode 100644 index 0000000000000000000000000000000000000000..7b737d0475555e20464767855aae8be0b2c9dd28 GIT binary patch literal 8452 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 V!PXd=pBMuGRYeVjGC8x){{viTX(Ipt literal 0 HcmV?d00001 diff --git a/Images/Icons/crow.svg b/Images/Icons/crow.svg new file mode 100644 index 00000000..4904e68e --- /dev/null +++ b/Images/Icons/crow.svg @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + C.R.O.W. + + diff --git a/OTKCrow/OTKCrow.csproj b/OTKCrow/OTKCrow.csproj deleted file mode 100644 index 6a557706..00000000 --- a/OTKCrow/OTKCrow.csproj +++ /dev/null @@ -1,60 +0,0 @@ - - - - Debug - AnyCPU - {350D4F49-9901-4998-9903-BCA7D48DA58C} - Library - OTKCrow - OTKCrow - v4.5 - 8.0.30703 - 2.0 - 0.4 - $(SolutionDir)/build/$(Configuration) - $(SolutionDir)/build/obj/$(Configuration) - - - true - full - false - DEBUG;MEASURE_TIME - prompt - 4 - false - - - full - true - prompt - 4 - false - - - - - - - - - ..\packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\cairo-sharp.dll - - - ..\packages\OpenTK.Next.1.2.2336.6514-pre\lib\net20\OpenTK.dll - - - - - - - - - - {C2980F9B-4798-4C05-99E2-E174810F7C7B} - Crow - - - - - - diff --git a/Tests/GLCrow.cs b/Tests/GLCrow.cs deleted file mode 100644 index 1ede0268..00000000 --- a/Tests/GLCrow.cs +++ /dev/null @@ -1,152 +0,0 @@ -// -// GLCrow.cs -// -// Author: -// Jean-Philippe Bruyère -// -// Copyright (c) 2016 jp -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -using System; -using GLC; -using Pencil.Gaming; -using System.Collections.Generic; -using Crow; -using System.Linq; -using System.IO; - -namespace Tests -{ - public class GLCrow : GLC.Window - { - int idx = 0; - string [] testFiles; - - public int intValue = 25; - - public int IntValue { - get { - return intValue; - } - set { - intValue = value; - NotifyValueChanged ("IntValue", intValue); - } - } - void onSpinnerValueChange(object sender, ValueChangeEventArgs e){ - if (e.MemberName != "Value") - return; - intValue = Convert.ToInt32(e.NewValue); - } - void change_alignment(object sender, EventArgs e){ - RadioButton rb = sender as RadioButton; - if (rb == null) - return; - NotifyValueChanged ("alignment", Enum.Parse(typeof(Alignment), rb.Caption)); - } - public IList List2 = new List(new string[] - { - "string1", - "string2" - //"string3", - //"string4", - //"string5", - //"string6", - //"string7", - //"string8", - //"string8", - //"string8", - //"string8", - //"string8", - //"string8", - //"string9" - } - ); - IList testList = Color.ColorDic.ToList(); - public IList TestList { - set{ - testList = value; - NotifyValueChanged ("TestList", testList); - } - get { return testList; } - } - - void OnClear (object sender, MouseButtonEventArgs e) => TestList = null; - - void OnLoadList (object sender, MouseButtonEventArgs e) => TestList = Color.ColorDic.ToList(); - - - [STAThread] - public static void Main (string [] args) - { - using (GLCrow w = new GLCrow ()) { - w.Run (30); - } - } - public object data = "datas"; - public object Datas { - get { return data; } - } - void onSetDataToNull (object sender, MouseButtonEventArgs e) { - data = null; - NotifyValueChanged ("Datas", null); - } - public override void OnLoad () - { - //testFiles = new string [] { @"Interfaces/Divers/testBind0.crow" }; - testFiles = new string [] { @"Interfaces/Divers/testCombobox.crow" }; - testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/GraphicObject", "*.crow")).ToArray (); - //testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/basicTests", "*.crow")).ToArray (); - testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Container", "*.crow")).ToArray (); - testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Group", "*.crow")).ToArray (); - testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Stack", "*.crow")).ToArray (); - testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Splitter", "*.crow")).ToArray (); - testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Expandable", "*.crow")).ToArray (); - testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Divers", "*.crow")).ToArray (); - - //testFiles = Directory.GetFiles(@"Interfaces", "*.crow").Concat(testFiles).ToArray(); - this.Title = testFiles [idx]; - CrowInterface.LoadInterface(testFiles[idx]).DataSource = this; - - //CrowInterface.LoadInterface ("#Tests.ui.fps.crow").DataSource = this; - } - public GLCrow(int _width = 800, int _height=600) - :base(_width, _height, 32, 24, 0, 8, "TestWin") - { - - } - - protected override void OnKeyEvent (GlfwWindowPtr wnd, Pencil.Gaming.Key key, int scanCode, KeyAction action, Pencil.Gaming.KeyModifiers mods) - { - base.OnKeyEvent (wnd, key, scanCode, action, mods); - switch (action) { - case KeyAction.Release: - - break; - case KeyAction.Press: - if (key == Pencil.Gaming.Key.Space) { - CrowInterface.ClearInterface (); - idx++; - if (idx == testFiles.Length) - idx = 0; - this.Title = testFiles [idx]; - CrowInterface.LoadInterface(testFiles[idx]).DataSource = this; - - } - break; - } - } - } -} - diff --git a/Tests/GOLIBTests.cs b/Tests/GOLIBTests.cs deleted file mode 100644 index 53f36590..00000000 --- a/Tests/GOLIBTests.cs +++ /dev/null @@ -1,277 +0,0 @@ -#define MONO_CAIRO_DEBUG_DISPOSE - - -using System; -using System.Runtime.InteropServices; -using OpenTK; -using OpenTK.Graphics.OpenGL; - -using System.Diagnostics; - -//using GGL; -using Crow; -using System.Threading; -using System.Collections.Generic; -using System.Linq; - - -namespace test -{ - class GOLIBTests : OpenTKGameWindow, IValueChange - { - #region IValueChange implementation - public event EventHandler ValueChanged; - public virtual void NotifyValueChanged(string MemberName, object _value) - { - ValueChanged.Raise(this, new ValueChangeEventArgs(MemberName, _value)); - } - #endregion - - public GOLIBTests () - : base(800, 600,"test: press spacebar to toogle test files") - { - //VSync = VSyncMode.Off; - Interface.CurrentInterface = CrowInterface; - GraphicObject obj = CrowInterface.LoadInterface("Interfaces/" + testFiles[idx]); - obj.DataSource = this; - - } - - int frameCpt = 0; - int idx = 0; - string[] testFiles = { - "testMsgBox.goml", - "testCombobox.goml", - "testExpandable.goml", - "test_Listbox.goml", - "6.crow", - "testGroupBox.goml", - "1.crow", - "5.crow", - "testCheckbox.goml", - "testWindow.goml", - "fps.goml", - "testTabView.crow", - "0.crow", - "testImage.crow", - "testOutOfClipUpdate.crow", -// "test_Listbox.goml", -// "testTreeView.crow", - "1.crow", - "clip4.crow", - "clip3.crow", - "clip2.crow", - "clip0.crow", - "clip1.crow", - "testPopper.goml", - "testTextBox.crow", - "testColorList.crow", -// "5.crow", -// "testCombobox.goml", -// "testPopper.goml", - "testTextBox.crow", -// "testColorList.crow", - "4.crow", - "testSpinner.goml", - "testScrollbar.goml", - "testGrid.goml", - "testButton.crow", - "testBorder.goml", -// "testButton2.crow", - "test2WayBinding.crow", - "test4.goml", - "2.crow", - "test1.goml", - "testWindow2.goml", - - "testWindow3.goml", - "testLabel.goml", - "testAll.goml", -// "testSpinner.goml", -// "testRadioButton2.goml", - "testContainer.goml", - "testRadioButton.goml", - -// "testMeter.goml", - }; - - #region FPS - int _fps = 0; - - public int fps { - get { return _fps; } - set { - if (_fps == value) - return; - - _fps = value; - - if (_fps > fpsMax) { - fpsMax = _fps; - ValueChanged.Raise(this, new ValueChangeEventArgs ("fpsMax", fpsMax)); - } else if (_fps < fpsMin) { - fpsMin = _fps; - ValueChanged.Raise(this, new ValueChangeEventArgs ("fpsMin", fpsMin)); - } - - ValueChanged.Raise(this, new ValueChangeEventArgs ("fps", _fps)); - #if MEASURE_TIME - ValueChanged.Raise (this, new ValueChangeEventArgs ("update", - this.CrowInterface.updateTime.ElapsedTicks.ToString () + " ticks")); - ValueChanged.Raise (this, new ValueChangeEventArgs ("layouting", - this.CrowInterface.layoutTime.ElapsedTicks.ToString () + " ticks")); - ValueChanged.Raise (this, new ValueChangeEventArgs ("drawing", - this.CrowInterface.drawingTime.ElapsedTicks.ToString () + " ticks")); - #endif - } - } - - public int fpsMin = int.MaxValue; - public int fpsMax = 0; - - void resetFps () - { - fpsMin = int.MaxValue; - fpsMax = 0; - _fps = 0; - } - public string update = ""; - public string drawing = ""; - public string layouting = ""; - public Alignment alignment = Alignment.Left; - #endregion - - public int intValue = 25; - - public int IntValue { - get { - return intValue; - } - set { - intValue = value; - NotifyValueChanged ("IntValue", intValue); - } - } - void onSpinnerValueChange(object sender, ValueChangeEventArgs e){ - if (e.MemberName != "Value") - return; - intValue = Convert.ToInt32(e.NewValue); - } - void change_alignment(object sender, EventArgs e){ - RadioButton rb = sender as RadioButton; - if (rb == null) - return; - NotifyValueChanged ("alignment", Enum.Parse(typeof(Alignment), rb.Caption)); - } - public IList List2 = new List(new string[] - { - "string1", - "string2", - "string3", - "string4", - "string5", - "string6", - "string7", - "string8", - "string8", - "string8", - "string8", - "string8", - "string8", - "string9" - } - ); - IList testList = Color.ColorDic.ToList(); - public IList TestList { - set{ - testList = value; - NotifyValueChanged ("TestList", testList); - } - get { return testList; } - } - void OnClear (object sender, MouseButtonEventArgs e) => TestList = null; - - void OnLoadList (object sender, MouseButtonEventArgs e) { - TestList = Color.ColorDic.ToList(); - } - - void GOLIBTests_KeyboardKeyDown1 (object sender, OpenTK.Input.KeyboardKeyEventArgs e) - { - if (e.Key == OpenTK.Input.Key.Escape) { - Quit (null, null); - return; - } else if (e.Key == OpenTK.Input.Key.L) { - TestList.Add ("new string"); - NotifyValueChanged ("TestList", TestList); - return; - } else if (e.Key == OpenTK.Input.Key.W) { - GraphicObject w = CrowInterface.LoadInterface("Interfaces/testWindow.goml"); - w.DataSource = this; - return; - } - CrowInterface.ClearInterface (); - idx++; - if (idx == testFiles.Length) - idx = 0; - this.Title = testFiles [idx]; - GraphicObject obj = CrowInterface.LoadInterface("Interfaces/" + testFiles[idx]); - obj.DataSource = this; - } - -// protected override void OnUpdateFrame (FrameEventArgs e) -// { -// //if (frameCpt % 8 == 0) -// base.OnUpdateFrame (e); -// -// fps = (int)RenderFrequency; -// -// -// if (frameCpt > 50) { -// resetFps (); -// frameCpt = 0; -// GC.Collect(); -// GC.WaitForPendingFinalizers(); -// NotifyValueChanged("memory", GC.GetTotalMemory (false).ToString()); -// } -// frameCpt++; -// } - void onButClick(object send, MouseButtonEventArgs e) - { - Console.WriteLine ("button clicked:" + send.ToString()); - } - void onAddTabButClick(object sender, MouseButtonEventArgs e){ - - TabView tv = CrowInterface.FindByName("tabview1") as TabView; - if (tv == null) - return; - tv.AddChild (new TabItem () { Caption = "NewTab" }); - } - [STAThread] - static void Main () - { - Console.WriteLine ("starting example"); - Gtk.Application.Init (); - GOLIBTests win = new GOLIBTests (); - win.KeyPressEvent += win.Win_KeyPressEvent; - - Gtk.Application.Run (); - } - void onMsgBoxOk(object sender, EventArgs e){ - Debug.WriteLine ("OK"); - } - void onMsgBoxCancel(object sender, EventArgs e) - { - Debug.WriteLine ("cancel"); - } - void Win_KeyPressEvent (object o, Gtk.KeyPressEventArgs args) - { - CrowInterface.ClearInterface (); - idx++; - if (idx == testFiles.Length) - idx = 0; - this.Title = testFiles [idx]; - GraphicObject obj = CrowInterface.LoadInterface("Interfaces/" + testFiles[idx]); - obj.DataSource = this; - } - } -} diff --git a/OTKCrow/OpenGL/Shader.cs b/Tests/OpenGL/Shader.cs similarity index 100% rename from OTKCrow/OpenGL/Shader.cs rename to Tests/OpenGL/Shader.cs diff --git a/OTKCrow/OpenGL/vaoMesh.cs b/Tests/OpenGL/vaoMesh.cs similarity index 100% rename from OTKCrow/OpenGL/vaoMesh.cs rename to Tests/OpenGL/vaoMesh.cs diff --git a/Tests/OpenTK.dll.config b/Tests/OpenTK.dll.config deleted file mode 100644 index 23689f65..00000000 --- a/Tests/OpenTK.dll.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/OTKCrow/OpenTKGameWindow.cs b/Tests/OpenTKGameWindow.cs similarity index 100% rename from OTKCrow/OpenTKGameWindow.cs rename to Tests/OpenTKGameWindow.cs diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index fe7570b3..ff4e3c78 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -48,6 +48,9 @@ + + + @@ -68,7 +71,6 @@ PreserveNewest - PreserveNewest @@ -328,8 +330,6 @@ PreserveNewest - - @@ -362,9 +362,5 @@ {C2980F9B-4798-4C05-99E2-E174810F7C7B} Crow - - {350D4F49-9901-4998-9903-BCA7D48DA58C} - OTKCrow - diff --git a/src/GraphicObjects/Window.cs b/src/GraphicObjects/Window.cs index 05acf526..a36019e3 100644 --- a/src/GraphicObjects/Window.cs +++ b/src/GraphicObjects/Window.cs @@ -62,7 +62,7 @@ namespace Crow NotifyValueChanged ("Title", _title); } } - [XmlAttributeAttribute()][DefaultValue("#Crow.Images.Icons.tetra.png")] + [XmlAttributeAttribute()][DefaultValue("#Crow.Images.Icons.crow.png")] public string Icon { get { return _icon; } set { -- 2.47.3