diff --git a/src/Mod/CAM/PathSimulator/AppGL/EndMill.cpp b/src/Mod/CAM/PathSimulator/AppGL/EndMill.cpp index 68f8f5a73b..ec39d4cbf3 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/EndMill.cpp +++ b/src/Mod/CAM/PathSimulator/AppGL/EndMill.cpp @@ -90,10 +90,10 @@ void EndMill::GenerateDisplayLists(float quality) } // full tool - toolShape.RotateProfile(profilePoints, nPoints, 0, 0, nslices, false); + toolShape.RotateProfile(profilePoints, nPoints, 0, nslices, false); // half tool - halfToolShape.RotateProfile(profilePoints, nPoints, 0, 0, nslices / 2, true); + halfToolShape.RotateProfile(profilePoints, nPoints, 0, nslices / 2, true); // unit path int nFullPoints = PROFILE_BUFFER_POINTS(nPoints); diff --git a/src/Mod/CAM/PathSimulator/AppGL/SimShapes.cpp b/src/Mod/CAM/PathSimulator/AppGL/SimShapes.cpp index d21eb6df20..3be37ce14d 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/SimShapes.cpp +++ b/src/Mod/CAM/PathSimulator/AppGL/SimShapes.cpp @@ -33,11 +33,6 @@ using namespace MillSim; static float* sinTable = nullptr; static float* cosTable = nullptr; static int lastNumSlices = 0; -static int lastNumSectionIndices = 0; -static GLshort quadIndices[] = { 0, 2, 3, 0, 3, 1 }; -static GLshort quadIndicesReversed[] = { 0, 3, 2, 0, 1, 3 }; -static GLshort* sectionIndicesQuad = nullptr; -static GLshort* sectionIndicesTri = nullptr; static bool GenerateSinTable(int nSlices) { @@ -71,7 +66,7 @@ static bool GenerateSinTable(int nSlices) } -void MillSim::Shape::RotateProfile(float* profPoints, int nPoints, float distance, float deltaHeight, int nSlices, bool isHalfTurn) +void MillSim::Shape::RotateProfile(float* profPoints, int nPoints, float distance, int nSlices, bool isHalfTurn) { int vidx = 0; int iidx = 0; diff --git a/src/Mod/CAM/PathSimulator/AppGL/SimShapes.h b/src/Mod/CAM/PathSimulator/AppGL/SimShapes.h index 5e048d808a..0b2821e4d8 100644 --- a/src/Mod/CAM/PathSimulator/AppGL/SimShapes.h +++ b/src/Mod/CAM/PathSimulator/AppGL/SimShapes.h @@ -37,9 +37,6 @@ var[idx++] = z; \ } -// #define SET_TRIPLE(var, idx, x, y, z) {var[idx] = x; var[idx+1] = y; var[idx+2] = z;} -// #define SET_TRIPLE_OFFS(var, idx, offs, x, y, z) {var[idx] = x + offs; var[idx+1] = y + offs; -// var[idx+2] = z + offs;} #define SET_TRIPLE_OFFS(var, idx, offs, x, y, z) \ { \ @@ -78,7 +75,6 @@ public: void RotateProfile(float* profPoints, int nPoints, float distance, - float deltaHeight, int nSlices, bool isHalfTurn); void ExtrudeProfileRadial(float* profPoints,