sort variableNames to provide consistent observations

daveey · Feb 13, 2024 · d593520 · d593520
1 parent 9623461
commit d593520
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Griddly/Core/Grid.cpp b/src/Griddly/Core/Grid.cpp
@@ -446,6 +446,7 @@ std::shared_ptr<Object> Grid::getObject(glm::ivec2 location) const {
     const auto& objectsAtLocation = occupiedLocations_.at(location);
     if (!objectsAtLocation.empty()) {
       // Get the highest index object
+
       return objectsAtLocation.rbegin()->second;
     }
   }
@@ -497,6 +498,10 @@ void Grid::initObject(std::string objectName, std::vector<std::string> variableN
   objectCounters_.insert({objectName, {{0, std::make_shared<int32_t>(0)}}});
 
   for (auto& variableName : variableNames) {
+      objectVariables_.insert(variableName);
+  }
+  objectVariableMap_.clear();
+  for (auto& variableName : objectVariables_) {
     objectVariableIds_.insert({variableName, objectVariableIds_.size()});
   }
 
@@ -739,4 +744,4 @@ const std::unordered_map<std::string, std::unordered_set<std::string>>& Grid::ge
   return collisionObjectActionNames_;
 }
 
-}  // namespace griddly
+}  // namespace griddly
diff --git a/src/Griddly/Core/Grid.hpp b/src/Griddly/Core/Grid.hpp
@@ -110,7 +110,7 @@ class Grid : public std::enable_shared_from_this<Grid> {
   virtual const std::unordered_set<std::shared_ptr<Object>>& getObjects();
 
   virtual void addPlayerDefaultEmptyObject(std::shared_ptr<Object> emptyObject);
-  
+
   virtual void addPlayerDefaultBoundaryObject(std::shared_ptr<Object> boundaryObject);
 
   virtual std::shared_ptr<Object> getPlayerDefaultEmptyObject(uint32_t playerId) const;
@@ -199,6 +199,7 @@ class Grid : public std::enable_shared_from_this<Grid> {
   std::vector<std::unordered_set<glm::ivec2>> updatedLocations_;
 
   std::unordered_map<std::string, uint32_t> objectIds_;
+  std::set<std::string> objectVariables_;
   std::unordered_map<std::string, uint32_t> objectVariableIds_;
   std::unordered_map<std::string, std::vector<std::string>> objectVariableMap_;
   std::unordered_set<std::shared_ptr<Object>> objects_;
@@ -248,4 +249,4 @@ class Grid : public std::enable_shared_from_this<Grid> {
   std::shared_ptr<RandomGenerator> randomGenerator_ = std::make_shared<RandomGenerator>(RandomGenerator());
 };
 
-}  // namespace griddly
+}  // namespace griddly