base preview

Author: afwbkbc

GLSMAC_data/default/ui/parts/game/bottom_bar/object_preview.gls.js

@@ -29,9 +29,6 @@ return {
 			return;
 		}
 		const cls = #classof(object);
-		if (cls == 'Base') {
-			return; // TODO
-		}
 		if (this.last_object_class != cls) {
 			if (this.last_object_class != null) {
 				this.previews[this.last_object_class].hide();
@@ -85,15 +82,15 @@ return {
 
 		this.lines = this.frame.listview({
 			left: 3,
-			right: 3, // TODO: fix
+			right: 3,
 			top: 86,
 			bottom: 3,
 			itemsize: 17,
 		});
 
 		const f_line = (text, size, align) => {
 			this.lines.text({
-				align: 'top ' + align, // TODO: fix centered align
+				align: 'top ' + align,
 				color: 'rgb(116,156,56)',
 				font: 'arialnb.ttf:' + #to_string(size),
 				text: text,
@@ -126,6 +123,11 @@ return {
 				break;
 			}
 			case 'Base': {
+
+				f_line(object.name, 14, 'center');
+				
+				f_line('Producing:', 14, 'left'); // TODO
+
 				break;
 			}
 			default: {

src/game/backend/base/Base.cpp

@@ -113,6 +113,7 @@ WRAPIMPL_DESERIALIZE( Base )
 
 WRAPIMPL_DYNAMIC_GETTERS( Base )
 	WRAPIMPL_GET_CUSTOM( "id", Int, m_id )
+	WRAPIMPL_GET_CUSTOM( "name", String, m_name )
 	WRAPIMPL_LINK( "get_owner", m_owner )
 	WRAPIMPL_LINK( "get_tile", m_tile )
 	{

src/game/frontend/Game.cpp

@@ -53,13 +53,16 @@
 #include "GLSMAC.h"
 #include "game/backend/unit/UnitManager.h"
 #include "game/backend/unit/Unit.h"
+#include "game/backend/base/BaseManager.h"
+#include "game/backend/base/Base.h"
 #include "game/backend/map/Map.h"
 #include "game/backend/map/tile/Tile.h"
 #include "ui/UI.h"
 #include "ui/dom/Widget.h"
 #include "widget/Minimap.h"
 #include "widget/TilePreview.h"
 #include "widget/UnitPreview.h"
+#include "widget/BasePreview.h"
 #include "gse/value/Null.h"
 
 #define INITIAL_CAMERA_ANGLE { -M_PI * 0.5, M_PI * 0.75, 0 }
@@ -2647,6 +2650,22 @@ void Game::UpdateUnitPreview( const unit::Unit* const unit ) {
 	);
 }
 
+void Game::UpdateBasePreview( const base::Base* const base ) {
+	auto* const b = base
+		? m_game->GetBM()->GetBase( base->GetId() )
+		: nullptr;
+	Trigger(
+		m_game->GetMap(), "base_preview", ARGS_F( &b ) {
+			{
+				"base",
+				b
+					? b->Wrap( GSE_CALL )
+					: VALUE( gse::value::Null ),
+			},
+		}; }
+	);
+}
+
 void Game::UpdatePreviews( tile::Tile* const tile, const unit::Unit* const unit ) {
 	// new ui
 	UpdateTilePreview( tile );
@@ -2656,7 +2675,14 @@ void Game::UpdatePreviews( tile::Tile* const tile, const unit::Unit* const unit
 	else {
 		const auto* const selected_unit = m_um->GetSelectedUnit();
 		if ( !selected_unit || selected_unit->GetTile() != tile ) {
-			UpdateUnitPreview( tile->GetMostImportantUnit() );
+			const auto* const important_unit = tile->GetMostImportantUnit();
+			const auto* base = tile->GetBase();
+			if ( !important_unit && base ) {
+				UpdateBasePreview( base );
+			}
+			else {
+				UpdateUnitPreview( important_unit );
+			}
 		}
 	}
 }

src/game/frontend/Game.h

@@ -93,7 +93,8 @@ namespace frontend {
 #define X_WIDGETS \
     X_WIDGET( Minimap ) \
     X_WIDGET( TilePreview ) \
-    X_WIDGET( UnitPreview )
+    X_WIDGET( UnitPreview ) \
+    X_WIDGET( BasePreview )
 
 namespace widget {
 #define X_WIDGET( _x ) class _x;
@@ -531,6 +532,7 @@ CLASS( Game, common::Module )
 	void SetSelectedTile( tile::Tile* tile );
 	void UpdateTilePreview( tile::Tile* const tile );
 	void UpdateUnitPreview( const unit::Unit* const unit );
+	void UpdateBasePreview( const base::Base* const base );
 	void UpdatePreviews( tile::Tile* const tile, const unit::Unit* const unit );
 	void RefreshSelectedTile( unit::Unit* selected_unit = nullptr );
 	void RefreshSelectedTileIf( tile::Tile* if_tile, const unit::Unit* const selected_unit );

src/game/frontend/widget/BasePreview.cpp

@@ -0,0 +1,51 @@
+#include "BasePreview.h"
+
+#include "ui/UI.h"
+#include "ui/dom/Widget.h"
+#include "game/frontend/base/Base.h"
+#include "types/mesh/Rectangle.h"
+#include "ui/geometry/Rectangle.h"
+#include "scene/actor/Mesh.h"
+#include "game/frontend/Game.h"
+#include "game/backend/base/Base.h"
+#include "game/frontend/base/BaseManager.h"
+
+namespace game {
+namespace frontend {
+namespace widget {
+
+BasePreview::BasePreview( const Game* const game, ui::UI* const ui )
+	: Widget(
+	game, ui, ui::WT_BASE_PREVIEW, "base-preview", {
+		{ "base", { gse::VT_OBJECT, ::game::backend::base::Base::WRAP_CLASS } },
+	}
+) {}
+
+void BasePreview::Register( ui::dom::Widget* const widget ) {
+	widget->OnUpdate(
+		F_WIDGET_UPDATE( this ) {
+			const auto* const u = ::game::backend::base::Base::Unwrap( data->value.at( "base" ) );
+			ASSERT( u, "invalid base ptr" );
+			const auto* const base = m_game->GetBM()->GetBaseById( u->m_id );
+			ASSERT( base, "invalid base" );
+			Update( widget, base );
+		}
+	);
+}
+
+void BasePreview::Update( ui::dom::Widget* const widget, const base::Base* const base ) {
+	widget->Clear();
+
+	const auto& render = base->GetRenderData();
+
+	size_t index = 0;
+
+	ASSERT( render.base.mesh->GetType() == types::mesh::Mesh::MT_RECTANGLE, "base mesh not rectangle" ); // TODO: 3d bases
+
+	AddMeshAndTexture( widget, index++, render.base.mesh, render.base.texture, true );
+	AddMeshAndTexture( widget, index++, render.badge.mesh, render.badge.texture, true, { 0.16f, 0.27f }, { 0.04f, 0.04f } );
+}
+
+}
+}
+}

src/game/frontend/widget/BasePreview.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include "Widget.h"
+
+namespace game {
+namespace frontend {
+
+namespace base {
+class Base;
+}
+
+namespace widget {
+
+CLASS( BasePreview, Widget )
+public:
+	BasePreview( const Game* const game, ui::UI* const ui );
+
+	void Update( ui::dom::Widget* const widget, const base::Base* const unit );
+
+protected:
+	void Register( ui::dom::Widget* const widget ) override;
+
+};
+
+}
+}
+}

src/game/frontend/widget/CMakeLists.txt

@@ -4,5 +4,6 @@ SET( SRC ${SRC}
 	${PWD}/Minimap.cpp
 	${PWD}/TilePreview.cpp
 	${PWD}/UnitPreview.cpp
+	${PWD}/BasePreview.cpp
 
 	PARENT_SCOPE )

src/game/frontend/widget/UnitPreview.h

@@ -2,14 +2,6 @@
 
 #include "Widget.h"
 
-namespace scene::actor {
-class Mesh;
-}
-
-namespace types::texture {
-class Texture;
-}
-
 namespace game {
 namespace frontend {
 
@@ -28,13 +20,6 @@ CLASS( UnitPreview, Widget )
 protected:
 	void Register( ui::dom::Widget* const widget ) override;
 
-private:
-	struct preview_layer_t {
-		scene::actor::Mesh* object;
-		types::texture::Texture* texture;
-	};
-	std::vector< preview_layer_t > m_preview_layers = {}; // multiple layers of textures
-
 };
 
 }

src/ui/Types.h

@@ -48,6 +48,7 @@ enum widget_type_t {
 	WT_MINIMAP,
 	WT_TILE_PREVIEW,
 	WT_UNIT_PREVIEW,
+	WT_BASE_PREVIEW,
 };
 
 typedef std::function< void( ::ui::dom::Widget* const widget ) > f_with_widget_t;