Revert file(s) to pre-PR state

Author: ZzzhHe

assets/shaders/world2d.frag.glsl

@@ -40,4 +40,4 @@ void main() {
 			break;
 	}
 	id = u_id;
-}
+}

assets/test/shaders/world_commands.config

@@ -1,4 +1,4 @@
-// Copyright 2022-2025 the openage authors. See copying.md for legal info.
+// Copyright 2022-2024 the openage authors. See copying.md for legal info.
 
 #include "render_stage.h"
 
@@ -12,7 +12,6 @@
 #include "renderer/resources/texture_info.h"
 #include "renderer/shader_program.h"
 #include "renderer/stages/world/object.h"
-#include "renderer/stages/world/world_shader_commands.h"
 #include "renderer/texture.h"
 #include "renderer/window.h"
 #include "time/clock.h"
@@ -47,30 +46,6 @@ WorldRenderStage::WorldRenderStage(const std::shared_ptr<Window> &window,
 	log::log(INFO << "Created render stage 'World'");
 }
 
-WorldRenderStage::WorldRenderStage(const std::shared_ptr<Window> &window,
-                                   const std::shared_ptr<renderer::Renderer> &renderer,
-                                   const std::shared_ptr<renderer::camera::Camera> &camera,
-                                   const util::Path &shaderdir,
-                                   const util::Path &configdir,
-                                   const std::shared_ptr<renderer::resources::AssetManager> &asset_manager,
-                                   const std::shared_ptr<time::Clock> clock) :
-	renderer{renderer},
-	camera{camera},
-	asset_manager{asset_manager},
-	render_objects{},
-	clock{clock},
-	default_geometry{this->renderer->add_mesh_geometry(WorldObject::get_mesh())} {
-	auto size = window->get_size();
-	this->initialize_render_pass_with_shader_commands(size[0], size[1], shaderdir, configdir);
-	this->init_uniform_ids();
-
-	window->add_resize_callback([this](size_t width, size_t height, double /*scale*/) {
-		this->resize(width, height);
-	});
-
-	log::log(INFO << "Created render stage 'World' with shader command");
-}
-
 std::shared_ptr<renderer::RenderPass> WorldRenderStage::get_render_pass() {
 	return this->render_pass;
 }
@@ -181,37 +156,4 @@ void WorldRenderStage::init_uniform_ids() {
 	WorldObject::anchor_offset = this->display_shader->get_uniform_id("anchor_offset");
 }
 
-void WorldRenderStage::initialize_render_pass_with_shader_commands(size_t width, size_t height, const util::Path &shaderdir, const util::Path &config_path) {
-	auto vert_shader_file = (shaderdir / "demo_7_world.vert.glsl").open();
-	auto vert_shader_src = renderer::resources::ShaderSource(
-		resources::shader_lang_t::glsl,
-		resources::shader_stage_t::vertex,
-		vert_shader_file.read());
-	vert_shader_file.close();
-
-	auto frag_shader_file = (shaderdir / "demo_7_world.frag.glsl").open();
-	log::log(INFO << "Loading shader commands config from: " << (shaderdir / "demo_7_display.frag.glsl"));
-	this->shader_template = std::make_shared<ShaderCommandTemplate>(frag_shader_file.read());
-	if (not this->shader_template->load_commands(config_path / "world_commands.config")) {
-		log::log(ERR << "Failed to load shader commands configuration for world stage");
-		return;
-	}
-
-	auto frag_shader_src = renderer::resources::ShaderSource(
-		resources::shader_lang_t::glsl,
-		resources::shader_stage_t::fragment,
-		this->shader_template->generate_source());
-	frag_shader_file.close();
-
-	this->output_texture = renderer->add_texture(resources::Texture2dInfo(width, height, resources::pixel_format::rgba8));
-	this->depth_texture = renderer->add_texture(resources::Texture2dInfo(width, height, resources::pixel_format::depth24));
-	this->id_texture = renderer->add_texture(resources::Texture2dInfo(width, height, resources::pixel_format::r32ui));
-
-	this->display_shader = this->renderer->add_shader({vert_shader_src, frag_shader_src});
-	this->display_shader->bind_uniform_buffer("camera", this->camera->get_uniform_buffer());
-
-	auto fbo = this->renderer->create_texture_target({this->output_texture, this->depth_texture, this->id_texture});
-	this->render_pass = this->renderer->add_render_pass({}, fbo);
-}
-
 } // namespace openage::renderer::world

libopenage/renderer/stages/world/render_stage.cpp

@@ -1,4 +1,4 @@
-// Copyright 2022-2025 the openage authors. See copying.md for legal info.
+// Copyright 2022-2024 the openage authors. See copying.md for legal info.
 
 #pragma once
 
@@ -33,7 +33,6 @@ class AssetManager;
 namespace world {
 class RenderEntity;
 class WorldObject;
-class ShaderCommandTemplate;
 
 /**
  * Renderer for drawing and displaying entities in the game world (units, buildings, etc.)
@@ -61,26 +60,6 @@ class WorldRenderStage {
 	                 const util::Path &shaderdir,
 	                 const std::shared_ptr<renderer::resources::AssetManager> &asset_manager,
 	                 const std::shared_ptr<time::Clock> clock);
-
-	/**
-	 * Create a new render stage for the game world with shader command.
-	 *
-	 * @param window openage window targeted for rendering.
-	 * @param renderer openage low-level renderer.
-	 * @param camera Camera used for the rendered scene.
-	 * @param shaderdir Directory containing the shader source files.
-	 * @param configdir Directory containing the config for shader command.
-	 * @param asset_manager Asset manager for loading resources.
-	 * @param clock Simulation clock for timing animations.
-	 */
-	WorldRenderStage(const std::shared_ptr<Window> &window,
-	                 const std::shared_ptr<renderer::Renderer> &renderer,
-	                 const std::shared_ptr<renderer::camera::Camera> &camera,
-	                 const util::Path &shaderdir,
-	                 const util::Path &configdir,
-	                 const std::shared_ptr<renderer::resources::AssetManager> &asset_manager,
-	                 const std::shared_ptr<time::Clock> clock);
-
 	~WorldRenderStage() = default;
 
 	/**
@@ -132,17 +111,6 @@ class WorldRenderStage {
 	 */
 	void init_uniform_ids();
 
-	/**
-	 * Initialize render pass with shader commands.
-	 * This is an alternative to initialize_render_pass() that uses configurable shader commands.
-	 *
-	 * @param width Width of the FBO.
-	 * @param height Height of the FBO.
-	 * @param shaderdir Directory containing shader files.
-	 * @param configdir Directory containing configuration file.
-	 */
-	void initialize_render_pass_with_shader_commands(size_t width, size_t height, const util::Path &shaderdir, const util::Path &config_path);
-
 	/**
 	 * Reference to the openage renderer.
 	 */
@@ -163,11 +131,6 @@ class WorldRenderStage {
 	 */
 	std::shared_ptr<renderer::RenderPass> render_pass;
 
-	/**
-	 * Template for the world shader program.
-	 */
-	std::shared_ptr<ShaderCommandTemplate> shader_template;
-
 	/**
 	 * Render entities requested by the game world.
 	 */