diff --git a/docs/examples/modeling-ant/index.rst b/docs/examples/modeling-ant/index.rst index d0851bc6..3727f086 100644 --- a/docs/examples/modeling-ant/index.rst +++ b/docs/examples/modeling-ant/index.rst @@ -19,10 +19,10 @@ Modeling in Dust3D #. Load Reference Sheet from Menu: File > Change Turnaround... #. Click Plus(+) Icon from Tool Box -#. Place node on the canvas acording to the reference background. +#. Place node on the canvas according to the reference background. #. Use Mouse Wheel to Adjust the radius of the node, hold shift to slow down the scroll scale. #. Use the Parts List panel to toggle the settings to make you easily select or see nodes. -#. Use Mouse Middle button pluse Shift key to rotate and move around the Rendered Model. +#. Use Mouse Middle button plus Shift key to rotate and move around the Rendered Model. .. image:: https://raw.githubusercontent.com/huxingyi/dust3d/master/docs/examples/modeling-ant/modeling-ant-dust3d-screenshot.png diff --git a/docs/install.rst b/docs/install.rst index 389665cb..9334254c 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -21,7 +21,7 @@ Download and Install Dust3D https://github.com/huxingyi/dust3d/releases/download/1.0.0-rc.6/dust3d-1.0.0-rc.6.dmg - If "The following disk images could't be opened" popped up, that means the downloaded file was broken, please retry. + If "The following disk images couldn't be opened" popped up, that means the downloaded file was broken, please retry. If "can't be opened because its integrity cannot be verified" popped up, please follow ni_kush's answer in this reddit post_. diff --git a/docs/script_reference.rst b/docs/script_reference.rst index 02d3da6c..fe3137df 100644 --- a/docs/script_reference.rst +++ b/docs/script_reference.rst @@ -2,7 +2,7 @@ Dust3D Script Reference --------------------------------------- Introduction =============== -| The most important function of Dust3D is to generate mesh from the source document, which contains the position, radius and connectivity informations of all the nodes. +| The most important function of Dust3D is to generate mesh from the source document, which contains the position, radius and connectivity information of all the nodes. | | Normally, the nodes are drawn by user on the canvas. The scripting system, which we introduce in this document, is to provide a way to procedurally generate nodes, and then the mesh can be generated from these nodes. | diff --git a/docs/shortcuts.rst b/docs/shortcuts.rst index 72aa35ed..a132b653 100644 --- a/docs/shortcuts.rst +++ b/docs/shortcuts.rst @@ -70,7 +70,7 @@ Keyboard +----------------------+--------------------------------------------------------------------------+ | C | Toggle Part Chamfer state | +----------------------+--------------------------------------------------------------------------+ -| E | Swith the Selected Nodes to Different Profile (Main / Side) | +| E | Switch the Selected Nodes to Different Profile (Main / Side) | +----------------------+--------------------------------------------------------------------------+ | F | Bring the part widget of current hovered part to visible area | +----------------------+--------------------------------------------------------------------------+ diff --git a/dust3d.pro b/dust3d.pro index 579ea2e3..41a2bd18 100644 --- a/dust3d.pro +++ b/dust3d.pro @@ -853,11 +853,11 @@ win32 { } isEmpty(BOOST_INCLUDEDIR) { - error("No BOOST_INCLUDEDIR define found in enviroment variables") + error("No BOOST_INCLUDEDIR define found in environment variables") } isEmpty(CGAL_DIR) { - error("No CGAL_DIR define found in enviroment variables") + error("No CGAL_DIR define found in environment variables") } GMP_LIBNAME = libgmp-10 diff --git a/src/fixholes.cpp b/src/fixholes.cpp index dfcf4dff..f7838e94 100644 --- a/src/fixholes.cpp +++ b/src/fixholes.cpp @@ -7,7 +7,7 @@ #include "fixholes.h" #include "util.h" -void fixHoles(const std::vector &verticies, std::vector> &faces) +void fixHoles(const std::vector &vertices, std::vector> &faces) { std::map, std::unordered_set> edgeToFaceSetMap; @@ -139,7 +139,7 @@ void fixHoles(const std::vector &verticies, std::vector &verticies, std::vector simpleuvVertices(verticies.size()); + std::vector simpleuvVertices(vertices.size()); for (size_t i = 0; i < simpleuvVertices.size(); ++i) { - const auto &src = verticies[i]; + const auto &src = vertices[i]; simpleuvVertices[i] = simpleuv::Vertex {{src.x(), src.y(), src.z()}}; } std::vector newFaces; @@ -177,7 +177,7 @@ void fixHoles(const std::vector &verticies, std::vector> addedFaces; //std::vector> removedFaces; std::vector> fixedFaces; @@ -188,14 +188,14 @@ void fixHoles(const std::vector &verticies, std::vector {it.indices[0], it.indices[1], it.indices[2]}); //addedFaces.push_back(std::vector {it.indices[0], it.indices[1], it.indices[2]}); } - //saveAsObj("fixholes_output.obj", verticies, fixedFaces); - //saveAsObj("fixholes_added.obj", verticies, addedFaces); - //saveAsObj("fixholes_removed.obj", verticies, removedFaces); + //saveAsObj("fixholes_output.obj", vertices, fixedFaces); + //saveAsObj("fixholes_added.obj", vertices, addedFaces); + //saveAsObj("fixholes_removed.obj", vertices, removedFaces); faces = fixedFaces; diff --git a/src/fixholes.h b/src/fixholes.h index fe099701..476a9781 100644 --- a/src/fixholes.h +++ b/src/fixholes.h @@ -3,6 +3,6 @@ #include #include -void fixHoles(const std::vector &verticies, std::vector> &faces); +void fixHoles(const std::vector &vertices, std::vector> &faces); #endif diff --git a/src/gridmeshbuilder.cpp b/src/gridmeshbuilder.cpp index e10539c4..04b46258 100644 --- a/src/gridmeshbuilder.cpp +++ b/src/gridmeshbuilder.cpp @@ -316,7 +316,7 @@ void GridMeshBuilder::extrude() } bool pickSecondMesh = false; - // The outter faces should have longer edges + // The outer faces should have longer edges float sumOfFirstMeshEdgeLength = 0; float sumOfSecondMeshEdgeLength = 0; for (size_t i = 0; i < m_generatedFaces.size(); ++i) { diff --git a/src/meshsplitter.cpp b/src/meshsplitter.cpp index 796b8255..302beca1 100644 --- a/src/meshsplitter.cpp +++ b/src/meshsplitter.cpp @@ -66,7 +66,7 @@ bool MeshSplitter::split(const std::set &input, } } - // Find one triangle wich is direct neighbor of one splitter + // Find one triangle which is direct neighbor of one splitter MeshSplitterTriangle startTriangle; bool foundStartTriangle = false; for (const auto &triangle: splitter) { diff --git a/src/modelmeshbinder.cpp b/src/modelmeshbinder.cpp index eed1db79..2588bfe5 100644 --- a/src/modelmeshbinder.cpp +++ b/src/modelmeshbinder.cpp @@ -271,7 +271,7 @@ void ModelMeshBinder::paint(ModelShaderProgram *program) if (m_renderEdgeVertexCount > 0) { QOpenGLVertexArrayObject::Binder vaoBinder(&m_vaoEdge); QOpenGLFunctions *f = QOpenGLContext::currentContext()->functions(); - // glDrawArrays GL_LINES crashs on Mesa GL + // glDrawArrays GL_LINES crashes on Mesa GL if (program->isCoreProfile()) { program->setUniformValue(program->textureEnabledLoc(), 0); program->setUniformValue(program->normalMapEnabledLoc(), 0); diff --git a/src/modeloffscreenrender.cpp b/src/modeloffscreenrender.cpp index 10bf2524..79ab11a2 100644 --- a/src/modeloffscreenrender.cpp +++ b/src/modeloffscreenrender.cpp @@ -17,7 +17,7 @@ ModelOffscreenRender::ModelOffscreenRender(const QSurfaceFormat &format, QScreen ModelOffscreenRender::~ModelOffscreenRender() { // FIXME: If delete m_renderFbo inside toImage, - // sometimes, the application will freeze, maybe there are dead locks inside the desctruction call + // sometimes, the application will freeze, maybe there are dead locks inside the destruction call // move it here can make sure it will be deleted on the main GUI thread to avoid dead locks delete m_renderFbo; diff --git a/src/modelwidget.cpp b/src/modelwidget.cpp index 7caa4733..6f9f764b 100644 --- a/src/modelwidget.cpp +++ b/src/modelwidget.cpp @@ -9,7 +9,7 @@ #include "util.h" #include "preferences.h" -// Modifed from http://doc.qt.io/qt-5/qtopengl-hellogl2-glwidget-cpp.html +// Modified from http://doc.qt.io/qt-5/qtopengl-hellogl2-glwidget-cpp.html bool ModelWidget::m_transparent = true; float ModelWidget::m_minZoomRatio = 5.0; diff --git a/src/skeletongraphicswidget.h b/src/skeletongraphicswidget.h index 1b672a2b..8928e8fb 100644 --- a/src/skeletongraphicswidget.h +++ b/src/skeletongraphicswidget.h @@ -676,7 +676,7 @@ private: void alignSelectedToLocal(bool alignToVerticalCenter, bool alignToHorizontalCenter); void rotateItems(const std::set &nodeItems, int degree, QVector2D center); void rotateAllSideProfile(int degree); -private: //need initalize +private: //need initialize const SkeletonDocument *m_document; QGraphicsPixmapItem *m_backgroundItem; bool m_turnaroundChanged;