mirror of
https://github.com/id-Software/DOOM-3-BFG.git
synced 2025-03-15 07:00:58 +00:00
Fixed rebase conflicts
This commit is contained in:
parent
c3098186b5
commit
d69db4ebad
3 changed files with 30 additions and 2 deletions
|
@ -200,6 +200,32 @@ public:
|
|||
memTag = ( byte )tag_;
|
||||
};
|
||||
|
||||
struct Iterator
|
||||
{
|
||||
_type_* p;
|
||||
_type_& operator*( )
|
||||
{
|
||||
return *p;
|
||||
}
|
||||
bool operator != ( const Iterator& rhs )
|
||||
{
|
||||
return p != rhs.p;
|
||||
}
|
||||
void operator ++( )
|
||||
{
|
||||
++p;
|
||||
}
|
||||
};
|
||||
|
||||
auto begin( ) const // const version
|
||||
{
|
||||
return Iterator{list};
|
||||
};
|
||||
auto end( ) const // const version
|
||||
{
|
||||
return Iterator{list + Num( )};
|
||||
};
|
||||
|
||||
private:
|
||||
int num;
|
||||
int size;
|
||||
|
|
|
@ -390,10 +390,12 @@ void idRenderModelGLTF::TouchData( )
|
|||
common->Warning( "The method or operation is not implemented." );
|
||||
}
|
||||
|
||||
void idRenderModelGLTF::CreateBuffers( nvrhi::ICommandList* commandList )
|
||||
/*
|
||||
void idRenderModelGLTF::CreateBuffers()
|
||||
{
|
||||
common->Warning( "The method or operation is not implemented." );
|
||||
}
|
||||
*/
|
||||
|
||||
void idRenderModelGLTF::InitEmpty( const char* name )
|
||||
{
|
||||
|
|
|
@ -33,7 +33,7 @@ public:
|
|||
void SetLevelLoadReferenced( bool referenced ) override;
|
||||
bool IsLevelLoadReferenced( ) override;
|
||||
void TouchData( ) override;
|
||||
void CreateBuffers( nvrhi::ICommandList* commandList ) override;
|
||||
//void CreateBuffers( nvrhi::ICommandList* commandList ) override;
|
||||
void InitEmpty( const char* name ) override;
|
||||
void AddSurface( modelSurface_t surface ) override;
|
||||
void FinishSurfaces( bool useMikktspace ) override;
|
||||
|
|
Loading…
Reference in a new issue