forked from mirrors/kolyah35-minecraft-pe-0.6.1
Trying to replace pointers with references :v
This commit is contained in:
parent
7418263193
commit
12f5013ddb
126 changed files with 1343 additions and 2068 deletions
|
|
@ -10,7 +10,7 @@
|
|||
#include "culling/FrustumCuller.hpp"
|
||||
#include "entity/EntityRenderDispatcher.hpp"
|
||||
#include <Minecraft.hpp>
|
||||
#include "client/gamemode/GameMode.hpp"
|
||||
#include "gamemode/GameMode.hpp"
|
||||
#include "client/particle/ParticleEngine.hpp"
|
||||
#include "client/player/LocalPlayer.hpp"
|
||||
#include "client/gui/Screen.hpp"
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
static int _shTicks = -1;
|
||||
|
||||
GameRenderer::GameRenderer( Minecraft* mc )
|
||||
GameRenderer::GameRenderer( MinecraftClient& mc )
|
||||
: mc(mc),
|
||||
renderDistance(0),
|
||||
_tick(0),
|
||||
|
|
@ -61,17 +61,17 @@ GameRenderer::GameRenderer( Minecraft* mc )
|
|||
|
||||
EntityRenderDispatcher* e = EntityRenderDispatcher::getInstance();
|
||||
e->itemInHandRenderer = itemInHandRenderer;
|
||||
e->textures = mc->textures;
|
||||
e->textures = mc.textures;
|
||||
}
|
||||
|
||||
GameRenderer::~GameRenderer() {
|
||||
delete itemInHandRenderer;
|
||||
}
|
||||
|
||||
void renderCursor(float x, float y, Minecraft* minecraft) {
|
||||
void renderCursor(float x, float y, MinecraftClient& minecraft) {
|
||||
Tesselator& t = Tesselator::instance;
|
||||
|
||||
minecraft->textures->loadAndBindTexture("gui/cursor.png");
|
||||
minecraft.textures().loadAndBindTexture("gui/cursor.png");
|
||||
glEnable(GL_BLEND);
|
||||
|
||||
const float s = 32;
|
||||
|
|
@ -90,9 +90,9 @@ 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 = (float) (16 * 16 >> (mc.options.getIntValue(OPTIONS_VIEW_DISTANCE)));
|
||||
#if defined(ANDROID)
|
||||
if (mc->isPowerVR() && mc->options.getIntValue(OPTIONS_VIEW_DISTANCE) <= 2)
|
||||
if (mc.isPowerVR() && mc.options.getIntValue(OPTIONS_VIEW_DISTANCE) <= 2)
|
||||
renderDistance *= 0.8f;
|
||||
#endif
|
||||
|
||||
|
|
@ -100,21 +100,21 @@ void GameRenderer::setupCamera(float a, int eye) {
|
|||
glLoadIdentity2();
|
||||
|
||||
float stereoScale = 0.07f;
|
||||
if (mc->options.getBooleanValue(OPTIONS_ANAGLYPH_3D)) glTranslatef2(-(eye * 2 - 1) * stereoScale, 0, 0);
|
||||
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);
|
||||
gluPerspective(_setupCameraFov = getFov(a, true), mc.getScreenWidth() / (float) mc.getScreenHeight(), 0.05f, renderDistance);
|
||||
} else {
|
||||
gluPerspective(_setupCameraFov = getFov(a, true), mc->width / (float) mc->height, 0.05f, renderDistance);
|
||||
gluPerspective(_setupCameraFov = getFov(a, true), mc.getScreenWidth() / (float) mc.getScreenHeight(), 0.05f, renderDistance);
|
||||
}
|
||||
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
glLoadIdentity2();
|
||||
if (mc->options.getBooleanValue(OPTIONS_ANAGLYPH_3D)) glTranslatef2((eye * 2 - 1) * 0.10f, 0, 0);
|
||||
if (mc.options.getBooleanValue(OPTIONS_ANAGLYPH_3D)) glTranslatef2((eye * 2 - 1) * 0.10f, 0, 0);
|
||||
|
||||
bobHurt(a);
|
||||
if (mc->options.getBooleanValue(OPTIONS_VIEW_BOBBING)) bobView(a);
|
||||
if (mc.options.getBooleanValue(OPTIONS_VIEW_BOBBING)) bobView(a);
|
||||
|
||||
moveCameraToPlayer(a);
|
||||
}
|
||||
|
|
@ -124,14 +124,14 @@ extern int _t_keepPic;
|
|||
/*public*/
|
||||
void GameRenderer::render(float a) {
|
||||
TIMER_PUSH("mouse");
|
||||
if (mc->player && mc->mouseGrabbed) {
|
||||
mc->mouseHandler.poll();
|
||||
if (mc.player && mc.mouseGrabbed) {
|
||||
mc.mouseHandler.poll();
|
||||
//printf("Controller.x,y : %f,%f\n", Controller::getX(0), Controller::getY(0));
|
||||
|
||||
float ss = mc->options.getProgressValue(OPTIONS_SENSITIVITY) * 0.6f + 0.2f;
|
||||
float ss = mc.options.getProgressValue(OPTIONS_SENSITIVITY) * 0.6f + 0.2f;
|
||||
float sens = (ss * ss * ss) * 8;
|
||||
float xo = mc->mouseHandler.xd * sens * 4.f;
|
||||
float yo = mc->mouseHandler.yd * sens * 4.f;
|
||||
float xo = mc.mouseHandler.xd * sens * 4.f;
|
||||
float yo = mc.mouseHandler.yd * sens * 4.f;
|
||||
|
||||
const float now = _tick + a;
|
||||
float deltaT = now - _lastTickT;
|
||||
|
|
@ -142,19 +142,19 @@ void GameRenderer::render(float a) {
|
|||
_rotY += yo;
|
||||
|
||||
int yAxis = -1;
|
||||
if (mc->options.getBooleanValue(OPTIONS_INVERT_Y_MOUSE)) yAxis = 1;
|
||||
if (mc.options.getBooleanValue(OPTIONS_INVERT_Y_MOUSE)) yAxis = 1;
|
||||
|
||||
bool screenCovering = mc->screen && !mc->screen->passEvents;
|
||||
bool screenCovering = mc.screen && !mc.screen->passEvents;
|
||||
if (!screenCovering)
|
||||
{
|
||||
mc->player->turn(deltaT * _rotXlast, deltaT * _rotYlast * yAxis);
|
||||
mc.player->turn(deltaT * _rotXlast, deltaT * _rotYlast * yAxis);
|
||||
}
|
||||
}
|
||||
|
||||
int xMouse = (int)(Mouse::getX() * Gui::InvGuiScale);
|
||||
int yMouse = (int)(Mouse::getY() * Gui::InvGuiScale);
|
||||
|
||||
if (mc->useTouchscreen()) {
|
||||
if (mc.useTouchscreen()) {
|
||||
const int pid = Multitouch::getFirstActivePointerIdExThisUpdate();
|
||||
if (pid >= 0) {
|
||||
xMouse = (int)(Multitouch::getX(pid) * Gui::InvGuiScale);
|
||||
|
|
@ -169,29 +169,29 @@ void GameRenderer::render(float a) {
|
|||
bool hasClearedColorBuffer = false;
|
||||
bool hasSetupGuiScreen = false;
|
||||
useScreenScissor = false;
|
||||
if (mc->isLevelGenerated()) {
|
||||
if (mc.isLevelGenerated()) {
|
||||
|
||||
TIMER_PUSH("level");
|
||||
if (_t_keepPic < 0) {
|
||||
if (!(mc->screen && !mc->screen->renderGameBehind())) {
|
||||
if (!(mc.screen && !mc.screen->renderGameBehind())) {
|
||||
|
||||
if (mc->screen && mc->screen->hasClippingArea(screenScissorArea))
|
||||
if (mc.screen && mc.screen->hasClippingArea(screenScissorArea))
|
||||
useScreenScissor = true;
|
||||
|
||||
renderLevel(a);
|
||||
hasClearedColorBuffer = true;
|
||||
|
||||
if (!mc->options.getBooleanValue(OPTIONS_HIDEGUI)) {
|
||||
if (!mc.options.getBooleanValue(OPTIONS_HIDEGUI)) {
|
||||
TIMER_POP_PUSH("gui");
|
||||
setupGuiScreen(false);
|
||||
hasSetupGuiScreen = true;
|
||||
mc->gui.render(a, mc->screen != NULL, xMouse, yMouse);
|
||||
mc.gui().render(a, mc.screen != NULL, xMouse, yMouse);
|
||||
}
|
||||
}}
|
||||
TIMER_POP();
|
||||
|
||||
} else {
|
||||
glViewport(0, 0, mc->width, mc->height);
|
||||
glViewport(0, 0, mc.getScreenWidth(), mc.getScreenHeight());
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
glLoadIdentity2();
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
|
|
@ -204,23 +204,23 @@ void GameRenderer::render(float a) {
|
|||
if (!hasSetupGuiScreen)
|
||||
setupGuiScreen(!hasClearedColorBuffer);
|
||||
|
||||
if (mc->player && mc->screen == NULL) {
|
||||
if (mc->inputHolder) mc->inputHolder->render(a);
|
||||
if (mc->player->input) mc->player->input->render(a);
|
||||
if (mc.player && mc.screen == NULL) {
|
||||
if (mc.inputHolder) mc.inputHolder->render(a);
|
||||
if (mc.player->input) mc.player->input->render(a);
|
||||
}
|
||||
|
||||
if (mc->screen != NULL) {
|
||||
if (mc.screen != NULL) {
|
||||
if (useScreenScissor)
|
||||
glDisable2(GL_SCISSOR_TEST);
|
||||
|
||||
mc->screen->render(xMouse, yMouse, a);
|
||||
mc.screen->render(xMouse, yMouse, a);
|
||||
|
||||
mc->platform()->hideCursor(!mc->options.getBooleanValue(OPTIONS_RPI_CURSOR));
|
||||
if (mc->options.getBooleanValue(OPTIONS_RPI_CURSOR))
|
||||
mc.platform()->hideCursor(!mc.options.getBooleanValue(OPTIONS_RPI_CURSOR));
|
||||
if (mc.options.getBooleanValue(OPTIONS_RPI_CURSOR))
|
||||
renderCursor(xMouse, yMouse, mc);
|
||||
|
||||
// Screen might have been removed, so check it again
|
||||
if (mc->screen && !mc->screen->isInGameScreen())
|
||||
if (mc.screen && !mc.screen->isInGameScreen())
|
||||
sleepMs(15);
|
||||
}
|
||||
}
|
||||
|
|
@ -228,10 +228,10 @@ void GameRenderer::render(float a) {
|
|||
/*public*/
|
||||
void GameRenderer::renderLevel(float a) {
|
||||
|
||||
if (mc->cameraTargetPlayer == NULL) {
|
||||
if (mc->player)
|
||||
if (mc.cameraTargetPlayer == NULL) {
|
||||
if (mc.player)
|
||||
{
|
||||
mc->cameraTargetPlayer = mc->player;
|
||||
mc.cameraTargetPlayer = mc.player;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -242,21 +242,21 @@ void GameRenderer::renderLevel(float a) {
|
|||
TIMER_PUSH("pick");
|
||||
pick(a);
|
||||
|
||||
Mob* cameraEntity = mc->cameraTargetPlayer;
|
||||
LevelRenderer* levelRenderer = mc->levelRenderer;
|
||||
ParticleEngine* particleEngine = mc->particleEngine;
|
||||
Mob* cameraEntity = mc.cameraTargetPlayer;
|
||||
LevelRenderer* levelRenderer = mc.levelRenderer;
|
||||
ParticleEngine* particleEngine = mc.particleEngine;
|
||||
float xOff = cameraEntity->xOld + (cameraEntity->x - cameraEntity->xOld) * a;
|
||||
float yOff = cameraEntity->yOld + (cameraEntity->y - cameraEntity->yOld) * a;
|
||||
float zOff = cameraEntity->zOld + (cameraEntity->z - cameraEntity->zOld) * a;
|
||||
|
||||
for (int i = 0; i < 2; i++) {
|
||||
if (mc->options.getBooleanValue(OPTIONS_ANAGLYPH_3D)) {
|
||||
if (mc.options.getBooleanValue(OPTIONS_ANAGLYPH_3D)) {
|
||||
if (i == 0) glColorMask(false, true, true, false);
|
||||
else glColorMask(true, false, false, false);
|
||||
}
|
||||
|
||||
TIMER_POP_PUSH("clear");
|
||||
glViewport(0, 0, mc->width, mc->height);
|
||||
glViewport(0, 0, mc.getScreenWidth(), mc.getScreenHeight());
|
||||
setupClearColor(a);
|
||||
|
||||
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
||||
|
|
@ -272,7 +272,7 @@ void GameRenderer::renderLevel(float a) {
|
|||
screenScissorArea.w, screenScissorArea.h);
|
||||
}
|
||||
|
||||
if(mc->options.getBooleanValue(OPTIONS_FANCY_GRAPHICS)) {
|
||||
if(mc.options.getBooleanValue(OPTIONS_FANCY_GRAPHICS)) {
|
||||
setupFog(-1);
|
||||
TIMER_POP_PUSH("sky");
|
||||
glFogf(GL_FOG_START, renderDistance * 0.2f);
|
||||
|
|
@ -284,7 +284,7 @@ void GameRenderer::renderLevel(float a) {
|
|||
glEnable2(GL_FOG);
|
||||
setupFog(1);
|
||||
|
||||
if (mc->options.getBooleanValue(OPTIONS_AMBIENT_OCCLUSION)) {
|
||||
if (mc.options.getBooleanValue(OPTIONS_AMBIENT_OCCLUSION)) {
|
||||
glShadeModel2(GL_SMOOTH);
|
||||
}
|
||||
|
||||
|
|
@ -293,17 +293,17 @@ void GameRenderer::renderLevel(float a) {
|
|||
frustum.prepare(xOff, yOff, zOff);
|
||||
|
||||
TIMER_POP_PUSH("culling");
|
||||
mc->levelRenderer->cull(&frustum, a);
|
||||
mc->levelRenderer->updateDirtyChunks(cameraEntity, false);
|
||||
mc.levelRenderer->cull(&frustum, a);
|
||||
mc.levelRenderer->updateDirtyChunks(cameraEntity, false);
|
||||
|
||||
if(mc->options.getBooleanValue(OPTIONS_FANCY_GRAPHICS)) {
|
||||
if(mc.options.getBooleanValue(OPTIONS_FANCY_GRAPHICS)) {
|
||||
prepareAndRenderClouds(levelRenderer, a);
|
||||
}
|
||||
|
||||
setupFog(0);
|
||||
glEnable2(GL_FOG);
|
||||
|
||||
mc->textures->loadAndBindTexture("terrain.png");
|
||||
mc.textures().loadAndBindTexture("terrain.png");
|
||||
glDisable2(GL_ALPHA_TEST);
|
||||
glDisable2(GL_BLEND);
|
||||
glEnable2(GL_CULL_FACE);
|
||||
|
|
@ -316,7 +316,7 @@ void GameRenderer::renderLevel(float a) {
|
|||
|
||||
glShadeModel2(GL_FLAT);
|
||||
TIMER_POP_PUSH("entities");
|
||||
mc->levelRenderer->renderEntities(cameraEntity->getPos(a), &frustum, a);
|
||||
mc.levelRenderer->renderEntities(cameraEntity->getPos(a), &frustum, a);
|
||||
// setupFog(0);
|
||||
TIMER_POP_PUSH("particles");
|
||||
particleEngine->render(cameraEntity, a);
|
||||
|
|
@ -328,12 +328,12 @@ void GameRenderer::renderLevel(float a) {
|
|||
glDisable2(GL_CULL_FACE);
|
||||
glDepthMask(GL_FALSE);
|
||||
glDisable2(GL_ALPHA_TEST);
|
||||
mc->textures->loadAndBindTexture("terrain.png");
|
||||
//if (mc->options.fancyGraphics) {
|
||||
mc.textures().loadAndBindTexture("terrain.png");
|
||||
//if (mc.options.fancyGraphics) {
|
||||
// glColorMask(false, false, false, false);
|
||||
// int visibleWaterChunks = levelRenderer->render(cameraEntity, 1, a);
|
||||
// glColorMask(true, true, true, true);
|
||||
// if (mc->options.anaglyph3d) {
|
||||
// if (mc.options.anaglyph3d) {
|
||||
// if (i == 0) glColorMask(false, true, true, false);
|
||||
// else glColorMask(true, false, false, false);
|
||||
// }
|
||||
|
|
@ -357,13 +357,13 @@ void GameRenderer::renderLevel(float a) {
|
|||
glEnable2(GL_ALPHA_TEST);
|
||||
|
||||
if (/*!Minecraft::FLYBY_MODE &&*/ zoom == 1 && cameraEntity->isPlayer()) {
|
||||
if (mc->hitResult.isHit() && !cameraEntity->isUnderLiquid(Material::water)) {
|
||||
if (mc.hitResult.isHit() && !cameraEntity->isUnderLiquid(Material::water)) {
|
||||
TIMER_POP_PUSH("select");
|
||||
Player* player = (Player*) cameraEntity;
|
||||
// if (mc->useTouchscreen()) {
|
||||
levelRenderer->renderHitSelect(player, mc->hitResult, 0, NULL, a); //player.inventory->getSelected(), a);
|
||||
// if (mc.useTouchscreen()) {
|
||||
levelRenderer->renderHitSelect(player, mc.hitResult, 0, NULL, a); //player.inventory->getSelected(), a);
|
||||
// }
|
||||
levelRenderer->renderHit(player, mc->hitResult, 0, NULL, a);//player->inventory.getSelected(), a);
|
||||
levelRenderer->renderHit(player, mc.hitResult, 0, NULL, a);//player->inventory.getSelected(), a);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -375,13 +375,13 @@ void GameRenderer::renderLevel(float a) {
|
|||
// glDisable2(GL_FOG);
|
||||
setupFog(1);
|
||||
|
||||
if (zoom == 1 && !mc->options.getBooleanValue(OPTIONS_HIDEGUI)) {
|
||||
if (zoom == 1 && !mc.options.getBooleanValue(OPTIONS_HIDEGUI)) {
|
||||
TIMER_POP_PUSH("hand");
|
||||
glClear(GL_DEPTH_BUFFER_BIT);
|
||||
renderItemInHand(a, i);
|
||||
}
|
||||
|
||||
if (!mc->options.getBooleanValue(OPTIONS_ANAGLYPH_3D)) {
|
||||
if (!mc.options.getBooleanValue(OPTIONS_ANAGLYPH_3D)) {
|
||||
TIMER_POP();
|
||||
return;
|
||||
}
|
||||
|
|
@ -391,16 +391,16 @@ void GameRenderer::renderLevel(float a) {
|
|||
}
|
||||
|
||||
void GameRenderer::tickFov() {
|
||||
if (mc->cameraTargetPlayer != mc->player)
|
||||
if (mc.cameraTargetPlayer != mc.player)
|
||||
return;
|
||||
|
||||
oFov = fov;
|
||||
fov += (mc->player->getFieldOfViewModifier() - fov) * 0.5f;
|
||||
fov += (mc.player->getFieldOfViewModifier() - fov) * 0.5f;
|
||||
}
|
||||
|
||||
/*private*/
|
||||
float GameRenderer::getFov(float a, bool applyEffects) {
|
||||
Mob* player = mc->cameraTargetPlayer;
|
||||
Mob* player = mc.cameraTargetPlayer;
|
||||
float fov = 70;
|
||||
|
||||
if (applyEffects)
|
||||
|
|
@ -417,7 +417,7 @@ float GameRenderer::getFov(float a, bool applyEffects) {
|
|||
|
||||
/*private*/
|
||||
void GameRenderer::moveCameraToPlayer(float a) {
|
||||
Entity* player = mc->cameraTargetPlayer;
|
||||
Entity* player = mc.cameraTargetPlayer;
|
||||
|
||||
float heightOffset = player->heightOffset - 1.62f;
|
||||
|
||||
|
|
@ -433,10 +433,10 @@ void GameRenderer::moveCameraToPlayer(float a) {
|
|||
if(player->isPlayer() && ((Player*)player)->isSleeping()) {
|
||||
heightOffset += 1.0;
|
||||
glTranslatef(0.0f, 0.3f, 0);
|
||||
if (!mc->options.getBooleanValue(OPTIONS_FIXED_CAMERA)) {
|
||||
int t = mc->level->getTile(Mth::floor(player->x), Mth::floor(player->y), Mth::floor(player->z));
|
||||
if (!mc.options.getBooleanValue(OPTIONS_FIXED_CAMERA)) {
|
||||
int t = mc.level->getTile(Mth::floor(player->x), Mth::floor(player->y), Mth::floor(player->z));
|
||||
if (t == Tile::bed->id) {
|
||||
int data = mc->level->getData(Mth::floor(player->x), Mth::floor(player->y), Mth::floor(player->z));
|
||||
int data = mc.level->getData(Mth::floor(player->x), Mth::floor(player->y), Mth::floor(player->z));
|
||||
|
||||
int direction = data & 3;
|
||||
glRotatef(float(direction * 90), 0, 1, 0);
|
||||
|
|
@ -444,10 +444,10 @@ void GameRenderer::moveCameraToPlayer(float a) {
|
|||
glRotatef(player->yRotO + (player->yRot - player->yRotO) * a + 180, 0, -1, 0);
|
||||
glRotatef(player->xRotO + (player->xRot - player->xRotO) * a, -1, 0, 0);
|
||||
}
|
||||
} else if (mc->options.getBooleanValue(OPTIONS_THIRD_PERSON_VIEW)/* || (player->isPlayer() && !player->isAlive())*/) {
|
||||
} else if (mc.options.getBooleanValue(OPTIONS_THIRD_PERSON_VIEW)/* || (player->isPlayer() && !player->isAlive())*/) {
|
||||
float cameraDist = thirdDistanceO + (thirdDistance - thirdDistanceO) * a;
|
||||
|
||||
if (mc->options.getBooleanValue(OPTIONS_FIXED_CAMERA)) {
|
||||
if (mc.options.getBooleanValue(OPTIONS_FIXED_CAMERA)) {
|
||||
|
||||
float rotationY = thirdRotationO + (thirdRotation - thirdRotationO) * a;
|
||||
float xRot = thirdTiltO + (thirdTilt - thirdTiltO) * a;
|
||||
|
|
@ -471,7 +471,7 @@ void GameRenderer::moveCameraToPlayer(float a) {
|
|||
yo *= 0.1f;
|
||||
zo *= 0.1f;
|
||||
|
||||
HitResult hr = mc->level->clip(Vec3(x + xo, y + yo, z + zo), Vec3(x - xd + xo + zo, y - yd + yo, z - zd + zo)); // newTemp
|
||||
HitResult hr = mc.level->clip(Vec3(x + xo, y + yo, z + zo), Vec3(x - xd + xo + zo, y - yd + yo, z - zd + zo)); // newTemp
|
||||
if (hr.type != NO_HIT) {
|
||||
float dist = hr.pos.distanceTo(Vec3(x, y, z)); // newTemp
|
||||
if (dist < cameraDist) cameraDist = dist;
|
||||
|
|
@ -490,7 +490,7 @@ void GameRenderer::moveCameraToPlayer(float a) {
|
|||
glTranslatef2(0, 0, -0.1f);
|
||||
}
|
||||
|
||||
if (!mc->options.getBooleanValue(OPTIONS_FIXED_CAMERA)) {
|
||||
if (!mc.options.getBooleanValue(OPTIONS_FIXED_CAMERA)) {
|
||||
glRotatef2(player->xRotO + (player->xRot - player->xRotO) * a, 1.0f, 0.0f, 0.0f);
|
||||
glRotatef2(player->yRotO + (player->yRot - player->yRotO) * a + 180, 0, 1, 0);
|
||||
//if (_t_keepPic > 0)
|
||||
|
|
@ -500,7 +500,7 @@ void GameRenderer::moveCameraToPlayer(float a) {
|
|||
|
||||
/*private*/
|
||||
void GameRenderer::bobHurt(float a) {
|
||||
Mob* player = mc->cameraTargetPlayer;
|
||||
Mob* player = mc.cameraTargetPlayer;
|
||||
|
||||
float hurt = player->hurtTime - a;
|
||||
|
||||
|
|
@ -523,11 +523,11 @@ void GameRenderer::bobHurt(float a) {
|
|||
|
||||
/*private*/
|
||||
void GameRenderer::bobView(float a) {
|
||||
//if (mc->options.thirdPersonView) return;
|
||||
if (!(mc->cameraTargetPlayer->isPlayer())) {
|
||||
//if (mc.options.thirdPersonView) return;
|
||||
if (!(mc.cameraTargetPlayer->isPlayer())) {
|
||||
return;
|
||||
}
|
||||
Player* player = (Player*) mc->cameraTargetPlayer;
|
||||
Player* player = (Player*) mc.cameraTargetPlayer;
|
||||
|
||||
float wda = player->walkDist - player->walkDistO;
|
||||
float b = -(player->walkDist + wda * a);
|
||||
|
|
@ -541,7 +541,7 @@ void GameRenderer::bobView(float a) {
|
|||
|
||||
/*private*/
|
||||
void GameRenderer::setupFog(int i) {
|
||||
Mob* player = mc->cameraTargetPlayer;
|
||||
Mob* player = mc.cameraTargetPlayer;
|
||||
float fogBuffer[4] = {fr, fg, fb, 1};
|
||||
|
||||
glFogfv(GL_FOG_COLOR, (GLfloat*)fogBuffer);
|
||||
|
|
@ -555,7 +555,7 @@ void GameRenderer::setupFog(int i) {
|
|||
// float gg = 0.4f;
|
||||
// float bb = 0.9f;
|
||||
//
|
||||
// if (mc->options.anaglyph3d) {
|
||||
// if (mc.options.anaglyph3d) {
|
||||
// float rrr = (rr * 30 + gg * 59 + bb * 11) / 100;
|
||||
// float ggg = (rr * 30 + gg * 70) / (100);
|
||||
// float bbb = (rr * 30 + bb * 70) / (100);
|
||||
|
|
@ -571,7 +571,7 @@ void GameRenderer::setupFog(int i) {
|
|||
// float gg = 0.3f;
|
||||
// float bb = 0.3f;
|
||||
//
|
||||
// if (mc->options.anaglyph3d) {
|
||||
// if (mc.options.anaglyph3d) {
|
||||
// float rrr = (rr * 30 + gg * 59 + bb * 11) / 100;
|
||||
// float ggg = (rr * 30 + gg * 70) / (100);
|
||||
// float bbb = (rr * 30 + bb * 70) / (100);
|
||||
|
|
@ -589,7 +589,7 @@ void GameRenderer::setupFog(int i) {
|
|||
glFogf(GL_FOG_END, renderDistance * 1.0f);
|
||||
}
|
||||
|
||||
if (mc->level->dimension->foggy) {
|
||||
if (mc.level->dimension->foggy) {
|
||||
glFogf(GL_FOG_START, 0);
|
||||
}
|
||||
}
|
||||
|
|
@ -599,27 +599,27 @@ void GameRenderer::setupFog(int i) {
|
|||
}
|
||||
|
||||
void GameRenderer::updateAllChunks() {
|
||||
mc->levelRenderer->updateDirtyChunks(mc->cameraTargetPlayer, true);
|
||||
mc.levelRenderer->updateDirtyChunks(mc.cameraTargetPlayer, true);
|
||||
}
|
||||
|
||||
bool GameRenderer::updateFreeformPickDirection(float a, Vec3& outDir) {
|
||||
|
||||
if (!mc->inputHolder->allowPicking()) {
|
||||
if (!mc.inputHolder->allowPicking()) {
|
||||
_shTicks = 1;
|
||||
return false;
|
||||
}
|
||||
|
||||
Vec3 c = mc->cameraTargetPlayer->getPos(a);
|
||||
Vec3 c = mc.cameraTargetPlayer->getPos(a);
|
||||
|
||||
bool firstPerson = !mc->options.getBooleanValue(OPTIONS_THIRD_PERSON_VIEW);
|
||||
bool firstPerson = !mc.options.getBooleanValue(OPTIONS_THIRD_PERSON_VIEW);
|
||||
const float PickingDistance = firstPerson? 6.0f : 12.0f;
|
||||
|
||||
_shTicks = -1;
|
||||
|
||||
int vp[4] = {0, 0, mc->width, mc->height};
|
||||
int vp[4] = {0, 0, mc.getScreenWidth(), mc.getScreenHeight()};
|
||||
float pt[3];
|
||||
float x = mc->inputHolder->mousex;
|
||||
float y = mc->height - mc->inputHolder->mousey;
|
||||
float x = mc.inputHolder->mousex;
|
||||
float y = mc.getScreenHeight() - mc.inputHolder->mousey;
|
||||
|
||||
//sw.start();
|
||||
|
||||
|
|
@ -637,42 +637,42 @@ bool GameRenderer::updateFreeformPickDirection(float a, Vec3& outDir) {
|
|||
//sw.stop();
|
||||
//sw.printEvery(30, "unproject ");
|
||||
|
||||
const HitResult& hit = mc->hitResult = mc->level->clip(p0, p1, false);
|
||||
const HitResult& hit = mc.hitResult = mc.level->clip(p0, p1, false);
|
||||
|
||||
// If in 3rd person view - verify that the hit target is within range
|
||||
if (!firstPerson && hit.isHit()) {
|
||||
const float MaxSqrDist = PickingDistance*PickingDistance;
|
||||
if (mc->cameraTargetPlayer->distanceToSqr((float)hit.x, (float)hit.y, (float)hit.z) > MaxSqrDist)
|
||||
mc->hitResult.type = NO_HIT;
|
||||
if (mc.cameraTargetPlayer->distanceToSqr((float)hit.x, (float)hit.y, (float)hit.z) > MaxSqrDist)
|
||||
mc.hitResult.type = NO_HIT;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/*public*/
|
||||
void GameRenderer::pick(float a) {
|
||||
if (mc->level == NULL) return;
|
||||
if (mc->cameraTargetPlayer == NULL) return;
|
||||
if (!mc->cameraTargetPlayer->isAlive()) return;
|
||||
if (mc.level == NULL) return;
|
||||
if (mc.cameraTargetPlayer == NULL) return;
|
||||
if (!mc.cameraTargetPlayer->isAlive()) return;
|
||||
|
||||
float range = mc->gameMode->getPickRange();
|
||||
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);
|
||||
} else {
|
||||
mc->hitResult = mc->cameraTargetPlayer->pick(range, a);
|
||||
pickDirection = mc->cameraTargetPlayer->getViewVector(a);
|
||||
mc.hitResult = mc.cameraTargetPlayer->pick(range, a);
|
||||
pickDirection = mc.cameraTargetPlayer->getViewVector(a);
|
||||
}
|
||||
|
||||
Vec3 from = mc->cameraTargetPlayer->getPos(a);
|
||||
Vec3 from = mc.cameraTargetPlayer->getPos(a);
|
||||
float dist = range;
|
||||
if (mc->hitResult.isHit()) {
|
||||
dist = mc->hitResult.pos.distanceTo(from);
|
||||
if (mc.hitResult.isHit()) {
|
||||
dist = mc.hitResult.pos.distanceTo(from);
|
||||
}
|
||||
|
||||
if (mc->gameMode->isCreativeType()) {
|
||||
if (mc.gameMode->isCreativeType()) {
|
||||
/*dist =*/ range = 12;
|
||||
} else {
|
||||
if (dist > 3) dist = 3;
|
||||
|
|
@ -681,12 +681,12 @@ void GameRenderer::pick(float a) {
|
|||
|
||||
Vec3 pv = (pickDirection * range);
|
||||
Vec3 to = from + pv;
|
||||
mc->cameraTargetPlayer->aimDirection = pickDirection;
|
||||
mc.cameraTargetPlayer->aimDirection = pickDirection;
|
||||
|
||||
Entity* hovered = NULL;
|
||||
const float g = 1;
|
||||
AABB aabb = mc->cameraTargetPlayer->bb.expand(pv.x, pv.y, pv.z).grow(g, g, g);
|
||||
EntityList& objects = mc->level->getEntities(mc->cameraTargetPlayer, aabb);
|
||||
AABB aabb = mc.cameraTargetPlayer->bb.expand(pv.x, pv.y, pv.z).grow(g, g, g);
|
||||
EntityList& objects = mc.level->getEntities(mc.cameraTargetPlayer, aabb);
|
||||
float nearest = 0;
|
||||
for (unsigned int i = 0; i < objects.size(); i++) {
|
||||
Entity* e = objects[i];
|
||||
|
|
@ -714,26 +714,26 @@ void GameRenderer::pick(float a) {
|
|||
|
||||
if (hovered != NULL) {
|
||||
if(nearest < dist) {
|
||||
mc->hitResult = HitResult(hovered);
|
||||
mc.hitResult = HitResult(hovered);
|
||||
}
|
||||
}
|
||||
else if (isPicking && !mc->hitResult.isHit()) {
|
||||
else if (isPicking && !mc.hitResult.isHit()) {
|
||||
// if we don't have a hit result, attempt to hit the edge of the block we are standing on
|
||||
// (this is an pocket edition simplification to help building floors)
|
||||
//LOGI("hovered : %d (%f)\n", mc->hitResult.type, viewVec.y);
|
||||
//LOGI("hovered : %d (%f)\n", mc.hitResult.type, viewVec.y);
|
||||
if (pickDirection.y < -.7f) {
|
||||
// looking down by more than roughly 45 degrees, fetch a hit to the block standing on
|
||||
Vec3 to = from.add(0, -2.0f, 0);
|
||||
|
||||
HitResult downHitResult = mc->level->clip(from, to);
|
||||
HitResult downHitResult = mc.level->clip(from, to);
|
||||
if (downHitResult.isHit()) {
|
||||
mc->hitResult = downHitResult;
|
||||
mc->hitResult.indirectHit = true;
|
||||
mc.hitResult = downHitResult;
|
||||
mc.hitResult.indirectHit = true;
|
||||
// change face (not up)
|
||||
if (std::abs(pickDirection.x) > std::abs(pickDirection.z)) {
|
||||
mc->hitResult.f = (pickDirection.x < 0)? 4 : 5;
|
||||
mc.hitResult.f = (pickDirection.x < 0)? 4 : 5;
|
||||
} else {
|
||||
mc->hitResult.f = (pickDirection.z < 0)? 2 : 3;
|
||||
mc.hitResult.f = (pickDirection.z < 0)? 2 : 3;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -743,13 +743,13 @@ void GameRenderer::pick(float a) {
|
|||
void GameRenderer::tick(int nTick, int maxTick) {
|
||||
--_t_keepPic;
|
||||
|
||||
if (!mc->player)
|
||||
if (!mc.player)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (--_shTicks == 0)
|
||||
mc->hitResult.type = NO_HIT;
|
||||
mc.hitResult.type = NO_HIT;
|
||||
|
||||
//_rotXlast = _rotX;
|
||||
//_rotYlast = _rotY;
|
||||
|
|
@ -775,35 +775,35 @@ void GameRenderer::tick(int nTick, int maxTick) {
|
|||
fovOffsetO = fovOffset;
|
||||
cameraRollO = cameraRoll;
|
||||
|
||||
if (mc->cameraTargetPlayer == NULL) {
|
||||
mc->cameraTargetPlayer = mc->player;
|
||||
if (mc.cameraTargetPlayer == NULL) {
|
||||
mc.cameraTargetPlayer = mc.player;
|
||||
}
|
||||
|
||||
tickFov();
|
||||
|
||||
float brr = mc->level->getBrightness( Mth::floor(mc->cameraTargetPlayer->x),
|
||||
Mth::floor(mc->cameraTargetPlayer->y),
|
||||
Mth::floor(mc->cameraTargetPlayer->z));
|
||||
float brr = mc.level->getBrightness( Mth::floor(mc.cameraTargetPlayer->x),
|
||||
Mth::floor(mc.cameraTargetPlayer->y),
|
||||
Mth::floor(mc.cameraTargetPlayer->z));
|
||||
|
||||
float whiteness = (3 - mc->options.getIntValue(OPTIONS_VIEW_DISTANCE)) / 3.0f;
|
||||
float whiteness = (3 - mc.options.getIntValue(OPTIONS_VIEW_DISTANCE)) / 3.0f;
|
||||
float fogBrT = brr * (1 - whiteness) + whiteness;
|
||||
fogBr += (fogBrT - fogBr) * 0.1f;
|
||||
|
||||
_tick++;
|
||||
|
||||
itemInHandRenderer->tick();
|
||||
// if (mc->isRaining) tickRain();
|
||||
// if (mc.isRaining) tickRain();
|
||||
}
|
||||
|
||||
/*private*/
|
||||
void GameRenderer::setupClearColor(float a) {
|
||||
Level* level = mc->level;
|
||||
Mob* player = mc->cameraTargetPlayer;
|
||||
Level* level = mc.level;
|
||||
Mob* player = mc.cameraTargetPlayer;
|
||||
|
||||
float whiteness = 1.0f / (4 - mc->options.getIntValue(OPTIONS_VIEW_DISTANCE));
|
||||
float whiteness = 1.0f / (4 - mc.options.getIntValue(OPTIONS_VIEW_DISTANCE));
|
||||
whiteness = 1 - (float) pow(whiteness, 0.25f);
|
||||
|
||||
Vec3 skyColor = level->getSkyColor(mc->cameraTargetPlayer, a);
|
||||
Vec3 skyColor = level->getSkyColor(mc.cameraTargetPlayer, a);
|
||||
float sr = (float) skyColor.x;
|
||||
float sg = (float) skyColor.y;
|
||||
float sb = (float) skyColor.z;
|
||||
|
|
@ -832,7 +832,7 @@ void GameRenderer::setupClearColor(float a) {
|
|||
fg *= brr;
|
||||
fb *= brr;
|
||||
|
||||
if (mc->options.getBooleanValue(OPTIONS_ANAGLYPH_3D)) {
|
||||
if (mc.options.getBooleanValue(OPTIONS_ANAGLYPH_3D)) {
|
||||
float frr = (fr * 30 + fg * 59 + fb * 11) / 100;
|
||||
float fgg = (fr * 30 + fg * 70) / (100);
|
||||
float fbb = (fr * 30 + fb * 70) / (100);
|
||||
|
|
@ -859,8 +859,8 @@ void GameRenderer::unZoomRegion()
|
|||
|
||||
void GameRenderer::setupGuiScreen( bool clearColorBuffer )
|
||||
{
|
||||
int screenWidth = (int)(mc->width * Gui::InvGuiScale);
|
||||
int screenHeight = (int)(mc->height * Gui::InvGuiScale);
|
||||
int screenWidth = (int)(mc.getScreenWidth() * Gui::InvGuiScale);
|
||||
int screenHeight = (int)(mc.getScreenHeight() * Gui::InvGuiScale);
|
||||
|
||||
// Setup GUI render mode
|
||||
GLbitfield clearBits = clearColorBuffer?
|
||||
|
|
@ -878,19 +878,19 @@ void GameRenderer::setupGuiScreen( bool clearColorBuffer )
|
|||
/*private*/
|
||||
void GameRenderer::renderItemInHand(float a, int eye) {
|
||||
glLoadIdentity2();
|
||||
if (mc->options.getBooleanValue(OPTIONS_ANAGLYPH_3D)) glTranslatef2((eye * 2 - 1) * 0.10f, 0, 0);
|
||||
if (mc.options.getBooleanValue(OPTIONS_ANAGLYPH_3D)) glTranslatef2((eye * 2 - 1) * 0.10f, 0, 0);
|
||||
|
||||
glPushMatrix2();
|
||||
bobHurt(a);
|
||||
if (mc->options.getBooleanValue(OPTIONS_VIEW_BOBBING)) bobView(a);
|
||||
if (mc.options.getBooleanValue(OPTIONS_VIEW_BOBBING)) bobView(a);
|
||||
|
||||
if (!mc->options.getBooleanValue(OPTIONS_THIRD_PERSON_VIEW) && (mc->cameraTargetPlayer->isPlayer() && !((Player*)mc->cameraTargetPlayer)->isSleeping())) {
|
||||
if (!mc->options.getBooleanValue(OPTIONS_HIDEGUI)) {
|
||||
if (!mc.options.getBooleanValue(OPTIONS_THIRD_PERSON_VIEW) && (mc.cameraTargetPlayer->isPlayer() && !((Player*)mc.cameraTargetPlayer)->isSleeping())) {
|
||||
if (!mc.options.getBooleanValue(OPTIONS_HIDEGUI)) {
|
||||
float fov = getFov(a, false);
|
||||
if (fov != _setupCameraFov) {
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
glLoadIdentity();
|
||||
gluPerspective(fov, mc->width / (float) mc->height, 0.05f, renderDistance);
|
||||
gluPerspective(fov, mc.getScreenWidth() / (float) mc.getScreenHeight(), 0.05f, renderDistance);
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
}
|
||||
itemInHandRenderer->render(a);
|
||||
|
|
@ -898,11 +898,11 @@ void GameRenderer::renderItemInHand(float a, int eye) {
|
|||
}
|
||||
|
||||
glPopMatrix2();
|
||||
if (!mc->options.getBooleanValue(OPTIONS_THIRD_PERSON_VIEW) && (mc->cameraTargetPlayer->isPlayer() && !((Player*)mc->cameraTargetPlayer)->isSleeping())) {
|
||||
if (!mc.options.getBooleanValue(OPTIONS_THIRD_PERSON_VIEW) && (mc.cameraTargetPlayer->isPlayer() && !((Player*)mc.cameraTargetPlayer)->isSleeping())) {
|
||||
itemInHandRenderer->renderScreenEffect(a);
|
||||
bobHurt(a);
|
||||
}
|
||||
if (mc->options.getBooleanValue(OPTIONS_VIEW_BOBBING)) bobView(a);
|
||||
if (mc.options.getBooleanValue(OPTIONS_VIEW_BOBBING)) bobView(a);
|
||||
}
|
||||
|
||||
void GameRenderer::onGraphicsReset()
|
||||
|
|
@ -926,12 +926,12 @@ void GameRenderer::saveMatrices()
|
|||
}
|
||||
|
||||
void GameRenderer::prepareAndRenderClouds( LevelRenderer* levelRenderer, float a ) {
|
||||
//if(mc->options.isCloudsOn()) {
|
||||
//if(mc.options.isCloudsOn()) {
|
||||
TIMER_PUSH("clouds");
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
glPushMatrix2();
|
||||
glLoadIdentity2();
|
||||
gluPerspective(_setupCameraFov = getFov(a, true), mc->width / (float) mc->height, 2, renderDistance * 512);
|
||||
gluPerspective(_setupCameraFov = getFov(a, true), mc.getScreenWidth() / (float) mc.getScreenHeight(), 2, renderDistance * 512);
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
glPushMatrix2();
|
||||
setupFog(0);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue