diff options
Diffstat (limited to 'src/client/render/core.cpp')
-rw-r--r-- | src/client/render/core.cpp | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/src/client/render/core.cpp b/src/client/render/core.cpp index a7644681e..223af5142 100644 --- a/src/client/render/core.cpp +++ b/src/client/render/core.cpp @@ -27,11 +27,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "client/minimap.h" #include "client/content_cao.h" -RenderingCore::RenderingCore(IrrlichtDevice *_device, Client *_client, Hud *_hud) : - device(_device), driver(device->getVideoDriver()), - smgr(device->getSceneManager()), guienv(device->getGUIEnvironment()), - client(_client), camera(client->getCamera()), - mapper(client->getMinimap()), hud(_hud) +RenderingCore::RenderingCore(IrrlichtDevice *_device, Client *_client, Hud *_hud) + : device(_device), driver(device->getVideoDriver()), smgr(device->getSceneManager()), + guienv(device->getGUIEnvironment()), client(_client), camera(client->getCamera()), + mapper(client->getMinimap()), hud(_hud) { screensize = driver->getScreenSize(); virtual_size = screensize; @@ -56,8 +55,7 @@ void RenderingCore::updateScreenSize() } void RenderingCore::draw(video::SColor _skycolor, bool _show_hud, bool _show_minimap, - bool _draw_wield_tool, bool _draw_crosshair, bool _draw_tracers, - bool _draw_esp) + bool _draw_wield_tool, bool _draw_crosshair, bool _draw_tracers, bool _draw_esp) { v2u32 ss = driver->getScreenSize(); if (screensize != ss) { @@ -71,7 +69,7 @@ void RenderingCore::draw(video::SColor _skycolor, bool _show_hud, bool _show_min draw_crosshair = _draw_crosshair; draw_tracers = _draw_tracers; draw_esp = _draw_esp; - + beforeDraw(); drawAll(); } @@ -80,29 +78,29 @@ void RenderingCore::drawTracersAndESP() { ClientEnvironment &env = client->getEnv(); Camera *camera = client->getCamera(); - + v3f camera_offset = intToFloat(camera->getOffset(), BS); - + v3f eye_pos = (camera->getPosition() + camera->getDirection() - camera_offset); - - video::SMaterial material, oldmaterial; - oldmaterial = driver->getMaterial2D(); + + video::SMaterial material, oldmaterial; + oldmaterial = driver->getMaterial2D(); material.setFlag(video::EMF_LIGHTING, false); material.setFlag(video::EMF_BILINEAR_FILTER, false); material.setFlag(video::EMF_ZBUFFER, false); material.setFlag(video::EMF_ZWRITE_ENABLE, false); driver->setMaterial(material); - + auto allObjects = env.getAllActiveObjects(); for (auto &it : allObjects) { ClientActiveObject *cao = it.second; if (cao->isLocalPlayer() || cao->getParent()) continue; GenericCAO *obj = dynamic_cast<GenericCAO *>(cao); - if (!obj) + if (! obj) continue; aabb3f box; - if (!obj->getSelectionBox(&box)) + if (! obj->getSelectionBox(&box)) continue; v3f pos = obj->getPosition(); pos -= camera_offset; @@ -112,10 +110,9 @@ void RenderingCore::drawTracersAndESP() if (draw_esp) driver->draw3DBox(box, video::SColor(255, 255, 255, 255)); if (draw_tracers) - driver->draw3DLine( - eye_pos, pos, video::SColor(255, 255, 255, 255)); + driver->draw3DLine(eye_pos, pos, video::SColor(255, 255, 255, 255)); } - + driver->setMaterial(oldmaterial); } @@ -137,7 +134,7 @@ void RenderingCore::drawHUD() if (show_hud) { if (draw_crosshair) hud->drawCrosshair(); - + hud->drawHotbar(client->getEnv().getLocalPlayer()->getWieldIndex()); hud->drawLuaElements(camera->getOffset()); camera->drawNametags(); |