Working set

Author: Atlinx

bin/windows/netfox-boost.windows.template_debug.x86_64.dll

@@ -8,10 +8,7 @@
 Ref<_NetfoxLogger> PropertyCache::_logger;
 
 Ref<PropertyCache> PropertyCache::new_(Node* p_root)
-{
-	if (_logger.is_null())
-		_logger = _NetfoxLogger::for_netfox("PropertyCache");
-	
+{	
 	Ref<PropertyCache> ref;
 	ref.instantiate();
 	ref->root = p_root;

src/property_cache.cpp

@@ -68,9 +68,6 @@ String PropertyEntry::to_string() const
 
 Ref<PropertyEntry> PropertyEntry::parse(Node* root, String path)
 {
-	if (_logger.is_null())
-		_logger = _NetfoxLogger::for_netfox("PropertyEntry");
-
 	Ref<PropertyEntry> result;
 	result.instantiate();
 	result->node = root->get_node<Node>(NodePath(path));

src/property_entry.cpp

@@ -30,9 +30,9 @@ void initialize_gdextension_types(ModuleInitializationLevel p_level)
 	}
 	GDREGISTER_CLASS(NetfoxBoost);
 	GDREGISTER_CLASS(_NetfoxLogger);
+	GDREGISTER_CLASS(PropertyEntry);
 	GDREGISTER_CLASS(PropertyCache);
 	GDREGISTER_CLASS(_PropertyConfig);
-	GDREGISTER_CLASS(PropertyEntry);
 	GDREGISTER_CLASS(_HistoryBuffer);
 	GDREGISTER_CLASS(_PropertyHistoryBuffer);
 	GDREGISTER_CLASS(_PropertySnapshot);

src/register_types.cpp

@@ -44,9 +44,11 @@ Array _Set::values() const {
   Array res;
   res.resize(_data.size());
   int i = 0;
-  for (auto data : _data)
-    res[i] = data;
+  for (auto data : _data) 
+	{
+		res[i] = data;
     ++i;
+	}
 	return res;
 }
 
@@ -92,6 +94,7 @@ String _Set::_to_string() const {
 }
 
 bool _Set::_iter_init(Array p_iter) {
+	print_line("_iter_init: ", p_iter);
 	if (_data.is_empty()) {
 		return false;
 	}
@@ -100,21 +103,22 @@ bool _Set::_iter_init(Array p_iter) {
 }
 
 bool _Set::_iter_next(Array p_iter) {
+	print_line("_iter_next: ", p_iter);
   int curr_idx = p_iter[0];
-	if (curr_idx >= 0 && curr_idx < _data.size()) {
+	if (curr_idx >= 0 && curr_idx < _data.size() - 1) {
 		p_iter[0] = curr_idx + 1;
     return true;
 	}
-  p_iter[0] = -1;
   return false;
 }
 
-Variant _Set::_iter_get(Array p_iter) const {
-  int curr_idx = p_iter[0];
+Variant _Set::_iter_get(int p_iter) const {
+	print_line("_iter_get: ", p_iter);
+  int curr_idx = p_iter;
   if (curr_idx >= 0 && curr_idx < _data.size()) {
     auto it = _data.begin();
     while (curr_idx > 0) {
-      curr_idx--;
+      --curr_idx;
       ++it;
     }
     return *it;

src/set.cpp

@@ -39,7 +39,7 @@ class _Set : public RefCounted {
 
 	bool _iter_init(Array p_iter);
 	bool _iter_next(Array p_iter);
-	Variant _iter_get(Array p_iter) const;
+	Variant _iter_get(int p_iter) const;
 
 	String _to_string() const;
 };

src/set.h

@@ -27,15 +27,4 @@ bool Utils::is_instance_valid(const Variant &p_instance)
 		return false;
 	}
 	return p_instance.get_validated_object() != nullptr;
-}
-
-String Utils::vformatv(const String &p_text, const Array array) {
-	Variant args[sizeof...(p_args) + 1] = { p_args..., Variant() }; // +1 makes sure zero sized arrays are also supported.
-
-	bool error = false;
-	String fmt = p_text.sprintf(Span(args, sizeof...(p_args)), &error);
-
-	ERR_FAIL_COND_V_MSG(error, String(), String("Formatting error in string \"") + p_text + "\": " + fmt + ".");
-
-	return fmt;
 }