From 2c5b6d9c1216381e95f984f7cbc4ab8bb0805edc Mon Sep 17 00:00:00 2001 From: ski Date: Thu, 30 Oct 2014 16:03:24 +0300 Subject: [PATCH] 0024548: Ray Tracing mode not available in MFC samples Ray tracing functionality was added to OCCT MFC samples. --- samples/mfc/standard/Common/OCC_3dBaseDoc.cpp | 78 ++++++++++++++++++ samples/mfc/standard/Common/OCC_3dBaseDoc.h | 13 ++- .../mfc/standard/Common/OCC_3dChildFrame.cpp | 12 +++ .../mfc/standard/Common/OCC_3dChildFrame.h | 3 + .../mfc/standard/Common/res/OCC_Resource.h | 5 ++ .../mfc/standard/Common/res/OCC_Resource.rc | 10 +++ .../standard/Common/res/ToolbarRayTracing.bmp | Bin 0 -> 918 bytes .../mfcsample/adm/win/vc10/mfcsample.vcxproj | 1 + .../adm/win/vc10/mfcsample.vcxproj.filters | 3 + .../mfcsample/adm/win/vc11/mfcsample.vcxproj | 1 + .../adm/win/vc11/mfcsample.vcxproj.filters | 3 + .../mfcsample/adm/win/vc12/mfcsample.vcxproj | 1 + .../adm/win/vc12/mfcsample.vcxproj.filters | 3 + .../mfcsample/adm/win/vc8/mfcsample.vcproj | 4 + .../mfcsample/adm/win/vc9/mfcsample.vcproj | 4 + 15 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 samples/mfc/standard/Common/res/ToolbarRayTracing.bmp diff --git a/samples/mfc/standard/Common/OCC_3dBaseDoc.cpp b/samples/mfc/standard/Common/OCC_3dBaseDoc.cpp index 407ac62537..6e225fd6e8 100755 --- a/samples/mfc/standard/Common/OCC_3dBaseDoc.cpp +++ b/samples/mfc/standard/Common/OCC_3dBaseDoc.cpp @@ -42,6 +42,17 @@ BEGIN_MESSAGE_MAP(OCC_3dBaseDoc, OCC_BaseDoc) //}}AFX_MSG_MAP ON_COMMAND_EX_RANGE(ID_OBJECT_MATERIAL_BRASS,ID_OBJECT_MATERIAL_DEFAULT, OnObjectMaterialRange) ON_UPDATE_COMMAND_UI_RANGE(ID_OBJECT_MATERIAL_BRASS,ID_OBJECT_MATERIAL_DEFAULT, OnUpdateObjectMaterialRange) + + //RayTracing + ON_COMMAND(ID_OBJECT_RAY_TRACING,OnObjectRayTracing) + ON_COMMAND(ID_OBJECT_SHADOWS,OnObjectShadows) + ON_COMMAND(ID_OBJECT_REFLECTIONS,OnObjectReflections) + ON_COMMAND(ID_OBJECT_ANTI_ALIASING,OnObjectAntiAliasing) + + ON_UPDATE_COMMAND_UI(ID_OBJECT_RAY_TRACING, OnUpdateV3dButtons) + ON_UPDATE_COMMAND_UI(ID_OBJECT_SHADOWS, OnUpdateV3dButtons) + ON_UPDATE_COMMAND_UI(ID_OBJECT_REFLECTIONS, OnUpdateV3dButtons) + ON_UPDATE_COMMAND_UI(ID_OBJECT_ANTI_ALIASING, OnUpdateV3dButtons) END_MESSAGE_MAP() @@ -60,6 +71,11 @@ OCC_3dBaseDoc::OCC_3dBaseDoc() myViewer->SetDefaultLights(); myViewer->SetLightOn(); myAISContext = new AIS_InteractiveContext (myViewer); + + myRayTracingIsOn = false; + myRaytracedShadowsIsOn = true; + myRaytracedReflectionsIsOn = false; + myRaytracedAntialiasingIsOn = false; } OCC_3dBaseDoc::~OCC_3dBaseDoc() @@ -424,3 +440,65 @@ void OCC_3dBaseDoc::SetMaterial(Graphic3d_NameOfMaterial Material) myAISContext->SetMaterial (myAISContext->Current(), (Graphic3d_NameOfMaterial)(Material)); } + + +// RayTracing +void OCC_3dBaseDoc::OnObjectRayTracing() +{ + myRayTracingIsOn = !myRayTracingIsOn; + if(!myRayTracingIsOn) + { + myRaytracedShadowsIsOn = false; + myRaytracedReflectionsIsOn = false; + myRaytracedAntialiasingIsOn = false; + } + OnObjectRayTracingAction(); +} +// Shadows +void OCC_3dBaseDoc::OnObjectShadows() +{ + myRaytracedShadowsIsOn = !myRaytracedShadowsIsOn; + OnObjectRayTracingAction(); +} +// Reflections +void OCC_3dBaseDoc::OnObjectReflections() +{ + myRaytracedReflectionsIsOn = !myRaytracedReflectionsIsOn; + OnObjectRayTracingAction(); +} +// Anti-aliasing +void OCC_3dBaseDoc::OnObjectAntiAliasing() +{ + myRaytracedAntialiasingIsOn = !myRaytracedAntialiasingIsOn; + OnObjectRayTracingAction(); +} +void OCC_3dBaseDoc::OnUpdateV3dButtons (CCmdUI* pCmdUI) +{ + if (pCmdUI->m_nID == ID_OBJECT_RAY_TRACING) + { + pCmdUI->SetCheck(myRayTracingIsOn); + } else { + pCmdUI->Enable(myRayTracingIsOn); + if (pCmdUI->m_nID == ID_OBJECT_SHADOWS) + pCmdUI->SetCheck(myRaytracedShadowsIsOn); + if (pCmdUI->m_nID == ID_OBJECT_REFLECTIONS) + pCmdUI->SetCheck(myRaytracedReflectionsIsOn); + if (pCmdUI->m_nID == ID_OBJECT_ANTI_ALIASING) + pCmdUI->SetCheck(myRaytracedAntialiasingIsOn); + } +} +// Common function to change raytracing params and redraw view +void OCC_3dBaseDoc::OnObjectRayTracingAction() +{ + myAISContext->CurrentViewer()->InitActiveViews(); + Handle(V3d_View) aView = myAISContext->CurrentViewer()->ActiveView(); + Graphic3d_RenderingParams& aParams = aView->ChangeRenderingParams(); + if (myRayTracingIsOn) + aParams.Method = Graphic3d_RM_RAYTRACING; + else + aParams.Method = Graphic3d_RM_RASTERIZATION; + aParams.IsShadowEnabled = myRaytracedShadowsIsOn; + aParams.IsReflectionEnabled = myRaytracedReflectionsIsOn; + aParams.IsAntialiasingEnabled = myRaytracedAntialiasingIsOn; + myAISContext->UpdateCurrentViewer(); +} diff --git a/samples/mfc/standard/Common/OCC_3dBaseDoc.h b/samples/mfc/standard/Common/OCC_3dBaseDoc.h index e590141a2e..eff59545b1 100755 --- a/samples/mfc/standard/Common/OCC_3dBaseDoc.h +++ b/samples/mfc/standard/Common/OCC_3dBaseDoc.h @@ -57,6 +57,8 @@ public: int OnFileImportBrep_WithInitDir (const wchar_t* InitialDir); + void OnObjectRayTracingAction(); + // Generated message map functions protected: //{{AFX_MSG(OCC_3dBaseDoc) @@ -81,11 +83,20 @@ protected: afx_msg void OnObjectRemove(); afx_msg void OnUpdateObjectRemove(CCmdUI* pCmdUI); + afx_msg void OnUpdateV3dButtons(CCmdUI* pCmdUI); + afx_msg void OnObjectRayTracing(); + afx_msg void OnObjectShadows(); + afx_msg void OnObjectReflections(); + afx_msg void OnObjectAntiAliasing(); + //}}AFX_MSG DECLARE_MESSAGE_MAP() protected: - + bool myRayTracingIsOn; + bool myRaytracedShadowsIsOn; + bool myRaytracedReflectionsIsOn; + bool myRaytracedAntialiasingIsOn; int myPopupMenuNumber; }; diff --git a/samples/mfc/standard/Common/OCC_3dChildFrame.cpp b/samples/mfc/standard/Common/OCC_3dChildFrame.cpp index 77f6a8ae2b..c4d3409584 100755 --- a/samples/mfc/standard/Common/OCC_3dChildFrame.cpp +++ b/samples/mfc/standard/Common/OCC_3dChildFrame.cpp @@ -47,5 +47,17 @@ int OCC_3dChildFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) EnableDocking(CBRS_ALIGN_ANY); DockControlBar(&m_wndToolBar); + // Create toolbar for RayTracing functionality + if (!m_RTToolBar.Create(this) || !m_RTToolBar.LoadToolBar(IDR_RAY_TRACING)) + { + TRACE0("Failed to create toolbar\n"); + return -1; // fail to create + } + + m_RTToolBar.SetBarStyle(m_RTToolBar.GetBarStyle() | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC); + m_RTToolBar.EnableDocking(CBRS_ALIGN_ANY); + EnableDocking(CBRS_ALIGN_ANY); + DockControlBar(&m_RTToolBar); + return 0; } \ No newline at end of file diff --git a/samples/mfc/standard/Common/OCC_3dChildFrame.h b/samples/mfc/standard/Common/OCC_3dChildFrame.h index 170cd0da7a..ecc5b1a3bf 100755 --- a/samples/mfc/standard/Common/OCC_3dChildFrame.h +++ b/samples/mfc/standard/Common/OCC_3dChildFrame.h @@ -31,6 +31,9 @@ public: DECLARE_MESSAGE_MAP() +//Attributes +protected: + CToolBar m_RTToolBar; }; #endif // !defined(AFX_OCC_3DCHILDFRAME_H__84879CFC_7EE3_11D7_8632_0060B0EE281E__INCLUDED_) diff --git a/samples/mfc/standard/Common/res/OCC_Resource.h b/samples/mfc/standard/Common/res/OCC_Resource.h index f4fd5c518d..974db147b0 100755 --- a/samples/mfc/standard/Common/res/OCC_Resource.h +++ b/samples/mfc/standard/Common/res/OCC_Resource.h @@ -25,6 +25,7 @@ #define IDR_TB_AIS 149 #define IDD_GrilleRectangulaire 150 #define IDD_GrilleCirculaire 151 +#define IDR_RAY_TRACING 182 #define IDD_COLORMESH 552 #define IDB_coloredmesh 554 #define IDC_RICHEDIT_ResultDialog 1001 @@ -126,6 +127,10 @@ #define ID_BUTTON2DGridRectPoints 32779 #define ID_BUTTON2DGridCircLines 32780 #define ID_OBJECT_REMOVE 32796 +#define ID_OBJECT_RAY_TRACING 32898 +#define ID_OBJECT_SHADOWS 32899 +#define ID_OBJECT_REFLECTIONS 32900 +#define ID_OBJECT_ANTI_ALIASING 32902 #define ID_BUTTONZoomAll 40000 #define ID_OBJECT_ERASE 40001 #define ID_BUTTONZoomWin 40002 diff --git a/samples/mfc/standard/Common/res/OCC_Resource.rc b/samples/mfc/standard/Common/res/OCC_Resource.rc index 3667b0a6b7..38898aac7a 100755 --- a/samples/mfc/standard/Common/res/OCC_Resource.rc +++ b/samples/mfc/standard/Common/res/OCC_Resource.rc @@ -67,6 +67,7 @@ IDR_2dCHILDFRAME BITMAP "2dChildFrameTB.bmp" IDR_3dCHILDFRAME BITMAP "3dChildFrameTB.bmp" IDR_TB_AIS BITMAP "AIS_TB.bmp" IDB_coloredmesh BITMAP "coloredm.bmp" +IDR_RAY_TRACING BITMAP "ToolbarRayTracing.bmp" ///////////////////////////////////////////////////////////////////////////// // @@ -280,6 +281,7 @@ BEGIN PUSHBUTTON "Change dimension color",IDC_DimensionColor,105,156,63,24,BS_MULTILINE CONTROL "",IDC_Flyout,"msctls_trackbar32",TBS_TOP | TBS_TOOLTIPS | WS_TABSTOP,73,112,100,20 END + IDD_DIALOG_STEREO DIALOGEX 0, 0, 166, 177 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Configure stereo" @@ -386,6 +388,14 @@ BEGIN BUTTON ID_OBJECT_DIM END +IDR_RAY_TRACING TOOLBAR 20, 20 +BEGIN + BUTTON ID_OBJECT_RAY_TRACING + BUTTON ID_OBJECT_SHADOWS + BUTTON ID_OBJECT_REFLECTIONS + BUTTON ID_OBJECT_ANTI_ALIASING +END + ///////////////////////////////////////////////////////////////////////////// // diff --git a/samples/mfc/standard/Common/res/ToolbarRayTracing.bmp b/samples/mfc/standard/Common/res/ToolbarRayTracing.bmp new file mode 100644 index 0000000000000000000000000000000000000000..809af47b956a36f764bf631e884a55d6ceeb0e2b GIT binary patch literal 918 zcmd5)F%H5o3_JuYaL`?r@+5&SPHwaa8$0u#FJpQMu^!eb28VgKZ3hJSvw$H2$xoHQ|vepy>dY zpRQI~p{Gnut-NnK@4vyRB*U=>Wy3e&9MPn=9yErV&!E8$``w*{Qd)3%(3LsZU2 z@!*@R`zEFZuE57yNkW@b!r48ji8YFIu#Pt}#bTm_OYHL@{v|aMS<* literal 0 HcmV?d00001 diff --git a/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj index 78e53eafb0..e5f5c8e9a1 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj @@ -781,6 +781,7 @@ + diff --git a/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj.filters b/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj.filters index 3a5573ca69..9dfbb7d9a2 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj.filters +++ b/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj.filters @@ -285,5 +285,8 @@ Resource Files + + Resource Files + \ No newline at end of file diff --git a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj index 972ded5e24..246c776171 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj @@ -785,6 +785,7 @@ + diff --git a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj.filters b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj.filters index 1e4879dfd8..8c55ba1826 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj.filters +++ b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj.filters @@ -285,5 +285,8 @@ Resource Files + + Resource Files + \ No newline at end of file diff --git a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj index c97f860439..34c2e3931f 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj @@ -785,6 +785,7 @@ + diff --git a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj.filters b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj.filters index 1e4879dfd8..8c55ba1826 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj.filters +++ b/samples/mfc/standard/mfcsample/adm/win/vc12/mfcsample.vcxproj.filters @@ -285,5 +285,8 @@ Resource Files + + Resource Files + \ No newline at end of file diff --git a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj index 9c5d36a274..ab5526103e 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj @@ -1957,6 +1957,10 @@ RelativePath="..\..\..\..\Common\res\occ_logo.bmp" > + + diff --git a/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj b/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj index 2006d98994..16d410e35d 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj @@ -1954,6 +1954,10 @@ RelativePath="..\..\..\..\Common\res\occ_logo.bmp" > + +