From 7be891b4409178c9001d6690112a2b441e858ff9 Mon Sep 17 00:00:00 2001
From: Atahualpa <m_otto@hotmail.de>
Date: Mon, 10 May 2021 23:05:34 +0200
Subject: [PATCH] Directly use Geometry instead of Geode; fix for loop; add
 size_t type-cast.

---
 apps/opencs/view/render/cellborder.cpp | 35 +++++++++++++-------------
 apps/opencs/view/render/cellborder.hpp |  4 +--
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/apps/opencs/view/render/cellborder.cpp b/apps/opencs/view/render/cellborder.cpp
index 88de12ca5a..a1ae4f4527 100644
--- a/apps/opencs/view/render/cellborder.cpp
+++ b/apps/opencs/view/render/cellborder.cpp
@@ -2,7 +2,6 @@
 
 #include <osg/Group>
 #include <osg/PositionAttitudeTransform>
-#include <osg/Geode>
 #include <osg/Geometry>
 #include <osg/PrimitiveSet>
 
@@ -19,12 +18,12 @@ const int CSVRender::CellBorder::VertexCount = (ESM::Land::LAND_SIZE * 4) - 3;
 CSVRender::CellBorder::CellBorder(osg::Group* cellNode, const CSMWorld::CellCoordinates& coords)
     : mParentNode(cellNode)
 {
-    mBorderGeode = new osg::Geode();
+    mBorderGeometry = new osg::Geometry();
     
     mBaseNode = new osg::PositionAttitudeTransform();
     mBaseNode->setNodeMask(Mask_CellBorder);
     mBaseNode->setPosition(osg::Vec3f(coords.getX() * CellSize, coords.getY() * CellSize, 10));
-    mBaseNode->addChild(mBorderGeode);
+    mBaseNode->addChild(mBorderGeometry);
 
     mParentNode->addChild(mBaseNode);
 }
@@ -41,54 +40,56 @@ void CSVRender::CellBorder::buildShape(const ESM::Land& esmLand)
     if (!landData)
         return;
 
-    osg::ref_ptr<osg::Geometry> geometry = new osg::Geometry();
+    mBaseNode->removeChild(mBorderGeometry);
+    mBorderGeometry = new osg::Geometry();
 
     // Vertices
     osg::ref_ptr<osg::Vec3Array> vertices = new osg::Vec3Array();
 
-    int x = 0, y = 0;
-    for (; x < ESM::Land::LAND_SIZE; ++x)
+    int x = 0;
+    int y = 0;
+
+    for (/* */; x < ESM::Land::LAND_SIZE - 1; ++x)
         vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
 
     x = ESM::Land::LAND_SIZE - 1;
-    for (; y < ESM::Land::LAND_SIZE; ++y)
+    for (/* */; y < ESM::Land::LAND_SIZE - 1; ++y)
         vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
 
     y = ESM::Land::LAND_SIZE - 1;
-    for (; x >= 0; --x)
+    for (/* */; x > 0; --x)
         vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
 
     x = 0;
-    for (; y >= 0; --y)
+    for (/* */; y >= 0; --y)
         vertices->push_back(osg::Vec3f(scaleToWorld(x), scaleToWorld(y), landData->mHeights[landIndex(x, y)]));
 
-    geometry->setVertexArray(vertices);
+    mBorderGeometry->setVertexArray(vertices);
 
     // Color
     osg::ref_ptr<osg::Vec4Array> colors = new osg::Vec4Array();
     colors->push_back(osg::Vec4f(0.f, 0.5f, 0.f, 1.f));
 
-    geometry->setColorArray(colors, osg::Array::BIND_PER_PRIMITIVE_SET);
+    mBorderGeometry->setColorArray(colors, osg::Array::BIND_PER_PRIMITIVE_SET);
 
     // Primitive
     osg::ref_ptr<osg::DrawElementsUShort> primitives =
-        new osg::DrawElementsUShort(osg::PrimitiveSet::LINE_STRIP, VertexCount+1);
+        new osg::DrawElementsUShort(osg::PrimitiveSet::LINE_STRIP, VertexCount);
 
     for (size_t i = 0; i < VertexCount; ++i)
         primitives->setElement(i, i);
 
     primitives->setElement(VertexCount, 0);
 
-    geometry->addPrimitiveSet(primitives);
-    geometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
+    mBorderGeometry->addPrimitiveSet(primitives);
+    mBorderGeometry->getOrCreateStateSet()->setMode(GL_LIGHTING, osg::StateAttribute::OFF);
 
-    mBorderGeode->removeDrawables(0);
-    mBorderGeode->addDrawable(geometry);
+    mBaseNode->addChild(mBorderGeometry);
 }
 
 size_t CSVRender::CellBorder::landIndex(int x, int y)
 {
-    return y * ESM::Land::LAND_SIZE + x;
+    return static_cast<size_t>(y) * ESM::Land::LAND_SIZE + x;
 }
 
 float CSVRender::CellBorder::scaleToWorld(int value)
diff --git a/apps/opencs/view/render/cellborder.hpp b/apps/opencs/view/render/cellborder.hpp
index c7e47a00f4..be2e18eeee 100644
--- a/apps/opencs/view/render/cellborder.hpp
+++ b/apps/opencs/view/render/cellborder.hpp
@@ -7,7 +7,7 @@
 
 namespace osg
 {
-    class Geode;
+    class Geometry;
     class Group;
     class PositionAttitudeTransform;
 }
@@ -48,7 +48,7 @@ namespace CSVRender
 
         osg::Group* mParentNode;
         osg::ref_ptr<osg::PositionAttitudeTransform> mBaseNode;
-        osg::ref_ptr<osg::Geode> mBorderGeode;
+        osg::ref_ptr<osg::Geometry> mBorderGeometry;
     };
 }