v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,840 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

43 Commits (348c34811f5895b3ab086baabbdf6d43443d623a)

Author SHA1 Message Date
Marc-Antoine Lortie 11daed69d3 Fixed overwriting of CMake global output directory variables. 2020-08-07 16:04:39 -04: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
Marc-Antoine Lortie edfaaed56f Removed uneeded expression in else() and endif() constructs. 
The following changes were tested against building with a master copy.

For a more detailed report, please read the followings below:

The flags that were checked were the ones checked by default + the following:

ASSIMP_BUILD_ASSIMP_VIEW
ASSIMP_BUILD_SAMPLES

The list of compilable projects in Visual Studio were the following:

- assimp
- assimp_cmd
- assimp_simpleogl
- assimp_simpletextureddirectx11
- assimp_simpletexturedogl
- assimp_viewer
- INSTALL
- IrrXML
- uninstall
- unit
- UpdateAssimpLibsDebugSymbolsAndDLLs
- ZERO_CHECK
- zlib
- zlibstatic

The solution that was generated with the new changes comprised the same number of projects as the one from the master, unmodified. All projects except UpdateAssimpLibsDebugSymbolsAndDLLs were built without any error. All tests were run.

UpdateAssimpLibsDebugSymbolsAndDLLs could not be built because of the reasons explained in issue #3004.
 2020-02-23 07:09:35 -05:00
Fabien Péan 52d0170470
Update CMakeLists.txt 2019-09-09 23:00:04 +02: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
kimkulling 3f9a25df5a Devil: replace this by header-only lib. 2019-02-07 17:09:05 +01:00
BuildTools a8a1ca9894 header paths adjusted for unit tests and samples 2018-01-05 23:12:40 -08:00
Jared Mulconry 059a32654e Addressed warnings generated on MSVC across x86 and x64. 2017-09-24 19:29:43 +10:00
Chris Russ 63a4591683 Fixing bugs related to 64-bit upgrade in materials 2016-08-16 16:03:56 +10:00
Kim Kulling ba37e362e8 Sample: fix https://github.com/assimp/assimp/issues/113, remove deprecated makefile. 2015-09-04 17:10:51 +02: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
Alexander Gessler 71b275eea2 Merge pull request #602 from ReliaSolve/mac_build_improvements 
Builds out of the box on mac with ASSIMP_BUILD_SAMPLES turned on.
 2015-07-05 13:16:34 +02: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
Russ Taylor 8d07cfe1f3 Does not try and find the math library under Visual Studio compilers, where it is not needed. 2015-07-04 16:08:56 -04:00
Richard 1d96486437 Refactored: Reformat CMake files to conform to editor config 2015-06-28 15:50:57 -06:00
Ricardo Ortiz a94e668486 Define CMAKE_DEBUG_POSTFIX and use it instead of ASSIMP_DEBUG_PREFIX 
to have a consistent library name accross platforms.
 2015-01-23 14:19:29 -05:00
abma 6c5f9ecb06 fix most warnings with -pendantic 2014-08-18 02:09:06 +02:00
abma b2643a3835 fix SimpleOpenGL linking (missing libm) 2014-08-17 23:49:36 +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
aramis_acg aaf0be0bbf - CMake overhaul. Add proper FindXXX scripts for PkgMacros, ZLIB, DirectX. Isolate MSVC-specific defines. Add newer boost versions to boost whitelist. Many thanks to Mr. S. for the patch! (see http://zfx.info/viewtopic.php?f=9&t=334&p=32190#p32190) 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1293 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-17 22:56:15 +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
klickverbot 3b0d2cbdb3 Enable simple OpenGL sample under Linux. 
Thanks to Marcel Metz for the patch.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1206 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-19 18:40:48 +00:00
jonathanklein eebba5348d - Added Debug Postfix 
- added Viewer Installer

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1172 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-18 10:55:47 +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 c05acabea9 - update cmake build environment, now includes targets to build debian packages for Assimp. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@997 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-05-09 19:34:21 +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 0fd0f68b26 UPDATE: Add opengl-samples to cmake build enviroment for windows systems. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@823 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-10-03 12:08:21 +00:00
kimmi 733fd48f9e - UPDATE : Add documentation to Q3BSP-importer. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@822 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-09-29 19:42:50 +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
aramis_acg 74b1810bd5 Fix paths in SimpleOpenGL vc8 solution, debug profile. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@761 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-07-02 11:46:32 +00:00
aramis_acg 7b3f55b05b Add DevIL and Glut binaries for windows/x86. 
Restructure workspace locations for samples.
Add SamHayne's sample from http://sourceforge.net/projects/assimp/forums/forum/817654/topic/3736373 with some minor changes to suit the new directory layout.
Update README.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@759 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-06-30 11:29: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