Isometric-view

Fixed Missing Lighting calls and GL states which was causing stars to render too early

Split Controls should hopefully work on phones now

Chickens should hopefully lay eggs now

data/lang/en_US.lang

@@ -229,6 +229,12 @@ options.fancyGraphics=Fancy graphics
 options.renderDebug=Debug render
 options.anaglyph3d=3D anaglyph
 
+options.windowScale =Window Scaling
+
+options.menuStyle =Menu Style 
+options.menuStyle.pocket =Pocket Edition
+options.menuStyle.xperia =Xperia/Pi
+options.menuStyle.java =Java Beta
 
 performance.max=Max FPS
 performance.balanced=Balanced

src/client/Minecraft.cpp

@@ -10,11 +10,11 @@
 
 
 #if defined(APPLE_DEMO_PROMOTION)
-    #define NO_NETWORK
+#define NO_NETWORK
 #endif
 
 #if defined(RPI)
-	#define CREATORMODE
+#define CREATORMODE
 #endif
 #include "../network/RakNetInstance.h"
 #include "../network/ClientSideNetworkHandler.h"
@@ -98,8 +98,8 @@
 static void checkGlError(const char* tag) {
 #ifdef GLDEBUG
 	while (1) {
-        const int errCode = glGetError();
-        if (errCode == GL_NO_ERROR) break;
+		const int errCode = glGetError();
+		if (errCode == GL_NO_ERROR) break;
 
 		LOGE("################\nOpenGL-error @ %s : #%d\n", tag, errCode);
 	}
@@ -117,7 +117,7 @@ const char* Minecraft::progressMessages[] = {
 int Minecraft::customDebugId = Minecraft::CDI_NONE;
 
 #if defined(_MSC_VER)
-	#pragma warning( disable : 4355 ) // 'this' pointer in initialization list which is perfectly legal
+#pragma warning( disable : 4355 ) // 'this' pointer in initialization list which is perfectly legal
 #endif
 
 bool Minecraft::useAmbientOcclusion = false;
@@ -175,17 +175,17 @@ Minecraft::Minecraft() :
 	width(1), height(1),
 	//_respawnPlayerTicks(-1),
 #ifdef __APPLE__
-    _isSuperFast(false),
+	_isSuperFast(false),
 #endif
 	_powerVr(false),
 	commandPort(4711),
 	reserved_d1(0),reserved_d2(0),
 	reserved_f1(0),reserved_f2(0), options(this)
 {
-//#ifdef ANDROID
+	//#ifdef ANDROID
 
 #if defined(NO_NETWORK)
-    raknetInstance = new IRakNetInstance();
+	raknetInstance = new IRakNetInstance();
 #else
 	raknetInstance = new RakNetInstance();
 #endif
@@ -265,7 +265,7 @@ void Minecraft::setLevel(Level* level, const std::string& message /* ="" */, Loc
 
 	if (level != NULL) {
 		level->raknetInstance = raknetInstance;
-        gameMode->initLevel(level);
+		gameMode->initLevel(level);
 
 		if (!player && forceInsertPlayer)
 		{
@@ -296,19 +296,19 @@ void Minecraft::setLevel(Level* level, const std::string& message /* ="" */, Loc
 			// Non-threaded
 			generateLevel("Currently not used", level);
 		}
-    } else {
-        player = NULL;
-    }
+	} else {
+		player = NULL;
+	}
 
-    this->lastTickTime = 0;
+	this->lastTickTime = 0;
 	this->_running = true;
 }
 
 void Minecraft::leaveGame(bool renameLevel /*=false*/)
 {
-    if (isGeneratingLevel || !_hasSignaledGeneratingLevelFinished)
-        return;
-    
+	if (isGeneratingLevel || !_hasSignaledGeneratingLevelFinished)
+		return;
+
 	isGeneratingLevel = false;
 	bool saveLevel = level && (!level->isClientSide || renameLevel);
 
@@ -366,19 +366,19 @@ void Minecraft::prepareLevel(const std::string& title) {
 	int Max = CHUNK_CACHE_WIDTH * CHUNK_CACHE_WIDTH;
 	int pp = 0;
 	for (int x = 8; x < (CHUNK_CACHE_WIDTH * CHUNK_WIDTH); x += CHUNK_WIDTH) {
-        for (int z = 8; z < (CHUNK_CACHE_WIDTH * CHUNK_WIDTH); z += CHUNK_WIDTH) {
-            progressStagePercentage = 100 * pp++ / Max;
-            //printf("level generation progress %d\n", progressStagePercentage);
+		for (int z = 8; z < (CHUNK_CACHE_WIDTH * CHUNK_WIDTH); z += CHUNK_WIDTH) {
+			progressStagePercentage = 100 * pp++ / Max;
+			//printf("level generation progress %d\n", progressStagePercentage);
 			B.start();
-            level->getTile(x, 64, z);
+			level->getTile(x, 64, z);
 			B.stop();
 			L.start();
 			if (level->isNew())
 				while (level->updateLights())
 					;
 			L.stop();
-        }
-    }
+		}
+	}
 	A.stop();
 	level->setUpdateLights(true);
 
@@ -466,33 +466,33 @@ void Minecraft::update() {
 	}
 	TIMER_POP();
 
-	#ifndef STANDALONE_SERVER
-		if (gameMode != NULL) gameMode->render(timer.a);
-		TIMER_PUSH("sound");
-		soundEngine->update(player, timer.a);
-		TIMER_POP_PUSH("render");
-		gameRenderer->render(timer.a);
-		TIMER_POP();
-	#else
+#ifndef STANDALONE_SERVER
+	if (gameMode != NULL) gameMode->render(timer.a);
+	TIMER_PUSH("sound");
+	soundEngine->update(player, timer.a);
+	TIMER_POP_PUSH("render");
+	gameRenderer->render(timer.a);
+	TIMER_POP();
+#else
 	CThread::sleep(1);
-	#endif
+#endif
 #ifndef STANDALONE_SERVER
 	Multitouch::resetThisUpdate();
 #endif
-	
+
 #ifndef STANDALONE_SERVER
 	TIMER_POP();
 	checkGlError("Update finished");
 
 	if (options.getBooleanValue(OPTIONS_RENDER_DEBUG)) {
-//#ifndef PLATFORM_DESKTOP
+		//#ifndef PLATFORM_DESKTOP
 		if (!PerfTimer::enabled) {
 			PerfTimer::reset();
 			PerfTimer::enabled = true;
 		}
 		_perfRenderer->renderFpsMeter(1);
 		checkGlError("render debug");
-//#endif
+		//#endif
 	} else {
 		PerfTimer::enabled = false;
 	}
@@ -569,17 +569,17 @@ void Minecraft::tick(int nTick, int maxTick) {
 #ifndef STANDALONE_SERVER
 	textures->loadAndBindTexture("terrain.png");
 	if (!pause && !(screen && !screen->renderGameBehind())) {
-		#if !defined(RPI)
-			#ifdef __APPLE__
-			if (isSuperFast())
-			#endif
-			{
+#if !defined(RPI)
+#ifdef __APPLE__
+		if (isSuperFast())
+#endif
+		{
 			if (nTick == maxTick) {
 				TIMER_POP_PUSH("textures");
 				textures->tick(true);
 			}
-			}
-		#endif
+		}
+#endif
 	}
 	TIMER_POP_PUSH("particles");
 	if (!pause) {
@@ -641,8 +641,8 @@ void Minecraft::tickInput() {
 	while (Mouse::next()) {
 		//if (Mouse::getButtonState(MouseAction::ACTION_LEFT))
 		//	LOGI("mouse-down-at: %d, %d\n", Mouse::getX(), Mouse::getY());
-        	int passedTime = getTimeMs() - lastTickTime;
-        	if (passedTime > 200) continue; // @note: As long Mouse::clear CLEARS the whole buffer, it's safe to break here
+		int passedTime = getTimeMs() - lastTickTime;
+		if (passedTime > 200) continue; // @note: As long Mouse::clear CLEARS the whole buffer, it's safe to break here
 		// But since it might be rewritten anyway (and hopefully there aren't a lot of messages, we just continue.
 
 		const MouseAction& e = Mouse::getEvent();
@@ -673,14 +673,14 @@ void Minecraft::tickInput() {
 		}
 		/*
 		if (mouseDiggable && options.useMouseForDigging) {
-			if (Mouse::getEventButton() == MouseAction::ACTION_LEFT && Mouse::getEventButtonState()) {
-				handleMouseClick(MouseAction::ACTION_LEFT);
-				lastClickTick = ticks;
-			}
-			if (Mouse::getEventButton() == MouseAction::ACTION_RIGHT && Mouse::getEventButtonState()) {
-				handleMouseClick(MouseAction::ACTION_RIGHT);
-				lastClickTick = ticks;
-			}
+		if (Mouse::getEventButton() == MouseAction::ACTION_LEFT && Mouse::getEventButtonState()) {
+		handleMouseClick(MouseAction::ACTION_LEFT);
+		lastClickTick = ticks;
+		}
+		if (Mouse::getEventButton() == MouseAction::ACTION_RIGHT && Mouse::getEventButtonState()) {
+		handleMouseClick(MouseAction::ACTION_RIGHT);
+		lastClickTick = ticks;
+		}
 		}
 		*/
 	}
@@ -701,20 +701,20 @@ void Minecraft::tickInput() {
 				if (slot >= 0 && slot < gui.getNumSlots())
 					player->inventory->selectSlot(slot);
 
-				#if defined(WIN32)
-					if (digit >= 1 && GetAsyncKeyState(VK_CONTROL) < 0) {
-						// Set adventure settings here!
-						AdventureSettingsPacket p(level->adventureSettings);
-						p.toggle((AdventureSettingsPacket::Flags)(1 << slot));
-						p.fillIn(level->adventureSettings);
-						raknetInstance->send(p);
-					}
-					if (digit == 0) {
-						Pos pos((int)player->x, (int)player->y-1, (int)player->z);
-						SetSpawnPositionPacket p(pos);
-						raknetInstance->send(p);
-					}
-				#endif
+#if defined(WIN32)
+				if (digit >= 1 && GetAsyncKeyState(VK_CONTROL) < 0) {
+					// Set adventure settings here!
+					AdventureSettingsPacket p(level->adventureSettings);
+					p.toggle((AdventureSettingsPacket::Flags)(1 << slot));
+					p.fillIn(level->adventureSettings);
+					raknetInstance->send(p);
+				}
+				if (digit == 0) {
+					Pos pos((int)player->x, (int)player->y-1, (int)player->z);
+					SetSpawnPositionPacket p(pos);
+					raknetInstance->send(p);
+				}
+#endif
 			}
 
 			if (key == Keyboard::KEY_LEFT_CTRL) {
@@ -738,7 +738,7 @@ void Minecraft::tickInput() {
 				/*
 				ImprovedNoise noise;
 				for (int i = 0; i < 16; ++i)
-					printf("%d\t%f\n", i, noise.grad2(i, 3, 8));
+				printf("%d\t%f\n", i, noise.grad2(i, 3, 8));
 				*/
 			}
 
@@ -751,88 +751,88 @@ void Minecraft::tickInput() {
 				options.set(OPTIONS_VIEW_DISTANCE, (dst + 1) % 4);
 			}
 
-			#ifdef CHEATS
-				if (key == Keyboard::KEY_U) {
-					onGraphicsReset();
-					player->heal(100);
+#ifdef CHEATS
+			if (key == Keyboard::KEY_U) {
+				onGraphicsReset();
+				player->heal(100);
+			}
+
+			if (key == Keyboard::KEY_B || key == 108) // Toggle the game mode
+				setIsCreativeMode(!isCreativeMode());
+
+			if (key == Keyboard::KEY_P) // Step forward in time
+				level->setTime( level->getTime() + 1000);
+
+			if (key == Keyboard::KEY_G) {
+				setScreen(new ArmorScreen());
+				/*
+				std::vector<AABB>& boxs = level->getCubes(NULL, AABB(128.1f, 73, 128.1f, 128.9f, 74.9f, 128.9f));
+				LOGI("boxes: %d\n", (int)boxs.size());
+				*/
+			}
+
+			if (key == Keyboard::KEY_Y) {
+				textures->reloadAll();
+				player->hurtTo(2);
+			}
+			if (key == Keyboard::KEY_Z || key == 108) {
+				for (int i = 0; i < 1; ++i) {
+					Mob* mob = NULL;
+					int forceId = 0;//MobTypes::Sheep;
+
+					int types[] = {
+						MobTypes::Sheep,
+						MobTypes::Pig,
+						MobTypes::Chicken,
+						MobTypes::Cow,
+					};
+
+					int mobType = (forceId > 0)? forceId : types[Mth::random(sizeof(types) / sizeof(int))];
+					mob = MobFactory::CreateMob(mobType, level);
+
+					//((Animal*)mob)->setAge(-1000);
+					float dx = 4 - 8 * Mth::random() + 4 * Mth::sin(Mth::DEGRAD * player->yRot);
+					float dz = 4 - 8 * Mth::random() + 4 * Mth::cos(Mth::DEGRAD * player->yRot);
+					if (mob && !MobSpawner::addMob(level, mob, player->x + dx, player->y, player->z + dz, Mth::random()*360, 0, true))
+						delete mob;
 				}
+			}
 
-				if (key == Keyboard::KEY_B || key == 108) // Toggle the game mode
-					setIsCreativeMode(!isCreativeMode());
-
-				if (key == Keyboard::KEY_P) // Step forward in time
-					level->setTime( level->getTime() + 1000);
-
-				if (key == Keyboard::KEY_G) {
-					setScreen(new ArmorScreen());
-					/*
-					std::vector<AABB>& boxs = level->getCubes(NULL, AABB(128.1f, 73, 128.1f, 128.9f, 74.9f, 128.9f));
-					LOGI("boxes: %d\n", (int)boxs.size());
-					*/
+			if (key == Keyboard::KEY_X) {
+				const EntityList& entities = level->getAllEntities();
+				for (int i = entities.size()-1; i >= 0; --i) {
+					Entity* e = entities[i];
+					if (!e->isPlayer())
+						level->removeEntity(e);
 				}
+			}
 
-				if (key == Keyboard::KEY_Y) {
-					textures->reloadAll();
-					player->hurtTo(2);
-				}
-				if (key == Keyboard::KEY_Z || key == 108) {
-					for (int i = 0; i < 1; ++i) {
-						Mob* mob = NULL;
-						int forceId = 0;//MobTypes::Sheep;
+			if (key == Keyboard::KEY_C /*|| key == 4*/) {
+				player->inventory->clearInventoryWithDefault();
+				// @todo: Add saving here for benchmarking
+			}
+			if (key == Keyboard::KEY_H) {
+				setScreen( new PrerenderTilesScreen() );
+			}
 
-						int types[] = {
-							MobTypes::Sheep,
-							MobTypes::Pig,
-							MobTypes::Chicken,
-							MobTypes::Cow,
-						};
+			if (key == Keyboard::KEY_O) {
+				for (int i = Inventory::MAX_SELECTION_SIZE; i < player->inventory->getContainerSize(); ++i)
+					if (player->inventory->getItem(i))
+						player->inventory->dropSlot(i, false);
+			}
+			if (key == Keyboard::KEY_M) {
+				Difficulty difficulty = (Difficulty)options.getIntValue(OPTIONS_DIFFICULTY);
+				options.set(OPTIONS_DIFFICULTY, (difficulty == Difficulty::PEACEFUL)?
+					Difficulty::NORMAL : Difficulty::PEACEFUL);
+				//setIsCreativeMode( !isCreativeMode() );
+			}
 
-						int mobType = (forceId > 0)? forceId : types[Mth::random(sizeof(types) / sizeof(int))];
-						mob = MobFactory::CreateMob(mobType, level);
-
-						//((Animal*)mob)->setAge(-1000);
-						float dx = 4 - 8 * Mth::random() + 4 * Mth::sin(Mth::DEGRAD * player->yRot);
-						float dz = 4 - 8 * Mth::random() + 4 * Mth::cos(Mth::DEGRAD * player->yRot);
-						if (mob && !MobSpawner::addMob(level, mob, player->x + dx, player->y, player->z + dz, Mth::random()*360, 0, true))
-							delete mob;
-					}
+			if (options.getBooleanValue(OPTIONS_RENDER_DEBUG)) {
+				if (key >= '0' && key <= '9') {
+					_perfRenderer->debugFpsMeterKeyPress(key - '0');
 				}
-
-				if (key == Keyboard::KEY_X) {
-					const EntityList& entities = level->getAllEntities();
-					for (int i = entities.size()-1; i >= 0; --i) {
-						Entity* e = entities[i];
-						if (!e->isPlayer())
-							level->removeEntity(e);
-					}
-				}
-
-				if (key == Keyboard::KEY_C /*|| key == 4*/) {
-					player->inventory->clearInventoryWithDefault();
-					// @todo: Add saving here for benchmarking
-				}
-				if (key == Keyboard::KEY_H) {
-					setScreen( new PrerenderTilesScreen() );
-				}
-
-				if (key == Keyboard::KEY_O) {
-					for (int i = Inventory::MAX_SELECTION_SIZE; i < player->inventory->getContainerSize(); ++i)
-						if (player->inventory->getItem(i))
-							player->inventory->dropSlot(i, false);
-				}
-				if (key == Keyboard::KEY_M) {
-					Difficulty difficulty = (Difficulty)options.getIntValue(OPTIONS_DIFFICULTY);
-					options.set(OPTIONS_DIFFICULTY, (difficulty == Difficulty::PEACEFUL)?
-						Difficulty::NORMAL : Difficulty::PEACEFUL);
-					//setIsCreativeMode( !isCreativeMode() );
-				}
-
-				if (options.getBooleanValue(OPTIONS_RENDER_DEBUG)) {
-					if (key >= '0' && key <= '9') {
-						_perfRenderer->debugFpsMeterKeyPress(key - '0');
-					}
-				}
-			#endif
+			}
+#endif
 
 			if (options.getBooleanValue(OPTIONS_RENDER_DEBUG)) {
 				if (key >= '0' && key <= '9') {
@@ -843,33 +843,35 @@ void Minecraft::tickInput() {
 			if (key == Keyboard::KEY_ESCAPE)
 				pauseGame(false);
 
-			#ifndef OPENGL_ES
-				if (key == Keyboard::KEY_P) {
-					static bool isWireFrame = false;
-					isWireFrame = !isWireFrame;
-					glPolygonMode(GL_FRONT, isWireFrame? GL_LINE : GL_FILL);
-					//glPolygonMode(GL_BACK, isWireFrame? GL_LINE : GL_FILL);
-				}
-			#endif
-		}
-		#ifdef WIN32
-			if (key == Keyboard::KEY_M) {
-				for (int i = 0; i < 5 * SharedConstants::TicksPerSecond; ++i)
-					level->tick();
+#ifdef PLATFORM_DESKTOP
+			if (key == Keyboard::KEY_P) {
+				static bool isWireFrame = false;
+				isWireFrame = !isWireFrame;
+				glPolygonMode(GL_FRONT, isWireFrame? GL_LINE : GL_FILL);
+				//glPolygonMode(GL_BACK, isWireFrame? GL_LINE : GL_FILL);
 			}
-		#endif
+#endif
+		}
+#ifdef WIN32
+		if (key == Keyboard::KEY_M) {
+			for (int i = 0; i < 5 * SharedConstants::TicksPerSecond; ++i)
+				level->tick();
+		}
+#endif
 	}
 
 	TIMER_POP_PUSH("handlemouse");
-	
+
 	static bool prevMouseDownLeft = false;
 
-	if (Mouse::getButtonState(MouseAction::ACTION_LEFT) == 0) {
-		gameMode->stopDestroyBlock();
-	}
+	if (!useTouchscreen()) {
+		if (Mouse::getButtonState(MouseAction::ACTION_LEFT) == 0) {
+			gameMode->stopDestroyBlock();
+		}
 
-	if (!Mouse::isButtonDown(MouseAction::ACTION_RIGHT)) {
-		gameMode->releaseUsingItem(player);
+		if (!Mouse::isButtonDown(MouseAction::ACTION_RIGHT)) {
+			gameMode->releaseUsingItem(player);
+		}
 	}
 
 	if (useTouchscreen()) {
@@ -932,35 +934,35 @@ void Minecraft::handleBuildAction(BuildActionIntention* action) {
 	}
 	if(player->isUsingItem())
 		return;
-    bool mayUse = true;
+	bool mayUse = true;
 
 	if (!hitResult.isHit()) {
 		if (action->isRemove() && !gameMode->isCreativeType()) {
 			missTime = 10;
 		}
-    } else if (hitResult.type == ENTITY) {
-        if (action->isAttack()) {
+	} else if (hitResult.type == ENTITY) {
+		if (action->isAttack()) {
 			player->swing();
 			//LOGI("attacking!\n");
 			InteractPacket packet(InteractPacket::Attack, player->entityId, hitResult.entity->entityId);
 			raknetInstance->send(packet);
-            gameMode->attack(player, hitResult.entity);
+			gameMode->attack(player, hitResult.entity);
 		} else if (action->isInteract()) {
 			if (hitResult.entity->interactPreventDefault())
 				mayUse = false;
 			//LOGI("interacting!\n");
 			InteractPacket packet(InteractPacket::Interact, player->entityId, hitResult.entity->entityId);
 			raknetInstance->send(packet);
-            gameMode->interact(player, hitResult.entity);
-        }
-    } else if (hitResult.type == TILE) {
+			gameMode->interact(player, hitResult.entity);
+		}
+	} else if (hitResult.type == TILE) {
 		int x = hitResult.x;
-        int y = hitResult.y;
-        int z = hitResult.z;
-        int face = hitResult.f;
+		int y = hitResult.y;
+		int z = hitResult.z;
+		int face = hitResult.f;
 
 		int oldTileId = level->getTile(x, y, z);
-        Tile* oldTile = Tile::tiles[oldTileId];
+		Tile* oldTile = Tile::tiles[oldTileId];
 
 		//bool tryDestroyBlock = false;
 
@@ -969,8 +971,8 @@ void Minecraft::handleBuildAction(BuildActionIntention* action) {
 				return;
 
 			//LOGI("tile: %s - %d, %d, %d. b: %f - %f\n", oldTile->getDescriptionId().c_str(), x, y, z, oldTile->getBrightness(level, x, y, z), oldTile->getBrightness(level, x, y+1, z));
-            level->extinguishFire(x, y, z, hitResult.f);
-			
+			level->extinguishFire(x, y, z, hitResult.f);
+
 			if (action->isFirstRemove()) {
 				gameMode->startDestroyBlock(x, y, z, hitResult.f);
 			} else {
@@ -979,16 +981,16 @@ void Minecraft::handleBuildAction(BuildActionIntention* action) {
 
 			particleEngine->crack(x, y, z, hitResult.f);
 			player->swing();
-        }
+		}
 		else {
 			ItemInstance* item = player->inventory->getSelected();
- 			if (gameMode->useItemOn(player, level, item, x, y, z, face, hitResult.pos)) {
-			    mayUse = false;
-			    player->swing();
-			#ifdef RPI
-				} else if (item && item->id == ((Item*)Item::sword_iron)->id) {
-					player->swing();
-			#endif
+			if (gameMode->useItemOn(player, level, item, x, y, z, face, hitResult.pos)) {
+				mayUse = false;
+				player->swing();
+#ifdef RPI
+			} else if (item && item->id == ((Item*)Item::sword_iron)->id) {
+				player->swing();
+#endif
 			}
 			if (item && item->count <= 0) {
 				player->inventory->clearSlot(player->inventory->selected);
@@ -1014,7 +1016,7 @@ void Minecraft::handleBuildAction(BuildActionIntention* action) {
 
 bool Minecraft::isOnlineClient()
 {
-    return (level != NULL && level->isClientSide);
+	return (level != NULL && level->isClientSide);
 }
 
 bool Minecraft::isOnline()
@@ -1081,8 +1083,8 @@ void Minecraft::setScreen( Screen* screen )
 
 		if (screen->isInGameScreen() && level) {
 			level->saveLevelData();
-            level->saveGame();
-        }
+			level->saveGame();
+		}
 
 		//noRender = false;
 	} else {
@@ -1119,7 +1121,7 @@ void Minecraft::releaseMouse()
 
 bool Minecraft::useTouchscreen() {
 #if defined(TARGET_OS_IPHONE)
-    return true;
+	return true;
 #elif defined(RPI)
 	return false;
 #endif
@@ -1142,7 +1144,8 @@ void Minecraft::init()
 	textures->addDynamicTexture(new WaterSideTexture());
 	textures->addDynamicTexture(new LavaTexture());
 	textures->addDynamicTexture(new LavaSideTexture());
-	textures->addDynamicTexture(new FireTexture());
+	textures->addDynamicTexture(new FireTexture(0));
+	textures->addDynamicTexture(new FireTexture(1));
 	gui.texturesLoaded(textures);
 
 	levelRenderer = new LevelRenderer(this);
@@ -1150,7 +1153,7 @@ void Minecraft::init()
 	particleEngine = new ParticleEngine(level, textures);
 
 	// 4j's code for reference
-//	FoliageColor::init(textures->loadTexturePixels(L"misc/foliagecolor.png"));
+	//	FoliageColor::init(textures->loadTexturePixels(L"misc/foliagecolor.png"));
 
 
 	// my code
@@ -1162,7 +1165,7 @@ void Minecraft::init()
 	TextureId grassId = (textures->loadTexture("misc/grasscolor.png")); // loading the uh png for foliage color
 	int* grassPixels = textures->loadTexturePixels(grassId, "misc/grasscolor.png");
 	GrassColor::init(grassPixels);
-	
+
 	bool tint = options.getBooleanValue(OPTIONS_FOLIAGE_TINT); // finally, toggleable foliage color
 	FoliageColor::setUseTint(tint);
 	GrassColor::setUseTint(tint);
@@ -1187,59 +1190,82 @@ void Minecraft::init()
 
 void Minecraft::setSize(int w, int h) {
 #ifndef STANDALONE_SERVER
-    transformResolution(&w, &h);
+	transformResolution(&w, &h);
 
 	width  = w;
 	height = h;
-
-	int guiScale = options.getIntValue(OPTIONS_GUI_SCALE);
-
-	// determine gui scale, optionally overriding auto
-	if (guiScale != 0) {
-		// manual selection: 1->small, 2->medium, 3->large, 4->larger, 5->largest
-		switch (guiScale) {
-		case 1: Gui::GuiScale = 2.0f; break;
-		case 2: Gui::GuiScale = 3.0f; break;
-		case 3: Gui::GuiScale = 4.0f; break;
-		case 4: Gui::GuiScale = 5.0f; break;
-		case 5: Gui::GuiScale = 6.0f; break;
-		default: Gui::GuiScale = 1.0f; break; // auto
+	int screenWidth;
+	int screenHeight;
+	//#ifdef PLATFORM_DESKTOP
+	if (options.getBooleanValue(OPTIONS_WINDOW_SCALE)){ // scales with resolution using a formula instead of having hardcoded if checks
+		int guiScale = options.getIntValue(OPTIONS_GUI_SCALE);
+		if (guiScale == 0) {
+			guiScale = 1000;
 		}
+
+		// determine gui scale, optionally overriding auto
+
+
+		Gui::GuiScale = (float)Mth::Min(guiScale, Mth::Max(1, Mth::Min(width / 320, height / 240)));
+
+
+
 	} else {
-		// auto compute from resolution
-		if (width >= 1000) {
-        #ifdef __APPLE__
-            Gui::GuiScale = (width > 2000)? 8.0f : 4.0f;
-        #else
-            Gui::GuiScale = 4.0f;
-        #endif
-    }
-		else if (width >= 800) {
+
+
+		int guiScale = options.getIntValue(OPTIONS_GUI_SCALE);
+
+		// determine gui scale, optionally overriding auto
+		if (guiScale != 0) {
+			// manual selection: 1->small, 2->medium, 3->large, 4->larger, 5->largest
+			switch (guiScale) {
+			case 1: Gui::GuiScale = 2.0f; break;
+			case 2: Gui::GuiScale = 3.0f; break;
+			case 3: Gui::GuiScale = 4.0f; break;
+			case 4: Gui::GuiScale = 5.0f; break;
+			case 5: Gui::GuiScale = 6.0f; break;
+			default: Gui::GuiScale = 1.0f; break; // auto
+			}
+		} else {
+			// auto compute from resolution
+			if (width >= 1000) {
 #ifdef __APPLE__
-        Gui::GuiScale = 4.0f;
+				Gui::GuiScale = (width > 2000)? 8.0f : 4.0f;
 #else
-		Gui::GuiScale = 3.0f;
+				Gui::GuiScale = 4.0f;
 #endif
-    }
-		else if (width >= 400)
-			Gui::GuiScale = 2.0f;
-		else
-			Gui::GuiScale = 1.0f;
+			}
+			else if (width >= 800) {
+#ifdef __APPLE__
+				Gui::GuiScale = 4.0f;
+#else
+				Gui::GuiScale = 3.0f;
+#endif
+			}
+			else if (width >= 400)
+				Gui::GuiScale = 2.0f;
+			else
+				Gui::GuiScale = 1.0f;
+		}
+
+
+
+		// if (platform()) {
+		// 	float pixelsPerMillimeter = options.getProgressValue(&Option::PIXELS_PER_MILLIMETER);
+		// 	pixelCalc.setPixelsPerMillimeter(pixelsPerMillimeter);
+		// 	pixelCalcUi.setPixelsPerMillimeter(pixelsPerMillimeter * Gui::InvGuiScale);
+		// }
+
 	}
 
-	Gui::InvGuiScale = 1.0f / Gui::GuiScale;
-	int screenWidth  = (int)(width  * Gui::InvGuiScale);
-	int screenHeight = (int)(height * Gui::InvGuiScale);
 
-	// if (platform()) {
-	// 	float pixelsPerMillimeter = options.getProgressValue(&Option::PIXELS_PER_MILLIMETER);
-	// 	pixelCalc.setPixelsPerMillimeter(pixelsPerMillimeter);
-	// 	pixelCalcUi.setPixelsPerMillimeter(pixelsPerMillimeter * Gui::InvGuiScale);
-	// }
+	Gui::InvGuiScale = 1.0f / Gui::GuiScale;
+	screenWidth  = (int)(width  * Gui::InvGuiScale);
+	screenHeight = (int)(height * Gui::InvGuiScale);
 
 	Config config = createConfig(this);
 	gui.onConfigChanged(config);
-    
+
 	if (screen)
 		screen->setSize(screenWidth, screenHeight);
 
@@ -1268,9 +1294,9 @@ void Minecraft::reloadOptions() {
 
 	LOGI("Reloading-options\n");
 
-    // @todo @fix Android and iOS behaves a bit differently when leaving
-    //            an options screen (Android recreates OpenGL surface)
-    setSize(width, height);
+	// @todo @fix Android and iOS behaves a bit differently when leaving
+	//            an options screen (Android recreates OpenGL surface)
+	setSize(width, height);
 }
 
 void Minecraft::_reloadInput() {
@@ -1281,17 +1307,17 @@ void Minecraft::_reloadInput() {
 	if (useTouchHolder) {
 		inputHolder = new TouchInputHolder(this, &options);
 	} else {
-		#if defined(ANDROID) || defined(__APPLE__) 
-			inputHolder = new CustomInputHolder(
-				new XperiaPlayInput(&options),
-				new ControllerTurnInput(2, ControllerTurnInput::MODE_DELTA),
-				new IBuildInput());
-		#else
-			inputHolder = new CustomInputHolder(
-				new KeyboardInput(&options),
-				new MouseTurnInput(MouseTurnInput::MODE_DELTA, width/2, height/2),
-				new MouseBuildInput());
-		#endif
+#if defined(ANDROID) || defined(__APPLE__) 
+		inputHolder = new CustomInputHolder(
+			new XperiaPlayInput(&options),
+			new ControllerTurnInput(2, ControllerTurnInput::MODE_DELTA),
+			new IBuildInput());
+#else
+		inputHolder = new CustomInputHolder(
+			new KeyboardInput(&options),
+			new MouseTurnInput(MouseTurnInput::MODE_DELTA, width/2, height/2),
+			new MouseBuildInput());
+#endif
 	}
 
 	mouseHandler.setTurnInput(inputHolder->getTurnInput());
@@ -1334,7 +1360,7 @@ bool Minecraft::joinMultiplayerFromString( const std::string& server )
 {	
 	std::string ip = "";
 	std::string port = "19132";
-	
+
 	size_t pos = server.find(":");
 
 	if (pos != std::string::npos) {
@@ -1345,7 +1371,7 @@ bool Minecraft::joinMultiplayerFromString( const std::string& server )
 	}
 
 	printf("%s \n", port.c_str());
-	
+
 	if (isLookingForMultiplayer && netCallback) {
 		isLookingForMultiplayer = false;
 		printf("test");
@@ -1356,18 +1382,18 @@ bool Minecraft::joinMultiplayerFromString( const std::string& server )
 }
 
 void Minecraft::hostMultiplayer(int port) {
-    // Tear down last instance
-    raknetInstance->disconnect();
-    delete netCallback;
-    netCallback = NULL;
+	// Tear down last instance
+	raknetInstance->disconnect();
+	delete netCallback;
+	netCallback = NULL;
 
 #if !defined(NO_NETWORK)
 	netCallback = new ServerSideNetworkHandler(this, raknetInstance);
-    #ifdef STANDALONE_SERVER
-        raknetInstance->host("Server", port, 16);
-    #else
-        raknetInstance->host(options.getStringValue(OPTIONS_USERNAME), port);
-    #endif
+#ifdef STANDALONE_SERVER
+	raknetInstance->host("Server", port, 16);
+#else
+	raknetInstance->host(options.getStringValue(OPTIONS_USERNAME), port);
+#endif
 #endif
 }
 
@@ -1421,9 +1447,9 @@ void Minecraft::_levelGenerated()
 		player->resetPos(false);
 	}
 
-    if (level && level->dimension) {
-        
-       level->dimension->FogType = options.getIntValue(OPTIONS_FOG_TYPE);
+	if (level && level->dimension) {
+
+		level->dimension->FogType = options.getIntValue(OPTIONS_FOG_TYPE);
 	}
 
 
@@ -1454,14 +1480,14 @@ void Minecraft::_levelGenerated()
 
 std::string Minecraft::gatherStats1() {
 #ifndef STANDALONE_SERVER
-    return levelRenderer->gatherStats1();
+	return levelRenderer->gatherStats1();
 #endif
 	return "Blank";
 }
 
 std::string Minecraft::gatherStats2() {
 #ifndef STANDALONE_SERVER
-    return levelRenderer->gatherStats2();
+	return levelRenderer->gatherStats2();
 #endif
 	return "Blank";
 }
@@ -1474,7 +1500,7 @@ std::string Minecraft::gatherStats3() {
 }
 
 std::string Minecraft::gatherStats4() {
-    return level->gatherChunkSourceStats();
+	return level->gatherChunkSourceStats();
 }
 
 
@@ -1527,7 +1553,7 @@ void Minecraft::onGraphicsReset()
 {
 #ifndef STANDALONE_SERVER
 	textures->clear();
-	
+
 	font->onGraphicsReset();
 	gui.onGraphicsReset();
 
@@ -1566,12 +1592,12 @@ LevelStorageSource* Minecraft::getLevelSource()
 
 void Minecraft::audioEngineOn() {
 #ifndef STANDALONE_SERVER
-    soundEngine->enable(true);
+	soundEngine->enable(true);
 #endif
 }
 void Minecraft::audioEngineOff() {
 #ifndef STANDALONE_SERVER
-    soundEngine->enable(false);
+	soundEngine->enable(false);
 #endif
 }
 
@@ -1642,17 +1668,17 @@ void Minecraft::optionUpdated(OptionId option, bool value ) {
 }
 
 void Minecraft::optionUpdated(OptionId option, float value ) {
-// #ifndef STANDALONE_SERVER
-// 	if(option == OPTIONS_PIXELS_PER_MILLIMETER) {
-// 		pixelCalcUi.setPixelsPerMillimeter(value * Gui::InvGuiScale);
-// 		pixelCalc.setPixelsPerMillimeter(value);
-// 	}
-// #endif
+	// #ifndef STANDALONE_SERVER
+	// 	if(option == OPTIONS_PIXELS_PER_MILLIMETER) {
+	// 		pixelCalcUi.setPixelsPerMillimeter(value * Gui::InvGuiScale);
+	// 		pixelCalc.setPixelsPerMillimeter(value);
+	// 	}
+	// #endif
 }
 
 void Minecraft::optionUpdated(OptionId option, int value ) {
-    if(option == OPTIONS_GUI_SCALE) {
-        // reapply screen scaling using current window size
-        setSize(width, height);
-    }
+	if(option == OPTIONS_GUI_SCALE) {
+		// reapply screen scaling using current window size
+		setSize(width, height);
+	}
 }

src/client/Options.cpp

@@ -82,6 +82,10 @@ OptionBool restoredAnims("restoredAnims", true);
 
 OptionInt debugStyle("debugStyle", 0, 0, 1);
 
+OptionInt menuStyle("menuStyle",0, 0, 2);
+
+OptionBool windowScale("windowScale", false);
+
 OptionInt keyForward("key.forward", Keyboard::KEY_W);
 OptionInt keyLeft("key.left", Keyboard::KEY_A);
 OptionInt keyBack("key.back", Keyboard::KEY_S);
@@ -134,6 +138,7 @@ void Options::initTable() {
 
 
     m_options[OPTIONS_GUI_SCALE] = &guiScale;
+	m_options[OPTIONS_WINDOW_SCALE] = &windowScale;
 
 	m_options[OPTIONS_SKIN] = &skin;
 	m_options[OPTIONS_USERNAME] = &username;
@@ -170,6 +175,8 @@ void Options::initTable() {
 
     m_options[OPTIONS_SERVER_VISIBLE] = &serverVisible;
 
+	m_options[OPTIONS_MENU_STYLE] = &menuStyle;
+
     m_options[OPTIONS_KEY_FORWARD] = &keyForward;
     m_options[OPTIONS_KEY_LEFT] = &keyLeft;
     m_options[OPTIONS_KEY_BACK] = &keyBack;

src/client/Options.h

@@ -37,6 +37,7 @@ enum OptionId {
     OPTIONS_BAR_ON_TOP,
     OPTIONS_ALLOW_SPRINT,
     OPTIONS_AUTOJUMP,
+	OPTIONS_WINDOW_SCALE,
 
     // Graphics
     OPTIONS_RENDER_DEBUG,
@@ -51,6 +52,7 @@ enum OptionId {
     OPTIONS_FANCY_GRAPHICS,
 	OPTIONS_NORMAL_LIGHTING,
 
+
     // Cheats / debug
     OPTIONS_FLY_SPEED,
     OPTIONS_CAMERA_SPEED,
@@ -95,6 +97,8 @@ enum OptionId {
 	OPTIONS_BEAUTIFUL_SKY,
 	OPTIONS_VIGNETTE,
 	OPTIONS_DEBUG_STYLE,
+	OPTIONS_COMPLETE_LIGHTING,
+	OPTIONS_MENU_STYLE,
 	// Should be last!
 	OPTIONS_COUNT
 };

src/client/gui/components/OptionsItem.cpp

@@ -56,6 +56,28 @@ void OptionsItem::render( Minecraft* minecraft, int xm, int ym ) {
 		}
 		text += ": " + scaleText;
 	}
+	if (m_optionId == OPTIONS_MENU_STYLE) {
+		int value = minecraft->options.getIntValue(OPTIONS_MENU_STYLE);
+		std::string scaleText;
+		switch (value) {
+		case 0: scaleText = I18n::get("options.menuStyle.pocket"); break;
+		case 1: scaleText = I18n::get("options.menuStyle.xperia"); break;
+		case 2: scaleText = I18n::get("options.menuStyle.java"); break;
+		}
+		text += ": " + scaleText;
+	}
+	if (m_optionId == OPTIONS_VIEW_DISTANCE) {
+		int value = minecraft->options.getIntValue(OPTIONS_VIEW_DISTANCE);
+		std::string scaleText;
+		switch (value) {
+		case 0: scaleText = I18n::get("options.renderDistance.far"); break;
+		case 1: scaleText = I18n::get("options.renderDistance.normal"); break;
+		case 2: scaleText = I18n::get("options.renderDistance.short"); break;
+		case 3: scaleText = I18n::get("options.renderDistance.tiny"); break;
+		default: scaleText = "Debug"; break;
+		}
+		text += ": " + scaleText;
+	}
 
 	minecraft->font->draw(text, (float)x, (float)y + yOffset, 0x909090, false);
 	super::render(minecraft, xm, ym);

src/client/gui/screens/DeathScreen.cpp

@@ -23,12 +23,15 @@ DeathScreen::~DeathScreen()
 
 void DeathScreen::init()
 {
-	if (/* minecraft->useTouchscreen() */ true) {
+	if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 0) {
 		bRespawn = new Touch::TButton(1, "Respawn!");
 		bTitle = new Touch::TButton(2, "Main menu");
-	} else {
+	} else if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 1) {
 		bRespawn = new Button(1, "Respawn!");
 		bTitle = new Button(2, "Main menu");
+	} else {
+		bRespawn = new Button(1, 0, 0, 200, 20, "Respawn");
+		bTitle = new Button(2, 0, 0, 200, 20, "Title menu");
 	}
 	buttons.push_back(bRespawn);
 	buttons.push_back(bTitle);
@@ -39,13 +42,23 @@ void DeathScreen::init()
 
 void DeathScreen::setupPositions()
 {
-	bRespawn->width = bTitle->width = width / 4;
+if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
+    bRespawn->width = 200;
+    bTitle->width = 200;
 
+    int centerX = (width / 2) - (bRespawn->width / 2);
+    bRespawn->x = centerX;
+    bTitle->x = centerX;
+
+    bRespawn->y = (height / 2);
+    bTitle->y = bRespawn->y + 24;
+} else {
+	bRespawn->width = bTitle->width = width / 4;
 	bRespawn->y = bTitle->y = height / 2;
 	bRespawn->x = width/2 - bRespawn->width - 10;
 	bTitle->x = width/2 + 10;
-
-	LOGI("xyz: %d, %d (%d, %d)\n", bTitle->x, bTitle->y, width, height);
+}
+//	LOGI("xyz: %d, %d (%d, %d)\n", bTitle->x, bTitle->y, width, height);
 }
 
 void DeathScreen::tick() {
@@ -56,10 +69,20 @@ void DeathScreen::render( int xm, int ym, float a )
 {
 	fillGradient(0, 0, width, height, 0x60500000, 0xa0803030);
 
+if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
+	glPushMatrix2();
+	glScalef2(2, 2, 2);
+	drawCenteredString(font, "Game over!", width / 2 / 2, height / 8, 0xffffff);
+	glPopMatrix2();
+	std::stringstream ss;
+	ss << "Score: &e" << minecraft->player->getScore();
+	drawCenteredString(font, ss.str(), width / 2, (height / 4) + 32, 0xffffff);
+} else {
 	glPushMatrix2();
 	glScalef2(2, 2, 2);
 	drawCenteredString(font, "You died!", width / 2 / 2, height / 8, 0xffffff);
 	glPopMatrix2();
+}
 
 	if (_tick >= WAIT_TICKS)
 		Screen::render(xm, ym, a);

src/client/gui/screens/IngameBlockSelectionScreen.cpp

@@ -12,6 +12,7 @@
 #include "../../renderer/Textures.h"
 #include "../../gamemode/GameMode.h"
 #include "ArmorScreen.h"
+#include "crafting/WorkbenchScreen.h"
 #include "../components/Button.h"
 
 #if defined(__APPLE__)
@@ -27,7 +28,8 @@ IngameBlockSelectionScreen::IngameBlockSelectionScreen()
 	InventoryRows(1),
 	InventoryCols(1),
 	InventorySize(1),
-	bArmor(1, "Armor")
+	bArmor(1, "Armor"),
+	bCrafting(1, "Crafting")
 {
 }
 
@@ -42,6 +44,19 @@ void IngameBlockSelectionScreen::init()
 							(float)getSlotPosY(0) - 4,
 							(float)getSlotPosX(InventoryCols) + 4, 
 							(float)getSlotPosY(InventoryRows) + 4);
+	
+	if (!minecraft->isCreativeMode()) {
+		bArmor.width = 42;
+		bCrafting.width = 42;
+
+		bArmor.x = 0;
+		bArmor.y = height - bArmor.height;
+
+		bCrafting.x = 0;
+		bCrafting.y = height - bCrafting.height - 30;
+		buttons.push_back(&bArmor);
+		buttons.push_back(&bCrafting);
+	}
 
 	ItemInstance* selected = inventory->getSelected();
 	if (!selected || selected->isNull()) {
@@ -58,13 +73,6 @@ void IngameBlockSelectionScreen::init()
 	}
 	if (!isAllowed(selectedItem))
 		selectedItem = 0;
-
-	if (!minecraft->isCreativeMode()) {
-		bArmor.width = 42;
-		bArmor.x = 0;
-		bArmor.y = height - bArmor.height;
-		buttons.push_back(&bArmor);
-	}
 }
 
 void IngameBlockSelectionScreen::removed()
@@ -124,7 +132,7 @@ void IngameBlockSelectionScreen::renderSlots()
 	//w.printEvery(1000, "render-blocksel");
 
 	glDisable2(GL_RESCALE_NORMAL);
-	Lighting::turnOn(minecraft);
+	Lighting::turnOff();
 }
 
 int IngameBlockSelectionScreen::getSlotPosX(int slotX) {
@@ -249,7 +257,7 @@ void IngameBlockSelectionScreen::mouseClicked(int x, int y, int buttonNum)
 			//minecraft->soundEngine->playUI("random.click", 1, 1);
 		} else {
 			_pendingQuit = !_area.isInside((float)x, (float)y)
-			            && !bArmor.isInside(x, y);
+			            && !bArmor.isInside(x, y) && !bCrafting.isInside(x, y);
 		}
 	}
 	if (!_pendingQuit)
@@ -338,5 +346,8 @@ void IngameBlockSelectionScreen::buttonClicked( Button* button )
 	if (button == &bArmor) {
 		minecraft->setScreen(new ArmorScreen());
 	}
+	if (button == &bCrafting) {
+		minecraft->setScreen(new WorkbenchScreen(Recipe::SIZE_2X2));
+	}
 	super::buttonClicked(button);
 }

src/client/gui/screens/IngameBlockSelectionScreen.h

@@ -52,6 +52,7 @@ private:
 	bool _pendingQuit;
 
 	Button bArmor;
+	Button bCrafting;
 
 	RectangleArea _area;
 };

src/client/gui/screens/OptionsScreen.cpp

@@ -197,6 +197,7 @@ void OptionsScreen::generateOptionScreens() {
 	optionPanes[1]->addOptionItem(OPTIONS_DIFFICULTY, minecraft)
 		.addOptionItem(OPTIONS_SERVER_VISIBLE, minecraft)
 		.addOptionItem(OPTIONS_THIRD_PERSON_VIEW, minecraft)
+		.addOptionItem(OPTIONS_WINDOW_SCALE, minecraft)
 		.addOptionItem(OPTIONS_GUI_SCALE, minecraft)
 		.addOptionItem(OPTIONS_SENSITIVITY, minecraft)
 		.addOptionItem(OPTIONS_MUSIC_VOLUME, minecraft)
@@ -223,6 +224,7 @@ void OptionsScreen::generateOptionScreens() {
 		// .addOptionItem(&Option::ANAGLYPH, minecraft)
 		.addOptionItem(OPTIONS_LIMIT_FRAMERATE, minecraft)
 		.addOptionItem(OPTIONS_VSYNC, minecraft)
+		.addOptionItem(OPTIONS_VIEW_DISTANCE, minecraft)
 		.addOptionItem(OPTIONS_RENDER_DEBUG, minecraft)
 		.addOptionItem(OPTIONS_ANAGLYPH_3D, minecraft)
 		.addOptionItem(OPTIONS_VIEW_BOBBING, minecraft)
@@ -233,6 +235,7 @@ void OptionsScreen::generateOptionScreens() {
 
 	optionPanes[4]->addOptionItem(OPTIONS_ALLOW_SPRINT, minecraft)
 		.addOptionItem(OPTIONS_BAR_ON_TOP, minecraft)
+		.addOptionItem(OPTIONS_MENU_STYLE, minecraft)
 		.addOptionItem(OPTIONS_RPI_CURSOR, minecraft)
 		.addOptionItem(OPTIONS_FOLIAGE_TINT, minecraft)
 		.addOptionItem(OPTIONS_TINTED_SIDE, minecraft)

src/client/gui/screens/PauseScreen.cpp

@@ -8,20 +8,22 @@
 #include "client/Options.h"
 #include "client/gui/components/Button.h"
 #include "client/gui/screens/OptionsScreen.h"
+#include "UploadPhotoScreen.h"
 
 PauseScreen::PauseScreen(bool wasBackPaused)
-:	saveStep(0),
+	:	saveStep(0),
 	visibleTime(0),
 	bContinue(0),
 	bQuit(0),
 	bOptions(0),
 	bQuitAndSaveLocally(0),
 	bServerVisibility(0),
-//	bThirdPerson(0),
+	bPhotoMode(0),
+	//	bThirdPerson(0),
 	wasBackPaused(wasBackPaused),
 	// bSound(OPTIONS_SOUND_VOLUME, 1, 0),
 	bThirdPerson(OPTIONS_THIRD_PERSON_VIEW),
-    bHideGui(OPTIONS_HIDEGUI)
+	bHideGui(OPTIONS_HIDEGUI)
 {
 	ImageDef def;
 	def.setSrc(IntRectangle(160, 144, 39, 31));
@@ -34,7 +36,7 @@ PauseScreen::PauseScreen(bool wasBackPaused)
 	// bSound.setImageDef(def, true);
 	defSrc.y += defSrc.h;
 	bThirdPerson.setImageDef(def, true);
-    bHideGui.setImageDef(def, true);
+	bHideGui.setImageDef(def, true);
 	//void setImageDef(ImageDef& imageDef, bool setButtonSize);
 }
 
@@ -43,41 +45,53 @@ PauseScreen::~PauseScreen() {
 	delete bQuit;
 	delete bQuitAndSaveLocally;
 	delete bServerVisibility;
+	delete bPhotoMode;
 	delete bOptions;
-//	delete bThirdPerson;
+	//	delete bThirdPerson;
 }
 
 void PauseScreen::init() {
-	if (/* minecraft->useTouchscreen() */ true) {
+	if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 0) {
 		bContinue = new Touch::TButton(1, "Back to game");
 		bOptions = new Touch::TButton(5, "Options");
+		bPhotoMode = new Touch::TButton(6, "Photo Mode");
 		bQuit = new Touch::TButton(2, "Quit to title");
 		bQuitAndSaveLocally = new Touch::TButton(3, "Quit and copy map");
 		bServerVisibility = new Touch::TButton(4, "");
-//		bThirdPerson = new Touch::TButton(5, "Toggle 3:rd person view");
-	} else {
+		//		bThirdPerson = new Touch::TButton(5, "Toggle 3:rd person view");
+	} else if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 1) {
 		bContinue = new Button(1, "Back to game");
 		bOptions = new Button(5, "Options");
+		bPhotoMode = new Button(6, "Photo Mode");
 		bQuit = new Button(2, "Quit to title");
 		bQuitAndSaveLocally = new Button(3, "Quit and copy map");
 		bServerVisibility = new Button(4, "");
-//		bThirdPerson = new Button(5, "Toggle 3:rd person view");
+		//		bThirdPerson = new Button(5, "Toggle 3:rd person view");
+	} else {
+		bContinue = new Button(1, 0, 0, 200, 20, "Back to game");
+		bServerVisibility = new Button(4, 0, 0, 200, 20, "");
+		bOptions = new Button(5, 0, 0, 200, 20, "Options...");
+		bPhotoMode = new Button(6, 0, 0, 200, 20, "Photo Mode");
+		bQuit = new Button(2, 0, 0, 200, 20, "Save and quit to title");
+		bQuitAndSaveLocally = new Button(3, 0, 0, 200, 20, "Copy and quit map");
+		//		bThirdPerson = new Button(5, "Toggle 3:rd person view");
 	}
 
 	buttons.push_back(bContinue);
 	buttons.push_back(bQuit);
 	buttons.push_back(bOptions);
+	buttons.push_back(bPhotoMode);
 	// bSound.updateImage(&minecraft->options);
 	bThirdPerson.updateImage(&minecraft->options);
 	bHideGui.updateImage(&minecraft->options);
 	// buttons.push_back(&bSound);
 	buttons.push_back(&bThirdPerson);
-    //buttons.push_back(&bHideGui);
+	//buttons.push_back(&bHideGui);
 
 	// If Back wasn't pressed, set up additional items (more than Quit to menu
 	// and Back to game) here
-    
-    #if !defined(APPLE_DEMO_PROMOTION) && !defined(RPI)
+
+#if !defined(APPLE_DEMO_PROMOTION) && !defined(RPI)
 	if (true || !wasBackPaused) {
 		if (minecraft->raknetInstance) {
 			if (minecraft->raknetInstance->isServer()) {
@@ -85,14 +99,14 @@ void PauseScreen::init() {
 				buttons.push_back(bServerVisibility);
 			}
 			else {
-                #if !defined(DEMO_MODE)
-                buttons.push_back(bQuitAndSaveLocally);
-				#endif
+#if !defined(DEMO_MODE)
+				buttons.push_back(bQuitAndSaveLocally);
+#endif
 			}
 		}
 	}
-    #endif
-//	buttons.push_back(bThirdPerson);
+#endif
+	//	buttons.push_back(bThirdPerson);
 
 	for (unsigned int i = 0; i < buttons.size(); ++i) {
 		// if (buttons[i] == &bSound) continue;
@@ -103,27 +117,54 @@ void PauseScreen::init() {
 }
 
 void PauseScreen::setupPositions() {
-    saveStep = 0;
+	saveStep = 0;
 	int yBase = 16;
+	if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
+		yBase = 50;
 
-	bContinue->width = bOptions->width = bQuit->width = /*bThirdPerson->w =*/ 160;
-	bQuitAndSaveLocally->width = bServerVisibility->width = 160;
+		bContinue->width = bOptions->width = bPhotoMode->width = bQuit->width = /*bThirdPerson->w =*/ 200;
+		bQuitAndSaveLocally->width = bServerVisibility->width = 200;
 
-	bContinue->x = (width - bContinue->width) / 2;
-	bContinue->y = yBase + 32 * 1;
+		bContinue->x = (width - bContinue->width) / 2;
+		bContinue->y = yBase + 24 * 1;
 
-	bOptions->x = (width - bOptions->width) / 2;
-	bOptions->y = yBase + 32 * 2;
+		bQuitAndSaveLocally->x = bServerVisibility->x = (width - bQuitAndSaveLocally->width) / 2;
+		bQuitAndSaveLocally->y = bServerVisibility->y = yBase + 24 * 2;
 
-	bQuit->x = (width - bQuit->width) / 2;
-	bQuit->y = yBase + 32 * 3;
+		bPhotoMode->x = (width - bPhotoMode->width) / 2;
+		bPhotoMode->y = yBase + 24 * 3;
+
+		bOptions->x = (width - bOptions->width) / 2;
+		bOptions->y = yBase + 24 * 3 + 24;
+
+		bQuit->x = (width - bQuit->width) / 2;
+		bQuit->y = yBase + 24 * 4 + 24;
+
+	} else {
+		bContinue->width = bOptions->width = bPhotoMode->width = bQuit->width = /*bThirdPerson->w =*/ 160;
+		bQuitAndSaveLocally->width = bServerVisibility->width = 160;
+
+		bContinue->x = (width - bContinue->width) / 2;
+		bContinue->y = yBase + 32 * 1;
+
+		bOptions->x = (width - bOptions->width) / 2;
+		bOptions->y = yBase + 32 * 2;
+
+		bPhotoMode->x = (width - bPhotoMode->width) / 2;
+		bPhotoMode->y = yBase + 32 * 3;
+
+		bQuit->x = (width - bQuit->width) / 2;
+		bQuit->y = yBase + 32 * 4;
 
 #if APPLE_DEMO_PROMOTION
-    bQuit->y += 16;
+		bQuit->y += 16;
 #endif
-    
-	bQuitAndSaveLocally->x = bServerVisibility->x = (width - bQuitAndSaveLocally->width) / 2;
-	bQuitAndSaveLocally->y = bServerVisibility->y = yBase + 32 * 4;
+
+		bQuitAndSaveLocally->x = bServerVisibility->x = (width - bQuitAndSaveLocally->width) / 2;
+		bQuitAndSaveLocally->y = bServerVisibility->y = yBase + 32 * 5;
+	}
+
+
 
 	// bSound.y = bThirdPerson.y = 8;
 	// bSound.x = 4;
@@ -161,9 +202,12 @@ void PauseScreen::buttonClicked(Button* button) {
 		minecraft->setScreen(NULL);
 		//minecraft->grabMouse();
 	}
-    if (button->id == bQuit->id) {
+	if (button->id == bQuit->id) {
 		minecraft->leaveGame();
-    }
+	}
+	if (button->id == bPhotoMode->id) {
+		minecraft->setScreen(new UploadPhotoScreen());
+	}
 	if (button->id == bQuitAndSaveLocally->id) {
 		minecraft->leaveGame(true);
 	}
@@ -197,5 +241,5 @@ void PauseScreen::updateServerVisibilityText()
 	ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) minecraft->netCallback;
 	bServerVisibility->msg = ss->allowsIncomingConnections()?
 		"Server is visible"
-	:   "Server is invisible";
+		:   "Server is invisible";
 }

src/client/gui/screens/PauseScreen.h

@@ -33,6 +33,7 @@ private:
 	Button* bQuit;
 	Button* bQuitAndSaveLocally;
 	Button* bServerVisibility;
+	Button* bPhotoMode;
 	Button* bOptions;
 
 	//	Button* bThirdPerson;

src/client/gui/screens/ScreenChooser.cpp

@@ -21,7 +21,7 @@ Screen* ScreenChooser::createScreen( ScreenId id )
 	Screen* screen = NULL;
 
 	// :sob:
-	if (/* _mc->useTouchscreen() */ true) {
+	if (_mc->options.getIntValue(OPTIONS_MENU_STYLE) == 0) {
 		switch (id) {
 		case SCREEN_STARTMENU:	     screen = new Touch::StartMenuScreen();	break;
 		case SCREEN_SELECTWORLD:     screen = new Touch::SelectWorldScreen();break;

src/client/gui/screens/StartMenuScreen.cpp

@@ -23,49 +23,62 @@
 
 // Some kind of default settings, might be overridden in ::init
 StartMenuScreen::StartMenuScreen()
-:	bHost(    2, 0, 0, 160, 24, "Start Game"),
-	bJoin(    3, 0, 0, 160, 24, "Join Game"),
-	bOptions( 4, 0, 0, 160, 24, "Options"),
-	bQuit(    5, "")
 {
 }
 
 StartMenuScreen::~StartMenuScreen()
 {
+	delete bHost;
+	delete bJoin;
+	delete bOptions;
+	delete bQuit;
 }
 
 void StartMenuScreen::init()
 {
-	bJoin.active = bHost.active = bOptions.active = true;
+	if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
+		bHost = new Button(    2, 0, 0, 200, 20, "Singleplayer");
+		bJoin = new Button(    3, 0, 0, 200, 20, "Multiplayer");
+		bOptions = new Button( 4, 0, 0, 200, 20, "Options...");
+		bQuit = new Button( 5, 0, 0, 200, 20, "Ouit Game");
+	} else {
+		bHost = new Button(    2, 0, 0, 160, 24, "Start Game");
+		bJoin = new Button(    3, 0, 0, 160, 24, "Join Game");
+		bOptions = new Button( 4, 0, 0, 160, 24, "Options");
+		bQuit = new Button( 5, 0, 0, 160, 24, "Ouit Game");
+	}
+	bJoin->active = bHost->active = bOptions->active = true;
 
 	if (minecraft->options.getStringValue(OPTIONS_USERNAME).empty()) {
 		return; // tick() will redirect to UsernameScreen
 	}
 
-	buttons.push_back(&bHost);
-	buttons.push_back(&bJoin);
+	buttons.push_back(bHost);
+	buttons.push_back(bJoin);
 	//buttons.push_back(&bTest);
+	buttons.push_back(bQuit);
 
-	tabButtons.push_back(&bHost);
-	tabButtons.push_back(&bJoin);
+	tabButtons.push_back(bHost);
+	tabButtons.push_back(bJoin);
+	tabButtons.push_back(bQuit);
 
 	#ifndef RPI
-		buttons.push_back(&bOptions);
-		tabButtons.push_back(&bOptions);
+		buttons.push_back(bOptions);
+		tabButtons.push_back(bOptions);
 	#endif
 
-    // add quit button (top right X icon) – match OptionsScreen style
-    {
-        ImageDef def;
-        def.name = "gui/touchgui.png";
-        def.width = 34;
-        def.height = 26;
-        def.setSrc(IntRectangle(150, 0, (int)def.width, (int)def.height));
-        bQuit.setImageDef(def, true);
-        bQuit.scaleWhenPressed = false;
-        buttons.push_back(&bQuit);
-        // don't include in tab navigation
-    }
+    //// add quit button (top right X icon) – match OptionsScreen style
+    //{
+    //    ImageDef def;
+    //    def.name = "gui/touchgui.png";
+    //    def.width = 34;
+    //    def.height = 26;
+    //    def.setSrc(IntRectangle(150, 0, (int)def.width, (int)def.height));
+    //    bQuit.setImageDef(def, true);
+    //    bQuit.scaleWhenPressed = false;
+    //    buttons.push_back(&bQuit);
+    //    // don't include in tab navigation
+    //}
 
 	copyright = "\xffMojang AB";//. Do not distribute!";
 
@@ -93,20 +106,30 @@ void StartMenuScreen::init()
 }
 
 void StartMenuScreen::setupPositions() {
-	int yBase = height / 2;
+	if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
+		int yBase = (height / 2) - 20;
 
-	bHost.y =	 yBase;
-	bJoin.y =	 bHost.y + 24 + 4;
-	bOptions.y = bJoin.y + 24 + 4;
+		bHost->y =	 yBase;
+		bJoin->y =	 bHost->y + 24;
+		bOptions->y = bJoin->y + 24;
+		bQuit->y = bOptions->y + 24;
+	} else {
+		int yBase = height / 2;
+		bHost->y =	 yBase;
+		bJoin->y =	 bHost->y + 24 + 4;
+		bOptions->y = bJoin->y + 24 + 4;
+		bQuit->y = bOptions->y + 24 + 4;
+	}
 
 	// Center buttons
-	bHost.x = (width - bHost.width) / 2;
-	bJoin.x = (width - bJoin.width) / 2;
-	bOptions.x = (width - bOptions.width) / 2;
+	bHost->x = (width - bHost->width) / 2;
+	bJoin->x = (width - bJoin->width) / 2;
+	bOptions->x = (width - bOptions->width) / 2;
+	bQuit->x = (width - bQuit->width) / 2;
 
-    // position quit icon at top-right (use image-defined size)
-    bQuit.x = width - bQuit.width;
-    bQuit.y = 0;
+    //// position quit icon at top-right (use image-defined size)
+    //bQuit.x = width - bQuit.width;
+    //bQuit.y = 0;
 }
 
 void StartMenuScreen::tick() {
@@ -114,7 +137,7 @@ void StartMenuScreen::tick() {
 
 void StartMenuScreen::buttonClicked(Button* button) {
 
-	if (button->id == bHost.id)
+	if (button->id == bHost->id)
 	{
         #if defined(DEMO_MODE) || defined(APPLE_DEMO_PROMOTION)
 			minecraft->setScreen( new SimpleChooseLevelScreen("_DemoLevel") );
@@ -122,16 +145,16 @@ void StartMenuScreen::buttonClicked(Button* button) {
 			minecraft->screenChooser.setScreen(SCREEN_SELECTWORLD);
 		#endif
 	}
-	if (button->id == bJoin.id)
+	if (button->id == bJoin->id)
 	{
 		minecraft->locateMultiplayer();
 		minecraft->screenChooser.setScreen(SCREEN_JOINGAME);
 	}
-	if (button->id == bOptions.id)
+	if (button->id == bOptions->id)
 	{
 		minecraft->setScreen(new OptionsScreen());
 	}
-	if (button == &bQuit)
+	if (button->id == bQuit->id)
 	{
 		minecraft->quit();
 	}

src/client/gui/screens/StartMenuScreen.h

@@ -23,10 +23,10 @@ public:
 	bool isInGameScreen();
 private:
 
-	Button bHost;
-	Button bJoin;
-	Button bOptions;
-	ImageButton bQuit; // X button in top-right corner
+	Button* bHost;
+	Button* bJoin;
+	Button* bOptions;
+	Button* bQuit; 
 
 	std::string copyright;
 	int copyrightPosX;

src/client/gui/screens/UploadPhotoScreen.cpp

@@ -1,177 +1,160 @@
-#if 0
-
-#include "UploadPhotoScreen.h"
-#include "../renderer/TileRenderer.h"
-#include "../player/LocalPlayer.h"
-#include "../../world/entity/player/Inventory.h"
-
-UploadPhotoScreen::UploadPhotoScreen()
-	:
-selectedItem(0)
-{
-}
-
-void UploadPhotoScreen::init()
-{
-	int currentSelection = minecraft->player->inventory->getSelectedItemId();
-	for (int i = 0; i < Inventory::INVENTORY_SIZE; i++)
-	{
-		if (currentSelection == minecraft->player->inventory->getSelectionSlotItemId(i + Inventory::SELECTION_SIZE))
-		{
-			selectedItem = i;
-			break;
-		}
-	}
-
-}
-
-void UploadPhotoScreen::renderSlots()
-{
-	glColor4f2(1, 1, 1, 1);
-
-	blitOffset = -90;
-
-	minecraft->textures->loadAndBindTexture("gui/gui.png");
-	for (int r = 0; r < Inventory::INVENTORY_ROWS; r++)
-	{
-		blit(width / 2 - 182 / 2, height - 22 * 3 - 22 * r, 0, 0, 182, 22);
-	}
-	if (selectedItem >= 0)
-	{
-		int x = width / 2 - 182 / 2 - 1 + (selectedItem % Inventory::SELECTION_SIZE) * 20;
-		int y = height - 22 * 3 - 1 - (selectedItem / Inventory::SELECTION_SIZE) * 22;
-		blit(x, y, 0, 22, 24, 22);
-	}
-
-	for (int r = 0; r < Inventory::INVENTORY_ROWS; r++)
-	{
-		for (int i = 0; i < 9; i++) {
-			int x = width / 2 - 9 * 10 + i * 20 + 2;
-			int y = height - 16 - 3 - 22 * 2 - 22 * r;
-			renderSlot(r * 9 + i + Inventory::SELECTION_SIZE, x, y, 0);
-		}
-	}
-
-}
-
-void UploadPhotoScreen::renderSlot(int slot, int x, int y, float a)
-{
-	int itemId = minecraft->player->inventory->getSelectionSlotItemId(slot);
-	if (itemId < 0) return;
-
-	const bool fancy = false;
-
-	if (fancy && itemId < 256 && TileRenderer::canRender(Tile::tiles[itemId]->getRenderShape())) {
-
-	} else {
-		if (itemId < 256) {
-			Tile* tile = Tile::tiles[itemId];
-			if (tile == NULL) return;
-
-			minecraft->textures->loadAndBindTexture("terrain.png");
-
-			int textureId = tile->getTexture(2, 0);
-			blit(x, y, textureId % 16 * 16, textureId / 16 * 16, 16, 16);
-		}
-	}
-
-}
-
-void UploadPhotoScreen::keyPressed(int eventKey)
-{
-	int selX = selectedItem % Inventory::SELECTION_SIZE;
-	int selY = selectedItem / Inventory::SELECTION_SIZE;
-
-	Options& o = minecraft->options;
-	if (eventKey == o.keyLeft.key && selX > 0)
-	{
-		selectedItem -= 1;
-	}
-	else if (eventKey == o.keyRight.key && selX < (Inventory::SELECTION_SIZE - 1))
-	{
-		selectedItem += 1;
-	}
-	else if (eventKey == o.keyDown.key && selY > 0)
-	{
-		selectedItem -= Inventory::SELECTION_SIZE;
-	}
-	else if (eventKey == o.keyUp.key && selY < (Inventory::INVENTORY_ROWS - 1))
-	{
-		selectedItem += Inventory::SELECTION_SIZE;
-	}
-
-	if (eventKey == o.keyMenuOk.key)
-	{
-		selectSlotAndClose();
-	}
-}
-
-int UploadPhotoScreen::getSelectedSlot(int x, int y)
-{
-	int left = 3 + width / 2 - Inventory::SELECTION_SIZE * 10;
-	int top = height - 16 - 3 - 22 * 2 - 22 * Inventory::INVENTORY_ROWS;
-
-	if (x >= left && y >= top)
-	{
-		int xSlot = (x - left) / 20;
-		if (xSlot < Inventory::SELECTION_SIZE)
-		{
-			// rows are rendered upsidedown
-			return xSlot + Inventory::INVENTORY_SIZE - ((y - top) / 22) * Inventory::SELECTION_SIZE;
-		}
-	}
-	return -1;
-}
-
-void UploadPhotoScreen::mouseClicked(int x, int y, int buttonNum) {
-	if (buttonNum == MouseAction::ACTION_LEFT) {
-
-		int slot = getSelectedSlot(x, y);
-		if (slot >= 0 && slot < Inventory::INVENTORY_SIZE)
-		{
-			selectedItem = slot;
-			//minecraft->soundEngine->playUI("random.click", 1, 1);
-		}
-	}
-}
-
-void UploadPhotoScreen::mouseReleased(int x, int y, int buttonNum)
-{
-	if (buttonNum == MouseAction::ACTION_LEFT) {
-
-		int slot = getSelectedSlot(x, y);
-		if (slot >= 0 && slot < Inventory::INVENTORY_SIZE && slot == selectedItem)
-		{
-			selectSlotAndClose();
-		}
-	}
-}
-
-void UploadPhotoScreen::selectSlotAndClose()
-{
-	Inventory* inventory = minecraft->player->inventory;
-
-	int itemId = inventory->getSelectionSlotItemId(selectedItem + Inventory::SELECTION_SIZE);
-	int i = 0;
-
-	for (; i < Inventory::SELECTION_SIZE - 2; i++)
-	{
-		if (itemId == inventory->getSelectionSlotItemId(i))
-		{
-			break;
-		}
-	}
-
-	// update selection list
-	for (; i >= 1; i--)
-	{
-		inventory->setSelectionSlotItemId(i, inventory->getSelectionSlotItemId(i - 1));
-	}
-	inventory->setSelectionSlotItemId(0, itemId);
-	inventory->selectSlot(0);
-
-	minecraft->soundEngine->playUI("random.click", 1, 1);
-	minecraft->setScreen(NULL);
-}
-
-#endif
+#include "UploadPhotoScreen.h"
+
+#include "../components/Button.h"
+#include "../../Minecraft.h"
+#include "../../player/LocalPlayer.h"
+#include "../../../world/entity/item/TripodCamera.h"
+#include "../../../world/level/Level.h"
+#include "../../../platform/input/Keyboard.h"
+#include "../../renderer/GameRenderer.h"
+#include "../../renderer/LevelRenderer.h"
+
+UploadPhotoScreen::UploadPhotoScreen()
+: hasAppliedPhotoMode(false),
+  oldHideGui(false),
+  oldThirdPerson(false),
+  oldFixedCamera(false),
+  hasOldPose(false),
+  oldX(0),
+  oldY(0),
+  oldZ(0),
+  oldYaw(0),
+  oldPitch(0),
+  photoCameraTarget(NULL),
+  photoCameraX(0),
+  photoCameraY(0),
+  photoCameraZ(0),
+  bBack(0)
+{
+}
+
+UploadPhotoScreen::~UploadPhotoScreen()
+{
+	restorePhotoMode();
+	delete photoCameraTarget;
+	delete bBack;
+}
+
+void UploadPhotoScreen::init()
+{
+	applyPhotoMode();
+
+	if (minecraft->useTouchscreen()) {
+		bBack = new Touch::TButton(1, "Back");
+	} else {
+		bBack = new Button(1, "Back");
+	}
+
+	buttons.push_back(bBack);
+	tabButtons.push_back(bBack);
+}
+
+void UploadPhotoScreen::removed()
+{
+	restorePhotoMode();
+}
+
+void UploadPhotoScreen::applyPhotoMode()
+{
+	if (hasAppliedPhotoMode || !minecraft || !minecraft->gameRenderer) return;
+
+	if (minecraft->player) {
+		oldX = minecraft->player->x;
+		oldY = minecraft->player->y;
+		oldZ = minecraft->player->z;
+		oldYaw = minecraft->player->yRot;
+		oldPitch = minecraft->player->xRot;
+		hasOldPose = true;
+	}
+
+	oldHideGui = minecraft->options.getBooleanValue(OPTIONS_HIDEGUI);
+	oldThirdPerson = minecraft->options.getBooleanValue(OPTIONS_THIRD_PERSON_VIEW);
+	oldFixedCamera = minecraft->options.getBooleanValue(OPTIONS_FIXED_CAMERA);
+	Pos spawn = minecraft->level->getSharedSpawnPos();
+	photoCameraX = (float) spawn.x;
+	photoCameraY = 128.0f;
+	photoCameraZ = (float) spawn.z;
+	if (!photoCameraTarget) {
+		photoCameraTarget = new TripodCamera(minecraft->level, minecraft->player, photoCameraX, photoCameraY, photoCameraZ);
+	}
+	photoCameraTarget->setPos(photoCameraX, photoCameraY, photoCameraZ);
+	photoCameraTarget->xo = photoCameraTarget->xOld = photoCameraX;
+	photoCameraTarget->yo = photoCameraTarget->yOld = photoCameraY;
+	photoCameraTarget->zo = photoCameraTarget->zOld = photoCameraZ;
+
+	if (!oldHideGui) minecraft->options.toggle(OPTIONS_HIDEGUI);
+	if (!oldThirdPerson) minecraft->options.toggle(OPTIONS_THIRD_PERSON_VIEW);
+	if (!oldFixedCamera) minecraft->options.toggle(OPTIONS_FIXED_CAMERA);
+
+	minecraft->gameRenderer->setPhotoModeIsometric();
+	minecraft->levelRenderer->allChanged();
+	hasAppliedPhotoMode = true;
+}
+
+void UploadPhotoScreen::tick()
+{
+	if (!hasAppliedPhotoMode || !minecraft || !minecraft->player || !minecraft->level) return;
+
+	if (photoCameraTarget) {
+		photoCameraTarget->setPos(photoCameraX, photoCameraY, photoCameraZ);
+		photoCameraTarget->xo = photoCameraTarget->xOld = photoCameraX;
+		photoCameraTarget->yo = photoCameraTarget->yOld = photoCameraY;
+		photoCameraTarget->zo = photoCameraTarget->zOld = photoCameraZ;
+		photoCameraTarget->yRot = photoCameraTarget->yRotO = 45.0f;
+		photoCameraTarget->xRot = photoCameraTarget->xRotO = 68.0f;
+		minecraft->cameraTargetPlayer = photoCameraTarget;
+	}
+}
+
+void UploadPhotoScreen::restorePhotoMode()
+{
+	if (!hasAppliedPhotoMode || !minecraft) return;
+
+	if (minecraft->options.getBooleanValue(OPTIONS_HIDEGUI) != oldHideGui) minecraft->options.toggle(OPTIONS_HIDEGUI);
+	if (minecraft->options.getBooleanValue(OPTIONS_THIRD_PERSON_VIEW) != oldThirdPerson) minecraft->options.toggle(OPTIONS_THIRD_PERSON_VIEW);
+	if (minecraft->options.getBooleanValue(OPTIONS_FIXED_CAMERA) != oldFixedCamera) minecraft->options.toggle(OPTIONS_FIXED_CAMERA);
+	minecraft->gameRenderer->clearPhotoModeIsometric();
+	minecraft->cameraTargetPlayer = minecraft->player;
+
+	if (hasOldPose && minecraft->player) {
+		minecraft->player->yRot = oldYaw;
+		minecraft->player->xRot = oldPitch;
+	}
+
+	hasAppliedPhotoMode = false;
+}
+
+void UploadPhotoScreen::keyPressed(int eventKey)
+{
+	if (eventKey == Keyboard::KEY_ESCAPE) {
+		restorePhotoMode();
+		minecraft->setScreen(NULL);
+		return;
+	}
+
+	Screen::keyPressed(eventKey);
+}
+
+void UploadPhotoScreen::buttonClicked(Button* button)
+{
+	if (!button || button->id != 1) return;
+
+	restorePhotoMode();
+	minecraft->setScreen(NULL);
+}
+
+void UploadPhotoScreen::setupPositions()
+{
+	const int buttonWidth = 120;
+	const int buttonHeight = 24;
+	bBack->width = buttonWidth;
+	bBack->height = buttonHeight;
+	bBack->x = (width - buttonWidth) / 2;
+	bBack->y = height - 32;
+}
+
+void UploadPhotoScreen::render(int xm, int ym, float a)
+{
+	drawCenteredString(font, "Photo Mode - Isometric", width / 2, 12, 0xffffff);
+	Screen::render(xm, ym, a);
+}

src/client/gui/screens/UploadPhotoScreen.h

@@ -1,36 +1,50 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI_SCREENS__UploadPhotoScreen_H__
-#define NET_MINECRAFT_CLIENT_GUI_SCREENS__UploadPhotoScreen_H__
-
-#include "Screen.h"
-
-class UploadPhotoScreen : public Screen
-{
-public:
-
-	UploadPhotoScreen();
-	virtual ~UploadPhotoScreen() {}
-
-	virtual void init();
-
-	void render(int xm, int ym, float a) {
-		Screen::render(xm, ym, a);
-	}
-
-protected:
-
-	virtual void mouseClicked(int x, int y, int buttonNum);
-	virtual void mouseReleased(int x, int y, int buttonNum);
-	virtual void keyPressed(int eventKey);
-
-private:
-
-	int selectedItem;
-
-	void renderSlots();
-	void renderSlot(int slot, int x, int y, float a);
-
-	int getSelectedSlot(int x, int y);
-	void selectSlotAndClose();
-};
-
-#endif /*NET_MINECRAFT_CLIENT_GUI_SCREENS__UploadPhotoScreen_H__*/
+#ifndef NET_MINECRAFT_CLIENT_GUI_SCREENS__UploadPhotoScreen_H__
+#define NET_MINECRAFT_CLIENT_GUI_SCREENS__UploadPhotoScreen_H__
+
+#include "../Screen.h"
+
+class Button;
+class Mob;
+
+class UploadPhotoScreen : public Screen
+{
+public:
+
+	UploadPhotoScreen();
+	virtual ~UploadPhotoScreen();
+
+	virtual void init();
+	virtual void setupPositions();
+	virtual void tick();
+	virtual void removed();
+	virtual void keyPressed(int eventKey);
+
+	virtual void render(int xm, int ym, float a);
+
+protected:
+
+	virtual void buttonClicked(Button* button);
+
+private:
+
+	void applyPhotoMode();
+	void restorePhotoMode();
+
+	bool hasAppliedPhotoMode;
+	bool oldHideGui;
+	bool oldThirdPerson;
+	bool oldFixedCamera;
+	bool hasOldPose;
+	float oldX;
+	float oldY;
+	float oldZ;
+	float oldYaw;
+	float oldPitch;
+	Mob* photoCameraTarget;
+	float photoCameraX;
+	float photoCameraY;
+	float photoCameraZ;
+	Button* bBack;
+};
+
+#endif /*NET_MINECRAFT_CLIENT_GUI_SCREENS__UploadPhotoScreen_H__*/

src/client/renderer/GameRenderer.cpp

@@ -34,6 +34,7 @@ static int _shTicks = -1;
 GameRenderer::GameRenderer( Minecraft* mc )
 	:	mc(mc),
 	renderDistance(0),
+	photoModeIsometric(false),
 	_tick(0),
 	_lastTickT(0),
 	fovOffset(0),
@@ -90,7 +91,7 @@ void renderCursor(float x, float y, Minecraft* minecraft) {
 
 /*private*/
 void GameRenderer::setupCamera(float a, int eye) {
-	renderDistance = (float) (16 * 16 >> (mc->options.getIntValue(OPTIONS_VIEW_DISTANCE)));
+    renderDistance = photoModeIsometric ? 1024.0f : (float) (16 * 16 >> (mc->options.getIntValue(OPTIONS_VIEW_DISTANCE)));
 #if defined(ANDROID)
 	if (mc->isPowerVR() && mc->options.getIntValue(OPTIONS_VIEW_DISTANCE) <= 2)
 		renderDistance *= 0.8f;
@@ -101,12 +102,22 @@ void GameRenderer::setupCamera(float a, int eye) {
 
 	float stereoScale = 0.07f;
 	if (mc->options.getBooleanValue(OPTIONS_ANAGLYPH_3D)) glTranslatef2(-(eye * 2 - 1) * stereoScale, 0, 0);
-	if (zoom != 1) {
-		glTranslatef2((float) zoom_x, (float) -zoom_y, 0);
-		glScalef2(zoom, zoom, 1);
-		gluPerspective(_setupCameraFov = getFov(a, true), mc->width / (float) mc->height, 0.05f, renderDistance);
+	if (mc->options.getBooleanValue(OPTIONS_BETA_SKY)){
+		if (zoom != 1) {
+			glTranslatef2((float) zoom_x, (float) -zoom_y, 0);
+			glScalef2(zoom, zoom, 1);
+			gluPerspective(_setupCameraFov = getFov(a, true), mc->width / (float) mc->height, 0.05f, renderDistance * 2.0f);
+		} else {
+			gluPerspective(_setupCameraFov = getFov(a, true), mc->width / (float) mc->height, 0.05f, renderDistance * 2.0f);
+		}
 	} else {
-		gluPerspective(_setupCameraFov = getFov(a, true), mc->width / (float) mc->height, 0.05f, renderDistance);
+		if (zoom != 1) {
+			glTranslatef2((float) zoom_x, (float) -zoom_y, 0);
+			glScalef2(zoom, zoom, 1);
+			gluPerspective(_setupCameraFov = getFov(a, true), mc->width / (float) mc->height, 0.05f, renderDistance);
+		} else {
+			gluPerspective(_setupCameraFov = getFov(a, true), mc->width / (float) mc->height, 0.05f, renderDistance);
+		}
 	}
 
 	glMatrixMode(GL_MODELVIEW);
@@ -304,7 +315,7 @@ void GameRenderer::renderLevel(float a) {
 		setupFog(1);
 		// MCPE renders clouds using this, but this method breaks 3d clouds and also breaks 2d clouds transparency viewed from above, add as a Legacy Sky or Fast Sky option. - shredder
 		if(!mc->options.getBooleanValue(OPTIONS_BETA_SKY)){
-		if(mc->options.getBooleanValue(OPTIONS_FANCY_GRAPHICS)) { 
+		if(mc->options.getBooleanValue(OPTIONS_FANCY_GRAPHICS) && !photoModeIsometric) { 
 			prepareAndRenderClouds(levelRenderer, a);
 		}
 		}
@@ -340,10 +351,12 @@ void GameRenderer::renderLevel(float a) {
 		setupFog(0);
 		glEnable2(GL_BLEND);
 		glDisable2(GL_CULL_FACE);
-		glDepthMask(GL_FALSE);
+		glDepthMask(GL_FALSE); // @TODO commenting this out fixes Ice transparency and clouds are no longer visilbe underwater like normal beta - shredder
 		glDisable2(GL_ALPHA_TEST);
 		mc->textures->loadAndBindTexture("terrain.png");
-		//if (mc->options.fancyGraphics) {
+		// @TODO - below is a commented out double render system that fixes ice transparency, but probs harm performance, add it as an option - shredder
+
+		//if (mc->options.fancyGraphics) { 
 		//    glColorMask(false, false, false, false);
 		//    int visibleWaterChunks = levelRenderer->render(cameraEntity, 1, a);
 		//    glColorMask(true, true, true, true);
@@ -561,6 +574,14 @@ void GameRenderer::bobView(float a) {
 
 /*private*/
 void GameRenderer::setupFog(int i) {
+	if (photoModeIsometric) {
+		glDisable2(GL_FOG);
+		glFogf(GL_FOG_START, 0.0f);
+		glFogf(GL_FOG_END, 1024.0f);
+		glEnable2(GL_COLOR_MATERIAL);
+		return;
+	}
+
 	Mob* player = mc->cameraTargetPlayer;
 	float fogBuffer[4] = {fr, fg, fb, 1};
 
@@ -677,7 +698,7 @@ void GameRenderer::pick(float a) {
 	float range = mc->gameMode->getPickRange();
 	bool isPicking = true;
 
-	bool freeform = mc->useTouchscreen(); //&& !mc->options.getBooleanValue(OPTIONS_IS_JOY_TOUCH_AREA);
+	bool freeform = mc->useTouchscreen() && !mc->options.getBooleanValue(OPTIONS_IS_JOY_TOUCH_AREA);
 
 	if (freeform) {
 		isPicking = updateFreeformPickDirection(a, pickDirection);
@@ -817,6 +838,14 @@ void GameRenderer::tick(int nTick, int maxTick) {
 
 /*private*/
 void GameRenderer::setupClearColor(float a) {
+	if (photoModeIsometric) {
+		fr = 0.47f;
+		fg = 0.78f;
+		fb = 1.0f;
+		glClearColor(fr, fg, fb, 1.0f);
+		return;
+	}
+
 	Level* level = mc->level;
 	Mob* player = mc->cameraTargetPlayer;
 
@@ -930,6 +959,28 @@ void GameRenderer::onGraphicsReset()
 	if (itemInHandRenderer) itemInHandRenderer->onGraphicsReset();
 }
 
+void GameRenderer::setPhotoModeIsometric()
+{
+	photoModeIsometric = true;
+	thirdDistance = thirdDistanceO = 128.0f;
+	thirdRotation = thirdRotationO = 45.0f;
+	thirdTilt = thirdTiltO = 56.0f;
+	zoom = 1.0f;
+	zoom_x = 0.0f;
+	zoom_y = 0.0f;
+	cameraRoll = cameraRollO = 0.0f;
+}
+
+void GameRenderer::clearPhotoModeIsometric()
+{
+	photoModeIsometric = false;
+}
+
+bool GameRenderer::isPhotoModeIsometric() const
+{
+	return photoModeIsometric;
+}
+
 void GameRenderer::saveMatrices()
 {
 #if defined(RPI)

src/client/renderer/GameRenderer.h

@@ -33,6 +33,9 @@ public:
 	void renderItemInHand(float a, int eye);
 
 	void onGraphicsReset();
+	void setPhotoModeIsometric();
+	void clearPhotoModeIsometric();
+	bool isPhotoModeIsometric() const;
 
 	void setupCamera(float a, int eye);
 	void moveCameraToPlayer(float a);
@@ -58,6 +61,7 @@ private:
 	Minecraft* mc;
 
 	float renderDistance;
+	bool photoModeIsometric;
 	int _tick;
 	Vec3 pickDirection;
 

src/client/renderer/LevelRenderer.cpp

@@ -26,6 +26,7 @@
 #include "../../client/player/LocalPlayer.h"
 
 #include "../../world/level/GrassColor.h"
+#include "Lighting.h"
 
 #ifdef GFX_SMALLER_CHUNKS
 /* static */ const int LevelRenderer::CHUNK_SIZE = 8;
@@ -192,7 +193,9 @@ void LevelRenderer::allChanged()
 	TileRenderer::setUseTint(sideTint);
 
 
-	int dist = (512 >> 3) << (3 - lastViewDistance);
+	int dist = mc->gameRenderer && mc->gameRenderer->isPhotoModeIsometric()
+		? 1024
+		: (512 >> 3) << (3 - lastViewDistance);
 	if (lastViewDistance <= 2 && mc->isPowerVR())
 		dist = (int)((float)dist * 0.8f);
 	LOGI("last: %d, power: %d\n", lastViewDistance, mc->isPowerVR());
@@ -201,7 +204,9 @@ void LevelRenderer::allChanged()
 	dist *= 0.6f;
 #endif
 
-	if (dist > 400) dist = 400;
+	if (!(mc->gameRenderer && mc->gameRenderer->isPhotoModeIsometric())) {
+		if (dist > 400) dist = 400;
+	}
 	/*
 	* if (Minecraft.FLYBY_MODE) { dist = 512 - CHUNK_SIZE * 2; }
 	*/
@@ -575,7 +580,7 @@ void LevelRenderer::render(const AABB& b) const
 	//	t.color(255, 255, 255, 255); // again not needed, for some reason the vanilla source code tints it... white? maybe this was used for something else in MCPE's dev at one point? - shredder
 
 	//	t.offset(((Mob*)mc->player)->getPos(0).negated()); // why does this even exist normally, it just makes the thing... not render
-
+	glLineWidth(2.0f); // make it more thick - shredder
 	t.begin(GL_LINE_STRIP);
 	t.vertex(b.x0, b.y0, b.z0);
 	t.vertex(b.x1, b.y0, b.z0);
@@ -673,9 +678,11 @@ void LevelRenderer::tick()
 
 bool LevelRenderer::updateDirtyChunks( Mob* player, bool force )
 {
-	bool slow = false;
+	bool slow = mc->gameRenderer && mc->gameRenderer->isPhotoModeIsometric();
 
 	if (slow) {
+		const int visibleLimit = 12;
+		const int invisibleLimit = 4;
 		DirtyChunkSorter dirtySorter(player);
 		std::sort(dirtyChunks.begin(), dirtyChunks.end(), dirtySorter);
 		int s = dirtyChunks.size() - 1;
@@ -685,9 +692,9 @@ bool LevelRenderer::updateDirtyChunks( Mob* player, bool force )
 			if (!force) {
 				if (chunk->distanceToSqr(player) > 16 * 16) {
 					if (chunk->visible) {
-						if (i >= MAX_VISIBLE_REBUILDS_PER_FRAME) return false;
+						if (i >= visibleLimit) return false;
 					} else {
-						if (i >= MAX_INVISIBLE_REBUILDS_PER_FRAME) return false;
+						if (i >= invisibleLimit) return false;
 					}
 				}
 			} else {
@@ -701,10 +708,9 @@ bool LevelRenderer::updateDirtyChunks( Mob* player, bool force )
 
 		return dirtyChunks.size() == 0;
 	} else {
-		const int count = 3;
-
+		const int count = (mc->gameRenderer && mc->gameRenderer->isPhotoModeIsometric()) ? 32 : 3;
+		Chunk* toAdd[24] = {NULL};
 		DirtyChunkSorter dirtyChunkSorter(player);
-		Chunk* toAdd[count] = {NULL};
 		std::vector<Chunk*>* nearChunks = NULL;
 
 		int pendingChunkSize = dirtyChunks.size();
@@ -714,7 +720,7 @@ bool LevelRenderer::updateDirtyChunks( Mob* player, bool force )
 			Chunk* chunk = dirtyChunks[i];
 
 			if (!force) {
-				if (chunk->distanceToSqr(player) > 1024.0f) {
+				if (chunk->distanceToSqr(player) > ((mc->gameRenderer && mc->gameRenderer->isPhotoModeIsometric()) ? 65536.0f : 1024.0f)) {
 					int index;
 
 					// is this chunk in the closest <count>?
@@ -753,7 +759,7 @@ bool LevelRenderer::updateDirtyChunks( Mob* player, bool force )
 
 		// if there are nearby chunks that need to be prepared for
 		// rendering, sort them and then process them
-		static const float MaxFrameTime = 1.0f / 100.0f;
+		static const float MaxFrameTime = (mc->gameRenderer && mc->gameRenderer->isPhotoModeIsometric()) ? (1.0f / 75.0f) : (1.0f / 100.0f);
 		Stopwatch chunkWatch;
 		chunkWatch.start();
 
@@ -1157,23 +1163,22 @@ void LevelRenderer::renderSky(float alpha) {
 		glDisable(GL_FOG);
 	glDisable(GL_ALPHA_TEST);
 
-	// thanks to the mcpe 0.1 decomp project a bit for this part, was not getting the gl states correctly, gles is painful - shredder
+	// re ported this again from beta 1.6.6, thanks to the mcpe 0.1 decomp team's code for some bit of help about the void layer - shredder 
 
 	// Sunrise
 	if (mc->options.getBooleanValue(OPTIONS_BEAUTIFUL_SKY)) {
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
+	Lighting::turnOff();
 	float* c = level->dimension->getSunriseColor(level->getTimeOfDay(alpha), alpha);
 	if (c != nullptr)
 	{
 		glDisable(GL_TEXTURE_2D);
-
+//		glShadeModel(GL_SMOOTH); //
 
 		glPushMatrix();
 		glRotatef(90.0f, 1.0f, 0.0f, 0.0f);
 		glRotatef(level->getTimeOfDay(alpha) > 0.5f ? 180 : 0, 0.0f, 0.0f, 1.0f);
-
 		t.begin(GL_TRIANGLE_FAN);
 		t.color(c[0], c[1], c[2], c[3]);
 		t.vertex(0.0f, 100.0f, 0.0f);
@@ -1190,11 +1195,12 @@ void LevelRenderer::renderSky(float alpha) {
 
 		t.draw();
 		glPopMatrix();
+//		glShadeModel(GL_FLAT); //
 	}
 
 	// gets the time of day and rotates the sun and moon png based on the time
 	glEnable(GL_TEXTURE_2D);
-	glBlendFunc(GL_ONE, GL_ONE);
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE);
 	glPushMatrix();
 
 	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
@@ -1326,8 +1332,8 @@ void LevelRenderer::renderAdvancedClouds(float alpha) {
 
 	float cloudTime = (float)ticks + alpha;
 
-	double xo = (px + cloudTime * 0.03f) / ss;
-	double zo = pz / ss + 0.33f;
+	float xo = (px + cloudTime * 0.03f) / ss;
+	float zo = pz / ss + 0.33f;
 
 	float yy = 108.0f - py + 0.33f;
 

src/client/renderer/entity/EntityRenderer.cpp

@@ -130,9 +130,8 @@ void EntityRenderer::postRender(Entity* entity, float x, float y, float z, float
 		if (pow > 0) {
 			renderShadow(entity, x, y, z, pow, a);
 		}
-		//}
-		if (entity->isOnFire()) renderFlame(entity, x, y, z, a);
 	}
+		if (entity->isOnFire()) renderFlame(entity, x, y, z, a);
 }
 void EntityRenderer::renderFlame(Entity* e, float x, float y, float z, float a) {
 	glDisable(GL_LIGHTING);
@@ -187,7 +186,11 @@ void EntityRenderer::renderShadow(Entity* e, float x, float y, float z, float po
 	//Textures* textures = entityRenderDispatcher->textures;
 	//textures->bind(textures->loadTexture("%clamp%/environment/shadow.png"));
 	Textures* textures = entityRenderDispatcher->textures;
-
+	textures->loadAndBindTexture("/misc/shadow.png"); 
+    
+    
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
 
 
@@ -221,9 +224,6 @@ void EntityRenderer::renderShadow(Entity* e, float x, float y, float z, float po
 					renderTileShadow(Tile::tiles[t], x, y + e->getShadowHeightOffs(), z, xt, yt, zt, pow, r, xo, yo + e->getShadowHeightOffs(), zo);
 				}
 			}
-			textures->loadAndBindTexture(("/misc/shadow.png"));
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 			tt.draw();
 
 			glColor4f2(1, 1, 1, 1);

src/client/renderer/ptexture/DynamicTexture.cpp

@@ -393,8 +393,8 @@ void LavaSideTexture::tick() {
 		}
 }
 
-FireTexture::FireTexture()
-	:   super(((Tile*)Tile::fire)->tex),
+FireTexture::FireTexture(int id)
+	:   super(((Tile*)Tile::fire)->tex + id * 16),
 	_tick(0),
 	_frame(0)
 {

src/client/renderer/ptexture/DynamicTexture.h

@@ -106,7 +106,7 @@ class FireTexture: public DynamicTexture
 	float* heata;
 
 public:
-    FireTexture();
+    FireTexture(int id);
 	~FireTexture();
 
     void tick();

src/world/entity/animal/Chicken.cpp

@@ -51,13 +51,13 @@ void Chicken::aiStep()
 	flap += flapping * 2;
 
 	//@todo
-	//if (!isBaby()) {
-	//	if (!level->isClientSide && --eggTime <= 0) {
-	//		level->playSound(this, "mob.chickenplop", 1.0f, (random.nextFloat() - random.nextFloat()) * 0.2f + 1.0f);
-	//		spawnAtLocation(Item::egg->id, 1);
-	//		eggTime = random.nextInt(SharedConstants::TicksPerSecond * 60 * 5) + SharedConstants::TicksPerSecond * 60 * 5;
-	//	}
-	//}
+	if (!isBaby()) {
+		if (!level->isClientSide && --eggTime <= 0) {
+			level->playSound(this, "mob.chickenplop", 1.0f, (random.nextFloat() - random.nextFloat()) * 0.2f + 1.0f);
+			spawnAtLocation(Item::egg->id, 1);
+			eggTime = random.nextInt(SharedConstants::TicksPerSecond * 60 * 5) + SharedConstants::TicksPerSecond * 60 * 5;
+		}
+	}
 }
 
 void Chicken::addAdditonalSaveData( CompoundTag* tag )