From 5419e6714bbe993040a25cf4fd06f16df08678b5 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Mon, 29 Feb 2016 15:22:13 +0300
Subject: [PATCH] Scene3D/mesh testing for #183

---
 dlangui-msvc.sln                                | 14 +++++++++++++-
 dlangui-msvc.visualdproj                        |  8 ++++----
 examples/d3d/d3d-msvc.visualdproj               |  2 +-
 examples/d3d/src/d3d.d                          | 16 +++++++++-------
 examples/helloworld/helloworld-msvc.visualdproj |  6 +++---
 5 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/dlangui-msvc.sln b/dlangui-msvc.sln
index bb7d5c35..5238ee35 100644
--- a/dlangui-msvc.sln
+++ b/dlangui-msvc.sln
@@ -45,7 +45,9 @@ Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "opengl", "examples\opengl\o
 		{52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5} = {52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5}
 	EndProjectSection
 EndProject
-Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "dwindow_visuald", "..\dwindow\dwindow-visuald.visualdproj", "{6EF05FEE-F632-4B33-805C-5B219269A511}"
+Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "dwindow", "..\dwindow\dwindow-visuald.visualdproj", "{6EF05FEE-F632-4B33-805C-5B219269A511}"
+EndProject
+Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "dmdbug", "examples\dmdbug\dmdbug.visualdproj", "{6FD15ECD-35AF-457D-9327-DD8C2A0EADF1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -170,6 +172,16 @@ Global
 		{6EF05FEE-F632-4B33-805C-5B219269A511}.Unittest|Win32.Build.0 = Release|Win32
 		{6EF05FEE-F632-4B33-805C-5B219269A511}.Unittest|x64.ActiveCfg = Release|Win32
 		{6EF05FEE-F632-4B33-805C-5B219269A511}.Unittest|x64.Build.0 = Release|Win32
+		{6FD15ECD-35AF-457D-9327-DD8C2A0EADF1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6FD15ECD-35AF-457D-9327-DD8C2A0EADF1}.Debug|Win32.Build.0 = Debug|Win32
+		{6FD15ECD-35AF-457D-9327-DD8C2A0EADF1}.Debug|x64.ActiveCfg = Debug|Win32
+		{6FD15ECD-35AF-457D-9327-DD8C2A0EADF1}.Release|Win32.ActiveCfg = Release|Win32
+		{6FD15ECD-35AF-457D-9327-DD8C2A0EADF1}.Release|Win32.Build.0 = Release|Win32
+		{6FD15ECD-35AF-457D-9327-DD8C2A0EADF1}.Release|x64.ActiveCfg = Release|Win32
+		{6FD15ECD-35AF-457D-9327-DD8C2A0EADF1}.Unittest|Win32.ActiveCfg = Release|Win32
+		{6FD15ECD-35AF-457D-9327-DD8C2A0EADF1}.Unittest|Win32.Build.0 = Release|Win32
+		{6FD15ECD-35AF-457D-9327-DD8C2A0EADF1}.Unittest|x64.ActiveCfg = Release|Win32
+		{6FD15ECD-35AF-457D-9327-DD8C2A0EADF1}.Unittest|x64.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/dlangui-msvc.visualdproj b/dlangui-msvc.visualdproj
index 707027fd..c88cfe91 100644
--- a/dlangui-msvc.visualdproj
+++ b/dlangui-msvc.visualdproj
@@ -72,7 +72,7 @@
   <debuglevel>0</debuglevel>
   <debugids />
   <versionlevel>0</versionlevel>
-  <versionids>EmbedStandardResources ForceLogs</versionids>
+  <versionids>EmbedStandardResources ForceLogs USE_FREETYPE USE_OPENGL</versionids>
   <dump_source>0</dump_source>
   <mapverbosity>0</mapverbosity>
   <createImplib>0</createImplib>
@@ -219,7 +219,7 @@
   <vtls>0</vtls>
   <vgc>0</vgc>
   <symdebug>1</symdebug>
-  <optimize>0</optimize>
+  <optimize>1</optimize>
   <cpu>0</cpu>
   <isX86_64>0</isX86_64>
   <isLinux>0</isLinux>
@@ -238,7 +238,7 @@
   <noboundscheck>0</noboundscheck>
   <useSwitchError>0</useSwitchError>
   <useUnitTests>0</useUnitTests>
-  <useInline>0</useInline>
+  <useInline>1</useInline>
   <release>0</release>
   <preservePaths>0</preservePaths>
   <warnings>0</warnings>
@@ -276,7 +276,7 @@
   <debuglevel>0</debuglevel>
   <debugids />
   <versionlevel>0</versionlevel>
