luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2026-01-01 02:45:19 +01:00
Code Activity

Remove irr namespace (#16309)

Browse Source
This commit is contained in:
Lars Müller
2025-07-09 10:35:52 +02:00
committed by GitHub
parent 7e22c72492
commit 61551cfc3a
381 changed files with 680 additions and 1632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
irr/src/CNullDriver.cpp
View File

@@ -20,8 +20,6 @@
#include <cassert>
namespace irr
{
namespace video
{
@@ -354,7 +352,7 @@ ITexture *CNullDriver::addTextureCubemap(const io::path &name, IImage *imagePosX
return t;
}
ITexture *CNullDriver::addTextureCubemap(const irr::u32 sideLen, const io::path &name, ECOLOR_FORMAT format)
ITexture *CNullDriver::addTextureCubemap(const u32 sideLen, const io::path &name, ECOLOR_FORMAT format)
{
if (0 == sideLen)
return 0;
@@ -628,7 +626,7 @@ void CNullDriver::draw2DImageBatch(const video::ITexture *texture,
SColor color,
bool useAlphaChannelOfTexture)
{
const irr::u32 drawCount = core::min_<u32>(positions.size(), sourceRects.size());
const u32 drawCount = core::min_<u32>(positions.size(), sourceRects.size());
for (u32 i = 0; i < drawCount; ++i) {
draw2DImage(texture, positions[i], sourceRects[i],
@@ -1659,7 +1657,7 @@ ITexture *CNullDriver::addRenderTargetTextureMs(const core::dimension2d<u32> &si
return 0;
}
ITexture *CNullDriver::addRenderTargetTextureCubemap(const irr::u32 sideLen,
ITexture *CNullDriver::addRenderTargetTextureCubemap(const u32 sideLen,
const io::path &name, const ECOLOR_FORMAT format)
{
return 0;
@@ -1731,7 +1729,7 @@ core::dimension2du CNullDriver::getMaxTextureSize() const
return core::dimension2du(0x10000, 0x10000); // maybe large enough
}
bool CNullDriver::needsTransparentRenderPass(const irr::video::SMaterial &material) const
bool CNullDriver::needsTransparentRenderPass(const video::SMaterial &material) const
{
// TODO: I suspect it would be nice if the material had an enum for further control.
// Especially it probably makes sense to allow disabling transparent render pass as soon as material.ZWriteEnable is on.
@@ -1750,4 +1748,3 @@ bool CNullDriver::needsTransparentRenderPass(const irr::video::SMaterial &materi
}
} // end namespace
} // end namespace