0024699: Visualization - prototype interoperation of TKOpenGl viewer with Direct3D...
authordln <dln@opencascade.com>
Tue, 3 Jun 2014 06:11:33 +0000 (10:11 +0400)
committerbugmaster <bugmaster@opencascade.com>
Fri, 10 Oct 2014 11:06:42 +0000 (15:06 +0400)
Add new C# sample which allow to render the OCCT scene to a Direct3D context in a WPF application.
DirectX SDK is required in order to build this sample.

115 files changed:
dox/FILES_HTML.txt
dox/overview/overview.md
samples/CSharp/CSharp.sln [moved from samples/CSharp/CSharp-vc10.sln with 94% similarity]
samples/CSharp/CSharp_D3D.sln [moved from samples/CSharp/CSharp-vc9.sln with 59% similarity]
samples/CSharp/OCCTProxy/OCCTProxy.cpp
samples/CSharp/OCCTProxy/OCCTProxy.vcxproj
samples/CSharp/OCCTProxy_D3D/BridgeFBO.cxx [new file with mode: 0644]
samples/CSharp/OCCTProxy_D3D/BridgeFBO.hxx [new file with mode: 0644]
samples/CSharp/OCCTProxy_D3D/Direct3DProxy.cpp [new file with mode: 0644]
samples/CSharp/OCCTProxy_D3D/OCCTProxyD3D.cpp [new file with mode: 0644]
samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcproj [new file with mode: 0644]
samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcxproj [new file with mode: 0644]
samples/CSharp/ReadMe.md
samples/CSharp/ReadMe_D3D.md [new file with mode: 0644]
samples/CSharp/WPF_D3D/About.xaml [copied from samples/CSharp/WPF/About.xaml with 89% similarity]
samples/CSharp/WPF_D3D/About.xaml.cs [copied from samples/CSharp/WPF/About.xaml.cs with 97% similarity]
samples/CSharp/WPF_D3D/App.xaml [copied from samples/CSharp/WPF/App.xaml with 91% similarity]
samples/CSharp/WPF_D3D/App.xaml.cs [copied from samples/CSharp/WPF/App.xaml.cs with 92% similarity]
samples/CSharp/WPF_D3D/D3DViewer.cs [new file with mode: 0644]
samples/CSharp/WPF_D3D/IECommands.cs [copied from samples/CSharp/WPF/IECommands.cs with 98% similarity]
samples/CSharp/WPF_D3D/IE_WPF_D3D.csproj [copied from samples/CSharp/WPF/IE_WPF.csproj with 83% similarity]
samples/CSharp/WPF_D3D/MainWindow.xaml [copied from samples/CSharp/WPF/MainWindow.xaml with 90% similarity]
samples/CSharp/WPF_D3D/MainWindow.xaml.cs [new file with mode: 0644]
samples/CSharp/WPF_D3D/MaterialDlg.xaml [copied from samples/CSharp/WPF/MaterialDlg.xaml with 96% similarity]
samples/CSharp/WPF_D3D/MaterialDlg.xaml.cs [copied from samples/CSharp/WPF/MaterialDlg.xaml.cs with 95% similarity]
samples/CSharp/WPF_D3D/OCCViewer.cs [new file with mode: 0644]
samples/CSharp/WPF_D3D/Properties/AssemblyInfo.cs [copied from samples/CSharp/WPF/Properties/AssemblyInfo.cs with 100% similarity]
samples/CSharp/WPF_D3D/Properties/Resources.Designer.cs [copied from samples/CSharp/WPF/Properties/Resources.Designer.cs with 91% similarity]
samples/CSharp/WPF_D3D/Properties/Resources.resx [copied from samples/CSharp/WPF/Properties/Resources.resx with 100% similarity]
samples/CSharp/WPF_D3D/Properties/Settings.Designer.cs [copied from samples/CSharp/WPF/Properties/Settings.Designer.cs with 90% similarity]
samples/CSharp/WPF_D3D/Properties/Settings.settings [copied from samples/CSharp/WPF/Properties/Settings.settings with 100% similarity]
samples/CSharp/WPF_D3D/Simple Styles.xaml [copied from samples/CSharp/WPF/Simple Styles.xaml with 100% similarity]
samples/CSharp/WPF_D3D/TransparencyDialog.cs [copied from samples/CSharp/WPF/TransparencyDialog.cs with 97% similarity]
samples/CSharp/WPF_D3D/TransparencyDialog.resx [copied from samples/CSharp/WPF/TransparencyDialog.resx with 100% similarity]
samples/CSharp/WPF_D3D/app.config [copied from samples/CSharp/WPF/app.config with 100% similarity]
samples/CSharp/WPF_D3D/res/MainFrame.ico [copied from samples/CSharp/WPF/res/MainFrame.ico with 100% similarity]
samples/CSharp/WPF_D3D/res/document.png [copied from samples/CSharp/WPF/res/document.png with 100% similarity]
samples/CSharp/WPF_D3D/res/help.png [copied from samples/CSharp/WPF/res/help.png with 100% similarity]
samples/CSharp/WPF_D3D/res/lamp.png [copied from samples/CSharp/WPF/res/lamp.png with 100% similarity]
samples/CSharp/WPF_D3D/res/new.png [copied from samples/CSharp/WPF/res/new.png with 100% similarity]
samples/CSharp/WPF_D3D/res/occ_logo.bmp [copied from samples/CSharp/WPF/res/occ_logo.bmp with 100% similarity]
samples/CSharp/WPF_D3D/res/tool_color.png [copied from samples/CSharp/WPF/res/tool_color.png with 100% similarity]
samples/CSharp/WPF_D3D/res/tool_delete.png [copied from samples/CSharp/WPF/res/tool_delete.png with 100% similarity]
samples/CSharp/WPF_D3D/res/tool_material.png [copied from samples/CSharp/WPF/res/tool_material.png with 100% similarity]
samples/CSharp/WPF_D3D/res/tool_shading.png [copied from samples/CSharp/WPF/res/tool_shading.png with 100% similarity]
samples/CSharp/WPF_D3D/res/tool_transparency.png [copied from samples/CSharp/WPF/res/tool_transparency.png with 100% similarity]
samples/CSharp/WPF_D3D/res/tool_wireframe.png [copied from samples/CSharp/WPF/res/tool_wireframe.png with 100% similarity]
samples/CSharp/WPF_D3D/res/view_axo.png [copied from samples/CSharp/WPF/res/view_axo.png with 100% similarity]
samples/CSharp/WPF_D3D/res/view_back.png [copied from samples/CSharp/WPF/res/view_back.png with 100% similarity]
samples/CSharp/WPF_D3D/res/view_bottom.png [copied from samples/CSharp/WPF/res/view_bottom.png with 100% similarity]
samples/CSharp/WPF_D3D/res/view_comp_off.png [copied from samples/CSharp/WPF/res/view_comp_off.png with 100% similarity]
samples/CSharp/WPF_D3D/res/view_comp_on.png [copied from samples/CSharp/WPF/res/view_comp_on.png with 100% similarity]
samples/CSharp/WPF_D3D/res/view_fitall.png [copied from samples/CSharp/WPF/res/view_fitall.png with 100% similarity]
samples/CSharp/WPF_D3D/res/view_fitarea.png [copied from samples/CSharp/WPF/res/view_fitarea.png with 100% similarity]
samples/CSharp/WPF_D3D/res/view_front.png [copied from samples/CSharp/WPF/res/view_front.png with 100% similarity]
samples/CSharp/WPF_D3D/res/view_glpan.png [copied from samples/CSharp/WPF/res/view_glpan.png with 100% similarity]
samples/CSharp/WPF_D3D/res/view_left.png [copied from samples/CSharp/WPF/res/view_left.png with 100% similarity]
samples/CSharp/WPF_D3D/res/view_pan.png [copied from samples/CSharp/WPF/res/view_pan.png with 100% similarity]
samples/CSharp/WPF_D3D/res/view_reset.png [copied from samples/CSharp/WPF/res/view_reset.png with 100% similarity]
samples/CSharp/WPF_D3D/res/view_right.png [copied from samples/CSharp/WPF/res/view_right.png with 100% similarity]
samples/CSharp/WPF_D3D/res/view_rotate.png [copied from samples/CSharp/WPF/res/view_rotate.png with 100% similarity]
samples/CSharp/WPF_D3D/res/view_top.png [copied from samples/CSharp/WPF/res/view_top.png with 100% similarity]
samples/CSharp/WPF_D3D/res/view_zoom.png [copied from samples/CSharp/WPF/res/view_zoom.png with 100% similarity]
samples/CSharp/WPF_WinForms/About.xaml [moved from samples/CSharp/WPF/About.xaml with 88% similarity]
samples/CSharp/WPF_WinForms/About.xaml.cs [moved from samples/CSharp/WPF/About.xaml.cs with 97% similarity]
samples/CSharp/WPF_WinForms/App.xaml [moved from samples/CSharp/WPF/App.xaml with 90% similarity]
samples/CSharp/WPF_WinForms/App.xaml.cs [moved from samples/CSharp/WPF/App.xaml.cs with 91% similarity]
samples/CSharp/WPF_WinForms/IECommands.cs [moved from samples/CSharp/WPF/IECommands.cs with 98% similarity]
samples/CSharp/WPF_WinForms/IE_WPF_WinForms.csproj [moved from samples/CSharp/WPF/IE_WPF.csproj with 86% similarity]
samples/CSharp/WPF_WinForms/MainWindow.xaml [moved from samples/CSharp/WPF/MainWindow.xaml with 99% similarity]
samples/CSharp/WPF_WinForms/MainWindow.xaml.cs [moved from samples/CSharp/WPF/MainWindow.xaml.cs with 99% similarity]
samples/CSharp/WPF_WinForms/MaterialDlg.xaml [moved from samples/CSharp/WPF/MaterialDlg.xaml with 95% similarity]
samples/CSharp/WPF_WinForms/MaterialDlg.xaml.cs [moved from samples/CSharp/WPF/MaterialDlg.xaml.cs with 98% similarity]
samples/CSharp/WPF_WinForms/OCCViewer.cs [moved from samples/CSharp/WPF/OCCViewer.cs with 99% similarity]
samples/CSharp/WPF_WinForms/Properties/AssemblyInfo.cs [moved from samples/CSharp/WPF/Properties/AssemblyInfo.cs with 100% similarity]
samples/CSharp/WPF_WinForms/Properties/Resources.Designer.cs [moved from samples/CSharp/WPF/Properties/Resources.Designer.cs with 90% similarity]
samples/CSharp/WPF_WinForms/Properties/Resources.resx [moved from samples/CSharp/WPF/Properties/Resources.resx with 100% similarity]
samples/CSharp/WPF_WinForms/Properties/Settings.Designer.cs [moved from samples/CSharp/WPF/Properties/Settings.Designer.cs with 90% similarity]
samples/CSharp/WPF_WinForms/Properties/Settings.settings [moved from samples/CSharp/WPF/Properties/Settings.settings with 100% similarity]
samples/CSharp/WPF_WinForms/Simple Styles.xaml [moved from samples/CSharp/WPF/Simple Styles.xaml with 100% similarity]
samples/CSharp/WPF_WinForms/TransparencyDialog.cs [moved from samples/CSharp/WPF/TransparencyDialog.cs with 99% similarity]
samples/CSharp/WPF_WinForms/TransparencyDialog.resx [moved from samples/CSharp/WPF/TransparencyDialog.resx with 100% similarity]
samples/CSharp/WPF_WinForms/app.config [moved from samples/CSharp/WPF/app.config with 100% similarity]
samples/CSharp/WPF_WinForms/res/MainFrame.ico [moved from samples/CSharp/WPF/res/MainFrame.ico with 100% similarity]
samples/CSharp/WPF_WinForms/res/document.png [moved from samples/CSharp/WPF/res/document.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/help.png [moved from samples/CSharp/WPF/res/help.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/lamp.png [moved from samples/CSharp/WPF/res/lamp.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/new.png [moved from samples/CSharp/WPF/res/new.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/occ_logo.bmp [moved from samples/CSharp/WPF/res/occ_logo.bmp with 100% similarity]
samples/CSharp/WPF_WinForms/res/tool_color.png [moved from samples/CSharp/WPF/res/tool_color.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/tool_delete.png [moved from samples/CSharp/WPF/res/tool_delete.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/tool_material.png [moved from samples/CSharp/WPF/res/tool_material.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/tool_shading.png [moved from samples/CSharp/WPF/res/tool_shading.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/tool_transparency.png [moved from samples/CSharp/WPF/res/tool_transparency.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/tool_wireframe.png [moved from samples/CSharp/WPF/res/tool_wireframe.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/view_axo.png [moved from samples/CSharp/WPF/res/view_axo.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/view_back.png [moved from samples/CSharp/WPF/res/view_back.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/view_bottom.png [moved from samples/CSharp/WPF/res/view_bottom.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/view_comp_off.png [moved from samples/CSharp/WPF/res/view_comp_off.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/view_comp_on.png [moved from samples/CSharp/WPF/res/view_comp_on.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/view_fitall.png [moved from samples/CSharp/WPF/res/view_fitall.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/view_fitarea.png [moved from samples/CSharp/WPF/res/view_fitarea.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/view_front.png [moved from samples/CSharp/WPF/res/view_front.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/view_glpan.png [moved from samples/CSharp/WPF/res/view_glpan.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/view_left.png [moved from samples/CSharp/WPF/res/view_left.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/view_pan.png [moved from samples/CSharp/WPF/res/view_pan.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/view_reset.png [moved from samples/CSharp/WPF/res/view_reset.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/view_right.png [moved from samples/CSharp/WPF/res/view_right.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/view_rotate.png [moved from samples/CSharp/WPF/res/view_rotate.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/view_top.png [moved from samples/CSharp/WPF/res/view_top.png with 100% similarity]
samples/CSharp/WPF_WinForms/res/view_zoom.png [moved from samples/CSharp/WPF/res/view_zoom.png with 100% similarity]
samples/CSharp/msvc.bat
samples/CSharp/msvc_D3D.bat [new file with mode: 0644]
samples/CSharp/run_wpf.bat
samples/CSharp/run_wpf_D3D.bat [new file with mode: 0644]

index c3e94b4..06b7326 100644 (file)
@@ -9,6 +9,7 @@ overview/overview.md
 
 ../samples/mfc/standard/ReadMe.md
 ../samples/CSharp/ReadMe.md
+../samples/CSharp/ReadMe_D3D.md
 
 tutorial/tutorial.md
 
index 4aaa8d5..12c94e6 100644 (file)
@@ -623,5 +623,9 @@ Export:
   * Stl
   * Vrml
 
-See \subpage samples_csharp "Readme" for details.
+See \subpage samples_csharp_occt "Readme" for details.
+
+Also there is an other C# example with the same functionality which demonstrates integration of Direct3D Viewer into .NET applications using WPF front end.
+
+See \subpage samples_csharp_direct3d "Readme" for details.
 
similarity index 94%
rename from samples/CSharp/CSharp-vc10.sln
rename to samples/CSharp/CSharp.sln
index cefb3f1..e67bae1 100644 (file)
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IE_WPF", "WPF\IE_WPF.csproj", "{D12A8897-5BF8-4345-BBB0-8ADE4B9FB9A7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IE_WPF_WinForms", "WPF_WinForms\IE_WPF_WinForms.csproj", "{D12A8897-5BF8-4345-BBB0-8ADE4B9FB9A7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IE_WinForms", "WinForms\IE_WinForms.csproj", "{B9914BB3-B886-4B41-B48D-350EBEBEFD1F}"
 EndProject
similarity index 59%
rename from samples/CSharp/CSharp-vc9.sln
rename to samples/CSharp/CSharp_D3D.sln
index 6ec2e62..a0feddd 100644 (file)
@@ -1,10 +1,8 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IE_WPF", "WPF\IE_WPF.csproj", "{D12A8897-5BF8-4345-BBB0-8ADE4B9FB9A7}"
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IE_WPF_D3D", "WPF_D3D\IE_WPF_D3D.csproj", "{D12A8897-5BF8-4345-BBB0-8ADE4B9FB9A7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IE_WinForms", "WinForms\IE_WinForms.csproj", "{B9914BB3-B886-4B41-B48D-350EBEBEFD1F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OCCTProxy", "OCCTProxy\OCCTProxy.vcproj", "{969912D9-78E7-4AB8-B4FF-6B52B4F03991}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OCCTProxy_D3D", "OCCTProxy_D3D\OCCTProxy_D3D.vcxproj", "{969912D9-78E7-4AB8-B4FF-6B52B4F03991}"
 EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -22,14 +20,6 @@ Global
                {D12A8897-5BF8-4345-BBB0-8ADE4B9FB9A7}.Release|Win32.Build.0 = Release|x86
                {D12A8897-5BF8-4345-BBB0-8ADE4B9FB9A7}.Release|x64.ActiveCfg = Release|x64
                {D12A8897-5BF8-4345-BBB0-8ADE4B9FB9A7}.Release|x64.Build.0 = Release|x64
-               {B9914BB3-B886-4B41-B48D-350EBEBEFD1F}.Debug|Win32.ActiveCfg = Debug|x86
-               {B9914BB3-B886-4B41-B48D-350EBEBEFD1F}.Debug|Win32.Build.0 = Debug|x86
-               {B9914BB3-B886-4B41-B48D-350EBEBEFD1F}.Debug|x64.ActiveCfg = Debug|x64
-               {B9914BB3-B886-4B41-B48D-350EBEBEFD1F}.Debug|x64.Build.0 = Debug|x64
-               {B9914BB3-B886-4B41-B48D-350EBEBEFD1F}.Release|Win32.ActiveCfg = Release|x86
-               {B9914BB3-B886-4B41-B48D-350EBEBEFD1F}.Release|Win32.Build.0 = Release|x86
-               {B9914BB3-B886-4B41-B48D-350EBEBEFD1F}.Release|x64.ActiveCfg = Release|x64
-               {B9914BB3-B886-4B41-B48D-350EBEBEFD1F}.Release|x64.Build.0 = Release|x64
                {969912D9-78E7-4AB8-B4FF-6B52B4F03991}.Debug|Win32.ActiveCfg = Debug|Win32
                {969912D9-78E7-4AB8-B4FF-6B52B4F03991}.Debug|Win32.Build.0 = Debug|Win32
                {969912D9-78E7-4AB8-B4FF-6B52B4F03991}.Debug|x64.ActiveCfg = Debug|x64
index 3dd4538..e7bc2a6 100644 (file)
@@ -1094,5 +1094,5 @@ private:
   NCollection_Haft<Handle_V3d_Viewer> myViewer;
   NCollection_Haft<Handle_V3d_View> myView;
   NCollection_Haft<Handle_AIS_InteractiveContext> myAISContext;
-  NCollection_Haft<Handle_OpenGl_GraphicDriver>   myGraphicDriver;
+  NCollection_Haft<Handle_OpenGl_GraphicDriver> myGraphicDriver;
 };
index 91100d2..6c7f469 100644 (file)
@@ -78,8 +78,6 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\win64\bin\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">D:\builds\vc10\CR25067-master-occt\inc;$(IncludePath)</IncludePath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">D:\builds\vc10\CR25067-master-occt\win32\vc10\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/samples/CSharp/OCCTProxy_D3D/BridgeFBO.cxx b/samples/CSharp/OCCTProxy_D3D/BridgeFBO.cxx
new file mode 100644 (file)
index 0000000..12fa944
--- /dev/null
@@ -0,0 +1,152 @@
+#include "BridgeFBO.hxx"
+
+#include <OpenGl_ArbFBO.hxx>
+
+#include <Graphic3d_TextureParams.hxx>
+
+#include <d3dx9.h>
+
+// list of required libraries
+#pragma comment(lib, "TKOpenGl.lib")
+#pragma comment(lib, "opengl32.lib")
+
+// =======================================================================
+// function : Init
+// purpose  :
+// =======================================================================
+Standard_Boolean BridgeFBO::Init (const Handle(OpenGl_Context)& theGlContext,
+                                  void*                         theD3DDevice)
+{
+  const OpenGl_GlFunctions* aFuncs = (const OpenGl_GlFunctions* )theGlContext->core11;
+  if (aFuncs->wglDXOpenDeviceNV == NULL)
+  {
+    return Standard_False;
+  }
+
+  myGlD3DHandle = aFuncs->wglDXOpenDeviceNV (theD3DDevice);
+  if (myGlD3DHandle == NULL)
+  {
+    std::cerr << "Could not create the GL <-> DirectX Interop" << std::endl;
+    return Standard_False;
+  }
+
+  theGlContext->arbFBO->glGenFramebuffers (1, &myGlFBufferId);
+  return Standard_True;
+}
+
+// =======================================================================
+// function : Release
+// purpose  :
+// =======================================================================
+void BridgeFBO::Release (OpenGl_Context* theGlContext)
+{
+  if (myGlD3DHandle != NULL)
+  {
+    const OpenGl_GlFunctions* aFuncs = (const OpenGl_GlFunctions* )theGlContext->core11;
+    if (myGlD3DSharedColorHandle != NULL)
+    {
+      aFuncs->wglDXUnregisterObjectNV (myGlD3DHandle, myGlD3DSharedColorHandle);
+      myGlD3DSharedColorHandle = NULL;
+    }
+
+    aFuncs->wglDXCloseDeviceNV (myGlD3DHandle);
+    myGlD3DHandle = NULL;
+  }
+
+  OpenGl_FrameBuffer::Release (theGlContext);
+}
+
+// =======================================================================
+// function : RegisterD3DColorBuffer
+// purpose  :
+// =======================================================================
+Standard_Boolean BridgeFBO::RegisterD3DColorBuffer (const Handle(OpenGl_Context)& theGlContext,
+                                                    void*                         theD3DBuffer,
+                                                    void*                         theBufferShare)
+{
+  const OpenGl_GlFunctions* aFuncs = (const OpenGl_GlFunctions* )theGlContext->core11;
+  if (myGlD3DSharedColorHandle != NULL)
+  {
+    if (!aFuncs->wglDXUnregisterObjectNV (myGlD3DHandle, myGlD3DSharedColorHandle))
+    {
+      return Standard_False;
+    }
+    myGlD3DSharedColorHandle = NULL;
+  }
+
+  if (!aFuncs->wglDXSetResourceShareHandleNV (theD3DBuffer, theBufferShare))
+  {
+    return Standard_False;
+  }
+
+  myColorTexture->Release (theGlContext.operator->());
+  myColorTexture->Create  (theGlContext);
+
+  myGlD3DSharedColorHandle = aFuncs->wglDXRegisterObjectNV (myGlD3DHandle,
+    theD3DBuffer, myColorTexture->TextureId(), GL_TEXTURE_2D, WGL_ACCESS_WRITE_DISCARD_NV);
+
+  if (myGlD3DSharedColorHandle == NULL)
+  {
+    std::cerr << "Could not register color buffer" << std::endl;
+    return Standard_False;
+  }
+
+  return Standard_True;
+}
+
+// =======================================================================
+// function : Resize
+// purpose  :
+// =======================================================================
+void BridgeFBO::Resize (const Handle(OpenGl_Context)& theGlContext,
+                        int theSizeX,
+                        int theSizeY)
+{
+  myVPSizeX = theSizeX;
+  myVPSizeY = theSizeY;
+
+  myDepthStencilTexture->Init (theGlContext, GL_DEPTH24_STENCIL8,
+                               GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8,
+                               myVPSizeX, myVPSizeY, Graphic3d_TOT_2D);
+}
+
+// =======================================================================
+// function : BindBuffer
+// purpose  :
+// =======================================================================
+void BridgeFBO::BindBuffer (const Handle(OpenGl_Context)& theGlContext)
+{
+  if (myGlD3DSharedColorHandle != NULL)
+  {
+    // Lock for OpenGL
+    const OpenGl_GlFunctions* aFuncs = (const OpenGl_GlFunctions* )theGlContext->core11;
+    aFuncs->wglDXLockObjectsNV (myGlD3DHandle, 1, &myGlD3DSharedColorHandle);
+  }
+  
+  OpenGl_FrameBuffer::BindBuffer (theGlContext);
+  theGlContext->arbFBO->glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+                                                GL_TEXTURE_2D, myColorTexture->TextureId(), 0);
+  theGlContext->arbFBO->glFramebufferTexture2D (GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT,
+                                                GL_TEXTURE_2D, myDepthStencilTexture->TextureId(), 0);
+  if (theGlContext->arbFBO->glCheckFramebufferStatus (GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE)
+  {
+    std::cerr << "Invalid FBO can not be bound!\n";
+    Release (theGlContext.operator->());
+  }
+}
+
+// =======================================================================
+// function : UnbindBuffer
+// purpose  :
+// =======================================================================
+void BridgeFBO::UnbindBuffer (const Handle(OpenGl_Context)& theGlContext)
+{
+  // Unbind the frame buffer
+  OpenGl_FrameBuffer::UnbindBuffer (theGlContext);
+  if (myGlD3DSharedColorHandle != NULL)
+  {
+    // Unlock for Direct3D
+    const OpenGl_GlFunctions* aFuncs = (const OpenGl_GlFunctions* )theGlContext->core11;
+    aFuncs->wglDXUnlockObjectsNV (myGlD3DHandle, 1, &myGlD3DSharedColorHandle);
+  }
+}
diff --git a/samples/CSharp/OCCTProxy_D3D/BridgeFBO.hxx b/samples/CSharp/OCCTProxy_D3D/BridgeFBO.hxx
new file mode 100644 (file)
index 0000000..9860015
--- /dev/null
@@ -0,0 +1,53 @@
+#ifndef BRIDGE_FBO_HEADER
+#define BRIDGE_FBO_HEADER
+
+#include <OpenGl_GlCore20.hxx>
+#include <OpenGl_FrameBuffer.hxx>
+
+//! Implements bridge FBO for direct rendering to Direct3D surfaces.
+class BridgeFBO : public OpenGl_FrameBuffer
+{
+public:
+
+  //! Creates new bridge FBO.
+  BridgeFBO() : OpenGl_FrameBuffer()
+  {
+    //
+  }
+
+  //! Releases resources of bridge FBO.
+  ~BridgeFBO()
+  {
+    Release (NULL);
+  }
+
+  //! Releases resources of bridge FBO.
+  virtual void Release (OpenGl_Context* theGlContext);
+
+  //! Initializes OpenGL FBO for Direct3D interoperability.
+  Standard_Boolean Init (const Handle(OpenGl_Context)& theGlContext,
+                         void*                         theD3DDevice);
+
+  //! Binds Direcr3D color buffer to OpenGL texture.
+  Standard_Boolean RegisterD3DColorBuffer (const Handle(OpenGl_Context)& theGlContext,
+                                           void*                         theD3DBuffer,
+                                           void*                         theBufferShare);
+
+  //! Locks Direct3D objects for OpenGL drawing.
+  virtual void BindBuffer (const Handle(OpenGl_Context)& theGlContext);
+
+  //! Unlocks Direct3D objects after OpenGL drawing.
+  virtual void UnbindBuffer (const Handle(OpenGl_Context)& theGlContext);
+
+  //! Resizes  buffer according to Direct3D surfaces.
+  void Resize (const Handle(OpenGl_Context)& theGlContext,
+               int                           theSizeX,
+               int                           theSizeY);
+
+private:
+
+  HANDLE myGlD3DHandle;
+  HANDLE myGlD3DSharedColorHandle;
+};
+
+#endif
\ No newline at end of file
diff --git a/samples/CSharp/OCCTProxy_D3D/Direct3DProxy.cpp b/samples/CSharp/OCCTProxy_D3D/Direct3DProxy.cpp
new file mode 100644 (file)
index 0000000..407d93f
--- /dev/null
@@ -0,0 +1,278 @@
+#include <iostream>
+#include <windows.h>
+#include <d3dx9.h>
+
+using namespace System::Runtime::InteropServices;
+
+typedef HRESULT (WINAPI *DIRECT3DCREATE9EX)(UINT SDKVersion, IDirect3D9Ex**);
+
+LRESULT WINAPI MsgProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+  return DefWindowProcW (hWnd, msg, wParam, lParam);
+}
+
+WNDCLASSEXW THE_WNDCLASS_D3D =
+{
+  sizeof (WNDCLASSEXW),
+  CS_CLASSDC, MsgProc, NULL, NULL,
+  GetModuleHandle (NULL),
+  NULL, NULL, NULL, NULL, L"D3D", NULL
+};
+
+// =======================================================================
+// function : GetVertexProcessingCaps
+// purpose  :
+// =======================================================================
+DWORD GetVertexProcessingCaps (LPDIRECT3D9 theD3D)
+{
+  D3DCAPS9 aCaps;
+  return !SUCCEEDED (theD3D->GetDeviceCaps (D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, &aCaps))
+      || !(aCaps.DevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT)
+       ? D3DCREATE_SOFTWARE_VERTEXPROCESSING
+       : D3DCREATE_HARDWARE_VERTEXPROCESSING;
+}
+
+//! Encapsulates state of Direct3D renderer.
+class D3DRender
+{
+public:
+
+  D3DRender (int theSizeX = 512,
+             int theSizeY = 512)
+  : D3D (NULL),
+    D3DEx (NULL),
+    D3DDevice (NULL),
+    D3DDeviceEx (NULL),
+    D3DColorSurf (NULL),
+    D3DColorSurfShare (NULL),
+    FuncCreate9Ex (NULL),
+    WinSizeX (theSizeX),
+    WinSizeY (theSizeY)
+  {
+    CheckRegisterClass();
+    WinHandle = CreateWindowW (L"D3D", L"D3D",
+                               WS_OVERLAPPEDWINDOW, 0, 0, 1, 1,
+                               NULL, NULL, THE_WNDCLASS_D3D.hInstance, NULL);
+    Init();
+  }
+
+  ~D3DRender()
+  {
+    // do not release class instance shared between all renderers
+    //UnregisterClass (NULL, THE_WNDCLASS_D3D.hInstance);
+    if (D3DDevice != NULL)
+    {
+      D3DDevice->Release();
+    }
+    if (D3DDeviceEx != NULL)
+    {
+      D3DDeviceEx->Release();
+    }
+    if (D3D != NULL)
+    {
+      D3D->Release();
+    }
+    if (D3DEx != NULL)
+    {
+      D3DEx->Release();
+    }
+    if (D3DColorSurf != NULL)
+    {
+      D3DColorSurf->Release();
+      D3DColorSurfShare = NULL;
+    }
+  }
+
+  //! Creates Direct3D render target.
+  bool CreateRenderTarget()
+  {
+    if (!SetWindowPos (WinHandle, 0, 0, 0, WinSizeX, WinSizeY, 0))
+    {
+      return false;
+    }
+
+    if (D3DColorSurf != NULL)
+    {
+      D3DColorSurf->Release();
+      D3DColorSurfShare = NULL;
+    }
+
+    // Note: Render target surface should be lockable on
+    // Windows XP and non-lockable on Windows Vista or higher
+    if (FAILED (D3DDevice->CreateRenderTarget (WinSizeX, WinSizeY,
+                                               D3DFMT_X8R8G8B8, D3DMULTISAMPLE_NONE, 0, FuncCreate9Ex != NULL,
+                                               &D3DColorSurf, FuncCreate9Ex == NULL ? NULL : &D3DColorSurfShare)))
+    {
+      return false;
+    }
+
+    D3DDevice->SetRenderTarget (0, D3DColorSurf);
+    return true;
+  }
+
+private:
+
+  void Init()
+  {
+    // Vista requires the D3D "Ex" functions for optimal performance.
+    // The Ex functions are only supported with WDDM drivers, so they will not be available on XP.
+    HMODULE aD3D9 = GetModuleHandleW (L"d3d9");
+    FuncCreate9Ex = (DIRECT3DCREATE9EX )GetProcAddress (aD3D9, "Direct3DCreate9Ex");
+    
+    // Set up the structure used to create the D3DDevice
+    D3DPRESENT_PARAMETERS aParams;
+    ZeroMemory (&aParams, sizeof(aParams));
+    aParams.Windowed         = TRUE;
+    aParams.BackBufferHeight = 1;
+    aParams.BackBufferWidth  = 1;
+    aParams.SwapEffect       = D3DSWAPEFFECT_DISCARD;
+    aParams.BackBufferFormat = D3DFMT_X8R8G8B8;
+    (FuncCreate9Ex != NULL) ? InitializeD3DEx (aParams) : InitializeD3D (aParams);
+  }
+  
+  bool InitializeD3D (D3DPRESENT_PARAMETERS theParams)
+  {
+    D3D = Direct3DCreate9 (D3D_SDK_VERSION);
+    if (D3D == NULL)
+      return false;
+
+    DWORD aVertProcessCaps = GetVertexProcessingCaps (D3D);
+    HRESULT aResult = D3D->CreateDevice (D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, WinHandle,
+                                         aVertProcessCaps | D3DCREATE_MULTITHREADED | D3DCREATE_FPU_PRESERVE,
+                                         &theParams, &D3DDevice);
+    return SUCCEEDED (aResult);
+  }
+  
+  bool InitializeD3DEx (D3DPRESENT_PARAMETERS theParams)
+  {
+    if (FAILED (FuncCreate9Ex (D3D_SDK_VERSION, &D3DEx))
+     || FAILED (D3DEx->QueryInterface (__uuidof (IDirect3D9), reinterpret_cast<void**> (&D3D))))
+    {
+      return false;
+    }
+
+    DWORD aVertProcessCaps = GetVertexProcessingCaps (D3D);
+    if (FAILED (D3DEx->CreateDeviceEx (D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, WinHandle,
+                                       aVertProcessCaps | D3DCREATE_MULTITHREADED | D3DCREATE_FPU_PRESERVE,
+                                       &theParams, NULL, &D3DDeviceEx)))
+      return false;
+
+    return SUCCEEDED (D3DDeviceEx->QueryInterface (__uuidof (IDirect3DDevice9), reinterpret_cast<void**> (&D3DDevice)));
+  }
+
+  static void CheckRegisterClass()
+  {
+    static bool isRegistered = false;
+    if (!isRegistered)
+    {
+      RegisterClassExW (&THE_WNDCLASS_D3D);
+      isRegistered = true;
+    }
+  }
+
+public:
+
+  LPDIRECT3D9         D3D;
+  LPDIRECT3D9EX       D3DEx;
+  LPDIRECT3DDEVICE9   D3DDevice;
+  LPDIRECT3DDEVICE9EX D3DDeviceEx;
+
+  LPDIRECT3DSURFACE9  D3DColorSurf;
+  HANDLE              D3DColorSurfShare;
+
+  DIRECT3DCREATE9EX   FuncCreate9Ex;
+
+  HWND                WinHandle;
+  INT                 WinSizeX;
+  INT                 WinSizeY;
+
+};
+
+public ref struct WndSize
+{
+public:
+
+  WndSize(int theSizeX, int theSizeY)
+  {
+    mySize = new SIZE();
+    mySize->cx = theSizeX;
+    mySize->cy = theSizeY;
+  }
+
+  ~WndSize()
+  {
+    delete mySize;
+  }
+
+  property int cx
+  {
+    int get() { return mySize->cx; }
+  }
+
+  property int cy
+  {
+    int get() { return mySize->cy; }
+  }
+
+  LPSIZE GetPointer()
+  {
+    return mySize;
+  }
+
+private:
+
+  LPSIZE mySize;
+};
+
+public ref class Direct3DProxy
+{
+public :
+
+  Direct3DProxy()
+  {
+    //
+  }
+
+  // =======================================================================
+  // function : InitializeScene
+  // purpose  :
+  // =======================================================================
+  static System::IntPtr InitRender ([Out] System::IntPtr% theWinHandle,
+                                    [Out] System::IntPtr% theD3DDevice)
+  {
+    D3DRender* aRender = new D3DRender();
+    theWinHandle = System::IntPtr(aRender->WinHandle);
+    theD3DDevice = System::IntPtr(aRender->D3DDevice);
+
+    return System::IntPtr(aRender);
+  }
+
+  // =======================================================================
+  // function : ResizeWindow
+  // purpose  :
+  // =======================================================================
+  static void ResizeWindow ([In]  System::IntPtr% theRender,
+                            [In]  WndSize^%       theWndSize,
+                            [Out] System::IntPtr% theColorSurf,
+                            [Out] System::IntPtr% theColorSurfShare)
+  {
+    D3DRender* aRender = reinterpret_cast<D3DRender*> (theRender.ToPointer());
+    LPSIZE aSize = theWndSize->GetPointer();
+    aRender->WinSizeX = aSize->cx;
+    aRender->WinSizeY = aSize->cy;
+    aRender->CreateRenderTarget();
+
+    theColorSurf      = System::IntPtr(aRender->D3DColorSurf);
+    theColorSurfShare = System::IntPtr(aRender->D3DColorSurfShare);
+  }
+
+  // =======================================================================
+  // function : ReleaseRender
+  // purpose  :
+  // =======================================================================
+  static void ReleaseRender ([In] System::IntPtr% theRender)
+  {
+    D3DRender* aRender = reinterpret_cast<D3DRender*> (theRender.ToPointer());
+    delete aRender;
+  }
+};
\ No newline at end of file
diff --git a/samples/CSharp/OCCTProxy_D3D/OCCTProxyD3D.cpp b/samples/CSharp/OCCTProxy_D3D/OCCTProxyD3D.cpp
new file mode 100644 (file)
index 0000000..98da86e
--- /dev/null
@@ -0,0 +1,1109 @@
+#include "BridgeFBO.hxx"
+
+// include required OCCT headers
+#include <Standard_Version.hxx>
+#include <Message_ProgressIndicator.hxx>
+//for OCC graphic
+#include <Aspect_DisplayConnection.hxx>
+#include <WNT_Window.hxx>
+#include <Graphic3d_CView.hxx>
+#include <Graphic3d_Camera.hxx>
+#include <Graphic3d_TextureParams.hxx>
+#include <OpenGl_GraphicDriver.hxx>
+#include <OpenGl_CView.hxx>
+//for object display
+#include <V3d_Viewer.hxx>
+#include <V3d_View.hxx>
+#include <Visual3d_View.hxx>
+#include <AIS_InteractiveContext.hxx>
+#include <AIS_Shape.hxx>
+//topology
+#include <TopoDS_Shape.hxx>
+#include <TopoDS_Compound.hxx>
+//brep tools
+#include <BRep_Builder.hxx>
+#include <BRepTools.hxx>
+#include <MgtBRep.hxx>
+#include <PTColStd_PersistentTransientMap.hxx>
+//csfdb I/E
+#include <FSD_File.hxx>
+#include <ShapeSchema.hxx>
+#include <Storage_Data.hxx>
+#include <Storage_HSeqOfRoot.hxx>
+#include <Storage_Root.hxx>
+// iges I/E
+#include <IGESControl_Reader.hxx>
+#include <IGESControl_Controller.hxx>
+#include <IGESControl_Writer.hxx>
+#include <IFSelect_ReturnStatus.hxx>
+#include <Interface_Static.hxx>
+//step I/E
+#include <STEPControl_Reader.hxx>
+#include <STEPControl_Writer.hxx>
+//for stl export
+#include <StlAPI_Writer.hxx>
+//for vrml export
+#include <VrmlAPI_Writer.hxx>
+//wrapper of pure C++ classes to ref classes
+#include <NCollection_Haft.h>
+
+// list of required OCCT libraries
+#pragma comment(lib, "TKernel.lib")
+#pragma comment(lib, "TKMath.lib")
+#pragma comment(lib, "TKBRep.lib")
+#pragma comment(lib, "PTKernel.lib")
+#pragma comment(lib, "TKPShape.lib")
+#pragma comment(lib, "TKShapeSchema.lib")
+#pragma comment(lib, "TKXSBase.lib")
+#pragma comment(lib, "TKService.lib")
+#pragma comment(lib, "TKV3d.lib")
+#pragma comment(lib, "TKOpenGl.lib")
+#pragma comment(lib, "TKIGES.lib")
+#pragma comment(lib, "TKSTEP.lib")
+#pragma comment(lib, "TKStl.lib")
+#pragma comment(lib, "TKVrml.lib")
+
+/// <summary>
+/// Proxy class encapsulating calls to OCCT C++ classes within
+/// C++/CLI class visible from .Net (CSharp)
+/// </summary>
+public ref class OCCTProxyD3D
+{
+public:
+
+  OCCTProxyD3D() : myBridgeFBO (NULL)
+  {
+    //
+  }
+
+  // ============================================
+  // Viewer functionality
+  // ============================================
+
+  /// <summary>
+  ///Initialize a viewer
+  /// </summary>
+  /// <param name="theWnd">System.IntPtr that contains the window handle (HWND) of the control</param>
+  bool InitViewer (System::IntPtr theWnd)
+  {
+    myGraphicDriver() = new OpenGl_GraphicDriver (Handle(Aspect_DisplayConnection)());
+    //myGraphicDriver()->ChangeOptions().contextDebug = true;
+
+    TCollection_ExtendedString a3DName ("Visu3D");
+    myViewer() = new V3d_Viewer (myGraphicDriver(), a3DName.ToExtString(), "", 1000.0,
+                                 V3d_XposYnegZpos, Quantity_NOC_GRAY30,
+                                 V3d_ZBUFFER, V3d_GOURAUD, V3d_WAIT,
+                                 Standard_True, Standard_False);
+
+    myViewer()->SetDefaultLights();
+    myViewer()->SetLightOn();
+    myView() = myViewer()->CreateView();
+    Handle(WNT_Window) aWNTWindow = new WNT_Window (reinterpret_cast<HWND> (theWnd.ToPointer()));
+    myView()->SetWindow(aWNTWindow);
+    if (!aWNTWindow->IsMapped())
+    {
+      aWNTWindow->Map();
+    }
+    myAISContext() = new AIS_InteractiveContext (myViewer());
+    myAISContext()->UpdateCurrentViewer();
+    myView()->MustBeResized();
+    return true;
+  }
+
+  /// <summary> Initializes OCCT viewer for OpenGL-Direct3D interoperability. </summary>
+  bool InitViewer (System::IntPtr theHWND,
+                   System::IntPtr theD3DDevice)
+  {
+    if (!InitViewer (theHWND))
+    {
+      return false;
+    }
+
+    Graphic3d_CView*       aCView     = reinterpret_cast<Graphic3d_CView*> (myView()->View()->CView());
+    OpenGl_CView*          aCViewGl   = reinterpret_cast<OpenGl_CView*>    (aCView->ptrView);
+    Handle(OpenGl_Context) aGlContext = aCViewGl->WS->GetGlContext();
+    if (aGlContext.IsNull())
+    {
+      return false;
+    }
+    if (!aGlContext->IsCurrent())
+    {
+      aGlContext->MakeCurrent();
+    }
+
+    myBridgeFBO = new BridgeFBO();
+    if (!myBridgeFBO->Init (aGlContext, theD3DDevice.ToPointer()))
+    {
+      return false;
+    }
+
+    aCView->ptrFBO = myBridgeFBO;
+    return true;
+  }
+
+  /// <summary> Resizes custom FBO for Direct3D output. </summary>
+  bool ResizeBridgeFBO (int theWinSizeX,
+                        int theWinSizeY,
+                        System::IntPtr theColorSurf,
+                        System::IntPtr theColorSurfShare)
+  {
+    if (myBridgeFBO == NULL)
+    {
+      return false;
+    }
+
+    OpenGl_CView* aCView = reinterpret_cast<OpenGl_CView*> (reinterpret_cast<Graphic3d_CView*> (myView()->View()->CView())->ptrView);
+    Handle(OpenGl_Context) aGlContext = aCView->WS->GetGlContext();
+    if (aGlContext.IsNull()
+    || !aGlContext->MakeCurrent())
+    {
+      return false;
+    }
+
+    myBridgeFBO->Resize (aGlContext, theWinSizeX, theWinSizeY);
+    if (!myBridgeFBO->RegisterD3DColorBuffer (aGlContext, theColorSurf.ToPointer(), theColorSurfShare.ToPointer()))
+    {
+      return false;
+    }
+
+    myView()->Camera()->SetAspect (Standard_Real (theWinSizeX) / Standard_Real (theWinSizeY));
+    return true;
+  }
+
+  /// <summary>
+  /// Make dump of current view to file
+  /// </summary>
+  /// <param name="theFileName">Name of dump file</param>
+  bool Dump (const char* theFileName)
+  {
+    if (myView().IsNull())
+    {
+      return false;
+    }
+    myView()->Redraw();
+    return myView()->Dump (theFileName) != Standard_False;
+  }
+
+  /// <summary>
+  ///Redraw view
+  /// </summary>
+  void RedrawView()
+  {
+    if (!myView().IsNull())
+    {
+      myView()->Redraw();
+    }
+  }
+
+  /// <summary>
+  ///Update view
+  /// </summary>
+  void UpdateView(void)
+  {
+    if (!myView().IsNull())
+    {
+      myView()->MustBeResized();
+    }
+  }
+
+  /// <summary>
+  ///Set computed mode in false
+  /// </summary>
+  void SetDegenerateModeOn()
+  {
+    if (!myView().IsNull())
+    {
+      myView()->SetComputedMode (Standard_False);
+    }
+  }
+
+  /// <summary>
+  ///Set computed mode in true
+  /// </summary>
+  void SetDegenerateModeOff()
+  {
+    if (!myView().IsNull())
+    {
+      myView()->SetComputedMode (Standard_True);
+    }
+  }
+
+  /// <summary>
+  ///Fit all
+  /// </summary>
+  void WindowFitAll (int theXmin, int theYmin,
+                     int theXmax, int theYmax)
+  {
+    if (!myView().IsNull())
+    {
+      myView()->WindowFitAll (theXmin, theYmin, theXmax, theYmax);
+    }
+  }
+
+  /// <summary>
+  ///Current place of window
+  /// </summary>
+  /// <param name="theZoomFactor">Current zoom</param>
+  void Place (int theX, int theY, float theZoomFactor)
+  {    
+    Quantity_Factor aZoomFactor = theZoomFactor;
+    if (!myView().IsNull())
+    {
+      myView()->Place (theX, theY, aZoomFactor);
+    }
+  }
+
+  /// <summary>
+  ///Set Zoom
+  /// </summary>
+  void Zoom (int theX1, int theY1, int theX2, int theY2)
+  {
+    if (!myView().IsNull())
+    {
+      myView()->Zoom (theX1, theY1, theX2, theY2);
+    }
+  }
+
+  /// <summary>
+  ///Set Pan
+  /// </summary>
+  void Pan (int theX, int theY)
+  {
+    if (!myView().IsNull())
+    {
+      myView()->Pan (theX, theY);
+    }
+  }
+
+  /// <summary>
+  ///Rotation
+  /// </summary>
+  void Rotation (int theX, int theY)
+  {
+    if (!myView().IsNull())
+    {
+      myView()->Rotation (theX, theY);
+    }
+  }
+
+  /// <summary>
+  ///Start rotation
+  /// </summary>
+  void StartRotation (int theX, int theY)
+  {
+    if (!myView().IsNull())
+    {
+      myView()->StartRotation (theX, theY);
+    }
+  }
+
+  /// <summary>
+  ///Select by rectangle
+  /// </summary>
+  void Select (int theX1, int theY1, int theX2, int theY2)
+  {
+    if (!myAISContext().IsNull())
+    {
+      myAISContext()->Select (theX1, theY1, theX2, theY2, myView());
+    }
+  }
+
+  /// <summary>
+  ///Select by click
+  /// </summary>
+  void Select()
+  {
+    if (!myAISContext().IsNull())
+    {
+      myAISContext()->Select();
+    }
+  }
+
+  /// <summary>
+  ///Move view
+  /// </summary>
+  void MoveTo (int theX, int theY)
+  {
+    if (!myAISContext().IsNull() && !myView().IsNull())
+    {
+      myAISContext()->MoveTo (theX, theY, myView());
+    }
+  }
+
+  /// <summary>
+  ///Select by rectangle with pressed "Shift" key
+  /// </summary>
+  void ShiftSelect (int theX1, int theY1, int theX2, int theY2)
+  {
+    if (!myAISContext().IsNull() && !myView().IsNull())
+    {
+      myAISContext()->ShiftSelect (theX1, theY1, theX2, theY2, myView());
+    }
+  }
+
+  /// <summary>
+  ///Select by "Shift" key
+  /// </summary>
+  void ShiftSelect()
+  {
+    if (!myAISContext().IsNull())
+    {
+      myAISContext()->ShiftSelect();
+    }
+  }
+
+  /// <summary>
+  ///Set background color
+  /// </summary>
+  void BackgroundColor (int& theRed, int& theGreen, int& theBlue)
+  {
+    if (!myView().IsNull())
+    {
+      Quantity_Color aColor = myView()->BackgroundColor();
+      theRed   = (int )aColor.Red()   * 255;
+      theGreen = (int )aColor.Green() * 255;
+      theBlue  = (int )aColor.Blue()  * 255;
+    }
+  }
+
+  /// <summary>
+  ///Get background color Red
+  /// </summary>
+  int GetBGColR()
+  {
+    int anRgb[3];
+    BackgroundColor (anRgb[0], anRgb[1], anRgb[2]);
+    return anRgb[0];
+  }
+
+  /// <summary>
+  ///Get background color Green
+  /// </summary>
+  int GetBGColG()
+  {
+    int anRgb[3];
+    BackgroundColor (anRgb[0], anRgb[1], anRgb[2]);
+    return anRgb[1];
+  }
+
+  /// <summary>
+  ///Get background color Blue
+  /// </summary>
+  int GetBGColB()
+  {
+    int anRgb[3];
+    BackgroundColor (anRgb[0], anRgb[1], anRgb[2]);
+    return anRgb[2];
+  }
+
+  /// <summary>
+  ///Update current viewer
+  /// </summary>
+  void UpdateCurrentViewer()
+  {
+    if (!myAISContext().IsNull())
+    {
+      myAISContext()->UpdateCurrentViewer();
+    }
+  }
+
+  /// <summary>
+  ///Front side
+  /// </summary>
+  void FrontView()
+  {
+    if (!myView().IsNull())
+    {
+      myView()->SetProj (V3d_Xpos);
+    }
+  }
+
+  /// <summary>
+  ///Top side
+  /// </summary>
+  void TopView()
+  {
+    if (!myView().IsNull())
+    {
+      myView()->SetProj (V3d_Zpos);
+    }
+  }
+
+  /// <summary>
+  ///Left side
+  /// </summary>
+  void LeftView()
+  {
+    if (!myView().IsNull())
+    {
+      myView()->SetProj (V3d_Ypos);
+    }
+  }
+
+  /// <summary>
+  ///Back side
+  /// </summary>
+  void BackView()
+  {
+    if (!myView().IsNull())
+    {
+      myView()->SetProj (V3d_Xneg);
+    }
+  }
+
+  /// <summary>
+  ///Right side
+  /// </summary>
+  void RightView()
+  {
+    if (!myView().IsNull())
+    {
+      myView()->SetProj (V3d_Yneg);
+    }
+  }
+
+  /// <summary>
+  ///Bottom side
+  /// </summary>
+  void BottomView()
+  {
+    if (!myView().IsNull())
+    {
+      myView()->SetProj (V3d_Zneg);
+    }
+  }
+
+  /// <summary>
+  ///Axo side
+  /// </summary>
+  void AxoView()
+  {
+    if (!myView().IsNull())
+    {
+      myView()->SetProj (V3d_XposYnegZpos);
+    }
+  }
+
+  /// <summary>
+  ///Scale
+  /// </summary>
+  float Scale()
+  {
+    return myView().IsNull()
+         ? -1.0f
+         : float(myView()->Scale());
+  }
+
+  /// <summary>
+  ///Zoom in all view
+  /// </summary>
+  void ZoomAllView()
+  {
+    if (!myView().IsNull())
+    {
+      myView()->FitAll();
+      myView()->ZFitAll();
+    }
+  }
+
+  /// <summary>
+  ///Reset view
+  /// </summary>
+  void Reset()
+  {
+    if (!myView().IsNull())
+    {
+      myView()->Reset();
+    }
+  }
+
+  /// <summary>
+  ///Set display mode of objects
+  /// </summary>
+  /// <param name="theMode">Set current mode</param>
+  void SetDisplayMode (int theMode)
+  {
+    if (myAISContext().IsNull())
+    {
+      return;
+    }
+
+    AIS_DisplayMode aCurrentMode = theMode == 0
+                                 ? AIS_WireFrame
+                                 : AIS_Shaded;
+    if (myAISContext()->NbCurrents() == 0
+     || myAISContext()->NbSelected() == 0)
+    {
+       myAISContext()->SetDisplayMode (aCurrentMode);
+    }
+    else
+    {
+       for (myAISContext()->InitCurrent(); myAISContext()->MoreCurrent(); myAISContext()->NextCurrent())
+       {
+         myAISContext()->SetDisplayMode (myAISContext()->Current(), theMode, Standard_False);
+       }
+    }
+    myAISContext()->UpdateCurrentViewer();
+  }
+
+  /// <summary>
+  ///Set color
+  /// </summary>
+  void SetColor (int theR, int theG, int theB)
+  {
+    if (myAISContext().IsNull())
+    {
+      return;
+    }
+
+    Quantity_Color aCol (theR / 255.0, theG / 255.0, theB / 255.0, Quantity_TOC_RGB);
+    for (; myAISContext()->MoreCurrent(); myAISContext()->NextCurrent())
+    {
+      myAISContext()->SetColor (myAISContext()->Current(), aCol.Name());
+    }
+  }
+
+  /// <summary>
+  ///Get object color red
+  /// </summary>
+  int GetObjColR()
+  {
+    int anRgb[3];
+    ObjectColor (anRgb[0], anRgb[1], anRgb[2]);
+    return anRgb[0];
+  }
+
+  /// <summary>
+  ///Get object color green
+  /// </summary>
+  int GetObjColG()
+  {
+    int anRgb[3];
+    ObjectColor (anRgb[0], anRgb[1], anRgb[2]);
+    return anRgb[1];
+  }
+
+  /// <summary>
+  ///Get object color blue
+  /// </summary>
+  int GetObjColB()
+  {
+    int anRgb[3];
+    ObjectColor (anRgb[0], anRgb[1], anRgb[2]);
+    return anRgb[2];
+  }
+
+  /// <summary>
+  ///Get object color R/G/B
+  /// </summary>
+  void ObjectColor (int& theRed, int& theGreen, int& theBlue)
+  {
+    if (myAISContext().IsNull())
+    {
+      return;
+    }
+
+    theRed   = 255;
+    theGreen = 255;
+    theBlue  = 255;
+    myAISContext()->InitCurrent();
+    if (!myAISContext()->MoreCurrent())
+    {
+      return;
+    }
+
+    Handle(AIS_InteractiveObject) aCurrent = myAISContext()->Current();
+    if (aCurrent->HasColor())
+    {
+      Quantity_Color anObjCol = myAISContext()->Color (myAISContext()->Current());
+      theRed   = int(anObjCol.Red()   * 255.0);
+      theGreen = int(anObjCol.Green() * 255.0);
+      theBlue  = int(anObjCol.Blue()  * 255.0);
+    }
+  }
+
+  /// <summary>
+  ///Set background color R/G/B
+  /// </summary>
+  void SetBackgroundColor (int theRed, int theGreen, int theBlue)
+  {
+    if (!myView().IsNull())
+    {
+      myView()->SetBackgroundColor (Quantity_TOC_RGB, theRed / 255.0, theGreen / 255.0, theBlue / 255.0);
+    }
+  }
+
+  /// <summary>
+  ///Erase objects
+  /// </summary>
+  void EraseObjects()
+  {
+    if (myAISContext().IsNull())
+    {
+      return;
+    }
+    for(myAISContext()->InitCurrent(); myAISContext()->MoreCurrent(); myAISContext()->NextCurrent())
+    {
+      myAISContext()->Erase (myAISContext()->Current(), Standard_True);
+    }
+    myAISContext()->ClearCurrents();
+  }
+
+  /// <summary>
+  ///Get version
+  /// </summary>
+  float GetOCCVersion()
+  {
+    return (float )OCC_VERSION;
+  }
+
+  /// <summary>
+  ///set material
+  /// </summary>
+  void SetMaterial (int theMaterial)
+  {
+    if (myAISContext().IsNull())
+    {
+      return;
+    }
+    for (myAISContext()->InitCurrent(); myAISContext()->MoreCurrent(); myAISContext()->NextCurrent())
+    {
+      myAISContext()->SetMaterial (myAISContext()->Current(), (Graphic3d_NameOfMaterial )theMaterial);
+    }
+    myAISContext()->UpdateCurrentViewer();
+  }
+
+  /// <summary>
+  ///set transparency
+  /// </summary>
+  void SetTransparency (int theTrans)
+  {
+    if (myAISContext().IsNull())
+    {
+      return;
+    }
+    for (myAISContext()->InitCurrent(); myAISContext()->MoreCurrent(); myAISContext()->NextSelected())
+    {
+      myAISContext()->SetTransparency (myAISContext()->Current(), ((Standard_Real )theTrans) / 10.0);
+    }
+  }
+
+  /// <summary>
+  ///Return true if object is selected
+  /// </summary>
+  bool IsObjectSelected()
+  {
+    if (myAISContext().IsNull())
+    {
+      return false;
+    }
+    myAISContext()->InitCurrent();
+    return myAISContext()->MoreCurrent() != Standard_False;
+  }
+
+  /// <summary>
+  ///Return display mode
+  /// </summary>
+  int DisplayMode()
+  {
+    if (myAISContext().IsNull())
+    {
+      return -1;
+    }
+
+    bool isOneOrMoreInShading   = false;
+    bool isOneOrMoreInWireframe = false;
+    for (myAISContext()->InitCurrent(); myAISContext()->MoreCurrent(); myAISContext()->NextCurrent())
+    {
+      if (myAISContext()->IsDisplayed (myAISContext()->Current(), AIS_Shaded))
+      {
+        isOneOrMoreInShading = true;
+      }
+      if (myAISContext()->IsDisplayed (myAISContext()->Current(), AIS_WireFrame))
+      {
+        isOneOrMoreInWireframe = true;
+      }
+    }
+    if (isOneOrMoreInShading
+     && isOneOrMoreInWireframe)
+    {
+      return 10;
+    }
+    else if (isOneOrMoreInShading)
+    {
+      return 1;
+    }
+    else if (isOneOrMoreInWireframe)
+    {
+      return 0;
+    }
+    return -1;
+  }
+
+  /// <summary>
+  ///Create new view
+  /// </summary>
+  /// <param name="theWnd">System.IntPtr that contains the window handle (HWND) of the control</param>
+  void CreateNewView (System::IntPtr theWnd)
+  {
+    if (myAISContext().IsNull())
+    {
+      return;
+    }
+
+    myView() = myAISContext()->CurrentViewer()->CreateView();
+    if (myGraphicDriver().IsNull())
+    {
+      myGraphicDriver() = new OpenGl_GraphicDriver (Handle(Aspect_DisplayConnection)());
+      //myGraphicDriver()->ChangeOptions().contextDebug = true;
+    }
+    Handle(WNT_Window) aWNTWindow = new WNT_Window (reinterpret_cast<HWND> (theWnd.ToPointer()));
+    myView()->SetWindow (aWNTWindow);
+    Standard_Integer aWidth = 100, aHeight = 100;
+    aWNTWindow->Size (aWidth, aHeight);
+    if (!aWNTWindow->IsMapped())
+    {
+      aWNTWindow->Map();
+    }
+  }
+
+  /// <summary>
+  ///Set AISContext
+  /// </summary>
+  bool SetAISContext (OCCTProxyD3D^ theViewer)
+  {
+     this->myAISContext() = theViewer->GetContext();
+     if (myAISContext().IsNull())
+     {
+       return false;
+     }
+    return true;
+  }
+
+  /// <summary>
+  ///Get AISContext
+  /// </summary>
+  Handle_AIS_InteractiveContext GetContext()
+  {
+    return myAISContext();
+  }
+
+public:
+  // ============================================
+  // Import / export functionality
+  // ============================================
+
+  /// <summary>
+  ///Import BRep file
+  /// </summary>
+  /// <param name="theFileName">Name of import file</param>
+  bool ImportBrep (System::String^ theFileName)
+  {
+    bool  isResult  = false;
+    int   aLength   = theFileName->Length;
+    char* aFilename = new char[aLength + 1];
+    for(int i = 0; i < aLength; ++i)
+    {
+      aFilename[i] = (char )theFileName->ToCharArray()[i];
+    }
+    aFilename[aLength] = '\0';
+    isResult = ImportBrep (aFilename);
+    delete[] aFilename;
+    return isResult;
+  }
+
+  /// <summary>
+  ///Import BRep file
+  /// </summary>
+  /// <param name="theFileName">Name of import file</param>
+  bool ImportBrep (char* theFileName)
+  {
+    TopoDS_Shape aShape;
+    BRep_Builder aBuilder;
+    if (!BRepTools::Read (aShape, theFileName, aBuilder))
+    {
+      return false;
+    }
+    if (myAISContext()->HasOpenedContext())
+    {
+      myAISContext()->CloseLocalContext();
+    }
+    Handle(AIS_Shape) aPrs = new AIS_Shape (aShape);
+    myAISContext()->SetMaterial   (aPrs, Graphic3d_NOM_GOLD);
+    myAISContext()->SetDisplayMode(aPrs, AIS_Shaded, Standard_False);
+    myAISContext()->Display (aPrs);
+    return true;
+  }
+
+  /// <summary>
+  ///Import Csfdb file
+  /// </summary>
+  /// <param name="theFileName">Name of import file</param>
+  bool ImportCsfdb (char* theFileName)
+  {
+    TCollection_AsciiString aName (theFileName);
+    if (FSD_File::IsGoodFileType (aName) != Storage_VSOk)
+    {
+      return false;
+    }
+
+    FSD_File aFileDriver;
+    if (aFileDriver.Open (aName, Storage_VSRead) != Storage_VSOk)
+    {
+      return false;
+    }
+
+    Handle(ShapeSchema)  aSchema = new ShapeSchema();
+    Handle(Storage_Data) aData   = aSchema->Read (aFileDriver);
+    if (aData->ErrorStatus() != Storage_VSOk)
+    {
+      return false;
+    }
+    aFileDriver.Close();
+
+    Handle(Storage_HSeqOfRoot) aRoots = aData->Roots();
+    for (Standard_Integer aRootIter = 1; aRootIter <= aRoots->Length(); ++aRootIter)
+    {
+      Handle(Storage_Root)        aStorRoot        = aRoots->Value (aRootIter);
+      Handle(Standard_Persistent) aStandPersistent = aStorRoot->Object();
+      Handle(PTopoDS_HShape)      aPShape          = Handle(PTopoDS_HShape)::DownCast (aStandPersistent);
+      if (!aPShape.IsNull())
+      {
+        PTColStd_PersistentTransientMap aMap;
+        TopoDS_Shape aTShape;
+        MgtBRep::Translate (aPShape, aMap, aTShape, MgtBRep_WithTriangle);
+        myAISContext()->Display (new AIS_Shape (aTShape), Standard_True);
+      }
+    }
+
+    return true;
+  }
+
+  /// <summary>
+  ///Import Step file
+  /// </summary>
+  /// <param name="theFileName">Name of import file</param>
+  bool ImportStep (char* theFileName)
+  {
+    STEPControl_Reader aReader;
+    if (aReader.ReadFile (theFileName) != IFSelect_RetDone)
+    {
+      return false;
+    }
+
+    bool isFailsonly = false;
+    aReader.PrintCheckLoad( isFailsonly, IFSelect_ItemsByEntity );
+
+    int aNbRoot = aReader.NbRootsForTransfer();
+    aReader.PrintCheckTransfer (isFailsonly, IFSelect_ItemsByEntity);
+    for (Standard_Integer aRootIter = 1; aRootIter <= aNbRoot; ++aRootIter)
+    {
+      aReader.TransferRoot (aRootIter);
+      int aNbShap = aReader.NbShapes();
+      if (aNbShap > 0)
+      {
+        for (int aShapeIter = 1; aShapeIter <= aNbShap; ++aShapeIter)
+        {
+          myAISContext()->Display (new AIS_Shape (aReader.Shape (aShapeIter)), Standard_True);
+        }
+      }
+    }
+    return true;
+  }
+
+  /// <summary>
+  ///Import Iges file
+  /// </summary>
+  /// <param name="theFileName">Name of import file</param>
+  bool ImportIges (char* theFileName)
+  {
+    IGESControl_Reader aReader;
+    if (aReader.ReadFile (theFileName) != IFSelect_RetDone)
+    {
+      return false;
+    }
+
+    aReader.TransferRoots();
+    TopoDS_Shape aShape = aReader.OneShape();
+    myAISContext()->Display (new AIS_Shape (aShape), Standard_False);
+    myAISContext()->UpdateCurrentViewer();
+    return true;
+  }
+
+  /// <summary>
+  ///Export BRep file
+  /// </summary>
+  /// <param name="theFileName">Name of export file</param>
+  bool ExportBRep (char* theFileName)
+  {
+    myAISContext()->InitCurrent();
+    if (!myAISContext()->MoreCurrent())
+    {
+      return false;
+    }
+
+    Handle(AIS_Shape) anIS = Handle(AIS_Shape)::DownCast (myAISContext()->Current());
+    return !anIS.IsNull()
+         && BRepTools::Write (anIS->Shape(), theFileName);
+  }
+
+  /// <summary>
+  ///Export Step file
+  /// </summary>
+  /// <param name="theFileName">Name of export file</param>
+  bool ExportStep (char* theFileName)
+  {
+    STEPControl_StepModelType aType = STEPControl_AsIs;
+    STEPControl_Writer        aWriter;
+    for (myAISContext()->InitCurrent(); myAISContext()->MoreCurrent(); myAISContext()->NextCurrent())
+    {
+      Handle(AIS_Shape) anIS = Handle(AIS_Shape)::DownCast (myAISContext()->Current());
+      if (anIS.IsNull())
+      {
+        return false;
+      }
+
+      TopoDS_Shape aShape = anIS->Shape();
+      if (aWriter.Transfer (aShape, aType) != IFSelect_RetDone)
+      {
+        return false;
+      }
+    }
+    return aWriter.Write (theFileName) == IFSelect_RetDone;
+  }
+
+  /// <summary>
+  ///Export Iges file
+  /// </summary>
+  /// <param name="theFileName">Name of export file</param>
+  bool ExportIges (char* theFileName)
+  {
+    IGESControl_Controller::Init();
+    IGESControl_Writer aWriter (Interface_Static::CVal ("XSTEP.iges.unit"),
+                                Interface_Static::IVal ("XSTEP.iges.writebrep.mode"));
+    for (myAISContext()->InitCurrent(); myAISContext()->MoreCurrent(); myAISContext()->NextCurrent())
+    {
+      Handle(AIS_Shape) anIS = Handle(AIS_Shape)::DownCast (myAISContext()->Current());
+      if (anIS.IsNull())
+      {
+        return false;
+      }
+
+      aWriter.AddShape (anIS->Shape());
+    }
+
+    aWriter.ComputeModel();
+    return aWriter.Write (theFileName) != Standard_False;
+  }
+
+  /// <summary>
+  ///Export Vrml file
+  /// </summary>
+  /// <param name="theFileName">Name of export file</param>
+  bool ExportVrml (char* theFileName)
+  {
+    TopoDS_Compound aRes;
+    BRep_Builder    aBuilder;
+    aBuilder.MakeCompound (aRes);
+    for (myAISContext()->InitCurrent(); myAISContext()->MoreCurrent(); myAISContext()->NextCurrent())
+    {
+      Handle(AIS_Shape) anIS = Handle(AIS_Shape)::DownCast (myAISContext()->Current());
+      if (anIS.IsNull())
+      {
+        return false;
+      }
+      aBuilder.Add (aRes, anIS->Shape());
+    }
+
+    VrmlAPI_Writer aWriter;
+    aWriter.Write (aRes, theFileName);
+    return true;
+  }
+
+  /// <summary>
+  ///Export Stl file
+  /// </summary>
+  /// <param name="theFileName">Name of export file</param>
+  bool ExportStl (char* theFileName)
+  {
+    TopoDS_Compound aComp;
+    BRep_Builder    aBuilder;
+    aBuilder.MakeCompound (aComp);
+    for (myAISContext()->InitCurrent(); myAISContext()->MoreCurrent(); myAISContext()->NextCurrent())
+    {
+      Handle(AIS_Shape) anIS = Handle(AIS_Shape)::DownCast (myAISContext()->Current());
+      if (anIS.IsNull())
+      {
+        return false;
+      }
+      aBuilder.Add (aComp, anIS->Shape());
+    }
+
+    StlAPI_Writer aWriter;
+    aWriter.Write (aComp, theFileName);
+    return true;
+  }
+
+  /// <summary>
+  ///Define which Import/Export function must be called
+  /// </summary>
+  /// <param name="theFileName">Name of Import/Export file</param>
+  /// <param name="theFormat">Determines format of Import/Export file</param>
+  /// <param name="theIsImport">Determines is Import or not</param>
+  bool TranslateModel (System::String^ theFileName, int theFormat, bool theIsImport)
+  {
+    bool  isResult  = false;
+    int   aLength   = theFileName->Length;
+    char* aFilename = new char[aLength + 1];
+    for (int aCharIter = 0; aCharIter < aLength; ++aCharIter)
+    {
+      aFilename[aCharIter] = (char)theFileName->ToCharArray()[aCharIter];
+    }
+    aFilename[aLength] = '\0';
+
+    if (theIsImport)
+    {
+      switch (theFormat)
+      {
+        case 0: isResult = ImportBrep  (aFilename); break;
+        case 1: isResult = ImportCsfdb (aFilename); break;
+        case 2: isResult = ImportStep  (aFilename); break;
+        case 3: isResult = ImportIges  (aFilename); break;
+      }
+    }
+    else 
+    {
+      switch (theFormat)
+      {
+        case 0: isResult = ExportBRep (aFilename); break;
+        case 2: isResult = ExportStep (aFilename); break;
+        case 3: isResult = ExportIges (aFilename); break;
+        case 4: isResult = ExportVrml (aFilename); break;
+        case 5: isResult = ExportStl  (aFilename); break;
+        case 6: isResult = Dump (aFilename);      break;
+      }
+    }
+    delete[] aFilename;
+    return isResult;
+  }
+
+  /// <summary>
+  ///Initialize OCCTProxyD3D
+  /// </summary>
+  void InitOCCTProxy()
+  {
+    myGraphicDriver().Nullify();
+    myViewer().Nullify();
+    myView().Nullify();
+    myAISContext().Nullify();
+  }
+
+private:
+
+  NCollection_Haft<Handle_V3d_Viewer>             myViewer;
+  NCollection_Haft<Handle_V3d_View>               myView;
+  NCollection_Haft<Handle_AIS_InteractiveContext> myAISContext;
+  NCollection_Haft<Handle_OpenGl_GraphicDriver>   myGraphicDriver;
+  BridgeFBO*                                      myBridgeFBO;     //!< Provides output to Direct3D buffers
+
+};
diff --git a/samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcproj b/samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcproj
new file mode 100644 (file)
index 0000000..db2b50a
--- /dev/null
@@ -0,0 +1,379 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="9.00"
+       Name="OCCTProxy_D3D"
+       ProjectGUID="{969912D9-78E7-4AB8-B4FF-6B52B4F03991}"
+       RootNamespace="OCCTProxy_D3D"
+       Keyword="Win32Proj"
+       TargetFrameworkVersion="131072"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+               <Platform
+                       Name="x64"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="..\win32\bind"
+                       IntermediateDirectory="obj\$(PlatformName)\$(ConfigurationName)"
+                       ConfigurationType="2"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       CharacterSet="2"
+                       ManagedExtensions="1"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="..\OCC\;$(CSF_OPT_INC);&quot;$(DXSDK_DIR)Include&quot;"
+                               PreprocessorDefinitions="WNT;_DEBUG"
+                               MinimalRebuild="false"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               OutputFile="$(OutDir)/OCCTProxy_D3D.dll"
+                               LinkIncremental="1"
+                               AdditionalLibraryDirectories="$(CSF_OPT_LIB32D)"
+                               GenerateDebugInformation="true"
+                               AssemblyDebug="1"
+                               ProgramDatabaseFile="$(OutDir)/OCCTProxy_D3D.pdb"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(OutDir)/OCCTProxy_D3D.lib"
+                               TargetMachine="1"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       OutputDirectory="..\win64\bind"
+                       IntermediateDirectory="obj\$(PlatformName)\$(ConfigurationName)"
+                       ConfigurationType="2"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       CharacterSet="2"
+                       ManagedExtensions="1"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="..\OCC\;$(CSF_OPT_INC);&quot;$(DXSDK_DIR)Include&quot;"
+                               PreprocessorDefinitions="WNT;_DEBUG"
+                               MinimalRebuild="false"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               OutputFile="$(OutDir)/OCCTProxy_D3D.dll"
+                               LinkIncremental="1"
+                               AdditionalLibraryDirectories="$(CSF_OPT_LIB64D)"
+                               GenerateDebugInformation="true"
+                               AssemblyDebug="1"
+                               ProgramDatabaseFile="$(OutDir)/OCCTProxy_D3D.pdb"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(OutDir)/OCCTProxy_D3D.lib"
+                               TargetMachine="17"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="..\win32\bin"
+                       IntermediateDirectory="obj\$(PlatformName)\$(ConfigurationName)"
+                       ConfigurationType="2"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       CharacterSet="2"
+                       ManagedExtensions="1"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalIncludeDirectories="..\OCC\;$(CSF_OPT_INC);&quot;$(DXSDK_DIR)Include&quot;"
+                               PreprocessorDefinitions="WNT"
+                               RuntimeLibrary="2"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               OutputFile="$(OutDir)/OCCTProxy_D3D.dll"
+                               LinkIncremental="1"
+                               AdditionalLibraryDirectories="$(CSF_OPT_LIB32)"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(OutDir)/OCCTProxy_D3D.lib"
+                               TargetMachine="1"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       OutputDirectory="..\win64\bin"
+                       IntermediateDirectory="obj\$(PlatformName)\$(ConfigurationName)"
+                       ConfigurationType="2"
+                       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+                       CharacterSet="2"
+                       ManagedExtensions="1"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalIncludeDirectories="..\OCC\;$(CSF_OPT_INC);&quot;$(DXSDK_DIR)Include&quot;"
+                               PreprocessorDefinitions="WNT"
+                               RuntimeLibrary="2"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               OutputFile="$(OutDir)/OCCTProxy_D3D.dll"
+                               LinkIncremental="1"
+                               AdditionalLibraryDirectories="$(CSF_OPT_LIB64)"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(OutDir)/OCCTProxy_D3D.lib"
+                               TargetMachine="17"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+                       >
+                       <File
+                               RelativePath=".\BridgeFBO.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\OCCTProxyD3D.cpp"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Header Files"
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+                       >
+                       <File
+                               RelativePath=".\BridgeFBO.hxx"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Resource Files"
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+                       >
+               </Filter>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>
diff --git a/samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcxproj b/samples/CSharp/OCCTProxy_D3D/OCCTProxy_D3D.vcxproj
new file mode 100644 (file)
index 0000000..e5176b4
--- /dev/null
@@ -0,0 +1,203 @@
+\feff<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{969912D9-78E7-4AB8-B4FF-6B52B4F03991}</ProjectGuid>
+    <RootNamespace>OCCTProxy_D3D</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>OCCTProxy_D3D</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <CLRSupport>true</CLRSupport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <CLRSupport>true</CLRSupport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <CLRSupport>true</CLRSupport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <CLRSupport>true</CLRSupport>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\win32\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">obj\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\win64\bind\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\win32\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">obj\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\win64\bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\OCC\;$(CSF_OPT_INC);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WNT;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)OCCTProxy_D3D.dll</OutputFile>
+      <AdditionalLibraryDirectories>$(CSF_OPT_LIB32D);$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AssemblyDebug>true</AssemblyDebug>
+      <ProgramDatabaseFile>$(OutDir)OCCTProxy_D3D.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(OutDir)OCCTProxy_D3D.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalDependencies>d3d9.lib;d3dx9d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\OCC\;$(CSF_OPT_INC);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WNT;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)OCCTProxy_D3D.dll</OutputFile>
+      <AdditionalLibraryDirectories>$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AssemblyDebug>true</AssemblyDebug>
+      <ProgramDatabaseFile>$(OutDir)OCCTProxy_D3D.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(OutDir)OCCTProxy_D3D.lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\OCC\;$(CSF_OPT_INC);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)OCCTProxy_D3D.dll</OutputFile>
+      <AdditionalLibraryDirectories>$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(OutDir)OCCTProxy_D3D.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\OCC\;$(CSF_OPT_INC);$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WNT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)OCCTProxy_D3D.dll</OutputFile>
+      <AdditionalLibraryDirectories>$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(OutDir)OCCTProxy_D3D.lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="BridgeFBO.cxx" />
+    <ClCompile Include="Direct3DProxy.cpp" />
+    <ClCompile Include="OCCTProxyD3D.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="BridgeFBO.hxx" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
index 97cd8d3..f5605f5 100644 (file)
@@ -1,4 +1,4 @@
-OCCT CSharp sample {#samples_csharp}
+OCCT CSharp sample {#samples_csharp_occt}
 ================== 
        
 This sample demonstrates simple way of using OCCT libraries in .Net application
@@ -14,7 +14,7 @@ The sample implements two approaches for organizing user interface with C#.
 Both applications provide the same functionality as the standard OCCT 
 Import/Export sample.
 First project is called "IE_WinForms" and uses Windows Forms for GUI.
-Second application is called "IE_WPF" and uses Windows Presentation Foundation.
+Second application is called "IE_WPF_WinForms" and uses Windows Presentation Foundation.
 
 Note a few important details:
 
@@ -39,7 +39,7 @@ Note a few important details:
   control embedding OCCT viewer.
 
 Run msvc.bat to start MS Visual Studio for building the sample.
-Note that project files are provided only for VS 2008, you can open them in
+Note that project files are provided only for VS 2010, you can open them in
 newer versions of Visual Studio using automatic converter.
 After conversion check option "Target framework" in properties of C# projects 
 (tab "Application") to ensure that it corresponds to the version set in
@@ -51,4 +51,4 @@ Note that all batch scripts use configuration defined in OCCT custom.bat file
 as default; you can provide arguments specifying VS version, bitness, and mode
 to override these settings, e.g.:
 
-> msvc.bat vc9 win64 Debug
+> msvc.bat vc10 win64 Debug
diff --git a/samples/CSharp/ReadMe_D3D.md b/samples/CSharp/ReadMe_D3D.md
new file mode 100644 (file)
index 0000000..4a1a7eb
--- /dev/null
@@ -0,0 +1,56 @@
+Direct3D CSharp sample {#samples_csharp_direct3d}
+================== 
+       
+This sample demonstrates simple way of using OCCT and DirectX libraries in .Net application
+whitten using CSharp and Windows Presentation Foundation (WPF).
+
+The connection between .Net, OCCT (C++) and DirectX level is provided by proxy libraies,
+OCCProxy and D3DProxy, written in C++/CLI. The proxy OCCProxy library contains single ref class
+encapsulating OCCT viewer and providing functionality to manipulate this viewer
+and to import / export OCCT shapes from / to several supported formats of CAD 
+files (IGES, STEP, BREP). And the proxy D3DProxy library contains helper methods for rendering 
+via DirectX.  
+
+Organizing of user interface in this sample is provided by Windows Presentation Foundation (WPF).
+And it has the same functionality as the standard OCCT Import/Export sample. The project is 
+called "IE_WPF_D3D".
+
+Note a few important details:
+
+- to build this sample you should to download and install DirectX SDK
+  http://www.microsoft.com/en-us/download/details.aspx?id=6812
+
+- to encapsulate C++ class into a field of ref class, template class 
+  NCollection_Haft provided by OCCT is used
+  
+- in order to work consistently on 64-bit systems with OCCT libraries built in 
+  32-bit mode, C# assemblies need to have platform target explicitly set to "x86"
+  (in project Properties / Build)
+  
+- this sample demonstrates indirect method of wrapping C++ to C# using manually
+  created proxy library. Alternative method is available, wrapping individual
+  OCCT classes to C# equivalents so that their full API is available to C# user
+  and the code can be programmed on C# level similarly to C++ one. See desciption
+  of OCCT C# Wrapper in Advanced Samples and Tools on OCCT web site at 
+  http://www.opencascade.org/support/products/advsamples
+
+- in WPF sample, WinForms control is used to encapsulate OCC viewer since WPF 
+  does not provide necessary interface to embed OpenGl view. Other possible
+  solution could be to render OpenGl scene in off-screen buffer and map it
+  to WPF control as image. That approach would allow using all WPF features in
+  control embedding OCCT viewer.
+
+Run msvc.bat to start MS Visual Studio for building the sample.
+Note that project files are provided only for VS 2010, you can open them in
+newer versions of Visual Studio using automatic converter.
+After conversion check option "Target framework" in properties of C# projects 
+(tab "Application") to ensure that it corresponds to the version set in
+the properties of the C++ projects (e.g. ".Net Framework 4.0" for VS 2010).
+
+Run run_wpf-D3D.bat to launch the corresponding sample.
+
+Note that all batch scripts use configuration defined in OCCT custom.bat file
+as default; you can provide arguments specifying VS version, bitness, and mode
+to override these settings, e.g.:
+
+> msvc.bat vc10 win64 Debug
similarity index 89%
copy from samples/CSharp/WPF/About.xaml
copy to samples/CSharp/WPF_D3D/About.xaml
index 59f2a05..c9f4fb2 100644 (file)
@@ -1,9 +1,9 @@
 \feff<Window
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       x:Class="IE_WPF.AboutDialog"
+       x:Class="IE_WPF_D3D.AboutDialog"
        x:Name="Window"
-       xmlns:local="clr-namespace:IE_WPF"
+       xmlns:local="clr-namespace:IE_WPF_D3D"
        Title="About Import/Export Sample"
        Width="312" Height="285">
        
similarity index 97%
copy from samples/CSharp/WPF/About.xaml.cs
copy to samples/CSharp/WPF_D3D/About.xaml.cs
index c3b0343..f39e66d 100644 (file)
@@ -10,7 +10,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace IE_WPF
+namespace IE_WPF_D3D
 {
        /// <summary>
        /// Interaction logic for About.xaml
similarity index 91%
copy from samples/CSharp/WPF/App.xaml
copy to samples/CSharp/WPF_D3D/App.xaml
index d3ba244..f1eaf2b 100644 (file)
@@ -1,4 +1,4 @@
-\feff<Application x:Class="IE_WPF.App"
+\feff<Application x:Class="IE_WPF_D3D.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     StartupUri="MainWindow.xaml">
similarity index 92%
copy from samples/CSharp/WPF/App.xaml.cs
copy to samples/CSharp/WPF_D3D/App.xaml.cs
index c2a2e28..4df5b1f 100644 (file)
@@ -5,7 +5,7 @@ using System.Data;
 using System.Linq;
 using System.Windows;
 
-namespace IE_WPF
+namespace IE_WPF_D3D
 {
     /// <summary>
     /// Interaction logic for App.xaml
diff --git a/samples/CSharp/WPF_D3D/D3DViewer.cs b/samples/CSharp/WPF_D3D/D3DViewer.cs
new file mode 100644 (file)
index 0000000..4eb2635
--- /dev/null
@@ -0,0 +1,160 @@
+\feffusing System;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Interop;
+using System.Runtime.InteropServices;
+
+namespace IE_WPF_D3D
+{
+  /// <summary>
+  /// Tool object for output OCCT rendering with Direct3D.
+  /// </summary>
+  class D3DViewer
+  {
+    /// <summary> Direct3D renderer. </summary>
+    private IntPtr myD3DRender;
+
+    /// <summary> Direct3D output image. </summary>
+    private D3DImage myD3DImage = new D3DImage ();
+
+    /// <summary> Direct3D color surface. </summary>
+    private IntPtr myColorSurf;
+
+    public OCCViewer Viewer;
+
+    /// <summary> Creates new Direct3D-based OCCT viewer. </summary>
+    public D3DViewer ()
+    {
+      myD3DImage.IsFrontBufferAvailableChanged
+        += new DependencyPropertyChangedEventHandler (OnIsFrontBufferAvailableChanged);
+
+      BeginRenderingScene ();
+    }
+
+    /// <summary> Creates new Direct3D-based OCCT viewer. </summary>
+    private void OnIsFrontBufferAvailableChanged (object sender, DependencyPropertyChangedEventArgs e)
+    {
+      // If the front buffer is available, then WPF has just created a new
+      // Direct3D device, thus we need to start rendering our custom scene
+      if (myD3DImage.IsFrontBufferAvailable)
+      {
+        BeginRenderingScene ();
+      }
+      else
+      {
+        // If the front buffer is no longer available, then WPF has lost Direct3D
+        // device, thus we need to stop rendering until the new device is created
+        StopRenderingScene ();
+      }
+    }
+
+    private bool myIsFailed = false;
+
+    /// <summary> Initializes Direct3D-OCCT rendering. </summary>
+    private void BeginRenderingScene ()
+    {
+      if (myIsFailed)
+      {
+        return;
+      }
+
+      if (myD3DImage.IsFrontBufferAvailable)
+      {
+        IntPtr aWinHandle;
+        IntPtr aD3DDevice;
+
+        // Initialize Direct3D device and render target
+        myD3DRender = Direct3DProxy.InitRender(out aWinHandle, out aD3DDevice);
+
+        Viewer = new OCCViewer();
+
+        if (!Viewer.InitInterop (aWinHandle, aD3DDevice))
+        {
+          MessageBox.Show ("Failed to initialize OpenGL-Direct3D interoperability!",
+            "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+
+          myIsFailed = true;
+
+          if (myD3DRender != IntPtr.Zero)
+              Direct3DProxy.ReleaseRender(ref myD3DRender);
+
+          return;
+        }
+
+        // Leverage the Rendering event of WPF composition
+        // target to update the our custom Direct3D scene
+        CompositionTarget.Rendering += OnRendering;
+      }
+    }
+
+    /// <summary> Initializes Direct3D-OCCT rendering. </summary>
+    public void StopRenderingScene ()
+    {
+      // This method is called when WPF loses its Direct3D device,
+      // so we should just release our custom Direct3D scene
+      CompositionTarget.Rendering -= OnRendering;
+
+      if (myD3DRender != IntPtr.Zero)
+          Direct3DProxy.ReleaseRender(ref myD3DRender);
+
+      myColorSurf = IntPtr.Zero;
+    }
+
+    /// <summary> Initializes Direct3D-OCCT rendering. </summary>
+    private void OnRendering (object sender, EventArgs e)
+    {
+      UpdateScene ();
+    }
+
+    /// <summary> Current size of rendering window. </summary>
+    private WndSize mySize = new WndSize(1, 1);
+
+    /// <summary> Initializes Direct3D-OCCT rendering. </summary>
+    private void UpdateScene ()
+    {
+      if (!myIsFailed && myD3DImage.IsFrontBufferAvailable && myColorSurf != IntPtr.Zero)
+      {
+        myD3DImage.Lock ();
+        {
+          // Update the scene (via a call into our custom library)
+          Viewer.View.RedrawView ();
+
+          // Invalidate the updated region of the D3DImage
+          myD3DImage.AddDirtyRect(new Int32Rect(0, 0, mySize.cx, mySize.cy));
+        }
+        myD3DImage.Unlock ();
+      }
+    }
+
+    /// <summary> Resizes Direct3D surfaces and OpenGL FBO. </summary>
+    public void Resize (int theSizeX, int theSizeY)
+    {
+        mySize = new WndSize(theSizeX, theSizeY);
+
+      if (!myIsFailed && myD3DImage.IsFrontBufferAvailable)
+      {
+        IntPtr aColorSurfShare;
+
+        // Initialize Direct3D device and render target
+        Direct3DProxy.ResizeWindow(ref myD3DRender, ref mySize, out myColorSurf, out aColorSurfShare);
+
+        // Set the back buffer for Direct3D WPF image
+        myD3DImage.Lock ();
+        {
+          myD3DImage.SetBackBuffer (D3DResourceType.IDirect3DSurface9, myColorSurf);
+        }
+        myD3DImage.Unlock ();
+
+        Viewer.View.ResizeBridgeFBO(mySize.cx, mySize.cy, myColorSurf, aColorSurfShare);
+      }
+    }
+
+    public D3DImage Image
+    {
+      get
+      {
+        return myD3DImage;
+      }
+    }
+  }
+}
similarity index 98%
copy from samples/CSharp/WPF/IECommands.cs
copy to samples/CSharp/WPF_D3D/IECommands.cs
index 738260e..0089a17 100644 (file)
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Input;
 
-namespace IE_WPF
+namespace IE_WPF_D3D
 {
     public class IECommands
     {
similarity index 83%
copy from samples/CSharp/WPF/IE_WPF.csproj
copy to samples/CSharp/WPF_D3D/IE_WPF_D3D.csproj
index 2aa78ad..d080875 100644 (file)
@@ -8,8 +8,8 @@
     <ProjectGuid>{D12A8897-5BF8-4345-BBB0-8ADE4B9FB9A7}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>IE_WPF</RootNamespace>
-    <AssemblyName>IE_WPF</AssemblyName>
+    <RootNamespace>IE_WPF_D3D</RootNamespace>
+    <AssemblyName>IE_WPF_D3D</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
     <TargetFrameworkProfile />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <Compile Include="About.xaml.cs">
       <DependentUpon>About.xaml</DependentUpon>
     </Compile>
+    <Compile Include="D3DViewer.cs" />
     <Compile Include="IECommands.cs" />
     <Compile Include="MaterialDlg.xaml.cs">
       <DependentUpon>MaterialDlg.xaml</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
     <Compile Include="OCCViewer.cs">
-      <SubType>Form</SubType>
     </Compile>
     <Compile Include="TransparencyDialog.cs">
       <SubType>Form</SubType>
     <Resource Include="res\occ_logo.bmp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\OCCTProxy\OCCTProxy.vcxproj">
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\OCCTProxy_D3D\OCCTProxy_D3D.vcxproj">
       <Project>{969912D9-78E7-4AB8-B4FF-6B52B4F03991}</Project>
-      <Name>OCCTProxy</Name>
+      <Name>OCCTProxy_D3D</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
similarity index 90%
copy from samples/CSharp/WPF/MainWindow.xaml
copy to samples/CSharp/WPF_D3D/MainWindow.xaml
index 5d54370..ed04816 100644 (file)
@@ -1,8 +1,8 @@
 \feff<Window
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       x:Class="IE_WPF.MainWindow"
-       xmlns:local="clr-namespace:IE_WPF"
+       x:Class="IE_WPF_D3D.MainWindow"
+       xmlns:local="clr-namespace:IE_WPF_D3D"
     Title="Sample Import/Export" Height="600" Width="900" Icon="res/MainFrame.ico">
        
        <Window.Background>
                <TabControl Name="ViewPanel" Grid.Row="2"
                     SelectionChanged="OnViewerChanged"
                     Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}, Path=IsDocumentOpen, Converter={StaticResource boolToVisibilityConverter}}">
-            
+
             <TabControl.ContextMenu>
-                <ContextMenu>
+                <ContextMenu Opened="OnContextOpened">
+                    <MenuItem Name="WireframeItem" Header="Wireframe" Click="Wireframe_Click" Style="{StaticResource popupItem}"/>
+                    <MenuItem Name="ShadingItem" Header="Shading" Click="Shading_Click" Style="{StaticResource popupItem}"/>
+                    <MenuItem Name="ColorItem" Header="Color" Click="Color_Click" Style="{StaticResource popupItem}"/>
+                    <MenuItem Name="MaterialItem" Header="Material" Click="Material_Click" Style="{StaticResource popupItem}"/>
+                    <MenuItem Name="TransparencyItem" Header="Transparency" Click="Transparency_Click" Style="{StaticResource popupItem}"/>
+                    <MenuItem Name="DeleteItem" Header="Delete" Click="Delete_Click" Style="{StaticResource popupItem}"/>
+                    <MenuItem Name="BackgroundItem" Header="Background" Click="Background_Click" Style="{StaticResource popupItem}"/>
+                    <Separator/>
                     <MenuItem Command="local:IECommands.New" Style="{StaticResource popupItem}"/>
                     <MenuItem Command="local:IECommands.Close" Style="{StaticResource popupItem}"/>
                 </ContextMenu>
             </TabControl.ContextMenu>
-            
-               </TabControl>
+
+        </TabControl>
         
         <StatusBar Background="White"  Grid.Row="3" Visibility="{Binding ElementName=ActivateStatusbar, Path=IsChecked, Converter={StaticResource boolToVisibilityConverter}}">
                <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}, Path=StatusBarText}"/>
diff --git a/samples/CSharp/WPF_D3D/MainWindow.xaml.cs b/samples/CSharp/WPF_D3D/MainWindow.xaml.cs
new file mode 100644 (file)
index 0000000..9132417
--- /dev/null
@@ -0,0 +1,695 @@
+\feffusing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.ComponentModel;
+using System.Windows.Forms.Integration;
+using System.Windows.Interop;
+using System.Runtime.InteropServices;
+
+namespace IE_WPF_D3D
+{
+  /// <summary>
+  /// Interaction logic for MainWindow.xaml
+  /// </summary>
+  public partial class MainWindow : Window, INotifyPropertyChanged
+  {
+    public event PropertyChangedEventHandler PropertyChanged;
+    protected void RaisePropertyChanged (string thePropertyName)
+    {
+      if (PropertyChanged != null)
+      {
+        PropertyChanged (this, new PropertyChangedEventArgs (thePropertyName));
+      }
+    }
+
+    public MainWindow ()
+    {
+      InitializeComponent ();
+
+      StatusBarText = String.Empty;
+      IsHlrOffPushed = false;
+      IsHlrOnPushed = true;
+      IsZoomWinEnabled = true;
+
+      #region menu operations
+
+      CommandBinding aBind_New = new CommandBinding (IECommands.New);
+      aBind_New.Executed += NewCommand_Executed;
+      CommandBindings.Add (aBind_New);
+
+      CommandBinding aBind_Close = new CommandBinding (IECommands.Close);
+      aBind_Close.Executed += CloseCommand_Executed;
+      aBind_Close.CanExecute += CloseCommand_CanExecute;
+      CommandBindings.Add (aBind_Close);
+
+      CommandBinding aBind_Quit = new CommandBinding (IECommands.Quit);
+      aBind_Quit.Executed += QuitCommand_Executed;
+      CommandBindings.Add (aBind_Quit);
+
+      CommandBinding aBind_About = new CommandBinding (IECommands.About);
+      aBind_About.Executed += AboutCommand_Executed;
+      CommandBindings.Add (aBind_About);
+
+      #endregion
+    }
+
+    private String myStatusBarText;
+    public String StatusBarText
+    {
+      get
+      {
+        return myStatusBarText;
+      }
+      private set
+      {
+        myStatusBarText = value;
+        RaisePropertyChanged ("StatusBarText");
+      }
+    }
+
+    private bool isHlrOffPushed;
+    public Boolean IsHlrOffPushed
+    {
+      get
+      {
+        return isHlrOffPushed;
+      }
+      set
+      {
+        isHlrOffPushed = value;
+        RaisePropertyChanged ("isHlrOffPushed");
+      }
+    }
+
+    private bool isHlrOnPushed;
+    public Boolean IsHlrOnPushed
+    {
+      get
+      {
+        return isHlrOnPushed;
+      }
+      set
+      {
+        isHlrOnPushed = value;
+        RaisePropertyChanged ("IsHlrOnPushed");
+      }
+    }
+
+    private bool isZoomWinEnabled;
+    public Boolean IsZoomWinEnabled
+    {
+      get
+      {
+        return isZoomWinEnabled;
+      }
+      set
+      {
+        isZoomWinEnabled = value;
+        RaisePropertyChanged ("IsZoomWinEnabled");
+      }
+    }
+
+    private OCCViewer ActiveViewer
+    {
+      get
+      {
+        if (!IsDocumentOpen)
+        {
+          return null;
+        }
+
+        Grid aGrid = (ViewPanel.SelectedContent) as Grid;
+
+        if (aGrid == null)
+        {
+          return null;
+        }
+
+        return Map[aGrid].Viewer;
+      }
+    }
+
+    public Boolean IsDocumentOpen
+    {
+      get
+      {
+        return ViewPanel.Items.Count > 0;
+      }
+    }
+
+    private int myDocumentCounter = 1;
+
+    Dictionary<Grid, D3DViewer> Map = new Dictionary<Grid, D3DViewer> ();
+
+    private void NewCommand_Executed (object sender, ExecutedRoutedEventArgs e)
+    {
+      D3DViewer aViwer = new D3DViewer ();
+
+      Grid g = new Grid ();
+
+      Map.Add (g, aViwer);
+
+      ImageBrush anImage = new ImageBrush (aViwer.Image);
+      
+      anImage.RelativeTransform = new ScaleTransform (1.0, -1.0, 0.5, 0.5);
+
+      g.Background = anImage;
+      g.MouseMove += new MouseEventHandler (g_MouseMove);
+      g.MouseDown += new MouseButtonEventHandler (g_MouseDown);
+      g.MouseUp += new MouseButtonEventHandler (g_MouseUp);
+
+      g.HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch;
+
+
+      TabItem aNewTab = new TabItem ();
+      aNewTab.Content = g;
+
+      aNewTab.HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch;
+      aNewTab.HorizontalContentAlignment = System.Windows.HorizontalAlignment.Stretch;
+      aNewTab.VerticalContentAlignment = System.Windows.VerticalAlignment.Stretch;
+
+      g.SizeChanged += new SizeChangedEventHandler (g_SizeChanged);
+
+      aNewTab.IsSelected = true;
+      aNewTab.Header = "Document " + myDocumentCounter.ToString ();
+      myDocumentCounter++;
+
+      ViewPanel.Items.Add (aNewTab);
+
+      ViewPanel.Focus ();
+
+      // update XAML property
+      RaisePropertyChanged ("IsDocumentOpen");
+    }
+
+    void g_SizeChanged (object sender, SizeChangedEventArgs e)
+    {
+      if (!IsDocumentOpen)
+        return;
+
+      Grid aGrid = (ViewPanel.SelectedContent) as Grid;
+
+      if (aGrid == null)
+        return;
+
+      Map[aGrid].Resize (Convert.ToInt32 (e.NewSize.Width),
+                         Convert.ToInt32 (e.NewSize.Height));
+    }
+
+    void g_MouseUp (object sender, MouseButtonEventArgs e)
+    {
+      Grid aGrid = (ViewPanel.SelectedContent) as Grid;
+
+      if (aGrid != null)
+      {
+          ActiveViewer.OnMouseUp(aGrid, e);
+      }
+    }
+
+    void g_MouseDown (object sender, MouseButtonEventArgs e)
+    {
+      Grid aGrid = (ViewPanel.SelectedContent) as Grid;
+
+      if (aGrid != null)
+      {
+          ActiveViewer.OnMouseDown(ViewPanel, e);
+      }
+    }
+
+    void g_MouseMove (object sender, MouseEventArgs e)
+    {
+      Grid aGrid = (ViewPanel.SelectedContent) as Grid;
+
+      if (aGrid != null)
+      {
+        ActiveViewer.OnMouseMove (aGrid, e);
+      }
+    }
+
+    private void CloseCommand_Executed (object sender, ExecutedRoutedEventArgs e)
+    {
+      if (ViewPanel.Items.Count > 0)
+      {
+        Grid aGrid = (ViewPanel.SelectedContent) as Grid;
+
+        if (aGrid == null)
+        {
+          return;
+        }
+
+        Map[aGrid].StopRenderingScene ();
+
+        ViewPanel.Items.Remove (ViewPanel.SelectedItem);
+      }
+
+      // update XAML property
+      RaisePropertyChanged ("IsDocumentOpen");
+    }
+
+    private void CloseCommand_CanExecute (object sender, CanExecuteRoutedEventArgs e)
+    {
+      e.CanExecute = IsDocumentOpen;
+    }
+
+    private void QuitCommand_Executed (object sender, ExecutedRoutedEventArgs e)
+    {
+      this.Close ();
+    }
+
+    private void ImportBRep_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.ImportModel (ModelFormat.BREP);
+      }
+    }
+
+    private void ImportIges_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.ImportModel (ModelFormat.IGES);
+      }
+    }
+
+    private void ImportStep_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.ImportModel (ModelFormat.STEP);
+      }
+    }
+
+    private void ExportBRep_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.ExportModel (ModelFormat.BREP);
+      }
+    }
+
+    private void ExportStep_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.ExportModel (ModelFormat.STEP);
+      }
+    }
+
+    private void ExportIges_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.ExportModel (ModelFormat.IGES);
+      }
+    }
+
+    private void ExportStl_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.ExportModel (ModelFormat.STL);
+      }
+    }
+
+    private void ExportVrml_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.ExportModel (ModelFormat.VRML);
+      }
+    }
+
+    private void ExportImage_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.ExportModel (ModelFormat.IMAGE);
+      }
+    }
+
+    private void FitAllBtn_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.FitAll ();
+      }
+    }
+
+    private void ZoomWindowBtn_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        IsZoomWinEnabled = false;
+        ActiveViewer.ZoomWindow ();
+      }
+    }
+
+    private void DynamicZoomingBtn_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.DynamicZooming ();
+      }
+    }
+
+    private void DynamicPanningBtn_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.DynamicPanning ();
+      }
+    }
+
+    private void GlobalPanningBtn_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.GlobalPanning ();
+      }
+    }
+
+    private void FrontBtn_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.FrontView ();
+      }
+    }
+
+    private void BackBtn_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.BackView ();
+      }
+    }
+
+    private void TopBtn_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.TopView ();
+      }
+    }
+
+    private void BottomBtn_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.BottomView ();
+      }
+    }
+
+    private void LeftBtn_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.LeftView ();
+      }
+    }
+
+    private void RightBtn_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.RightView ();
+      }
+    }
+
+    private void AxoBtn_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.AxoView ();
+      }
+    }
+
+    private void ResetBtn_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.Reset ();
+      }
+    }
+
+    private void DynamicRotationBtn_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.DynamicRotation ();
+      }
+    }
+
+    private void HiddenOffBtn_Click (object sender, RoutedEventArgs e)
+    {
+      IsHlrOffPushed = true;
+      IsHlrOnPushed = false;
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.HiddenOff ();
+      }
+    }
+
+    private void HiddenOnBtn_Click (object sender, RoutedEventArgs e)
+    {
+      IsHlrOffPushed = false;
+      IsHlrOnPushed = true;
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.HiddenOn ();
+      }
+    }
+
+    private void AboutCommand_Executed (object sender, ExecutedRoutedEventArgs e)
+    {
+      AboutDialog aDlg = new AboutDialog ();
+      aDlg.ShowDialog ();
+    }
+
+    private void ToolBar_MouseEnter (object sender, MouseEventArgs e)
+    {
+      StatusBarText = "Toolbar";
+    }
+
+    private void DocumentToolBar_MouseEnter (object sender, MouseEventArgs e)
+    {
+      StatusBarText = "Document toolbar";
+    }
+
+    private void ViewToolBar_MouseEnter (object sender, MouseEventArgs e)
+    {
+      StatusBarText = "View toolbar";
+    }
+
+    private void ToolBar_MouseLeave (object sender, MouseEventArgs e)
+    {
+      StatusBarText = "";
+    }
+
+    public void OnZoomingFinished (object sender, EventArgs e)
+    {
+      IsZoomWinEnabled = true;
+    }
+
+    public bool IsWireframeEnabled
+    {
+      get
+      {
+        if (ActiveViewer != null)
+        {
+          return ActiveViewer.IsWireframeEnabled;
+        }
+        return false;
+      }
+    }
+
+    private void Wireframe_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.Wireframe ();
+      }
+    }
+
+    private void Shading_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.Shading ();
+      }
+    }
+
+    public bool IsShadingEnabled
+    {
+      get
+      {
+        if (ActiveViewer != null)
+        {
+          return ActiveViewer.IsShadingEnabled;
+        }
+        return false;
+      }
+    }
+
+    private void Color_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.Color ();
+      }
+    }
+
+    public bool IsColorEnabled
+    {
+      get
+      {
+        if (ActiveViewer != null)
+        {
+          return ActiveViewer.IsColorEnabled;
+        }
+        return false;
+      }
+    }
+
+    private void Material_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.Material ();
+      }
+    }
+
+    public bool IsMaterialEnabled
+    {
+      get
+      {
+        if (ActiveViewer != null)
+        {
+          return ActiveViewer.IsMaterialEnabled;
+        }
+        return false;
+      }
+    }
+
+    private void Transparency_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.Transparency ();
+      }
+    }
+
+    public bool IsTransparencyEnabled
+    {
+      get
+      {
+        if (ActiveViewer != null)
+        {
+          return ActiveViewer.IsTransparencyEnabled;
+        }
+        return false;
+      }
+    }
+
+    private void Delete_Click (object sender, RoutedEventArgs e)
+    {
+      if (ActiveViewer != null)
+      {
+        ActiveViewer.Delete ();
+      }
+    }
+
+    private void Background_Click(object sender, RoutedEventArgs e)
+    {
+        if (ActiveViewer != null)
+        {
+            ActiveViewer.Background();
+        }
+    }
+
+    public bool IsDeleteEnabled
+    {
+      get
+      {
+        if (ActiveViewer != null)
+        {
+          return ActiveViewer.IsDeleteEnabled;
+        }
+        return false;
+      }
+    }
+
+    private void AvaliabiltyOfOperationToolbarChanged ()
+    {
+      RaisePropertyChanged ("IsWireframeEnabled");
+      RaisePropertyChanged ("IsShadingEnabled");
+      RaisePropertyChanged ("IsTransparencyEnabled");
+      RaisePropertyChanged ("IsColorEnabled");
+      RaisePropertyChanged ("IsMaterialEnabled");
+      RaisePropertyChanged ("IsDeleteEnabled");
+    }
+
+    public void OnAvaliabiltyOfOperationsChanged (object sender, EventArgs e)
+    {
+      AvaliabiltyOfOperationToolbarChanged ();
+    }
+
+    private void OnViewerChanged (object sender, SelectionChangedEventArgs e)
+    {
+      if (e.RemovedItems.Count > 0)
+      {
+        Grid aHost = ((e.RemovedItems[0] as TabItem).Content) as Grid;
+        if (aHost == null)
+        {
+          return;
+        }
+
+        OCCViewer aViewer = Map[aHost].Viewer;
+        if (aViewer != null)
+        {
+          aViewer.ZoomingFinished -= new EventHandler (OnZoomingFinished);
+          aViewer.AvaliabiltyOfOperationsChanged -= new EventHandler (OnAvaliabiltyOfOperationsChanged);
+        }
+      }
+
+      if (e.AddedItems.Count > 0)
+      {
+        Grid aHost = ((e.AddedItems[0] as TabItem).Content) as Grid;
+        if (aHost == null)
+        {
+          return;
+        }
+
+        OCCViewer aViewer = Map[aHost].Viewer;
+        if (aViewer != null)
+        {
+          aViewer.ZoomingFinished += new EventHandler (OnZoomingFinished);
+          aViewer.AvaliabiltyOfOperationsChanged += new EventHandler (OnAvaliabiltyOfOperationsChanged);
+        }
+      }
+
+      AvaliabiltyOfOperationToolbarChanged ();
+    }
+
+    private void OnContextOpened(object sender, RoutedEventArgs e)
+    {
+        this.WireframeItem.IsEnabled    = IsWireframeEnabled;
+        this.ShadingItem.IsEnabled      = IsShadingEnabled;
+        this.ColorItem.IsEnabled        = IsColorEnabled;
+        this.MaterialItem.IsEnabled     = IsMaterialEnabled;
+        this.TransparencyItem.IsEnabled = IsTransparencyEnabled;
+        this.DeleteItem.IsEnabled       = IsDeleteEnabled;
+    }
+  }
+}
similarity index 96%
copy from samples/CSharp/WPF/MaterialDlg.xaml
copy to samples/CSharp/WPF_D3D/MaterialDlg.xaml
index ef50086..dafa734 100644 (file)
@@ -2,7 +2,7 @@
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-       x:Class="IE_WPF.MaterialDlg"
+       x:Class="IE_WPF_D3D.MaterialDlg"
        x:Name="Window"
        Title="Material"
        Width="133" Height="181" mc:Ignorable="d">
