Fixed rebase conflicts

This commit is contained in:
Robert Beckebans 2022-06-06 17:36:18 +02:00
parent c3098186b5
commit d69db4ebad
3 changed files with 30 additions and 2 deletions

View file

@ -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;

View file

@ -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 )
{

View file

@ -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;