Commit Graph

35 Commits (b6cf553ff5be05e50f418ce8ebc82e3237e4fc0e)

Author SHA1 Message Date
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
Kim Kulling 0ede630b10 bugfix:
- fix unhandled exception with sample SimpleTexturedOpenGL #308
- remove commented code, which made no sense any more.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-08-16 13:34:35 +02:00
Alexander Gessler 79d8e4c14a SimpleTexturedOpenGL/CMakeLists.txt: add path to DEVIL prebuilt library. 2014-06-01 17:33:50 +02:00
Marcel Metz c1b28ff1ce Removed unreferenced variables. 2013-11-20 14:40:25 +01:00
Marcel Metz 07ab616644 Fixed building simple opengl texture example with mingw. 2013-11-20 14:40:24 +01:00
Eric Haines f2997a562b typo fix: loose -> lose 2013-11-14 10:09:10 -08:00
Jared Duke 4328636d14 Allow commandline-supplied model path for the SimpledTexturedOGL sample
Currently, the path to the model in the sample is hardcoded.  Allow the user
to provide a model path via the command line for the sample, and remove a few
redundant comments.
2013-10-02 18:09:03 -07:00
Jared Duke 90179ec6e3 Enable SimpleAssimpViewX compilation on OSX
Update the XCode projects, and fix several compilation problems.
2013-09-21 10:59:13 -07: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
aramis_acg 21a0a222b8 - apply https://github.com/assimp/assimp/pull/5
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1273 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-07-08 01:32:29 +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 6f1408a7f0 - update CHANGES.current.
- mark aiAnimMesh data structures as *NOT CURRENTLY USED*. They are, however, still contained and visible because some ports may be relying on their presence.
- add SimpleAssimpViewX sample provided by drparallax. Thanks! (http://sourceforge.net/projects/assimp/forums/forum/817654/topic/3917829)


git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@843 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-21 14:57:00 +00:00
klickverbot 7e5e2d7ea1 Quick fix to make the SimpleOpenGL sample compile with MinGW.
This commit is cluttered with whitespace fixes, sorry for that.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@839 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-10 19:34:40 +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 78b94afb71 Update SimpleTexturedOpenGL sample.
Add Martin Walser to CREDITS.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@760 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-02 11:41:36 +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
aramis_acg fda7571914 Clarify README for samples.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@697 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-04-17 18:39:12 +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
klickverbot 0bf34ced10 A couple of small documentation fixes (spelling, missing characters, …).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@456 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-07-31 22:34:21 +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