diff --git a/adm/UDLIST b/adm/UDLIST index 2165d54dd0..c2f073ced8 100644 --- a/adm/UDLIST +++ b/adm/UDLIST @@ -207,7 +207,6 @@ t TKShHealing t TKTopAlgo t TKXMesh n InterfaceGraphic -n VoxelClient p AIS p AIS2D p AlienImage diff --git a/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp b/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp index 70da435841..d04a262957 100755 --- a/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp +++ b/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp @@ -1088,11 +1088,30 @@ GetDocument()->UpdateResultMessageDlg("SetAntialiasingOn/SetAntialiasingOff",Mes void CViewer3dView::OnClearLights() { // Setting Off all viewer active lights + TColStd_ListOfTransient lights; for(myView->Viewer()->InitActiveLights(); myView->Viewer()->MoreActiveLights(); myView->Viewer()->NextActiveLights()) - myView->Viewer()->SetLightOff(myView->Viewer()->ActiveLight()); + { + lights.Append(myView->Viewer()->ActiveLight()); + } + TColStd_ListIteratorOfListOfTransient itrLights(lights); + for (; itrLights.More(); itrLights.Next()) + { + Handle(V3d_Light) light = Handle(V3d_Light)::DownCast(itrLights.Value()); + myView->Viewer()->SetLightOff(light); + } + // Setting Off all view active lights - for(myView->InitActiveLights(); myView->MoreActiveLights(); myView->NextActiveLights()) - myView->SetLightOff(myView->ActiveLight()); + lights.Clear(); + for(myView->InitActiveLights(); myView->MoreActiveLights(); myView->NextActiveLights()) + { + lights.Append(myView->ActiveLight()); + } + itrLights.Initialize(lights); + for (; itrLights.More(); itrLights.Next()) + { + Handle(V3d_Light) light = Handle(V3d_Light)::DownCast(itrLights.Value()); + myView->SetLightOff(light); + } myView->Viewer()->SetDefaultLights();// Setting the default lights on @@ -1101,10 +1120,31 @@ void CViewer3dView::OnClearLights() myView->Update(); TCollection_AsciiString Message("\ +// Setting Off all viewer active lights\n\ +TColStd_ListOfTransient lights;\n\ for(myView->Viewer()->InitActiveLights(); myView->Viewer()->MoreActiveLights(); myView->Viewer()->NextActiveLights())\n\ - myView->Viewer()->SetLightOff(myView->Viewer()->ActiveLight()); //Setting Off all viewer active lights\n\ +{\n\ + lights.Append(myView->Viewer()->ActiveLight());\n\ +}\n\ +TColStd_ListIteratorOfListOfTransient itrLights(lights);\n\ +for (; itrLights.More(); itrLights.Next())\n\ +{\n\ + Handle(V3d_Light) light = Handle(V3d_Light)::DownCast(itrLights.Value());\n\ + myView->Viewer()->SetLightOff(light);\n\ +}\n\ +\n\ +// Setting Off all view active lights\n\ +lights.Clear();\n\ for(myView->InitActiveLights(); myView->MoreActiveLights(); myView->NextActiveLights())\n\ - myView->SetLightOff(myView->ActiveLight()); //Setting Off all view active lights\n\ +{\n\ + lights.Append(myView->ActiveLight());\n\ +}\n\ +itrLights.Initialize(lights);\n\ +for (; itrLights.More(); itrLights.Next())\n\ +{\n\ + Handle(V3d_Light) light = Handle(V3d_Light)::DownCast(itrLights.Value());\n\ + myView->SetLightOff(light);\n\ +}\n\ \n\ myView->Viewer()->SetDefaultLights();// Setting the default lights on\n\ "); diff --git a/samples/mfc/standard/06_Ocaf/src/OcafApp.cpp b/samples/mfc/standard/06_Ocaf/src/OcafApp.cpp index ed5d3a8758..6a106f5288 100755 --- a/samples/mfc/standard/06_Ocaf/src/OcafApp.cpp +++ b/samples/mfc/standard/06_Ocaf/src/OcafApp.cpp @@ -143,7 +143,7 @@ BOOL COcafApp::IsViewExisting(CDocument * pDoc, CRuntimeClass * pViewClass, CVie void COcafApp::OnFileOpen() { CFileDialog aDlg(TRUE, NULL, NULL, OFN_FILEMUSTEXIST|OFN_HIDEREADONLY, - "OCAFSample(STA) (*.sta)|*.sta|OCAFSample(XML) (*.xml)|*.xml|OCAFSample(Binary) (*.cbf)|*.cbf||"); + "OCAFSample(STD) (*.std)|*.std|OCAFSample(XML) (*.xml)|*.xml|OCAFSample(Binary) (*.cbf)|*.cbf||"); if (aDlg.DoModal() != IDOK) return; diff --git a/samples/mfc/standard/06_Ocaf/src/OcafDoc.cpp b/samples/mfc/standard/06_Ocaf/src/OcafDoc.cpp index 75234c6a64..329dff7d16 100755 --- a/samples/mfc/standard/06_Ocaf/src/OcafDoc.cpp +++ b/samples/mfc/standard/06_Ocaf/src/OcafDoc.cpp @@ -603,7 +603,8 @@ D->CommitCommand(); \n\ // Get the TOcafFunction_CutDriver using its Standard_GUID in the TFunction_DriverTable Handle(TOcafFunction_CutDriver) myCutDriver; - TFunction_DriverTable::Get()->FindDriver(myDriverID, myCutDriver); + if (TFunction_DriverTable::Get()->FindDriver(myDriverID, myCutDriver)) + myCutDriver->Init(LabObject); // Recompute the cut object if it must be (look at the MustExecute function code) // if (myCutDriver->MustExecute(log)) @@ -904,21 +905,21 @@ void COcafDoc::OnFileSaveAs() CString Filter; if (TPathName.SearchFromEnd(".xml") > 0){ - Filter = "OCAFSample(XML) (*.xml)|*.xml|OCAFSample(STA) (*.sta)|*.sta|OCAFSample(Binary) (*.cbf)|*.cbf||"; + Filter = "OCAFSample(XML) (*.xml)|*.xml|OCAFSample(STD) (*.std)|*.std|OCAFSample(Binary) (*.cbf)|*.cbf||"; } else if (TPathName.SearchFromEnd(".cbf") > 0){ - Filter = "OCAFSample(Binary) (*.cbf)|*.cbf|OCAFSample(STA) (*.sta)|*.sta|OCAFSample(XML) (*.xml)|*.xml||"; + Filter = "OCAFSample(Binary) (*.cbf)|*.cbf|OCAFSample(STD) (*.std)|*.std|OCAFSample(XML) (*.xml)|*.xml||"; } else{ - Filter = "OCAFSample(STA) (*.sta)|*.sta|OCAFSample(XML) (*.xml)|*.xml|OCAFSample(Binary) (*.cbf)|*.cbf||"; + Filter = "OCAFSample(STD) (*.std)|*.std|OCAFSample(XML) (*.xml)|*.xml|OCAFSample(Binary) (*.cbf)|*.cbf||"; } CFileDialog dlg(FALSE, - "sta", + "std", GetTitle(), OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, Filter, -// "sta Files (*.sta)|*.sta; |All Files (*.*)|*.*||", +// "std Files (*.std)|*.std; |All Files (*.*)|*.*||", NULL ); @@ -930,8 +931,8 @@ void COcafDoc::OnFileSaveAs() CWaitCursor aWaitCursor; CString CSPath = dlg.GetPathName(); -// if((CSPath.Find(CString(".sta")))==-1 ) -// CSPath = CSPath + ".sta"; +// if((CSPath.Find(CString(".std")))==-1 ) +// CSPath = CSPath + ".std"; cout << "Save As " << CSPath << endl; PathName=CSPath; @@ -1042,11 +1043,11 @@ m_App->SaveAs(myOcafDoc,(TCollection_ExtendedString) TPath); \n\ } CFileDialog dlg(FALSE, - "sta", + "std", GetTitle(), OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, - "OCAFSample(STA) (*.sta)|*.sta|OCAFSample(XML) (*.xml)|*.xml|OCAFSample(Binary) (*.cbf)|*.cbf||", -// "sta Files (*.sta)|*.sta; |All Files (*.*)|*.*||", + "OCAFSample(STD) (*.std)|*.std|OCAFSample(XML) (*.xml)|*.xml|OCAFSample(Binary) (*.cbf)|*.cbf||", +// "std Files (*.std)|*.std; |All Files (*.*)|*.*||", NULL ); if (dlg.DoModal() != IDOK) return; @@ -1088,8 +1089,8 @@ m_App->SaveAs(myOcafDoc,(TCollection_ExtendedString) TPath); \n\ } -// if((CSPath.Find(CString(".sta")))==-1 ) -// CSPath = CSPath + ".sta"; +// if((CSPath.Find(CString(".std")))==-1 ) +// CSPath = CSPath + ".std"; // cout << "Save As " << CSPath << endl; // PathName=CSPath; diff --git a/samples/qt/VoxelDemo/VoxelDemo.sln b/samples/qt/VoxelDemo/VoxelDemo.sln new file mode 100644 index 0000000000..1e5a741470 --- /dev/null +++ b/samples/qt/VoxelDemo/VoxelDemo.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VoxelDemo", "VoxelDemo.vcproj", "{EF9DFAE9-E10E-42D4-87D1-52431728AFDF}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {EF9DFAE9-E10E-42D4-87D1-52431728AFDF}.Debug|Win32.ActiveCfg = Debug|Win32 + {EF9DFAE9-E10E-42D4-87D1-52431728AFDF}.Debug|Win32.Build.0 = Debug|Win32 + {EF9DFAE9-E10E-42D4-87D1-52431728AFDF}.Release|Win32.ActiveCfg = Release|Win32 + {EF9DFAE9-E10E-42D4-87D1-52431728AFDF}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/samples/qt/VoxelDemo/VoxelDemo.vcproj b/samples/qt/VoxelDemo/VoxelDemo.vcproj new file mode 100644 index 0000000000..538b89c1e2 --- /dev/null +++ b/samples/qt/VoxelDemo/VoxelDemo.vcproj @@ -0,0 +1,291 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/qt/voxeldemo/inc/Application.h b/samples/qt/VoxelDemo/inc/Application.h old mode 100755 new mode 100644 similarity index 100% rename from samples/qt/voxeldemo/inc/Application.h rename to samples/qt/VoxelDemo/inc/Application.h diff --git a/samples/qt/voxeldemo/inc/ConversionThread.h b/samples/qt/VoxelDemo/inc/ConversionThread.h old mode 100755 new mode 100644 similarity index 100% rename from samples/qt/voxeldemo/inc/ConversionThread.h rename to samples/qt/VoxelDemo/inc/ConversionThread.h diff --git a/samples/qt/voxeldemo/inc/Timer.h b/samples/qt/VoxelDemo/inc/Timer.h old mode 100755 new mode 100644 similarity index 100% rename from samples/qt/voxeldemo/inc/Timer.h rename to samples/qt/VoxelDemo/inc/Timer.h diff --git a/samples/qt/voxeldemo/inc/Viewer.h b/samples/qt/VoxelDemo/inc/Viewer.h old mode 100755 new mode 100644 similarity index 100% rename from samples/qt/voxeldemo/inc/Viewer.h rename to samples/qt/VoxelDemo/inc/Viewer.h diff --git a/src/VoxelClient/VoxelClient_VisDrawer.h b/samples/qt/VoxelDemo/inc/VoxelClient_VisDrawer.h old mode 100755 new mode 100644 similarity index 94% rename from src/VoxelClient/VoxelClient_VisDrawer.h rename to samples/qt/VoxelDemo/inc/VoxelClient_VisDrawer.h index a36cca95ea..cb89ac2bfd --- a/src/VoxelClient/VoxelClient_VisDrawer.h +++ b/samples/qt/VoxelDemo/inc/VoxelClient_VisDrawer.h @@ -24,8 +24,6 @@ #include "Voxel_VisData.h" #include -class Handle(OpenGl_GraphicDriver); - class VoxelClient_VisDrawer { public: @@ -34,7 +32,7 @@ public: public: - Standard_EXPORT static void Init (Handle(OpenGl_GraphicDriver)& theDriver); + Standard_EXPORT static void Init(); Standard_EXPORT VoxelClient_VisDrawer(Voxel_VisData* theData); Standard_EXPORT virtual ~VoxelClient_VisDrawer(); diff --git a/samples/qt/VoxelDemo/msvc.bat b/samples/qt/VoxelDemo/msvc.bat new file mode 100644 index 0000000000..fc4216854b --- /dev/null +++ b/samples/qt/VoxelDemo/msvc.bat @@ -0,0 +1,6 @@ +set CASROOT=D:\OCC653\ros +set QTDIR=D:\qt\4.8.2 +set PATH=%QTDIR%\bin;%PATH% + +call %CASROOT%/env.bat %1 %2 %3 +call %CASROOT%/msvc.bat %1 %2 %3 VoxelDemo.sln diff --git a/samples/qt/voxeldemo/src/Application.cpp b/samples/qt/VoxelDemo/src/Application.cpp old mode 100755 new mode 100644 similarity index 100% rename from samples/qt/voxeldemo/src/Application.cpp rename to samples/qt/VoxelDemo/src/Application.cpp diff --git a/samples/qt/voxeldemo/src/ConversionThread.cpp b/samples/qt/VoxelDemo/src/ConversionThread.cpp old mode 100755 new mode 100644 similarity index 100% rename from samples/qt/voxeldemo/src/ConversionThread.cpp rename to samples/qt/VoxelDemo/src/ConversionThread.cpp diff --git a/samples/qt/voxeldemo/src/Main.cpp b/samples/qt/VoxelDemo/src/Main.cpp old mode 100755 new mode 100644 similarity index 100% rename from samples/qt/voxeldemo/src/Main.cpp rename to samples/qt/VoxelDemo/src/Main.cpp diff --git a/samples/qt/voxeldemo/src/Timer.cpp b/samples/qt/VoxelDemo/src/Timer.cpp old mode 100755 new mode 100644 similarity index 100% rename from samples/qt/voxeldemo/src/Timer.cpp rename to samples/qt/VoxelDemo/src/Timer.cpp diff --git a/samples/qt/voxeldemo/src/Viewer.cpp b/samples/qt/VoxelDemo/src/Viewer.cpp old mode 100755 new mode 100644 similarity index 100% rename from samples/qt/voxeldemo/src/Viewer.cpp rename to samples/qt/VoxelDemo/src/Viewer.cpp diff --git a/src/VoxelClient/VoxelClient_VisDrawer.cxx b/samples/qt/VoxelDemo/src/VoxelClient_VisDrawer.cxx old mode 100755 new mode 100644 similarity index 99% rename from src/VoxelClient/VoxelClient_VisDrawer.cxx rename to samples/qt/VoxelDemo/src/VoxelClient_VisDrawer.cxx index 88497ec46d..e75fbc7228 --- a/src/VoxelClient/VoxelClient_VisDrawer.cxx +++ b/samples/qt/VoxelDemo/src/VoxelClient_VisDrawer.cxx @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include @@ -46,11 +46,6 @@ public: void Render (const Handle(OpenGl_Workspace) &theWorkspace) const; - virtual void Release (const Handle(OpenGl_Context)& theContext) - { - // - } - private: VoxelClient_VisDrawer* myHandler; @@ -131,14 +126,16 @@ static OpenGl_Element* VisDrawerCallBack (const Graphic3d_CUserDraw* theUserDraw } /**************************************************************************/ -void VoxelClient_VisDrawer::Init (Handle(OpenGl_GraphicDriver)& theDriver) +void VoxelClient_VisDrawer::Init() { static Standard_Boolean isInitializeded(Standard_False); if (!isInitializeded) { isInitializeded = Standard_True; - theDriver->UserDrawCallback() = VisDrawerCallBack; + + OpenGl_UserDrawCallback& aCallback = UserDrawCallback (); + aCallback = VisDrawerCallBack; } } diff --git a/samples/qt/voxeldemo/OpenGl/OpenGl.vcproj b/samples/qt/voxeldemo/OpenGl/OpenGl.vcproj deleted file mode 100755 index 7bda01bb53..0000000000 --- a/samples/qt/voxeldemo/OpenGl/OpenGl.vcproj +++ /dev/null @@ -1,643 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/qt/voxeldemo/VoxelDemo-vc8.sln b/samples/qt/voxeldemo/VoxelDemo-vc8.sln deleted file mode 100644 index c3f4ef625a..0000000000 --- a/samples/qt/voxeldemo/VoxelDemo-vc8.sln +++ /dev/null @@ -1,29 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenGl", "OpenGl\OpenGl.vcproj", "{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VoxelDemo", "VoxelDemo.vcproj", "{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}" - ProjectSection(ProjectDependencies) = postProject - {CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5} = {CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Debug|Win32.ActiveCfg = Debug|Win32 - {CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Debug|Win32.Build.0 = Debug|Win32 - {CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Release|Win32.ActiveCfg = Release|Win32 - {CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Release|Win32.Build.0 = Release|Win32 - {2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Debug|Win32.ActiveCfg = Debug|Win32 - {2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Debug|Win32.Build.0 = Debug|Win32 - {2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Release|Win32.ActiveCfg = Release|Win32 - {2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/samples/qt/voxeldemo/VoxelDemo-vc9.sln b/samples/qt/voxeldemo/VoxelDemo-vc9.sln deleted file mode 100644 index c9e690cf94..0000000000 --- a/samples/qt/voxeldemo/VoxelDemo-vc9.sln +++ /dev/null @@ -1,29 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenGl", "OpenGl\OpenGl.vcproj", "{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VoxelDemo", "VoxelDemo.vcproj", "{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}" - ProjectSection(ProjectDependencies) = postProject - {CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5} = {CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Debug|Win32.ActiveCfg = Debug|Win32 - {CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Debug|Win32.Build.0 = Debug|Win32 - {CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Release|Win32.ActiveCfg = Release|Win32 - {CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Release|Win32.Build.0 = Release|Win32 - {2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Debug|Win32.ActiveCfg = Debug|Win32 - {2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Debug|Win32.Build.0 = Debug|Win32 - {2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Release|Win32.ActiveCfg = Release|Win32 - {2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/samples/qt/voxeldemo/VoxelDemo.vcproj b/samples/qt/voxeldemo/VoxelDemo.vcproj deleted file mode 100755 index a5ffc00c1a..0000000000 --- a/samples/qt/voxeldemo/VoxelDemo.vcproj +++ /dev/null @@ -1,438 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/qt/voxeldemo/env.bat b/samples/qt/voxeldemo/env.bat deleted file mode 100755 index b07d52967e..0000000000 --- a/samples/qt/voxeldemo/env.bat +++ /dev/null @@ -1,16 +0,0 @@ -@ECHO OFF - -IF not "%CASDEB%" EQU "" ( -SET BIN_DIR=Debug -) ELSE ( -SET BIN_DIR=Release -) - -SET PATH=%~dp0%BIN_DIR%;%PATH% - -SET CSF_GraphicShr=OpenGl\%BIN_DIR%\VoxelOpenGl.dll - -SET PATH=%~dp0OpenGl\%BIN_DIR%;%PATH% - -SET CSF_TEX_FONT=2 -SET MMGT_REENTRANT=1 diff --git a/samples/qt/voxeldemo/msvc.bat b/samples/qt/voxeldemo/msvc.bat deleted file mode 100644 index f0e56be8cd..0000000000 --- a/samples/qt/voxeldemo/msvc.bat +++ /dev/null @@ -1,4 +0,0 @@ -call ../../../env.bat %1 %2 %3 -call %~dp0env.bat -if not ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% %CASDEB% VoxelDemo-%VCVER%.sln -if ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% "" VoxelDemo-%VCVER%.sln \ No newline at end of file diff --git a/samples/qt/voxeldemo/run.bat b/samples/qt/voxeldemo/run.bat deleted file mode 100644 index d6571cce86..0000000000 --- a/samples/qt/voxeldemo/run.bat +++ /dev/null @@ -1,18 +0,0 @@ -call ../../../env.bat %1 %2 %3 - -call %~dp0env.bat - -if not exist "%BIN_DIR%\VoxelDemo.exe" goto ERR_EXE - -echo Starting VoxelDemo ..... -start /D "%BIN_DIR%" VoxelDemo.exe - -goto END - -:ERR_EXE -echo Executable %BIN_DIR%\VoxelDemo.exe not found." -echo Probably you didn't compile the application. -pause -goto END - -:END \ No newline at end of file diff --git a/src/OS/Visualization.tcl b/src/OS/Visualization.tcl index db96db5335..a34ff23b5c 100755 --- a/src/OS/Visualization.tcl +++ b/src/OS/Visualization.tcl @@ -35,7 +35,6 @@ proc Visualization:ressources { } { return [list \ [list both r FontMFT {}] \ [list both r Textures {}] \ - [list both n VoxelClient {}] \ ] } ;# diff --git a/src/VoxelClient/FILES b/src/VoxelClient/FILES deleted file mode 100755 index 4ad113e873..0000000000 --- a/src/VoxelClient/FILES +++ /dev/null @@ -1,2 +0,0 @@ -VoxelClient_VisDrawer.h -VoxelClient_VisDrawer.cxx