TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 07:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update assimp to 6.0.5

Browse source
This commit is contained in:
AzaezelX 2026-06-09 12:46:56 -05:00
parent 2d2eb57e2e
commit f5cf21cfeb
941 changed files with 22718 additions and 12240 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/lib/assimp/samples/README
View file

@ -12,16 +12,16 @@ use in various real-world environments. Workspaces to build the
samples can be found in the respective directories. The VC workspaces
copy the created executables to the ./bin directory.
All GL-based samples depend on FreeGLUT, the image loading will be done
All GL-based samples depend on FreeGLUT, the image loading will be done
by a header-only library. For convenience, these libraries are included
in the repository in their respective Windows/x86 prebuilt versions.
To build on linux, install freeglut using the package manager of your
To build on linux, install freeglut using the package manager of your
choice. For instance on Ubuntu to install freeglut you can use the following
command:
> sudo apt install freeglut
All samples will be placed at
All samples will be placed at
Win32: <assimp_repo>/<config>/bin
@ -45,7 +45,7 @@ SimpleOpenGL
SimpleTexturedOpenGL
An extended OpenGL sample, featuring texturing using the DevIL
An extended OpenGL sample, featuring texturing using the DevIL
library. Based on SimpleOpenGL and the NeHe GL tutorial style.
This is a Windows-only sample.
@ -56,7 +56,7 @@ SimpleTexturedOpenGL
SimpleAssimpViewX
A Mac OSX-based viewer app. This sample was kindly provided by drparallax.
A Mac OSX-based viewer app. This sample was kindly provided by drparallax.
See http://sourceforge.net/projects/assimp/forums/forum/817654/topic/3917829

8
Engine/lib/assimp/samples/SimpleAssimpViewX/MyDocument.mm
View file

@ -257,7 +257,7 @@ static CVReturn MyDisplayLinkCallback(CVDisplayLinkRef displayLink,const CVTimeS
{
CVReturn rv = kCVReturnError;
NSAutoreleasePool *pool;
pool = [[NSAutoreleasePool alloc] init];
{
[self render];
@ -345,7 +345,7 @@ static CVReturn MyDisplayLinkCallback(CVDisplayLinkRef displayLink,const CVTimeS
NSNumber* textureNumber = (NSNumber*)[textureDictionary valueForKey:textureKey];
//NSLog(@"applyMaterialInContext: have texture %i", [textureNumber unsignedIntValue]);
meshHelper.textureID = [textureNumber unsignedIntValue];
meshHelper.textureID = [textureNumber unsignedIntValue];
}
else
meshHelper.textureID = 0;
@ -657,7 +657,7 @@ static CVReturn MyDisplayLinkCallback(CVDisplayLinkRef displayLink,const CVTimeS
/* getTexture Filenames and Numb of Textures */
for (unsigned int m = 0; m < _scene->mNumMaterials; m++)
{
{
int texIndex = 0;
aiReturn texFound = AI_SUCCESS;
@ -674,7 +674,7 @@ static CVReturn MyDisplayLinkCallback(CVDisplayLinkRef displayLink,const CVTimeS
[textureDictionary setValue:[NSNumber numberWithUnsignedInt:texIndex] forKey:texturePath];
texIndex++;
}
}
}
textureIds = (GLuint*) malloc(sizeof(GLuint) * [textureDictionary count]); //new GLuint[ [textureDictionary count] ];

2
Engine/lib/assimp/samples/SimpleTexturedDirectx11/SimpleTexturedDirectx11/main.cpp
View file

@ -157,7 +157,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/,
// Retrieve the model file path.
std::wstring filename(argv[1]);
char *targetStart = new char[filename.size()+1];
memset(targetStart, '\0', filename.size() + 1);

6
Engine/lib/assimp/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp
View file

@ -119,9 +119,9 @@ bool Import3DFromFile( const std::string &filename) {
logInfo(importer.GetErrorString());
return false;
}
fin.close();
g_scene = importer.ReadFile(filename, aiProcessPreset_TargetRealtime_Quality);
// If the import failed, report it
@ -176,7 +176,7 @@ void freeTextureIds() {
int LoadGLTextures(const aiScene* scene) {
freeTextureIds();
if (scene->HasTextures())
if (scene->HasTextures())
return 1;
/* getTexture Filenames and Numb of Textures */