similarity index 95%
copy from samples/CSharp/WPF/MaterialDlg.xaml.cs
copy to samples/CSharp/WPF_D3D/MaterialDlg.xaml.cs
index 0a8bebb..4751ed8 100644 (file)
@@ -10,7 +10,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace IE_WPF
+namespace IE_WPF_D3D
 {
     public enum Material
     {
@@ -29,7 +29,7 @@ namespace IE_WPF
        /// </summary>
        public partial class MaterialDlg : Window
        {
-               public MaterialDlg( OCCTProxy theView )
+               public MaterialDlg( OCCTProxyD3D theView )
                {
                        this.InitializeComponent();
 
@@ -43,7 +43,7 @@ namespace IE_WPF
             SetInitialState();
                }
 
-        public OCCTProxy View { get; private set; }
+        public OCCTProxyD3D View { get; private set; }
 
         private void PlasterBtn_Checked( object sender, RoutedEventArgs e )
         {
diff --git a/samples/CSharp/WPF_D3D/OCCViewer.cs b/samples/CSharp/WPF_D3D/OCCViewer.cs
new file mode 100644 (file)
index 0000000..19fdebd
--- /dev/null
@@ -0,0 +1,673 @@
+\feffusing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using System.Windows.Input;
+using System.Drawing;
+
+namespace IE_WPF_D3D
+{
+  public enum CurrentAction3d
+  {
+    CurAction3d_Nothing,
+    CurAction3d_DynamicZooming,
+    CurAction3d_WindowZooming,
+    CurAction3d_DynamicPanning,
+    CurAction3d_GlobalPanning,
+    CurAction3d_DynamicRotation
+  }
+  public enum CurrentPressedKey
+  {
+    CurPressedKey_Nothing,
+    CurPressedKey_Ctrl,
+    CurPressedKey_Shift
+  }
+  public enum ModelFormat
+  {
+    BREP,
+    CSFDB,
+    STEP,
+    IGES,
+    VRML,
+    STL,
+    IMAGE
+  }
+
+  public enum DisplayMode
+  {
+    Wireframe,
+    Shading
+  }
+
+  public class OCCViewer
+  {
+    public event EventHandler ZoomingFinished;
+    protected void RaiseZoomingFinished ()
+    {
+      if (ZoomingFinished != null)
+      {
+        ZoomingFinished (this, EventArgs.Empty);
+      }
+    }
+
+    public event EventHandler AvaliabiltyOfOperationsChanged;
+    protected void RaiseAvaliabiltyOfOperationsChanged ()
+    {
+      if (AvaliabiltyOfOperationsChanged != null)
+      {
+        AvaliabiltyOfOperationsChanged (this, EventArgs.Empty);
+      }
+    }
+
+    public OCCTProxyD3D View { get; private set; }
+    public CurrentAction3d CurrentMode { get; private set; }
+    private bool IsRectVisible { get; set; }
+    public bool DegenerateMode { get; private set; }
+
+    public bool IsWireframeEnabled { get; private set; }
+    public bool IsShadingEnabled { get; private set; }
+    public bool IsTransparencyEnabled { get; private set; }
+    public bool IsColorEnabled { get; private set; }
+    public bool IsMaterialEnabled { get; private set; }
+    public bool IsDeleteEnabled { get; private set; }
+
+    private float myCurZoom;// ~ Quantity_Factor
+    private int myXmin;
+    private int myYmin;
+    private int myXmax;
+    private int myYmax;
+    private int myButtonDownX;
+    private int myButtonDownY;
+    public OCCViewer()
+    {
+      View = new OCCTProxyD3D ();
+      View.InitOCCTProxy ();
+      CurrentMode = CurrentAction3d.CurAction3d_Nothing;
+      IsRectVisible = false;
+      DegenerateMode = true;
+    }
+
+    public bool InitInterop (IntPtr theHWND, IntPtr theD3DDevice)
+    {
+      return View.InitViewer (theHWND, theD3DDevice);
+    }
+
+    public void ImportModel (ModelFormat theFormat)
+    {
+      int aFormat = 10;
+      OpenFileDialog anOpenDialog = new OpenFileDialog ();
+      string aDataDir = ((Environment.GetEnvironmentVariable ("CASROOT")) + "\\..\\data");
+      string aFilter = "";
+
+      switch (theFormat)
+      {
+        case ModelFormat.BREP:
+          anOpenDialog.InitialDirectory = (aDataDir + "\\occ");
+          aFormat = 0;
+          aFilter = "BREP Files (*.brep *.rle)|*.brep; *.rle";
+          break;
+        case ModelFormat.CSFDB:
+          aFormat = 1;
+          aFilter = "CSFDB Files (*.csfdb)|*.csfdb";
+          break;
+        case ModelFormat.STEP:
+          anOpenDialog.InitialDirectory = (aDataDir + "\\step");
+          aFormat = 2;
+          aFilter = "STEP Files (*.stp *.step)|*.stp; *.step";
+          break;
+        case ModelFormat.IGES:
+          anOpenDialog.InitialDirectory = (aDataDir + "\\iges");
+          aFormat = 3;
+          aFilter = "IGES Files (*.igs *.iges)|*.igs; *.iges";
+          break;
+        default:
+          break;
+      }
+
+      anOpenDialog.Filter = aFilter + "|All files (*.*)|*.*";
+      if (anOpenDialog.ShowDialog () == DialogResult.OK)
+      {
+        string aFileName = anOpenDialog.FileName;
+        if (aFileName == "")
+        {
+          return;
+        }
+
+        if (!View.TranslateModel (aFileName, aFormat, true))
+        {
+          MessageBox.Show ("Cann't read this file", "Error!", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+        }
+      }
+      View.ZoomAllView ();
+    }
+
+    public void ExportModel (ModelFormat theFormat)
+    {
+      int aFormat = 10;
+      SaveFileDialog saveDialog = new SaveFileDialog ();
+      string aDataDir = ((Environment.GetEnvironmentVariable ("CASROOT")) + "\\..\\data");
+      string aFilter = "";
+
+      switch (theFormat)
+      {
+        case ModelFormat.BREP:
+          saveDialog.InitialDirectory = (aDataDir + "\\occ");
+          aFormat = 0;
+          aFilter = "BREP Files (*.brep *.rle)|*.brep; *.rle";
+          break;
+        case ModelFormat.CSFDB:
+          aFormat = 1;
+          aFilter = "CSFDB Files (*.csfdb)|*.csfdb";
+          break;
+        case ModelFormat.STEP:
+          saveDialog.InitialDirectory = (aDataDir + "\\step");
+          aFormat = 2;
+          aFilter = "STEP Files (*.stp *.step)|*.step; *.stp";
+          break;
+        case ModelFormat.IGES:
+          saveDialog.InitialDirectory = (aDataDir + "\\iges");
+          aFormat = 3;
+          aFilter = "IGES Files (*.igs *.iges)| *.iges; *.igs";
+          break;
+        case ModelFormat.VRML:
+          saveDialog.InitialDirectory = (aDataDir + "\\vrml");
+          aFormat = 4;
+          aFilter = "VRML Files (*.vrml)|*.vrml";
+          break;
+        case ModelFormat.STL:
+          saveDialog.InitialDirectory = (aDataDir + "\\stl");
+          aFormat = 5;
+          aFilter = "STL Files (*.stl)|*.stl";
+          break;
+        case ModelFormat.IMAGE:
+          saveDialog.InitialDirectory = (aDataDir + "\\images");
+          aFormat = 6;
+          aFilter = "Images Files (*.bmp)|*.bmp";
+          break;
+        default:
+          break;
+      }
+
+      saveDialog.Filter = aFilter;
+      if (saveDialog.ShowDialog () == DialogResult.OK)
+      {
+        string aFileName = saveDialog.FileName;
+        if (aFileName == "")
+        {
+          return;
+        }
+
+        if (!View.TranslateModel (aFileName, aFormat, false))
+        {
+          MessageBox.Show ("Can not write this file", "Error!", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+        }
+      }
+    }
+
+    public void FitAll ()
+    {
+      View.ZoomAllView ();
+    }
+
+    public void ZoomWindow ()
+    {
+      CurrentMode = CurrentAction3d.CurAction3d_WindowZooming;
+    }
+
+    public void DynamicZooming ()
+    {
+      CurrentMode = CurrentAction3d.CurAction3d_DynamicZooming;
+    }
+
+    public void DynamicPanning ()
+    {
+      CurrentMode = CurrentAction3d.CurAction3d_DynamicPanning;
+    }
+
+    public void GlobalPanning ()
+    {
+      myCurZoom = View.Scale ();
+      CurrentMode = CurrentAction3d.CurAction3d_GlobalPanning;
+    }
+
+    public void AxoView ()
+    {
+      View.AxoView ();
+    }
+
+    public void FrontView ()
+    {
+      View.FrontView ();
+    }
+
+    public void TopView ()
+    {
+      View.TopView ();
+    }
+
+    public void LeftView ()
+    {
+      View.LeftView ();
+    }
+
+    public void BackView ()
+    {
+      View.BackView ();
+    }
+
+    public void RightView ()
+    {
+      View.RightView ();
+    }
+
+    public void Reset ()
+    {
+      View.Reset ();
+    }
+
+    public void BottomView ()
+    {
+      View.BottomView ();
+    }
+
+    public void HiddenOff ()
+    {
+      View.SetDegenerateModeOff ();
+      DegenerateMode = false;
+    }
+
+    public void HiddenOn ()
+    {
+      View.SetDegenerateModeOn ();
+      DegenerateMode = true;
+    }
+
+    public void DynamicRotation ()
+    {
+      CurrentMode = CurrentAction3d.CurAction3d_DynamicRotation;
+    }
+
+    public void SelectionChanged ()
+    {
+      switch (View.DisplayMode ())
+      {
+        case -1:
+          IsShadingEnabled = false;
+          IsWireframeEnabled = false;
+          break;
+        case 0:
+          IsWireframeEnabled = false;
+          IsShadingEnabled = true;
+          IsTransparencyEnabled = false;
+          break;
+        case 1:
+          IsWireframeEnabled = true;
+          IsShadingEnabled = false;
+          IsTransparencyEnabled = true;
+          break;
+        case 10:
+          IsWireframeEnabled = true;
+          IsShadingEnabled = true;
+          IsTransparencyEnabled = true;
+          break;
+        default:
+          break;
+      }
+
+      if (View.IsObjectSelected ())
+      {
+        IsColorEnabled = true;
+        IsMaterialEnabled = true;
+        IsDeleteEnabled = true;
+      }
+      else
+      {
+        IsColorEnabled = false;
+        IsMaterialEnabled = false;
+        IsTransparencyEnabled = false;
+        IsDeleteEnabled = false;
+      }
+
+      RaiseAvaliabiltyOfOperationsChanged ();
+    }
+
+    public void ChangeColor (bool IsObjectColor)
+    {
+      int r, g, b;
+      if (IsObjectColor)
+      {
+        r = View.GetObjColR ();
+        g = View.GetObjColG ();
+        b = View.GetObjColB ();
+      }
+      else
+      {
+        r = View.GetBGColR ();
+        g = View.GetBGColG ();
+        b = View.GetBGColB ();
+      }
+      System.Windows.Forms.ColorDialog ColDlg = new System.Windows.Forms.ColorDialog ();
+      ColDlg.Color = System.Drawing.Color.FromArgb (r, g, b);
+      if (ColDlg.ShowDialog () == System.Windows.Forms.DialogResult.OK)
+      {
+        System.Drawing.Color c = ColDlg.Color;
+        r = c.R;
+        g = c.G;
+        b = c.B;
+        if (IsObjectColor)
+        {
+          View.SetColor (r, g, b);
+        }
+        else
+        {
+          View.SetBackgroundColor (r, g, b);
+        }
+      }
+      View.UpdateCurrentViewer ();
+    }
+
+    public void Wireframe ()
+    {
+      View.SetDisplayMode ((int)DisplayMode.Wireframe);
+      View.UpdateCurrentViewer ();
+
+      SelectionChanged ();
+      RaiseZoomingFinished ();
+    }
+
+    public void Shading ()
+    {
+      View.SetDisplayMode ((int)DisplayMode.Shading);
+      View.UpdateCurrentViewer ();
+
+      SelectionChanged ();
+      RaiseZoomingFinished ();
+    }
+
+    public void Color ()
+    {
+      ChangeColor (true);
+    }
+
+    public void Background ()
+    {
+      ChangeColor (false);
+    }
+
+    public void Material ()
+    {
+      MaterialDlg aDlg = new MaterialDlg (View);
+      aDlg.ShowDialog ();
+    }
+
+    public void Transparency ()
+    {
+      TransparencyDialog dlg = new TransparencyDialog ();
+      dlg.View = View;
+      dlg.ShowDialog ();
+    }
+
+    public void Delete ()
+    {
+      View.EraseObjects ();
+    }
+
+    protected void MultiDragEvent (int x, int y, int theState)
+    {
+      if (theState == -1) //mouse is down
+      {
+        myButtonDownX = x;
+        myButtonDownY = y;
+      }
+      else if (theState == 1) //mouse is up
+      {
+        View.ShiftSelect (Math.Min (myButtonDownX, x), Math.Min (myButtonDownY, y),
+                          Math.Max (myButtonDownX, x), Math.Max (myButtonDownY, y));
+      }
+    }
+
+    protected void DragEvent (int x, int y, int theState)
+    {
+      if (theState == -1) //mouse is down
+      {
+        myButtonDownX = x;
+        myButtonDownY = y;
+      }
+      else if (theState == 1) //mouse is up
+      {
+        View.Select (Math.Min (myButtonDownX, x), Math.Min (myButtonDownY, y),
+                     Math.Max (myButtonDownX, x), Math.Max (myButtonDownY, y));
+      }
+    }
+
+    public void OnMouseDown (System.Windows.IInputElement sender, MouseButtonEventArgs e)
+    {
+      System.Windows.Controls.TabControl aTabControl = sender as System.Windows.Controls.TabControl;
+      System.Windows.Controls.Grid aGrid = aTabControl.SelectedContent as System.Windows.Controls.Grid;
+
+      Point p = new Point((int)e.GetPosition(aGrid).X, (int)e.GetPosition(aGrid).Y);
+
+      // to avoid the context menu opening
+      aTabControl.ContextMenu.Visibility = System.Windows.Visibility.Collapsed;
+      aTabControl.ContextMenu.IsOpen = false;
+
+      if (e.LeftButton == MouseButtonState.Pressed)
+      {
+        myXmin = p.X;
+        myXmax = p.X;
+        myYmin = p.Y;
+        myYmax = p.Y;
+
+        if (Keyboard.IsKeyDown (Key.LeftCtrl) || Keyboard.IsKeyDown (Key.RightCtrl))
+        {
+          // start the dinamic zooming....
+          CurrentMode = CurrentAction3d.CurAction3d_DynamicZooming;
+        }
+        else
+        {
+          switch (CurrentMode)
+          {
+            case CurrentAction3d.CurAction3d_Nothing:
+              if (Keyboard.IsKeyDown (Key.LeftShift) || Keyboard.IsKeyDown (Key.RightShift))
+              {
+                MultiDragEvent (myXmax, myYmax, -1);
+              }
+              else
+              {
+                DragEvent (myXmax, myYmax, -1);
+              }
+              break;
+            case CurrentAction3d.CurAction3d_DynamicRotation:
+              if (!DegenerateMode)
+              {
+                View.SetDegenerateModeOn ();
+              }
+              View.StartRotation (p.X, p.Y);
+              break;
+            default:
+              break;
+          }
+        }
+      }
+      else if (e.RightButton == MouseButtonState.Pressed)
+      {
+        if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
+        {
+          if (!DegenerateMode)
+          {
+            View.SetDegenerateModeOn();
+          }
+          View.StartRotation(p.X, p.Y);
+        }
+        else
+        {
+          // show context menu only in this case
+          aTabControl.ContextMenu.Visibility = System.Windows.Visibility.Visible;
+        }
+      }
+    }
+
+    public void OnMouseUp(System.Windows.IInputElement sender, MouseButtonEventArgs e)
+    {
+      Point p = new Point((int)e.GetPosition(sender).X, (int)e.GetPosition(sender).Y);
+
+      if (e.ChangedButton == MouseButton.Left)
+      {
+        if (Keyboard.IsKeyDown (Key.LeftCtrl) || Keyboard.IsKeyDown (Key.RightCtrl))
+        {
+          CurrentMode = CurrentAction3d.CurAction3d_Nothing;
+          return;
+        }
+        switch (CurrentMode)
+        {
+          case CurrentAction3d.CurAction3d_Nothing:
+            if (p.X == myXmin && p.Y == myYmin)
+            {
+              myXmax = p.X;
+              myYmax = p.Y;
+              if (Keyboard.IsKeyDown (Key.LeftShift) || Keyboard.IsKeyDown (Key.RightShift))
+              {
+                View.ShiftSelect ();
+              }
+              else
+              {
+                View.Select ();
+              }
+            }
+            else
+            {
+              myXmax = p.X;
+              myYmax = p.Y;
+              if (Keyboard.IsKeyDown (Key.LeftShift) || Keyboard.IsKeyDown (Key.RightShift))
+              {
+                MultiDragEvent (myXmax, myYmax, 1);
+              }
+              else
+              {
+                DragEvent (myXmax, myYmax, 1);
+              }
+            }
+            break;
+          case CurrentAction3d.CurAction3d_DynamicZooming:
+            CurrentMode = CurrentAction3d.CurAction3d_Nothing;
+            break;
+          case CurrentAction3d.CurAction3d_WindowZooming:
+            myXmax = p.X;
+            myYmax = p.Y;
+            int ValZWMin = 1;
+            if (Math.Abs (myXmax - myXmin) > ValZWMin &&
+                 Math.Abs (myXmax - myYmax) > ValZWMin)
+            {
+              View.WindowFitAll (myXmin, myYmin, myXmax, myYmax);
+            }
+            RaiseZoomingFinished ();
+            CurrentMode = CurrentAction3d.CurAction3d_Nothing;
+            break;
+          case CurrentAction3d.CurAction3d_DynamicPanning:
+            CurrentMode = CurrentAction3d.CurAction3d_Nothing;
+            break;
+          case CurrentAction3d.CurAction3d_GlobalPanning:
+            View.Place (p.X, p.Y, myCurZoom);
+            CurrentMode = CurrentAction3d.CurAction3d_Nothing;
+            break;
+          case CurrentAction3d.CurAction3d_DynamicRotation:
+            CurrentMode = CurrentAction3d.CurAction3d_Nothing;
+            if (!DegenerateMode)
+            {
+              View.SetDegenerateModeOff ();
+            }
+            else
+            {
+              View.SetDegenerateModeOn ();
+            }
+            break;
+          default:
+            break;
+        }
+      }
+      else if (e.ChangedButton == MouseButton.Right)
+      {
+        if (!DegenerateMode)
+        {
+          View.SetDegenerateModeOff ();
+        }
+        else
+        {
+          View.SetDegenerateModeOn ();
+        }
+      }
+
+      SelectionChanged ();
+    }
+
+    public void OnMouseMove (System.Windows.IInputElement sender, System.Windows.Input.MouseEventArgs e)
+    {
+      Point p = new Point ((int)e.GetPosition (sender).X, (int)e.GetPosition (sender).Y);
+
+      if (e.LeftButton == MouseButtonState.Pressed) //left button is pressed
+      {
+        if (Keyboard.IsKeyDown (Key.LeftCtrl) || Keyboard.IsKeyDown (Key.RightCtrl))
+        {
+          View.Zoom (myXmax, myYmax, p.X, p.Y);
+          myXmax = p.X;
+          myYmax = p.Y;
+        }
+        else
+        {
+          switch (CurrentMode)
+          {
+            case CurrentAction3d.CurAction3d_Nothing:
+              myXmax = p.X;
+              myYmax = p.Y;
+              break;
+            case CurrentAction3d.CurAction3d_DynamicZooming:
+              View.Zoom (myXmax, myYmax, p.X, p.Y);
+              myXmax = p.X;
+              myYmax = p.Y;
+              break;
+            case CurrentAction3d.CurAction3d_WindowZooming:
+              myXmax = p.X;
+              myYmax = p.Y;
+              break;
+            case CurrentAction3d.CurAction3d_DynamicPanning:
+              View.Pan (p.X - myXmax, myYmax - p.Y);
+              myXmax = p.X;
+              myYmax = p.Y;
+              break;
+            case CurrentAction3d.CurAction3d_GlobalPanning:
+              break;
+            case CurrentAction3d.CurAction3d_DynamicRotation:
+              View.Rotation (p.X, p.Y);
+              View.RedrawView ();
+              break;
+            default:
+              break;
+          }
+        }
+      }
+      else if (e.MiddleButton == MouseButtonState.Pressed) //middle button is pressed
+      {
+        if (Keyboard.IsKeyDown (Key.LeftCtrl) || Keyboard.IsKeyDown (Key.RightCtrl))
+        {
+          View.Pan (p.X - myXmax, myYmax - p.Y);
+          myXmax = p.X;
+          myYmax = p.Y;
+        }
+      }
+      else if (e.RightButton == MouseButtonState.Pressed) //right button is pressed
+      {
+        if (Keyboard.IsKeyDown (Key.LeftCtrl) || Keyboard.IsKeyDown (Key.RightCtrl))
+        {
+          View.Rotation (p.X, p.Y);
+        }
+      }
+      else // no buttons are pressed
+      {
+        myXmax = p.X;
+        myYmax = p.Y;
+        View.MoveTo (p.X, p.Y);
+      }
+    }
+  }
+}
@@ -1,14 +1,14 @@
 \feff//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.5472
+//     Runtime Version:4.0.30319.18444
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace IE_WPF.Properties {
+namespace IE_WPF_D3D.Properties {
     using System;
     
     
@@ -19,7 +19,7 @@ namespace IE_WPF.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -39,7 +39,7 @@ namespace IE_WPF.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("IE_WPF.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("IE_WPF_D3D.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
@@ -1,18 +1,18 @@
 \feff//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.5472
+//     Runtime Version:4.0.30319.18444
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace IE_WPF.Properties {
+namespace IE_WPF_D3D.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -4,7 +4,7 @@ using System.Collections;
 using System.ComponentModel;
 using System.Windows.Forms;
 
-namespace IE_WPF
+namespace IE_WPF_D3D
 {
   /// <summary>
   /// Summary description for TransparencyDialog.
@@ -16,7 +16,7 @@ namespace IE_WPF
     /// Required designer variable.
     /// </summary>
     private System.ComponentModel.Container components = null;
-    private OCCTProxy myView;
+    private OCCTProxyD3D myView;
 
     public TransparencyDialog()
     {
@@ -96,7 +96,7 @@ namespace IE_WPF
       this.myView.SetTransparency(transp);
     }
 
-    public OCCTProxy View
+    public OCCTProxyD3D View
     {
       set
       {
similarity index 88%
rename from samples/CSharp/WPF/About.xaml
rename to samples/CSharp/WPF_WinForms/About.xaml
index 59f2a05..950405f 100644 (file)
@@ -1,9 +1,9 @@
 \feff<Window
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       x:Class="IE_WPF.AboutDialog"
+       x:Class="IE_WPF_WinForms.AboutDialog"
        x:Name="Window"
-       xmlns:local="clr-namespace:IE_WPF"
+       xmlns:local="clr-namespace:IE_WPF_WinForms"
        Title="About Import/Export Sample"
        Width="312" Height="285">
        
similarity index 97%
rename from samples/CSharp/WPF/About.xaml.cs
rename to samples/CSharp/WPF_WinForms/About.xaml.cs
index c3b0343..cc06e3a 100644 (file)
@@ -10,7 +10,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace IE_WPF
+namespace IE_WPF_WinForms
 {
        /// <summary>
        /// Interaction logic for About.xaml
similarity index 90%
rename from samples/CSharp/WPF/App.xaml
rename to samples/CSharp/WPF_WinForms/App.xaml
index d3ba244..d4faa61 100644 (file)
@@ -1,4 +1,4 @@
-\feff<Application x:Class="IE_WPF.App"
+\feff<Application x:Class="IE_WPF_WinForms.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     StartupUri="MainWindow.xaml">
similarity index 91%
rename from samples/CSharp/WPF/App.xaml.cs
rename to samples/CSharp/WPF_WinForms/App.xaml.cs
index c2a2e28..2da10a4 100644 (file)
@@ -5,7 +5,7 @@ using System.Data;
 using System.Linq;
 using System.Windows;
 
-namespace IE_WPF
+namespace IE_WPF_WinForms
 {
     /// <summary>
     /// Interaction logic for App.xaml
similarity index 98%
rename from samples/CSharp/WPF/IECommands.cs
rename to samples/CSharp/WPF_WinForms/IECommands.cs
index 738260e..55c44f6 100644 (file)
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Input;
 
-namespace IE_WPF
+namespace IE_WPF_WinForms
 {
     public class IECommands
     {
similarity index 86%
rename from samples/CSharp/WPF/IE_WPF.csproj
rename to samples/CSharp/WPF_WinForms/IE_WPF_WinForms.csproj
index 2aa78ad..3a71baa 100644 (file)
@@ -8,8 +8,8 @@
     <ProjectGuid>{D12A8897-5BF8-4345-BBB0-8ADE4B9FB9A7}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>IE_WPF</RootNamespace>
-    <AssemblyName>IE_WPF</AssemblyName>
+    <RootNamespace>IE_WPF_WinForms</RootNamespace>
+    <AssemblyName>IE_WPF_WinForms</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
     <TargetFrameworkProfile />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
       <Name>OCCTProxy</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
similarity index 99%
rename from samples/CSharp/WPF/MainWindow.xaml
rename to samples/CSharp/WPF_WinForms/MainWindow.xaml
index 5d54370..3a79a2d 100644 (file)
@@ -1,8 +1,8 @@
 \feff<Window
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-       x:Class="IE_WPF.MainWindow"
-       xmlns:local="clr-namespace:IE_WPF"
+       x:Class="IE_WPF_WinForms.MainWindow"
+       xmlns:local="clr-namespace:IE_WPF_WinForms"
     Title="Sample Import/Export" Height="600" Width="900" Icon="res/MainFrame.ico">
        
        <Window.Background>
similarity index 99%
rename from samples/CSharp/WPF/MainWindow.xaml.cs
rename to samples/CSharp/WPF_WinForms/MainWindow.xaml.cs
index d2535d3..c4a4074 100644 (file)
@@ -14,7 +14,7 @@ using System.Windows.Shapes;
 using System.ComponentModel;
 using System.Windows.Forms.Integration;
 
-namespace IE_WPF
+namespace IE_WPF_WinForms
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml
similarity index 95%
rename from samples/CSharp/WPF/MaterialDlg.xaml
rename to samples/CSharp/WPF_WinForms/MaterialDlg.xaml
index ef50086..8b2249d 100644 (file)
@@ -2,7 +2,7 @@
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-       x:Class="IE_WPF.MaterialDlg"
+       x:Class="IE_WPF_WinForms.MaterialDlg"
        x:Name="Window"
        Title="Material"
        Width="133" Height="181" mc:Ignorable="d">
similarity index 98%
rename from samples/CSharp/WPF/MaterialDlg.xaml.cs
rename to samples/CSharp/WPF_WinForms/MaterialDlg.xaml.cs
index 0a8bebb..e89ace7 100644 (file)
@@ -10,7 +10,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace IE_WPF
+namespace IE_WPF_WinForms
 {
     public enum Material
     {
similarity index 99%
rename from samples/CSharp/WPF/OCCViewer.cs
rename to samples/CSharp/WPF_WinForms/OCCViewer.cs
index 649b6a4..c0aa2e3 100644 (file)
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-namespace IE_WPF
+namespace IE_WPF_WinForms
 {
     public enum CurrentAction3d
     {
@@ -1,14 +1,14 @@
 \feff//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.5472
+//     Runtime Version:4.0.30319.18444
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace IE_WPF.Properties {
+namespace IE_WPF_WinForms.Properties {
     using System;
     
     
@@ -19,7 +19,7 @@ namespace IE_WPF.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -39,7 +39,7 @@ namespace IE_WPF.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("IE_WPF.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("IE_WPF_WinForms.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
@@ -1,18 +1,18 @@
 \feff//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.5472
+//     Runtime Version:4.0.30319.18444
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace IE_WPF.Properties {
+namespace IE_WPF_WinForms.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
similarity index 99%
rename from samples/CSharp/WPF/TransparencyDialog.cs
rename to samples/CSharp/WPF_WinForms/TransparencyDialog.cs
index 0b328d5..ba7a456 100644 (file)
@@ -4,7 +4,7 @@ using System.Collections;
 using System.ComponentModel;
 using System.Windows.Forms;
 
-namespace IE_WPF
+namespace IE_WPF_WinForms
 {
   /// <summary>
   /// Summary description for TransparencyDialog.
index 5232ec7..01b2c18 100644 (file)
@@ -1,7 +1,7 @@
 call "%~dp0..\..\env.bat" %1 %2 %3
 
 if ["%CASDEB%"] == [""] (
-  call "%~dp0..\..\msvc.bat" %VCVER% win%ARCH% Release "%~dp0\CSharp-%VCVER%.sln"
+  call "%~dp0..\..\msvc.bat" %VCVER% win%ARCH% Release %~dp0\CSharp.sln
 ) else (
-  call "%~dp0..\..\msvc.bat" %VCVER% win%ARCH% Debug "%~dp0\CSharp-%VCVER%.sln"
+  call "%~dp0..\..\msvc.bat" %VCVER% win%ARCH% Debug %~dp0\CSharp.sln
 )
\ No newline at end of file
diff --git a/samples/CSharp/msvc_D3D.bat b/samples/CSharp/msvc_D3D.bat
new file mode 100644 (file)
index 0000000..1e7d2a3
--- /dev/null
@@ -0,0 +1,14 @@
+@echo off
+
+if NOT DEFINED DXSDK_DIR (
+  echo ERROR: DirectX SDK is required in order to build the sample but it is not found in your system. Please install DirectX SDK and retry.
+  exit /B
+)
+
+call "%~dp0..\..\env.bat" %1 %2 %3
+
+if ["%CASDEB%"] == [""] (
+  call "%~dp0..\..\msvc.bat" %VCVER% win%ARCH% Release %~dp0\CSharp_D3D.sln
+) else (
+  call "%~dp0..\..\msvc.bat" %VCVER% win%ARCH% Debug %~dp0\CSharp_D3D.sln
+)
\ No newline at end of file
index 4cbccd9..07ddc2a 100644 (file)
@@ -10,7 +10,7 @@ if "%1" == "-h" (
 
 call "%~dp0..\..\env.bat" %1 %2 %3
 
-set "EXEC=%~dp0\win%ARCH%\bin%CASDEB%\IE_WPF.exe"
+set "EXEC=%~dp0\win%ARCH%\bin%CASDEB%\IE_WPF_WinForms.exe"
 
 if not exist "%EXEC%" goto err_exe
 
diff --git a/samples/CSharp/run_wpf_D3D.bat b/samples/CSharp/run_wpf_D3D.bat
new file mode 100644 (file)
index 0000000..37c8904
--- /dev/null
@@ -0,0 +1,27 @@
+@echo off
+
+if "%1" == "-h" (
+  echo Launch WPF sample as follows: 
+  echo %~n0 ^[vc9^] ^[win32^|win64^] ^[Debug^|Release^]
+  echo By default configuration set in ..\..\custom.bat is used
+  echo Run %~n0 -h to get this help
+  exit /B
+)
+
+call "%~dp0..\..\env.bat" %1 %2 %3
+
+set "EXEC=%~dp0\win%ARCH%\bin%CASDEB%\IE_WPF_D3D.exe"
+
+if not exist "%EXEC%" goto err_exe
+
+"%EXEC%"
+
+goto eof
+
+:err_exe
+echo Executable %EXEC% not found.
+echo Check that OCCT and sample are built with the selected configuration:
+echo compiler=%VCVER% platform=win%ARCH% %3
+exit /B
+
+:eof
\ No newline at end of file