René Martin
3001d88172
Merge branch 'master' into x3d_pugi_migration
2021-09-07 15:04:08 +02:00
Kim Kulling
b8ec93aa21
use c-styl cast in a c-file
2020-07-11 22:34:43 +02:00
Hill Ma
0b18d27042
Use strrchr() when finding the '.' that begins the file extension.
...
Sometimes we encounter file paths like ../foo/bar.obj; searching from the end of
the string would yield the correct result.
2020-06-28 16:02:33 -07:00
Kim Kulling
20c125218d
Merge branch 'master' into sample-simpleopengl-minor-improvements
2020-04-16 08:30:30 +02:00
Marc-Antoine Lortie
56e2f2e37e
Fixed /W4 compile warnings in sample SimpleOpenGL.
2020-04-02 14:19:16 -04:00
Marc-Antoine Lortie
c620e9a2ac
Fixed memory leak caused by glutMainLoop() not returning.
...
Fixed memory leak by allowing glutMainLoop() to return to allow for the scene and streams to be released.
2020-03-06 13:28:05 -05:00
Marc-Antoine Lortie
ed5aab9495
Fixed and changed a few things.
...
- Removed references to test models with relative path.
- Fixed a compile warning.
- Added usage message.
2020-02-26 12:19:06 -05:00
Fabien Péan
1899aaef6e
Update Sample_SimpleOpenGL.c
2019-09-09 22:44:58 +02:00
Kim Kulling
602b0cf0c2
Update Sample_SimpleOpenGL.c
...
Introduce C_STRUCT for c-compatibility mode.
2019-09-08 21:03:08 +02:00
Fabien Péan
1b86de9d14
Fix Sample_SimpleOpenGL.c
...
Extra `struct` causing problems
2019-09-08 19:15:57 +02:00
Chris Russ
63a4591683
Fixing bugs related to 64-bit upgrade in materials
2016-08-16 16:03:56 +10:00
Wil Shipley
8b7fa48d27
- Merge in latest from assimp/assimp on GitHub ( 5c00aef7cd
)
...
- Added at least some of the new files to my Xcode 6 project, as
well.
- Built and tested with the DAE importer, seems to work fine.
2015-07-26 19:16:01 -07:00
Russ Taylor
386ff96530
Knows where to look for glut.h on Mac with Clang compilers (command-line compilers under current XCode).
2015-07-04 16:27:00 -04:00
abma
6c5f9ecb06
fix most warnings with -pendantic
2014-08-18 02:09:06 +02:00
aramis_acg
4286c72e60
merge severin-lemaignan:for-upstream from github. This is a full rewrite of pyassimp, rendering it much easier to use.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1332 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-09 11:39:34 +00:00
klickverbot
fc114f5a5e
OpenGL sample: GCC fixes.
...
Thanks to Marcel Metz for the patch.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1207 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-19 18:41:11 +00:00
jonathanklein
6852eb6ffe
- compiler error fixes for sample programs
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1171 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-18 10:53:58 +00:00
aramis_acg
a5210b2765
- fix some issues with the SimpleOpenGl sample:
...
* Material's shininess would not be set if strength wasn't defined too;
* Two-sided culling was working the opposite way, GL_CULL_FACE actually removes back faces when enabled;
* GL_COLOR_MATERIAL should not be enabled for mesh->mColors since it replaces other materials, it now sets vertex color only. Also, it now uses glColor4fv directly.
Thanks to Ricardo Costa for the patch (http://sourceforge.net/projects/assimp/forums/forum/817653/topic/4502991 ).
- some doc and formatting fixes in the very same sample.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@973 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-25 11:29:07 +00:00
aramis_acg
fdda697af7
Move test models with problematic license restrictions to test/models-nonbsd and update the test suites accordingly.
...
Update note in LICENSE accordingly.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@827 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-13 17:57:06 +00:00
kimmi
d4f563c795
- UPDATE : Add bugfixes for the correct topology import from a bsp-level.
...
- UPDATE : Add the first pk3-archive for the bsp-loader.
- UPDATE : Add missing license info to aiAssert-file.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@818 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-09-26 15:56:52 +00:00
kimmi
14283aa036
- FEATURE : Add improved OpenGL sample sent by Brad Grantham, many thanks for your work!
...
- BUGFIX : Fix the library input path for AssImp-library.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@498 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-10-24 11:10:42 +00:00
aramis_acg
d7f7e40adb
SimpleSample_OpenGL now builds under Linux
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@448 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-07-17 21:26:00 +00:00
aramis_acg
adb4ab602e
Adding Importer::ReadFileFromMemory to make Chromanoid happy.
...
Updating unit test suite to verify the newly added stuff for correctness.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@444 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-06-21 19:44:48 +00:00
aramis_acg
cc96f55c61
Adding samples/SimpleOpenGL.
...
Adding basic math functions to the C API. This functionality is exposed to C++ users via operator overloading of aiMatrix4x4, aiMatrix3x3, aiVector3D.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@442 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-06-20 14:49:49 +00:00