Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into kimkulling_dev

Browse Source
This commit is contained in:
Kim Kulling
2020-01-18 14:05:51 +01:00
committed by GitHub
parent 783430667b e0571329e7
commit c4d98ced49
19 changed files with 263 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/Assjson/cencode.c
View File

@@ -45,7 +45,7 @@ int base64_encode_block(const char* plaintext_in, int length_in, char* code_out,
{
state_in->result = result;
state_in->step = step_A;
return codechar - code_out;
return (int)(codechar - code_out);
}
fragment = *plainchar++;
result = (fragment & 0x0fc) >> 2;
@@ -56,7 +56,7 @@ int base64_encode_block(const char* plaintext_in, int length_in, char* code_out,
{
state_in->result = result;
state_in->step = step_B;
return codechar - code_out;
return (int)(codechar - code_out);
}
fragment = *plainchar++;
result |= (fragment & 0x0f0) >> 4;
@@ -67,7 +67,7 @@ int base64_encode_block(const char* plaintext_in, int length_in, char* code_out,
{
state_in->result = result;
state_in->step = step_C;
return codechar - code_out;
return (int)(codechar - code_out);
}
fragment = *plainchar++;
result |= (fragment & 0x0c0) >> 6;
@@ -84,7 +84,7 @@ int base64_encode_block(const char* plaintext_in, int length_in, char* code_out,
}
}
/* control should not reach here */
return codechar - code_out;
return (int)(codechar - code_out);
}
int base64_encode_blockend(char* code_out, base64_encodestate* state_in)
@@ -107,7 +107,7 @@ int base64_encode_blockend(char* code_out, base64_encodestate* state_in)
}
*codechar++ = '\n';
return codechar - code_out;
return (int)(codechar - code_out);
}
#pragma warning(pop)

4
code/MDL/HalfLife/HL1MDLLoader.cpp
View File

@@ -175,9 +175,9 @@ void HL1MDLLoader::load_file() {
release_resources();
} catch (const std::exception &e) {
} catch (...) {
release_resources();
throw e;
throw;
}
}

6
code/MDL/MDLLoader.cpp
View File

@@ -179,9 +179,9 @@ void MDLImporter::InternReadFile( const std::string& pFile,
}
// This should work for all other types of MDL files, too ...
// the quake header is one of the smallest, afaik
// the HL1 sequence group header is one of the smallest, afaik
iFileSize = (unsigned int)file->FileSize();
if( iFileSize < sizeof(MDL::Header)) {
if( iFileSize < sizeof(MDL::HalfLife::SequenceHeader_HL1)) {
throw DeadlyImportError( "MDL File is too small.");
}
@@ -1575,7 +1575,7 @@ void MDLImporter::InternReadFile_3DGS_MDL7( )
const size_t maxSize(buffersize - (i*AI_MDL7_MAX_GROUPNAMESIZE));
pcNode->mName.length = ai_snprintf(szBuffer, maxSize, "Group_%u", p);
} else {
pcNode->mName.length = ::strlen(szBuffer);
pcNode->mName.length = (ai_uint32)::strlen(szBuffer);
}
::strncpy(pcNode->mName.data,szBuffer,MAXLEN-1);
++p;

6
code/MDL/MDLMaterialLoader.cpp
View File

