Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Project modernization (#630)

Browse Source 
* Fixed boats falling and a TP glitch #266

* Replaced every C-style cast with C++ ones

* Replaced every C-style cast with C++ ones

* Fixed boats falling and a TP glitch #266

* Updated NULL to nullptr and fixing some type issues

* Modernized and fixed a few bugs

- Replaced most instances of `NULL` with `nullptr`.
- Replaced most `shared_ptr(new ...)` with `make_shared`.
- Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances.

* Fixing more conflicts

* Replace int loops with size_t and start work on overrides
This commit is contained in:
ModMaker101
2026-03-07 21:56:03 -05:00
committed by GitHub
parent 1be5faaea7
commit a9be52c41a
1373 changed files with 19903 additions and 19449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Minecraft.Client/FireballRenderer.cpp
View File

@@ -20,7 +20,7 @@ void FireballRenderer::render(shared_ptr<Entity> _fireball, double x, double y,
glPushMatrix();
glTranslatef((float) x, (float) y, (float) z);
glTranslatef(static_cast<float>(x), static_cast<float>(y), static_cast<float>(z));
glEnable(GL_RESCALE_NORMAL);
float s = scale;
glScalef(s / 1.0f, s / 1.0f, s / 1.0f);
@@ -43,10 +43,10 @@ void FireballRenderer::render(shared_ptr<Entity> _fireball, double x, double y,
glRotatef(-entityRenderDispatcher->playerRotX, 1, 0, 0);
t->begin();
t->normal(0, 1, 0);
t->vertexUV((float)(0 - xo), (float)( 0 - yo), (float)( 0), (float)( u0), (float)( v1));
t->vertexUV((float)(r - xo), (float)( 0 - yo), (float)( 0), (float)( u1), (float)( v1));
t->vertexUV((float)(r - xo), (float)( 1 - yo), (float)( 0), (float)( u1), (float)( v0));
t->vertexUV((float)(0 - xo), (float)( 1 - yo), (float)( 0), (float)( u0), (float)( v0));
t->vertexUV((float)(0 - xo), (float)( 0 - yo), static_cast<float>(0), (float)( u0), (float)( v1));
t->vertexUV((float)(r - xo), (float)( 0 - yo), static_cast<float>(0), (float)( u1), (float)( v1));
t->vertexUV((float)(r - xo), (float)( 1 - yo), static_cast<float>(0), (float)( u1), (float)( v0));
t->vertexUV((float)(0 - xo), (float)( 1 - yo), static_cast<float>(0), (float)( u0), (float)( v0));
t->end();
glDisable(GL_RESCALE_NORMAL);
@@ -61,7 +61,7 @@ void FireballRenderer::renderFlame(shared_ptr<Entity> e, double x, double y, dou
Icon *tex = Tile::fire->getTextureLayer(0);
glPushMatrix();
glTranslatef((float) x, (float) y, (float) z);
glTranslatef(static_cast<float>(x), static_cast<float>(y), static_cast<float>(z));
float s = e->bbWidth * 1.4f;
glScalef(s, s, s);
@@ -75,7 +75,7 @@ void FireballRenderer::renderFlame(shared_ptr<Entity> e, double x, double y, dou
// float yo = 0.0f;
float h = e->bbHeight / s;
float yo = (float) (e->y - e->bb->y0);
float yo = static_cast<float>(e->y - e->bb->y0);
//glRotatef(-entityRenderDispatcher->playerRotY, 0, 1, 0);
@@ -99,10 +99,10 @@ void FireballRenderer::renderFlame(shared_ptr<Entity> e, double x, double y, dou
u1 = u0;
u0 = tmp;
t->vertexUV((float)(0 - xo), (float)( 0 - yo), (float)( 0), (float)( u1), (float)( v1));
t->vertexUV((float)(r - xo), (float)( 0 - yo), (float)( 0), (float)( u0), (float)( v1));
t->vertexUV((float)(r - xo), (float)( 1.4f - yo), (float)( 0), (float)( u0), (float)( v0));
t->vertexUV((float)(0 - xo), (float)( 1.4f - yo), (float)( 0), (float)( u1), (float)( v0));
t->vertexUV((float)(0 - xo), (float)( 0 - yo), static_cast<float>(0), (float)( u1), (float)( v1));
t->vertexUV((float)(r - xo), (float)( 0 - yo), static_cast<float>(0), (float)( u0), (float)( v1));
t->vertexUV((float)(r - xo), (float)( 1.4f - yo), static_cast<float>(0), (float)( u0), (float)( v0));
t->vertexUV((float)(0 - xo), (float)( 1.4f - yo), static_cast<float>(0), (float)( u1), (float)( v0));
t->end();
glPopMatrix();