mirror of
https://github.com/rwengine/openrw.git
synced 2025-04-30 05:48:04 +03:00
7e4e1db85d
Should fix these memory leaks:
==22737== 14,598,040 (131,472 direct, 14,466,568 indirect) bytes in 2,739 blocks are definitely lost in loss record 3,124 of 3,126
==22737== at 0x4C2F1CA: operator new(unsigned long) (vg_replace_malloc.c:334)
==22737== by 0x90FE4B: LoaderDFF::loadFromMemory(std::shared_ptr<FileContentsInfo>) (LoaderDFF.cpp:443)
==22737== by 0x7BCC86: GameData::loadModel(unsigned short) (GameData.cpp:474)
==22737== by 0x7DF7BC: GameWorld::createInstance(unsigned short, glm::tvec3<float, (glm::precision)0> const&, glm::tquat<float, (glm::precision)0> const&) (GameWorld.cpp:144)
==22737== by 0x7DF44C: GameWorld::placeItems(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) (GameWorld.cpp:120)
==22737== by 0x758D38: RWGame::newGame() (RWGame.cpp:116)
==22737== by 0x786389: LoadingState::enter() (LoadingState.cpp:9)
==22737== by 0x75DC59: void StateManager::enter<LoadingState, RWGame*, RWGame::RWGame(Logger&, int, char**)::{lambda()#1}>(RWGame*&&, RWGame::RWGame(Logger&, int, char**)::{lambda()#1}&&) (StateManager.hpp:40)
==22737== by 0x758484: RWGame::RWGame(Logger&, int, char**) (RWGame.cpp:81)
==22737== by 0x747815: main (main.cpp:13)
61 lines
1.5 KiB
C++
61 lines
1.5 KiB
C++
#pragma once
|
|
#ifndef _LOADERDFF_HPP_
|
|
#define _LOADERDFF_HPP_
|
|
|
|
#include <data/Clump.hpp>
|
|
#include <gl/TextureData.hpp>
|
|
#include <loaders/RWBinaryStream.hpp>
|
|
#include <platform/FileHandle.hpp>
|
|
|
|
#include <functional>
|
|
#include <string>
|
|
|
|
class DFFLoaderException {
|
|
std::string _message;
|
|
|
|
public:
|
|
DFFLoaderException(const std::string& message) : _message(message) {
|
|
}
|
|
|
|
const std::string& which() {
|
|
return _message;
|
|
}
|
|
};
|
|
|
|
class LoaderDFF {
|
|
public:
|
|
using TextureLookupCallback = std::function<TextureData::Handle(
|
|
const std::string&, const std::string&)>;
|
|
using GeometryList = std::vector<GeometryPtr>;
|
|
using FrameList = std::vector<ModelFramePtr>;
|
|
|
|
ClumpPtr loadFromMemory(FileHandle file);
|
|
|
|
void setTextureLookupCallback(TextureLookupCallback tlc) {
|
|
texturelookup = tlc;
|
|
}
|
|
|
|
private:
|
|
TextureLookupCallback texturelookup;
|
|
|
|
FrameList readFrameList(const RWBStream& stream);
|
|
|
|
GeometryList readGeometryList(const RWBStream& stream);
|
|
|
|
GeometryPtr readGeometry(const RWBStream& stream);
|
|
|
|
void readMaterialList(GeometryPtr& geom, const RWBStream& stream);
|
|
|
|
void readMaterial(GeometryPtr& geom, const RWBStream& stream);
|
|
|
|
void readTexture(Geometry::Material& material, const RWBStream& stream);
|
|
|
|
void readGeometryExtension(GeometryPtr& geom, const RWBStream& stream);
|
|
|
|
void readBinMeshPLG(GeometryPtr& geom, const RWBStream& stream);
|
|
|
|
AtomicPtr readAtomic(FrameList& framelist, GeometryList& geometrylist,
|
|
const RWBStream& stream);
|
|
};
|
|
|
|
#endif
|