Project modernization (#630)
* 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:
@@ -24,29 +24,29 @@ public:
|
||||
|
||||
void set(int16_t _x, int16_t _y, int16_t _w, int16_t _h, int texWidth, int texHeight)
|
||||
{
|
||||
x0 = (int16_t)(4096 * (float(_x) / texWidth));
|
||||
y0 = (int16_t)(4096 * (float(_y) / texHeight));
|
||||
x1 = x0 + (int16_t)(4096 * (float(_w) / texWidth));
|
||||
y1 = y0 + (int16_t)(4096 * (float(_h) / texHeight));
|
||||
x0 = static_cast<int16_t>(4096 * (float(_x) / texWidth));
|
||||
y0 = static_cast<int16_t>(4096 * (float(_y) / texHeight));
|
||||
x1 = x0 + static_cast<int16_t>(4096 * (float(_w) / texWidth));
|
||||
y1 = y0 + static_cast<int16_t>(4096 * (float(_h) / texHeight));
|
||||
}
|
||||
|
||||
void flipHorizontal() { int16_t temp = x0; x0 = x1; x1 = temp; }
|
||||
void flipVertical() { int16_t temp = y0; y0 = y1; y1 = temp; }
|
||||
|
||||
float getU0() const { return (float(x0) / 4096) + UVAdjust; }//sc_texWidth) + getUAdjust(); }
|
||||
float getU1() const { return (float(x1) / 4096.0f) - UVAdjust; } //sc_texWidth) - getUAdjust(); }
|
||||
float getU0() const { return (static_cast<float>(x0) / 4096) + UVAdjust; }//sc_texWidth) + getUAdjust(); }
|
||||
float getU1() const { return (static_cast<float>(x1) / 4096.0f) - UVAdjust; } //sc_texWidth) - getUAdjust(); }
|
||||
float getU(double offset) const
|
||||
{
|
||||
float diff = getU1() - getU0();
|
||||
return getU0() + (diff * ((float) offset / 16));//SharedConstants::WORLD_RESOLUTION));
|
||||
return getU0() + (diff * (static_cast<float>(offset) / 16));//SharedConstants::WORLD_RESOLUTION));
|
||||
}
|
||||
|
||||
float getV0() const { return (float(y0) / 4096.0f) + UVAdjust; } //sc_texHeight) + getVAdjust(); }
|
||||
float getV1() const { return (float(y1) / 4096.0f) - UVAdjust; } //sc_texHeight) - getVAdjust(); }
|
||||
float getV0() const { return (static_cast<float>(y0) / 4096.0f) + UVAdjust; } //sc_texHeight) + getVAdjust(); }
|
||||
float getV1() const { return (static_cast<float>(y1) / 4096.0f) - UVAdjust; } //sc_texHeight) - getVAdjust(); }
|
||||
float getV(double offset) const
|
||||
{
|
||||
float diff = getV1() - getV0();
|
||||
return getV0() + (diff * ((float) offset / 16)); //SharedConstants::WORLD_RESOLUTION));
|
||||
return getV0() + (diff * (static_cast<float>(offset) / 16)); //SharedConstants::WORLD_RESOLUTION));
|
||||
}
|
||||
|
||||
// virtual wstring getName() const = 0;
|
||||
|
||||
Reference in New Issue
Block a user