-  <versionids> EmbedStandardResources ForceLogs</versionids>
+  <versionids> EmbedStandardResources ForceLogs  USE_OPENGL USE_FREETYPE</versionids>
   <dump_source>0</dump_source>
   <mapverbosity>0</mapverbosity>
   <createImplib>0</createImplib>
diff --git a/examples/d3d/d3d-msvc.visualdproj b/examples/d3d/d3d-msvc.visualdproj
index a21c2b53..985d53d8 100644
--- a/examples/d3d/d3d-msvc.visualdproj
+++ b/examples/d3d/d3d-msvc.visualdproj
@@ -72,7 +72,7 @@
   <debuglevel>0</debuglevel>
   <debugids />
   <versionlevel>0</versionlevel>
-  <versionids> EmbedStandardResources</versionids>
+  <versionids> EmbedStandardResources USE_OPENGL</versionids>
   <dump_source>0</dump_source>
   <mapverbosity>0</mapverbosity>
   <createImplib>0</createImplib>
diff --git a/examples/d3d/src/d3d.d b/examples/d3d/src/d3d.d
index fbbfe94d..148f5c1b 100644
--- a/examples/d3d/src/d3d.d
+++ b/examples/d3d/src/d3d.d
@@ -46,13 +46,14 @@ class UiWidget : VerticalLayout {
                 id: glView
                 margins: 10
                 padding: 10
-                TextWidget { text: "Hello World example for DlangUI"; textColor: "red"; fontSize: 150%; fontWeight: 800; fontFace: "Arial" }
+                TextWidget { text: "There should be OpenGL animation on background"; textColor: "red"; fontSize: 150%; fontWeight: 800; fontFace: "Arial" }
+                TextWidget { text: "Do you see it? If no, there is some bug in Mesh rendering code..."; fontSize: 120% }
                 HorizontalLayout {
-                layoutWidth: fill
-                        TextWidget { text: "Text 20%"; backgroundColor:"#80FF0000"; layoutWidth: 20% }
+                    layoutWidth: fill
+                    TextWidget { text: "Text 20%"; backgroundColor:"#80FF0000"; layoutWidth: 20% }
                     VerticalLayout {
-                    layoutWidth: 30%
-                            TextWidget { text: "Text 30%"; backgroundColor:"#80FF00FF" }
+                        layoutWidth: 30%
+                        TextWidget { text: "Text 30%"; backgroundColor:"#80FF00FF" }
                         TextWidget { text: "Text 30%"; backgroundColor:"#8000FFFF" }
                         TextWidget { text: "Text 30%"; backgroundColor:"#8000FFFF" }
                     }
@@ -60,8 +61,8 @@ class UiWidget : VerticalLayout {
                 }
                 // arrange controls as form - table with two columns
                 TableLayout {
-                colCount: 2
-                        TextWidget { text: "param 1" }
+                    colCount: 2
+                    TextWidget { text: "param 1" }
                     EditLine { id: edit1; text: "some text" }
                     TextWidget { text: "param 2" }
                     EditLine { id: edit2; text: "some text for param2" }
@@ -80,6 +81,7 @@ class UiWidget : VerticalLayout {
                     }
                 }
                 HorizontalLayout {
+                    TextWidget { text: "Some buttons:" }
                     Button { id: btnOk; text: "Ok"; fontSize: 27px }
                     Button { id: btnCancel; text: "Cancel"; fontSize: 27px }
                 }
diff --git a/examples/helloworld/helloworld-msvc.visualdproj b/examples/helloworld/helloworld-msvc.visualdproj
index 10d1fb5b..2a21fd55 100644
--- a/examples/helloworld/helloworld-msvc.visualdproj
+++ b/examples/helloworld/helloworld-msvc.visualdproj
@@ -133,13 +133,13 @@
   <useIn>0</useIn>
   <useOut>0</useOut>
   <useArrayBounds>0</useArrayBounds>
-  <noboundscheck>0</noboundscheck>
+  <noboundscheck>1</noboundscheck>
   <useSwitchError>0</useSwitchError>
   <useUnitTests>0</useUnitTests>
   <useInline>1</useInline>
   <release>1</release>
   <preservePaths>0</preservePaths>
-  <warnings>0</warnings>
+  <warnings>1</warnings>
   <infowarnings>0</infowarnings>
   <checkProperty>0</checkProperty>
   <genStackFrame>0</genStackFrame>
@@ -174,7 +174,7 @@
   <debuglevel>0</debuglevel>
   <debugids />
   <versionlevel>0</versionlevel>
-  <versionids>EmbedStandardResources</versionids>
+  <versionids>EmbedStandardResources USE_OPENGL USE_FREETYPE</versionids>
   <dump_source>0</dump_source>
   <mapverbosity>0</mapverbosity>
   <createImplib>0</createImplib>