@@ -541,7 +541,7 @@ void MDLImporter::ParseSkinLump_3DGS_MDL7(
size_t iLen2 = iLen+1;
iLen2 = iLen2 > MAXLEN ? MAXLEN : iLen2;
memcpy(szFile.data,(const char*)szCurrent,iLen2);
szFile.length = iLen;
szFile.length = (ai_uint32)iLen;
szCurrent += iLen2;
@@ -710,7 +710,7 @@ void MDLImporter::ParseSkinLump_3DGS_MDL7(
aiString szFile;
const size_t iLen = strlen((const char*)szCurrent);
::memcpy(szFile.data,(const char*)szCurrent,iLen+1);
szFile.length = iLen;
szFile.length = (ai_uint32)iLen;
pcMatOut->AddProperty(&szFile,AI_MATKEY_TEXTURE_DIFFUSE(0));
@@ -831,7 +831,7 @@ void MDLImporter::ParseSkinLump_3DGS_MDL7(
aiString szFile;
::memcpy(szFile.data,pcSkin->texture_name,sizeof(pcSkin->texture_name));
szFile.data[sizeof(pcSkin->texture_name)] = '\0';
szFile.length = ::strlen(szFile.data);
szFile.length = (ai_uint32)::strlen(szFile.data);
pcMatOut->AddProperty(&szFile,AI_MATKEY_NAME);
}

2
code/X/XFileImporter.cpp
View File

@@ -211,7 +211,7 @@ aiNode* XFileImporter::CreateNodes( aiScene* pScene, aiNode* pParent, const XFil
// create node
aiNode* node = new aiNode;
node->mName.length = pNode->mName.length();
node->mName.length = (ai_uint32)pNode->mName.length();
node->mParent = pParent;
memcpy( node->mName.data, pNode->mName.c_str(), pNode->mName.length());
node->mName.data[node->mName.length] = 0;

4
code/glTF/glTFAsset.inl
View File

@@ -688,7 +688,9 @@ inline void Image::SetData(uint8_t* data, size_t length, Asset& r)
bufferView->byteOffset = b->AppendData(data, length);
}
else { // text file: will be stored as a data uri
this->mData.reset(data);
uint8_t *temp = new uint8_t[length];
memcpy(temp, data, length);
this->mData.reset(temp);
this->mDataLength = length;
}
}

9
code/glTF/glTFExporter.cpp
View File

@@ -100,17 +100,16 @@ glTFExporter::glTFExporter(const char* filename, IOSystem* pIOSystem, const aiSc
{
aiScene* sceneCopy_tmp;
SceneCombiner::CopyScene(&sceneCopy_tmp, pScene);
aiScene *sceneCopy(sceneCopy_tmp);
SplitLargeMeshesProcess_Triangle tri_splitter;
tri_splitter.SetLimit(0xffff);
tri_splitter.Execute(sceneCopy);
tri_splitter.Execute(sceneCopy_tmp);
SplitLargeMeshesProcess_Vertex vert_splitter;
vert_splitter.SetLimit(0xffff);
vert_splitter.Execute(sceneCopy);
vert_splitter.Execute(sceneCopy_tmp);
mScene = sceneCopy;
mScene.reset(sceneCopy_tmp);
mAsset.reset( new glTF::Asset( pIOSystem ) );
@@ -877,7 +876,7 @@ void glTFExporter::ExportMetadata()
// Copyright
aiString copyright_str;
if (mScene->mMetaData->Get(AI_METADATA_SOURCE_COPYRIGHT, copyright_str)) {
if (mScene->mMetaData != nullptr && mScene->mMetaData->Get(AI_METADATA_SOURCE_COPYRIGHT, copyright_str)) {
asset.copyright = copyright_str.C_Str();
}
}

2
code/glTF/glTFExporter.h
View File

@@ -90,7 +90,7 @@ namespace Assimp
const char* mFilename;
IOSystem* mIOSystem;
const aiScene* mScene;
std::shared_ptr<const aiScene> mScene;
const ExportProperties* mProperties;
std::map<std::string, unsigned int> mTexturesByPath;

7
code/glTF2/glTF2Asset.inl
View File

@@ -752,6 +752,7 @@ inline uint8_t* Image::StealData()
return mData.release();
}
// Never take over the ownership of data whenever binary or not
inline void Image::SetData(uint8_t* data, size_t length, Asset& r)
{
Ref<Buffer> b = r.GetBodyBuffer();
@@ -764,8 +765,10 @@ inline void Image::SetData(uint8_t* data, size_t length, Asset& r)
bufferView->byteOffset = b->AppendData(data, length);
}
else { // text file: will be stored as a data uri
this->mData.reset(data);
this->mDataLength = length;
uint8_t *temp = new uint8_t[length];
memcpy(temp, data, length);
this->mData.reset(temp);
this->mDataLength = length;
}
}

6
code/glTF2/glTF2Exporter.cpp
View File

@@ -352,10 +352,8 @@ void glTF2Exporter::GetMatTex(const aiMaterial* mat, Ref<Texture>& texture, aiTe
if (path[0] == '*') { // embedded
aiTexture* tex = mScene->mTextures[atoi(&path[1])];
// copy data since lifetime control is handed over to the asset
uint8_t* data = new uint8_t[tex->mWidth];
memcpy(data, tex->pcData, tex->mWidth);
texture->source->SetData(data, tex->mWidth, *mAsset);
// The asset has its own buffer, see Image::SetData
texture->source->SetData(reinterpret_cast<uint8_t*> (tex->pcData), tex->mWidth, *mAsset);
if (tex->achFormatHint[0]) {
std::string mimeType = "image/";