Merge branch 'develop'

Author: charliewhitfield

CHANGELOG.md

@@ -6,6 +6,13 @@ File format follows [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 See cloning and downloading instructions [here](https://www.ivoyager.dev/developers/).
 
+## [v0.0.20] - 2024-12-20
+
+Developed using Godot 4.3.
+
+### Fixed
+* Export breaking reference to EditorInterface outside of EditorPlugin.
+
 ## [v0.0.19] - 2024-12-16
 
 Developed using Godot 4.3.
@@ -84,5 +91,6 @@ Requires plugin [ivoyager_table_reader](https://github.com/ivoyager/ivoyager_tab
 ##
 I, Voyager projects v0.0.16 and earlier used a different core submodule [ivoyager](https://github.com/ivoyager/ivoyager) (now depreciated); see previous changelog [here](https://github.com/ivoyager/ivoyager/blob/master/CHANGELOG.md).
 
+[v0.0.20]: https://github.com/ivoyager/ivoyager_core/compare/v0.0.19...v0.0.20
 [v0.0.19]: https://github.com/ivoyager/ivoyager_core/compare/v0.0.18...v0.0.19
 [v0.0.18]: https://github.com/ivoyager/ivoyager_core/compare/v0.0.17...v0.0.18

editor_plugin/core_editor_plugin.gd

@@ -43,7 +43,7 @@ func _enter_tree() -> void:
 	# Wait for required plugins...
 	await get_tree().process_frame
 	var wait_counter := 0
-	while !IVPluginUtils.is_plugins_enabled(REQUIRED_PLUGINS):
+	while !_is_required_plugins_enabled():
 		wait_counter += 1
 		if wait_counter == 10:
 			push_error("Enable required plugins before ivoyager_core: " + str(REQUIRED_PLUGINS))
@@ -66,6 +66,13 @@ func _exit_tree() -> void:
 	_remove_autoloads()
 
 
+func _is_required_plugins_enabled() -> bool:
+	for plugin in REQUIRED_PLUGINS:
+		if !EditorInterface.is_plugin_enabled(plugin):
+			return false
+	return true
+
+
 func _process_ivoyager_cofig_files() -> void:
 	_config = IVPluginUtils.get_ivoyager_config("res://addons/ivoyager_core/ivoyager_core.cfg")
 	if !_config:

editor_plugin/plugin_utils.gd

@@ -30,25 +30,16 @@ extends Object
 
 
 ## Supply only the base name from the plugin path.
-## Assumes plugin.cfg path is "res://addons/<plugin>/plugin.cfg".
+## Assumes plugin.cfg path is "res://addons/<plugin>/plugin.cfg".[br][br]
+##
+## This is for runtime usage! EditorPlugin should use the EditorInterface
+## function of the same name instead.
 static func is_plugin_enabled(plugin: String) -> bool:
-	if EditorInterface.has_method(&"is_plugin_enabled"): # called from EditorPlugin!
-		return EditorInterface.is_plugin_enabled(plugin)
-	# called at runtime...
 	var path := "res://addons/" + plugin + "/plugin.cfg"
 	var plugin_paths: PackedStringArray = ProjectSettings.get_setting("editor_plugins/enabled")
 	return plugin_paths.has(path)
 
 
-## Supply only the base names from the plugin paths.
-## Assumes plugin.cfg paths are "res://addons/<plugin>/plugin.cfg".
-static func is_plugins_enabled(plugins: Array[String]) -> bool:
-	for plugin in plugins:
-		if !is_plugin_enabled(plugin):
-			return false
-	return true
-
-
 ## Assumes plugin.cfg path is "res://addons/<plugin>/plugin.cfg".[br][br]
 ## WARNING: For this function to work in exported project, add "*.cfg" or specific cofig file to
 ## Project/Export.../Resources/"Filters to export non-resource files/folders".

plugin.cfg

@@ -3,5 +3,5 @@
 name="I, Voyager - Core"
 description="This is I, Voyager's core plugin! It runs the solar system simulator."
 author="Charlie Whitfield"
-version="v0.0.19"
+version="v0.0.20"
 script="editor_plugin/core_editor_plugin.gd"

shaders/rings.gdshader

@@ -79,7 +79,7 @@ void vertex() {
 	vec3 sun_position = iv_sun_global_positions[sun_index];
 	vec3 sun_vector = (VIEW_MATRIX * vec4(sun_position, 1.0)).xyz;
 	sun_direction = normalize(sun_vector);
-	
+
 	mat4 inverse_model_matrix = inverse(MODEL_MATRIX);
 	float sun_y = (inverse_model_matrix * vec4(sun_position, 1.0)).y;
 	float camera_y = (inverse_model_matrix * vec4(CAMERA_POSITION_WORLD, 1.0)).y;
@@ -150,7 +150,7 @@ void fragment() {
 
 		// FIXME? Godot docs suggest that use of discard might break something
 		// related to shadows. Or maybe not. For now we're using ALPHA = 0.0.
-		// We can revisit use of discard after other shadow issues are resolved. 
+		// We can revisit use of discard after other shadow issues are resolved.
 
 		//discard;
 		ALPHA = 0.0;