cleanup
This commit is contained in:
parent
b2cec3135c
commit
82ab88a335
8 changed files with 13 additions and 32 deletions
|
@ -25,13 +25,6 @@ struct Listener
|
|||
};
|
||||
|
||||
|
||||
struct Source
|
||||
{
|
||||
Entity entity;
|
||||
ComponentIndex component;
|
||||
};
|
||||
|
||||
|
||||
struct PlayingSound
|
||||
{
|
||||
Lumix::Audio::BufferHandle buffer_id;
|
||||
|
@ -53,7 +46,6 @@ struct AudioSceneImpl : public AudioScene
|
|||
AudioSceneImpl(AudioSystem& system, Universe& universe, IAllocator& allocator)
|
||||
: m_allocator(allocator)
|
||||
, m_universe(universe)
|
||||
, m_sources(allocator)
|
||||
, m_clips(allocator)
|
||||
, m_system(system)
|
||||
{
|
||||
|
@ -107,16 +99,6 @@ struct AudioSceneImpl : public AudioScene
|
|||
}
|
||||
|
||||
|
||||
int getSourceIndex(ComponentIndex component)
|
||||
{
|
||||
for (int i = 0, c = m_sources.size(); i < c; ++i)
|
||||
{
|
||||
if (m_sources[i].component == component) return i;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
void destroyComponent(ComponentIndex component, uint32 type) override
|
||||
{
|
||||
if (type == LISTENER_HASH)
|
||||
|
@ -312,7 +294,6 @@ struct AudioSceneImpl : public AudioScene
|
|||
Universe& getUniverse() override { return m_universe; }
|
||||
IPlugin& getPlugin() const override { return m_system; }
|
||||
|
||||
Lumix::Array<Source> m_sources;
|
||||
Listener m_listener;
|
||||
IAllocator& m_allocator;
|
||||
Universe& m_universe;
|
||||
|
|
|
@ -12,9 +12,9 @@ namespace Lumix
|
|||
MeasureTool();
|
||||
|
||||
void tick() override {}
|
||||
virtual bool onEntityMouseDown(const RayCastModelHit& hit, int x, int y) override;
|
||||
bool onEntityMouseDown(const RayCastModelHit& hit, int x, int y) override;
|
||||
void onMouseMove(int, int, int, int) override {}
|
||||
virtual void onMouseUp(int, int, MouseButton::Value) override {}
|
||||
void onMouseUp(int, int, MouseButton::Value) override {}
|
||||
void enable(bool is_enabled) { m_is_enabled = is_enabled; m_is_from_set = false; }
|
||||
bool isEnabled() const { return m_is_enabled; }
|
||||
const Vec3& getFrom() const { return m_from; }
|
||||
|
|
|
@ -14,7 +14,7 @@ public:
|
|||
DefaultAllocator() {}
|
||||
~DefaultAllocator() {}
|
||||
|
||||
virtual void* allocate(size_t n) override;
|
||||
void* allocate(size_t n) override;
|
||||
void deallocate(void* p) override;
|
||||
void* reallocate(void* ptr, size_t size) override;
|
||||
};
|
||||
|
|
|
@ -22,8 +22,8 @@ namespace Lumix
|
|||
Renderer& getRenderer() { return m_renderer; }
|
||||
|
||||
protected:
|
||||
virtual Resource* createResource(const Path& path) override;
|
||||
virtual void destroyResource(Resource& resource) override;
|
||||
Resource* createResource(const Path& path) override;
|
||||
void destroyResource(Resource& resource) override;
|
||||
|
||||
private:
|
||||
IAllocator& m_allocator;
|
||||
|
|
|
@ -165,7 +165,7 @@ struct RendererImpl : public Renderer
|
|||
uint32 cacheReadSize(uint64) override { return 0; }
|
||||
bool cacheRead(uint64, void*, uint32) override { return false; }
|
||||
void cacheWrite(uint64, const void*, uint32) override {}
|
||||
virtual void captureEnd() override { ASSERT(false); }
|
||||
void captureEnd() override { ASSERT(false); }
|
||||
void captureFrame(const void*, uint32) override { ASSERT(false); }
|
||||
};
|
||||
|
||||
|
@ -241,7 +241,7 @@ struct RendererImpl : public Renderer
|
|||
void destroy() override {}
|
||||
|
||||
|
||||
virtual const char* getName() const override { return "renderer"; }
|
||||
const char* getName() const override { return "renderer"; }
|
||||
|
||||
|
||||
Engine& getEngine() override { return m_engine; }
|
||||
|
|
|
@ -34,10 +34,10 @@ public:
|
|||
TerrainEditor(Lumix::WorldEditor& editor, Lumix::Array<Action*>& actions);
|
||||
~TerrainEditor();
|
||||
|
||||
virtual void tick() override;
|
||||
virtual bool onEntityMouseDown(const Lumix::RayCastModelHit& hit, int, int) override;
|
||||
virtual void onMouseMove(int x, int y, int /*rel_x*/, int /*rel_y*/) override;
|
||||
virtual void onMouseUp(int, int, Lumix::MouseButton::Value) override;
|
||||
void tick() override;
|
||||
bool onEntityMouseDown(const Lumix::RayCastModelHit& hit, int, int) override;
|
||||
void onMouseMove(int x, int y, int /*rel_x*/, int /*rel_y*/) override;
|
||||
void onMouseUp(int, int, Lumix::MouseButton::Value) override;
|
||||
void onGUI();
|
||||
void setComponent(Lumix::ComponentUID cmp) { m_component = cmp; }
|
||||
|
||||
|
|
|
@ -50,7 +50,7 @@ public:
|
|||
}
|
||||
}
|
||||
|
||||
virtual void execute() override
|
||||
void execute() override
|
||||
{
|
||||
for (int32 i = 0; i < m_size; i++)
|
||||
{
|
||||
|
|
|
@ -48,7 +48,7 @@ namespace Lumix
|
|||
{
|
||||
}
|
||||
|
||||
virtual int task() override
|
||||
int task() override
|
||||
{
|
||||
while(!m_tests_todo->isAborted())
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue