#29 texture selection

L3P3 · Aug 4, 2024 · 132b3d8 · 132b3d8
1 parent 3e5647c
commit 132b3d8
Show file tree

Hide file tree

Showing 33 changed files with 296 additions and 324 deletions.
diff --git a/app-dev.html b/app-dev.html
@@ -10,8 +10,5 @@
 	<body>
 		<script type=module src=https://cdn.jsdelivr.net/gh/L3P3/lui@2/lui.dev.js></script>
 		<script type=module src=src/app.js></script>
-		<script>
-			window.ASSETS = 'assets/';
-		</script>
 	</body>
 </html>
diff --git a/app-prod.html b/app-prod.html
@@ -10,8 +10,5 @@
 	<body>
 		<script defer src=https://cdn.jsdelivr.net/gh/L3P3/lui@2/lui.dev.js></script>
 		<script defer src=dist/app-en.js></script>
-		<script>
-			window.ASSETS = 'assets/';
-		</script>
 	</body>
 </html>
diff --git a/assets/blocks.webp b/assets/blocks.webp
diff --git a/build.js b/build.js
@@ -48,14 +48,14 @@ async function lang_generate(lang) {
 	return output;
 }
 
-const env_set = async (version, debug, lang, api, api_download) => Promise.all([
+const env_set = async (version, debug, lang, api, api_data) => Promise.all([
 	writeFile(
 		'./src/etc/env.js',
 `export const VERSION = '${version}';
 export const DEBUG = ${debug};
 export const LANG = '${lang}';
 export const API = '${api}';
-export const API_DOWNLOAD = '${api_download}';
+export const API_DATA = '${api_data}';
 `,
 		'utf8'
 	),
@@ -92,7 +92,7 @@ async function build_js(lang) {
 		false,
 		lang,
 		prod ? '/api/minicraft/' : '//l3p3.de/api/minicraft/',
-		prod ? '/static/minicraft/worlds/' : '//l3p3.de/static/minicraft/worlds/'
+		prod ? '/static/minicraft/' : '//l3p3.de/static/minicraft/'
 	);
 
 	console.log('js pass 1...');
@@ -170,7 +170,7 @@ try {
 	for (const lang of languages) await build_js(lang);
 }
 finally {
-	await env_set('dev', true, 'en', '//l3p3.de/api/minicraft/', '//l3p3.de/static/minicraft/worlds/');
+	await env_set('dev', true, 'en', '//l3p3.de/api/minicraft/', '//l3p3.de/static/minicraft/');
 }
 
 console.log('done.');
diff --git a/locales/de.csv b/locales/de.csv
@@ -1,6 +1,7 @@
 amount: Anzahl
 ask_world_delete_1: Welt "
 ask_world_delete_2: " wirklich löschen?
+back: Zurück
 back_to_game: Zurück zum Spiel
 change_world_name: Welt-Namen ändern
 chunk_regenerated: Chunk neu generiert.
@@ -78,7 +79,6 @@ settings: Einstellungen
 show_world_settings: Aktionen/Einstellungen zur Welt anzeigen
 spawn_updated: Startpunkt aktualisiert.
 surfaces_colored: Einfarbig
-surfaces_textured: Texturiert
 surfaces: Oberflächen
 teleported_to_spawn: Zum Startpunkt teleportiert.
 teleported_to: Teleportiert zu

diff --git a/locales/en.csv b/locales/en.csv
@@ -1,6 +1,7 @@
 amount: Amount
 ask_world_delete_1: Really delete world "
 ask_world_delete_2: "?
+back: Back
 back_to_game: Back to game
 change_world_name: Change world name
 chunk_regenerated: Chunk regenerated.
@@ -78,7 +79,6 @@ settings: Settings
 show_world_settings: Show world settings
 spawn_updated: Spawn updated.
 surfaces_colored: Plain
-surfaces_textured: Textured
 surfaces: Surfaces
 teleported_to_spawn: Teleported to spawn.
 teleported_to: Teleported to

diff --git a/locales/ru.csv b/locales/ru.csv
@@ -1,6 +1,7 @@
 amount: Число
 ask_world_delete_1: Мир "
 ask_world_delete_2: " точно удалить?
+back: Вернуться
 back_to_game: Вернуться в игру
 change_world_name: Изменит имя миру
 chunk_regenerated: Чанки перезагружается 
@@ -78,7 +79,6 @@ settings: Настройки
 show_world_settings: Акции/Показать настройки мира
 spawn_updated: Началная точка обновлена
 surfaces_colored: Одноцветный
-surfaces_textured: С текстурами
 surfaces: Поверхность
 teleported_to_spawn: Переместится к стартовой точки
 teleported_to: Переместится к

diff --git a/locales/tr.csv b/locales/tr.csv
@@ -1,6 +1,7 @@
 amount: Miktar
 ask_world_delete_1: "
 ask_world_delete_2: " isimli dünya gerçekten silinsin mi?
+back: Geri
 back_to_game: Oyuna geri dön
 change_world_name: Dünyayı değiştir
 chunk_regenerated: Parça yenilendi.
@@ -78,7 +79,6 @@ settings: Ayarlar
 show_world_settings: Dünya ayarlarını göster
 spawn_updated: Spawn güncellendi.
 surfaces_colored: Sade
-surfaces_textured: Dokulu
 surfaces: Yüzeyler
 teleported_to_spawn: Spawn\'a ışınlandı.
 teleported_to: Şuraya ışınlandı: 

diff --git a/locales/uk.csv b/locales/uk.csv
@@ -1,6 +1,7 @@
 amount: Номер
 ask_world_delete_1: Світ "
 ask_world_delete_2: " дійсно видалити?
+back: Повернуться
 back_to_game: Повернуться в гру
 change_world_name: Змінити ім\'я світу
 chunk_regenerated: Участки відновлені.
@@ -77,8 +78,7 @@ selection_secondary: Друга крапка вибору
 settings: Налаштування
 show_world_settings: Акції/Показати налаштування світу.
 spawn_updated: Початкова крапка оновлена.
-surfaces_colored: Однотонні 
-surfaces_textured: Текстурований
+surfaces_colored: Однотонні
 surfaces: Поверхности 
 teleported_to_spawn: Перемістився до початкової.
 teleported_to: Переміститися до

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "minicraft",
-	"version": "0.10.7",
+	"version": "0.11.0",
 	"description": "voxel-based 3d game, written in javascript",
 	"homepage": "https://l3p3.de/minicraft",
 	"repository": {

diff --git a/src/app.css b/src/app.css
@@ -82,7 +82,6 @@ button {
 }
 .game .bitmap {
 	background-size: 100% auto;
-	transform: scaleY(-1);
 }
 .game > .diagnostics {
 	position: absolute;
@@ -266,9 +265,11 @@ button {
 	margin: 1rem;
 	display: grid;
 	grid-template-columns: repeat(auto-fit, minmax(12rem, 1fr));
-	grid-template-rows: 3rem;
 	gap: 1rem;
 }
+.game .menu > .settings > * {
+	min-height: 2rem;
+}
 .game .menu.inventory, .game .menu.advanced {
 	display: flex;
 	align-items: center;

diff --git a/src/app.js b/src/app.js
@@ -38,6 +38,9 @@ import {
 	game_key,
 	game_save,
 } from './game/m_game.js';
+import {
+	tiles_set,
+} from './game/m_renderer.js';
 
 import App from './game/c_app.js';
 
@@ -121,6 +124,7 @@ function Root() {
 			addEventListener_('touchstart', handler_touch, true);
 		}
 	}, [flag_touch]);
+	hook_effect(tiles_set, [state.config.textures]);
 
 	hook_dom('', {
 		onkeydown: handler_key,

diff --git a/src/etc/constants.js b/src/etc/constants.js
@@ -5,8 +5,9 @@ import {
 	locale_item_labels,
 } from './locale.js';
 
-export const APP_VIEW_WORLDS = 0;
-export const APP_VIEW_GAME = 1;
+export const APP_VIEW_GAME = 0;
+export const APP_VIEW_SETTINGS = 1;
+export const APP_VIEW_WORLDS = 2;
 
 export const CHUNK_WIDTH_L2 = 4;
 export const CHUNK_WIDTH = 1 << CHUNK_WIDTH_L2;

diff --git a/src/etc/env.js b/src/etc/env.js
@@ -2,4 +2,4 @@ export const VERSION = 'dev';
 export const DEBUG = true;
 export const LANG = 'en';
 export const API = '//l3p3.de/api/minicraft/';
-export const API_DOWNLOAD = '//l3p3.de/static/minicraft/worlds/';
+export const API_DATA = '//l3p3.de/static/minicraft/';
diff --git a/src/etc/helpers.js b/src/etc/helpers.js
@@ -33,8 +33,11 @@ export const localStorage_getItem = key => localStorage_.getItem(key);
 export const localStorage_setItem = localStorage_.setItem.bind(localStorage_);
 export const localStorage_removeItem = localStorage_.removeItem.bind(localStorage_);
 export const indexedDB_ = window_.indexedDB;
+export const fetch_ = fetch;
+export const Error_ = msg => new Error(msg);
 export const Uint8Array_ = Uint8Array;
 export const Uint32Array_ = Uint32Array;
+export const Set_ = Set;
 export const Map_ = Map;
 export const Number_ = Number;
 export const Object_ = Object;

diff --git a/src/etc/locale.js b/src/etc/locale.js
@@ -1,6 +1,7 @@
 export const locale_amount = 'Amount';
 export const locale_ask_world_delete_1 = 'Really delete world "';
 export const locale_ask_world_delete_2 = '"?';
+export const locale_back = 'Back';
 export const locale_back_to_game = 'Back to game';
 export const locale_change_world_name = 'Change world name';
 export const locale_chunk_regenerated = 'Chunk regenerated.';
@@ -78,7 +79,6 @@ export const locale_settings = 'Settings';
 export const locale_show_world_settings = 'Show world settings';
 export const locale_spawn_updated = 'Spawn updated.';
 export const locale_surfaces_colored = 'Plain';
-export const locale_surfaces_textured = 'Textured';
 export const locale_surfaces = 'Surfaces';
 export const locale_teleported_to_spawn = 'Teleported to spawn.';
 export const locale_teleported_to = 'Teleported to';

diff --git a/src/etc/state.js b/src/etc/state.js
@@ -6,6 +6,7 @@ import {
 	JSON_parse,
 	JSON_stringify,
 	Object_keys,
+	Set_,
 	localStorage_,
 	localStorage_getItem,
 	localStorage_removeItem,
@@ -25,7 +26,7 @@ if (
 	config_loaded['worlds'] &&
 	config_loaded['version'].startsWith('0.9.')
 ) {
-	const prefixes_keep = new Set(
+	const prefixes_keep = new Set_(
 		config_loaded['worlds']
 		.map(world => 'minicraft.world.' + world.id)
 	);
@@ -42,25 +43,20 @@ export const reducers = {
 	init: () => {
 		let needs_save = false;
 		const config = {
-			flag_textures: true,
 			flag_touch: false, // not saved
 			pixel_grouping: 1,
 			mouse_sensitivity: 3,
 			resolution_scaling: 4,
+			textures: 1,
 			view_angle: 120,
 			view_distance: 64,
 			world_last: 0,
 			/** @type {!Array<TYPE_WORLD_LISTING_LOCAL>} */
 			worlds: [],
 		};
 		if (config_loaded) {
-			let tmp = config_loaded['flag_textures'];
+			let tmp = config_loaded['pixel_grouping'];
 			if (tmp != null) {
-				config.flag_textures = tmp;
-			}
-			if ((
-				tmp = config_loaded['pixel_grouping']
-			) != null) {
 				config.pixel_grouping = tmp;
 			}
 			if ((
@@ -69,6 +65,18 @@ export const reducers = {
 				config.mouse_sensitivity = tmp;
 			}
 			config.resolution_scaling = config_loaded['resolution_scaling'];
+			if ((
+				tmp = config_loaded['textures']
+			) != null) {
+				config.textures = tmp;
+			}
+			else {
+				config.textures = (
+					config_loaded['flag_textures']
+					?	1
+					:	0
+				);
+			}
 			config.view_angle = config_loaded['view_angle'];
 			config.view_distance = config_loaded['view_distance'];
 			if ((
@@ -117,10 +125,10 @@ export const reducers = {
 		if (config === state.config_saved) return state;
 		localStorage_setItem('minicraft.config', JSON_stringify({
 			'version': VERSION,
-			'flag_textures': config.flag_textures,
 			'pixel_grouping': config.pixel_grouping,
 			'mouse_sensitivity': config.mouse_sensitivity,
 			'resolution_scaling': config.resolution_scaling,
+			'textures': config.textures,
 			'view_angle': config.view_angle,
 			'view_distance': config.view_distance,
 			'world_last': config.world_last,

diff --git a/src/etc/textures.js b/src/etc/textures.js
diff --git a/src/etc/textures.js b/src/etc/textures.js
@@ -0,0 +1,30 @@
+export const TILES_COUNT = 26;
+export const TILES_RESOLUTION_LOG2 = 4;
+export const TILES_RESOLUTION = 1 << TILES_RESOLUTION_LOG2;
+
+export const TILE_STONE = 0;
+export const TILE_GRASS_TOP = 1;
+export const TILE_DIRT = 2;
+export const TILE_COBBLE = 3;
+export const TILE_PLANKS = 4;
+export const TILE_BEDROCK = 5;
+export const TILE_LOG_SIDE = 6;
+export const TILE_LEAVES = 7;
+export const TILE_BRICKS = 8;
+export const TILE_WOOL = 9;
+export const TILE_SAND = 10;
+export const TILE_GRAVEL = 11;
+export const TILE_GLASS = 12;
+export const TILE_BOOKSHELF = 13;
+export const TILE_OBSIDIAN = 14;
+export const TILE_STONE_BRICKS = 15;
+export const TILE_SANDSTONE = 16;
+export const TILE_LAPIS_BLOCK = 17;
+export const TILE_IRON_BLOCK = 18;
+export const TILE_GOLD_BLOCK = 19;
+export const TILE_DIAMOND_BLOCK = 20;
+export const TILE_EMERALD_BLOCK = 21;
+export const TILE_REDSTONE_BLOCK = 22;
+export const TILE_QUARTZ_BLOCK = 23;
+export const TILE_GRASS_SIDE = 24;
+export const TILE_LOG_TOP = 25;
diff --git a/src/externs.js b/src/externs.js
@@ -262,11 +262,6 @@ var onmousedown;
 */
 var onmouseup;
 
-/**
-	@type {string}
-*/
-var ASSETS;
-
 /**
 	@type {boolean}
 */
@@ -327,6 +322,15 @@ var TYPE_WORLD_API;
 */
 var TYPE_CHAT_API;
 
+/**
+	@typedef {{
+		id: number,
+		label: string,
+		owner: string,
+	}}
+*/
+var TYPE_TEXTURES_ITEM;
+
 /**
 	@typedef {{
 		account: {