luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6337 through r6363 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6379 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2022-05-04 21:26:18 +00:00
parent 2d63fdba3d
commit 993f990036
28 changed files with 439 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
include/CIndexBuffer.h
View File

@@ -14,7 +14,7 @@ namespace scene
class CIndexBuffer : public IIndexBuffer
{
// Virtual function wrapper around irr::core::array
class IIndexList
{
public:
@@ -22,14 +22,15 @@ namespace scene
virtual u32 stride() const =0;
virtual u32 size() const =0;
virtual void push_back(const u32 &element) =0;
virtual void push_back(u32 value) =0;
virtual u32 operator [](u32 index) const =0;
virtual u32 getLast() =0;
virtual void setValue(u32 index, u32 value) =0;
virtual void set_used(u32 usedNow) =0;
virtual void reallocate(u32 new_size) =0;
virtual void reallocate(u32 new_size, bool canShrink=true) =0;
virtual u32 allocated_size() const =0;
virtual void* pointer() =0;
virtual const void* const_pointer() const =0;
virtual video::E_INDEX_TYPE getType() const =0;
};
@@ -43,10 +44,9 @@ namespace scene
virtual u32 size() const IRR_OVERRIDE {return Indices.size();}
virtual void push_back(const u32 &element) IRR_OVERRIDE
virtual void push_back(u32 value) IRR_OVERRIDE
{
// push const ref due to compiler problem with gcc 4.6, big endian
Indices.push_back((const T&)element);
Indices.push_back((T)value);
}
virtual u32 operator [](u32 index) const IRR_OVERRIDE
@@ -66,9 +66,9 @@ namespace scene
Indices.set_used(usedNow);
}
virtual void reallocate(u32 new_size) IRR_OVERRIDE
virtual void reallocate(u32 new_size, bool canShrink) IRR_OVERRIDE
{
Indices.reallocate(new_size);
Indices.reallocate(new_size, canShrink);
}
virtual u32 allocated_size() const IRR_OVERRIDE
@@ -76,7 +76,8 @@ namespace scene
return Indices.allocated_size();
}
virtual void* pointer() IRR_OVERRIDE {return Indices.pointer();}
virtual void* pointer() IRR_OVERRIDE { return Indices.pointer(); }
virtual const void* const_pointer() const IRR_OVERRIDE { return Indices.const_pointer(); }
virtual video::E_INDEX_TYPE getType() const IRR_OVERRIDE
{
@@ -109,12 +110,14 @@ namespace scene
delete Indices;
}
//virtual void setType(video::E_INDEX_TYPE IndexType);
virtual void setType(video::E_INDEX_TYPE IndexType) IRR_OVERRIDE
virtual void setType(video::E_INDEX_TYPE indexType) IRR_OVERRIDE
{
if ( Indices && Indices->getType() == indexType )
return;
IIndexList *NewIndices=0;
switch (IndexType)
switch (indexType)
{
case video::EIT_16BIT:
{
@@ -142,6 +145,7 @@ namespace scene
}
virtual void* getData() IRR_OVERRIDE {return Indices->pointer();}
virtual const void* getData() const IRR_OVERRIDE { return Indices->const_pointer(); }
virtual video::E_INDEX_TYPE getType() const IRR_OVERRIDE {return Indices->getType();}
@@ -152,9 +156,9 @@ namespace scene
return Indices->size();
}
virtual void push_back(const u32 &element) IRR_OVERRIDE
virtual void push_back(u32 value) IRR_OVERRIDE
{
Indices->push_back(element);
Indices->push_back(value);
}
virtual u32 operator [](u32 index) const IRR_OVERRIDE
@@ -177,9 +181,9 @@ namespace scene
Indices->set_used(usedNow);
}
virtual void reallocate(u32 new_size) IRR_OVERRIDE
virtual void reallocate(u32 new_size, bool canShrink=true) IRR_OVERRIDE
{
Indices->reallocate(new_size);
Indices->reallocate(new_size, canShrink);
}
virtual u32 allocated_size() const IRR_OVERRIDE
@@ -187,11 +191,6 @@ namespace scene
return Indices->allocated_size();
}
virtual void* pointer() IRR_OVERRIDE
{
return Indices->pointer();
}
//! get the current hardware mapping hint
virtual E_HARDWARE_MAPPING getHardwareMappingHint() const IRR_OVERRIDE
{