mirror of
https://github.com/Garux/netradiant-custom.git
synced 2026-09-28 00:00:03 +02:00
minor tweaks
This commit is contained in:
@@ -32,7 +32,7 @@ Image* LoadMDLImage( Assimp::Importer& importer, ArchiveFile& file ){
|
||||
if( scene != nullptr && scene->HasTextures() ){
|
||||
const aiTexture *tex = scene->mTextures[0];
|
||||
if( tex->mWidth != 0 ){ // not compressed
|
||||
RGBAImage* image = new RGBAImage( tex->mWidth, tex->mHeight );
|
||||
auto *image = new RGBAImage( tex->mWidth, tex->mHeight );
|
||||
unsigned char* pRGBA = image->getRGBAPixels();
|
||||
const aiTexel *texel = tex->pcData;
|
||||
for( size_t i = 0; i < tex->mWidth * tex->mHeight; ++i, ++texel ){
|
||||
|
||||
@@ -429,7 +429,7 @@ private:
|
||||
for( size_t n = 0; n < node->mNumMeshes; ++n ){
|
||||
const aiMesh *mesh = scene.m_scene->mMeshes[node->mMeshes[n]];
|
||||
if( mesh->mPrimitiveTypes & aiPrimitiveType_TRIANGLE ){
|
||||
PicoSurface* picosurface = new PicoSurface( scene, mesh );
|
||||
auto *picosurface = new PicoSurface( scene, mesh );
|
||||
aabb_extend_by_aabb_safe( m_aabb_local, picosurface->localAABB() );
|
||||
m_surfaces.push_back( picosurface );
|
||||
}
|
||||
@@ -441,7 +441,7 @@ private:
|
||||
}
|
||||
}
|
||||
void constructNull(){
|
||||
PicoSurface* picosurface = new PicoSurface();
|
||||
auto *picosurface = new PicoSurface();
|
||||
m_aabb_local = picosurface->localAABB();
|
||||
m_surfaces.push_back( picosurface );
|
||||
}
|
||||
|
||||
@@ -225,7 +225,7 @@ class Doom3ModelSkinCache final : public ModelSkinCache, public ModuleObserver
|
||||
: m_cache( cache ){
|
||||
}
|
||||
Doom3ModelSkinCacheElement* construct( const CopiedString& name ){
|
||||
Doom3ModelSkinCacheElement* skin = new Doom3ModelSkinCacheElement;
|
||||
auto *skin = new Doom3ModelSkinCacheElement;
|
||||
if ( m_cache.realised() ) {
|
||||
skin->realise( name.c_str() );
|
||||
}
|
||||
|
||||
@@ -164,7 +164,7 @@ Image* LoadBMPBuff( PointerInputStream& inputStream, std::size_t length ){
|
||||
rows = -rows;
|
||||
}
|
||||
|
||||
RGBAImage* image = new RGBAImage( columns, rows );
|
||||
auto *image = new RGBAImage( columns, rows );
|
||||
|
||||
switch ( bmpHeader.bitsPerPixel )
|
||||
{
|
||||
|
||||
@@ -37,7 +37,7 @@ Image* LoadDDSBuff( const byte* buffer ){
|
||||
return 0;
|
||||
}
|
||||
|
||||
RGBAImage* image = new RGBAImage( width, height );
|
||||
auto *image = new RGBAImage( width, height );
|
||||
|
||||
if ( DDSDecompress( reinterpret_cast<ddsBuffer_t*>( const_cast<byte*>( buffer ) ), image->getRGBAPixels() ) == -1 ) {
|
||||
image->release();
|
||||
|
||||
@@ -368,7 +368,7 @@ static Image* LoadJPGBuff_( const void *src_buffer, int src_size ){
|
||||
|
||||
int row_stride = cinfo.output_width * cinfo.output_components;
|
||||
|
||||
RGBAImage* image = new RGBAImage( cinfo.output_width, cinfo.output_height );
|
||||
auto *image = new RGBAImage( cinfo.output_width, cinfo.output_height );
|
||||
|
||||
JSAMPARRAY buffer = ( *cinfo.mem->alloc_sarray )( ( j_common_ptr ) & cinfo, JPOOL_IMAGE, row_stride, 1 );
|
||||
|
||||
|
||||
@@ -321,7 +321,7 @@ Image* LoadKTXBuff( PointerInputStream& istream ){
|
||||
}
|
||||
istream.seek( bytesOfKeyValueData + sizeof( uint32_t ) );
|
||||
|
||||
RGBAImage* image = new RGBAImage( width, height );
|
||||
auto *image = new RGBAImage( width, height );
|
||||
|
||||
if ( type ) {
|
||||
KTX_Decoder* decoder = NULL;
|
||||
|
||||
@@ -192,7 +192,7 @@ Image* LoadPCX32Buff( byte* buffer, std::size_t length ){
|
||||
return 0;
|
||||
}
|
||||
|
||||
RGBAImage* image = new RGBAImage( width, height );
|
||||
auto *image = new RGBAImage( width, height );
|
||||
c = ( width ) * ( height );
|
||||
pic32 = image->getRGBAPixels();
|
||||
for ( i = 0; i < c; i++ )
|
||||
|
||||
@@ -282,7 +282,7 @@ inline void targa_header_read_istream( TargaHeader& targa_header, PointerInputSt
|
||||
|
||||
template<typename Flip>
|
||||
Image* Targa_decodeImageData( const TargaHeader& targa_header, PointerInputStream& istream, const Flip& flip ){
|
||||
RGBAImage* image = new RGBAImage( targa_header.width, targa_header.height );
|
||||
auto *image = new RGBAImage( targa_header.width, targa_header.height );
|
||||
|
||||
if ( targa_header.image_type == 2 || targa_header.image_type == 3 ) {
|
||||
switch ( targa_header.pixel_size )
|
||||
|
||||
@@ -109,7 +109,7 @@ Image* LoadHLWBuff( byte* buffer ){
|
||||
columns = lpMip->width;
|
||||
rows = lpMip->height;
|
||||
|
||||
RGBAImage* image = new RGBAImage( columns, rows );
|
||||
auto *image = new RGBAImage( columns, rows );
|
||||
|
||||
for ( row = 0; row < rows; row++ )
|
||||
{
|
||||
|
||||
@@ -173,7 +173,7 @@ Image* LoadMIPBuff( byte* buffer ){
|
||||
|
||||
numPixels = columns * rows;
|
||||
|
||||
RGBAImage* image = new RGBAImage( columns, rows );
|
||||
auto *image = new RGBAImage( columns, rows );
|
||||
|
||||
//Sys_Printf( "lpMip->width = %i, lpMip->height = %i, lpMip->offsets[0] = %i, lpMip->offsets[1] = %i, lpMip->offsets[2] = %i, lpMip->offsets[3] = %i, numPixels = %i\n", lpMip->width, lpMip->height, lpMip->offsets[0], lpMip->offsets[1], lpMip->offsets[2], lpMip->offsets[3], numPixels );
|
||||
//for ( i = 0; i < sizeof( *lpMip ); i++ )
|
||||
|
||||
@@ -159,7 +159,7 @@ Image* LoadIDSPBuff( byte *buffer ){
|
||||
// palette = buffer+mipdatasize+2;
|
||||
// buf_p = buffer+lpMip->offsets[0];
|
||||
|
||||
RGBAImage* image = new RGBAImage( columns, rows );
|
||||
auto *image = new RGBAImage( columns, rows );
|
||||
|
||||
#ifdef DEBUG
|
||||
frametype = spriteframetype_t( pframetype->type );
|
||||
|
||||
@@ -144,7 +144,7 @@ Image* LoadPNGBuff( unsigned char* fbuffer ){
|
||||
int height = png_get_image_height( png_ptr, info_ptr );
|
||||
|
||||
// allocate the pixel buffer, and the row pointers
|
||||
RGBAImage* image = new RGBAImage( width, height );
|
||||
auto *image = new RGBAImage( width, height );
|
||||
|
||||
row_pointers = (png_byte**) malloc( ( height ) * sizeof( png_byte* ) );
|
||||
|
||||
|
||||
@@ -128,7 +128,7 @@ Image* LoadMipTex( byte* buffer, byte TypeofTex ){
|
||||
source = buffer + offset;
|
||||
}
|
||||
|
||||
RGBAImageFlags* image = new RGBAImageFlags( w, h, flags, contents, value );
|
||||
auto *image = new RGBAImageFlags( w, h, flags, contents, value );
|
||||
|
||||
byte* dest = image->getRGBAPixels();
|
||||
byte* end = source + ( w * h );
|
||||
|
||||
@@ -75,7 +75,7 @@ Image* LoadM32Buff( byte* buffer ){
|
||||
int contents = istream_read_uint32_le( inputStream );
|
||||
int value = istream_read_uint32_le( inputStream );
|
||||
|
||||
RGBAImageFlags* image = new RGBAImageFlags( w, h, flags, contents, value );
|
||||
auto *image = new RGBAImageFlags( w, h, flags, contents, value );
|
||||
|
||||
const byte* source = buffer + offset;
|
||||
std::copy( source, source + ( w * h * 4 ), image->getRGBAPixels() );
|
||||
|
||||
@@ -269,13 +269,13 @@ void MD2Model_read( Model& model, const byte* buffer, ArchiveFile& file ){
|
||||
}
|
||||
|
||||
scene::Node& MD2Model_new( const byte* buffer, ArchiveFile& file ){
|
||||
ModelNode* modelNode = new ModelNode();
|
||||
auto *modelNode = new ModelNode();
|
||||
MD2Model_read( modelNode->model(), buffer, file );
|
||||
return modelNode->node();
|
||||
}
|
||||
|
||||
scene::Node& MD2Model_default(){
|
||||
ModelNode* modelNode = new ModelNode();
|
||||
auto *modelNode = new ModelNode();
|
||||
Model_constructNull( modelNode->model() );
|
||||
return modelNode->node();
|
||||
}
|
||||
|
||||
@@ -295,13 +295,13 @@ void MD3Model_read( Model& model, unsigned char* buffer ){
|
||||
}
|
||||
|
||||
scene::Node& MD3Model_new( unsigned char* buffer ){
|
||||
ModelNode* modelNode = new ModelNode();
|
||||
auto *modelNode = new ModelNode();
|
||||
MD3Model_read( modelNode->model(), buffer );
|
||||
return modelNode->node();
|
||||
}
|
||||
|
||||
scene::Node& MD3Model_default(){
|
||||
ModelNode* modelNode = new ModelNode();
|
||||
auto *modelNode = new ModelNode();
|
||||
Model_constructNull( modelNode->model() );
|
||||
return modelNode->node();
|
||||
}
|
||||
|
||||
@@ -429,7 +429,7 @@ void MD5Model_construct( Model& model, TextInputStream& inputStream ){
|
||||
}
|
||||
|
||||
scene::Node& MD5Model_new( TextInputStream& inputStream ){
|
||||
ModelNode* modelNode = new ModelNode();
|
||||
auto *modelNode = new ModelNode();
|
||||
MD5Model_construct( modelNode->model(), inputStream );
|
||||
return modelNode->node();
|
||||
}
|
||||
|
||||
@@ -250,13 +250,13 @@ void MDCModel_read( Model& model, const byte* buffer ){
|
||||
}
|
||||
|
||||
scene::Node& MDCModel_new( const byte* buffer ){
|
||||
ModelNode* modelNode = new ModelNode();
|
||||
auto *modelNode = new ModelNode();
|
||||
MDCModel_read( modelNode->model(), buffer );
|
||||
return modelNode->node();
|
||||
}
|
||||
|
||||
scene::Node& MDCModel_default(){
|
||||
ModelNode* modelNode = new ModelNode();
|
||||
auto *modelNode = new ModelNode();
|
||||
Model_constructNull( modelNode->model() );
|
||||
return modelNode->node();
|
||||
}
|
||||
|
||||
@@ -206,13 +206,13 @@ void MDLModel_read( Model& model, const byte* buffer, const char* name ){
|
||||
}
|
||||
|
||||
scene::Node& MDLModel_new( const byte* buffer, const char* name ){
|
||||
ModelNode* modelNode = new ModelNode();
|
||||
auto *modelNode = new ModelNode();
|
||||
MDLModel_read( modelNode->model(), buffer, name );
|
||||
return modelNode->node();
|
||||
}
|
||||
|
||||
scene::Node& MDLModel_default(){
|
||||
ModelNode* modelNode = new ModelNode();
|
||||
auto *modelNode = new ModelNode();
|
||||
Model_constructNull( modelNode->model() );
|
||||
return modelNode->node();
|
||||
}
|
||||
|
||||
@@ -128,7 +128,7 @@ Image* LoadMDLImageBuff( byte* buffer ){
|
||||
break;
|
||||
}
|
||||
|
||||
RGBAImage* image = new RGBAImage( skinwidth, skinheight );
|
||||
auto *image = new RGBAImage( skinwidth, skinheight );
|
||||
unsigned char* pRGBA = image->getRGBAPixels();
|
||||
|
||||
for ( int i = 0; i < ( skinheight ); i++ )
|
||||
|
||||
@@ -386,13 +386,13 @@ private:
|
||||
/* fix the surface's normals */
|
||||
PicoFixSurfaceNormals( surface );
|
||||
|
||||
PicoSurface* picosurface = new PicoSurface( surface );
|
||||
auto *picosurface = new PicoSurface( surface );
|
||||
aabb_extend_by_aabb_safe( m_aabb_local, picosurface->localAABB() );
|
||||
m_surfaces.push_back( picosurface );
|
||||
}
|
||||
}
|
||||
void constructNull(){
|
||||
PicoSurface* picosurface = new PicoSurface();
|
||||
auto *picosurface = new PicoSurface();
|
||||
m_aabb_local = picosurface->localAABB();
|
||||
m_surfaces.push_back( picosurface );
|
||||
}
|
||||
@@ -926,7 +926,7 @@ size_t picoInputStreamReam( void* inputStream, unsigned char* buffer, size_t len
|
||||
|
||||
scene::Node& loadPicoModel( const picoModule_t* module, ArchiveFile& file ){
|
||||
picoModel_t* model = PicoModuleLoadModelStream( module, &file.getInputStream(), picoInputStreamReam, file.size(), 0, file.getName() );
|
||||
PicoModelNode* modelNode = new PicoModelNode( model );
|
||||
auto *modelNode = new PicoModelNode( model );
|
||||
PicoFreeModel( model );
|
||||
return modelNode->node();
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ void LoadSpriteModel( entity_interfaces_t *interfaces, const char *name ){
|
||||
return; // NULL;
|
||||
}
|
||||
|
||||
CSpriteModel *model = new CSpriteModel();
|
||||
auto *model = new CSpriteModel();
|
||||
model->Construct( pShader );
|
||||
interfaces->pRender = (IRender*)model;
|
||||
interfaces->pRender->IncRef();
|
||||
|
||||
@@ -53,7 +53,7 @@ public:
|
||||
virtual ArchiveFile* openFile( const char* name ) override {
|
||||
UnixPath path( m_root.c_str() );
|
||||
path.push_filename( name );
|
||||
DirectoryArchiveFile* file = new DirectoryArchiveFile( name, path.c_str() );
|
||||
auto *file = new DirectoryArchiveFile( name, path.c_str() );
|
||||
if ( !file->failed() ) {
|
||||
return file;
|
||||
}
|
||||
@@ -63,7 +63,7 @@ public:
|
||||
virtual ArchiveTextFile* openTextFile( const char* name ) override {
|
||||
UnixPath path( m_root.c_str() );
|
||||
path.push_filename( name );
|
||||
DirectoryArchiveTextFile* file = new DirectoryArchiveTextFile( name, path.c_str() );
|
||||
auto *file = new DirectoryArchiveTextFile( name, path.c_str() );
|
||||
if ( !file->failed() ) {
|
||||
return file;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user