minor fixes (3)

GaijinEntertainment · Jan 9, 2024 · a6d338b · a6d338b
1 parent 5647fba
commit a6d338b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/_docs/build_all_docs.py b/_docs/build_all_docs.py
@@ -4,7 +4,7 @@
 
 _DIR = os.path.dirname(os.path.realpath(__file__))
 def shell(cmd):
-  subprocess.check_call(cmd, shell=True, stdout=sys.stdout, stderr=subprocess.STDOUT, bufsize=1, universal_newlines=True)
+  subprocess.check_call(cmd, shell=False, stdout=sys.stdout, stderr=subprocess.STDOUT, bufsize=1, universal_newlines=True)
 
 def main():
   prevd = os.getcwd()

diff --git a/prog/dagorInclude/scene/dag_occlusion.h b/prog/dagorInclude/scene/dag_occlusion.h
@@ -27,7 +27,7 @@
 class Occlusion
 {
 public:
-  Occlusion() : curView(), curProj(), curViewProj(), curViewPos(), cockpitAnim(){};
+  Occlusion() = default;
   void init()
   {
     occ = OcclusionSystem::create();
@@ -282,14 +282,14 @@ class Occlusion
   inline int getRasterizedQuadOccluders() const { return 0; }
 #endif
 protected:
-  mat44f curViewProj;
-  mat44f curView;
-  mat44f curProj;
-  vec3f curViewPos;
+  mat44f curViewProj = {};
+  mat44f curView = {};
+  mat44f curProj = {};
+  vec3f curViewPos = v_zero();
   OcclusionSystem *occ = 0;
   float cockpitDistance = 0;
   CockpitReprojectionMode cockpitMode = COCKPIT_NO_REPROJECT;
-  mat44f cockpitAnim;
+  mat44f cockpitAnim = {};
   int rasterizedBoxOccluders = 0, rasterizedQuadOccluders = 0, rasterizedTriOccluders = 0;
   bool hasMergedOcclusion = false;
 #if CAN_DEBUG_OCCLUSION

diff --git a/prog/engine/anim/animFABRIKCtrl.cpp b/prog/engine/anim/animFABRIKCtrl.cpp
@@ -279,10 +279,10 @@ void AnimV20::MultiChainFABRIKCtrl::process(IPureAnimStateHolder &st, real wt, G
     {
       chain_vec_tab_t &chain = chains.push_back();
       dag::Span<chain_node_t> nodeIds = S.chainNodeIds(i);
-      for (int i = 1; i < nodeIds.size(); i++)
+      for (int j = 1; j < nodeIds.size(); j++)
       {
-        add_bone(chain, tree.getNodeWposRel(nodeIds[i - 1]), tree.getNodeWposRel(nodeIds[i]));
-        // debug("add bone* %s - %s", tree.getNodeName(nodeIds[i-1]), tree.getNodeName(nodeIds[i]));
+        add_bone(chain, tree.getNodeWposRel(nodeIds[j - 1]), tree.getNodeWposRel(nodeIds[j]));
+        // debug("add bone* %s - %s", tree.getNodeName(nodeIds[j-1]), tree.getNodeName(nodeIds[j]));
       }
       mat44f &n0_wtm = tree.getNodeWtmRel(nodeIds.back());
       add_last_bone_point(chain, n0_wtm.col3);

diff --git a/prog/gameLibs/render/randomGrass.cpp b/prog/gameLibs/render/randomGrass.cpp
@@ -902,11 +902,11 @@ void RandomGrass::initWebTools()
   {
     GrassLayer *layer = layers[i];
     int foundIdx = -1;
-    for (int i = 0; i < grassNameCount.size(); ++i)
+    for (int j = 0; j < grassNameCount.size(); ++j)
     {
-      if (strcmp(grassNameCount[i].name, layer->info.resName.str()) == 0)
+      if (strcmp(grassNameCount[j].name, layer->info.resName.str()) == 0)
       {
-        foundIdx = i;
+        foundIdx = j;
         break;
       }
     }