* 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
33 lines
661 B
C++
33 lines
661 B
C++
#include "stdafx.h"
|
|
#include "MemTexture.h"
|
|
|
|
MemTexture::MemTexture(const wstring& _url, PBYTE pbData,DWORD dwBytes, MemTextureProcessor *processor)
|
|
{
|
|
// 4J - added
|
|
count = 1;
|
|
id = -1;
|
|
isLoaded = false;
|
|
ticksSinceLastUse = 0;
|
|
|
|
// 4J - TODO - actually implement
|
|
|
|
// load the texture, and process it
|
|
//loadedImage=Textures::getTexture()
|
|
// 4J - remember to add deletes in here for any created BufferedImages when implemented
|
|
loadedImage = new BufferedImage(pbData,dwBytes);
|
|
if(processor==nullptr)
|
|
{
|
|
|
|
}
|
|
else
|
|
{
|
|
//loadedImage=processor.process(ImageIO.read(huc.getInputStream()));
|
|
}
|
|
|
|
|
|
}
|
|
|
|
MemTexture::~MemTexture()
|
|
{
|
|
delete loadedImage;
|
|
} |