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

66 Commits (8ad4bb0b2c54259a0206e63f888dcea036d46501)

Author SHA1 Message Date
Kim Kulling bfb46ca5ef
Fix protocol type. 2022-05-03 17:16:25 +02:00
U-DESKTOP-0R560PH\George 63183a048c Minor updates to ASSIMP Viewer 2022-04-30 08:10:47 -07:00
Kim Kulling 50c7301a38 Update copyrights 2022-01-10 21:13:43 +01:00
IOhannes m zmölnig 3b8126d26a Fix spelling mistake 2021-10-08 08:48:01 +02:00
Krishty 758116b083 removed trailing spaces and tabs from source and text 
This commit ignores the “contrib” folder in order to prevent merge conflicts in dependencies, should these be updated via git.
 2021-07-29 13:28:51 +02:00
Kim Kulling 9e8dbd0ca5 Update copyrights to 2021. 2021-02-28 12:17:54 +01:00
Biswapriyo Nath c65f2cb3fb Remove extra semicolon while GCC being pedantic. 2020-12-13 00:12:44 +05:30
Marc-Antoine Lortie 3510d85967 Replaced NULL with nullptr for pointers in Assimp viewer. 2020-04-07 10:56:22 -04:00
Kim Kulling a73fd6c84c
Update MessageProc.cpp 
I guess Turol meant this change.
 2020-04-04 18:24:19 +02:00
Marc-Antoine Lortie 1cb564aa4b Fixed /W4 compile warnings in Assimp viewer. 2020-04-03 14:36:44 -04:00
Marc-Antoine Lortie 4e7e47bd43 Updated copyright dates. 
Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, assimp team".

Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, ASSIMP Development Team".

Changed copyright end year to 2020 in LICENCE.rtf.

Changed copyright end year in CMakeFiles.txt files and any other places referencing Assimp with a copyright start and end year.
 2020-01-20 08:53:12 -05:00
Kim Kulling 1e35ea3bc8
Merge branch 'master' into sec_issues 2019-02-06 11:27:53 +01:00
Kim Kulling 6e39c22554 Fix potential security issues. 2019-02-05 22:05:52 +01:00
Kim Kulling afb779e59d remove dead code 2019-02-05 00:36:07 +01:00
Kim Kulling f5ef078834 fix openfiledialog in modelviewer. 2019-02-04 22:15:15 +01:00
kimkulling 4347ce4311 Some more findings. 2019-01-31 17:24:08 +01:00
kimkulling de02fb2129 Fix review findings. 2019-01-30 16:07:40 +01:00
Kim Kulling 1b71c2fd34
Merge branch 'master' into assimpviewer_dev 2018-05-13 10:41:16 +02:00
kimkulling 60d803f490 Some minor fixes of typos and formatting issues. 2018-05-09 09:51:05 +02:00
Jean-Louis 5a5db25df6 Fix AssimpView build 
- Use std::min/max instead of min/max macro in windef.h
- Use mmsytem.h instead of timeapi.h with MinGW
 2018-05-08 00:28:53 +02:00
Kim Kulling ebaa8be106 fix findings. 2018-01-23 13:02:13 +01:00
Kim Kulling cab6cdf7b2 Viewer: fix the build. 2017-06-01 16:21:23 +02:00
Jared Mulconry 745f754310 Fixed build warnings on MSVC14 x64 in the Message Proc source. 2016-11-20 12:04:50 +11:00
Richard e3ebef0094 Fixed: Correct null pointer dereference 2015-07-03 19:33:58 -06:00
Richard 5ae1c28881 Refactor: Apply editor config rules to tools 2015-06-29 20:54:59 -06:00
Kim Kulling 2bfc353fde License info: update year info. 2015-06-28 21:48:25 +02:00
Kim Kulling 76dd9467b2 fix win32-build for assimp_viewer . 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-04-17 20:02:55 +02:00
Alexander Gessler cc32eda226 assimp_view: fix crash when trying to export while no model is loaded. 2014-07-22 20:35:09 +02:00
Léo Terziman 800f835f6f In AssimpViewer: verification + asserts on the variables in DoExport function to try to understand the stack corruption arround szFileName 2014-01-17 11:54:04 +01:00
Léo Terziman e6bbb512d7 In AssimpViewer: postprocess steps added to export to correct bugs in export (especially conversion from left to right handed) 2014-01-17 11:53:27 +01:00
Marcel Metz c4d797ef58 Replaced function parameters with correct literals. 2013-11-20 14:42:23 +01:00
Marcel Metz 8d0b76a535 Added parenthesis for explicit operator evaluation priority. 2013-11-20 14:42:23 +01:00
Marcel Metz c6297ec333 Fixed variable assignment values. 2013-11-20 14:40:25 +01:00
Marcel Metz 93fd1133ff Fixed mingw cross compiler issues. 2013-11-20 14:40:20 +01:00
Alexander Gessler 0b9d6bec0d - drop a few swear words from documentation. Some of these are years old and I think the authors (me included) don't want them associated with their commits. 2013-03-21 19:54:55 +01:00
Alexander Gessler acdd0bfcb3 - fix animation selection combobox in assimpview. 2012-07-26 03:01:08 +02:00
aramis_acg ec6c62e005 - consistent use of ai_assert instead of assert. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1241 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 23:22:40 +00:00
aramis_acg 6f2ca1bb22 [3459159] Tidy up UI layout in assimp_view. 
I changed the size slightly, but left the majority of the patch unchanged. Many thanks to Tor Andersson for the original patch! (see https://sourceforge.net/tracker/?func=detail&aid=3459159&group_id=226462&atid=1067634)

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1155 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-03 17:50:01 +00:00
aramis_acg 4dbf539b44 - update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1147 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-03 03:38:30 +00:00
ulfjorensen 487071be77 Bugfix: FCollada's special texture tag "bump" now maps to aiTEXTURE_NORMAL. Thanks to agent8261 for the hint 
Bugfix: AssimpView now properly skips the leading quotation mark when being executed with a file

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1078 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-09-14 09:41:48 +00:00
aramis_acg 9d0d06d637 - assimp_view: add support for Debone pp step. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@949 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-04-15 15:15:06 +00:00
aramis_acg 2e2cb8ea79 # fix crash when attempting to export without having a model loaded. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@941 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-04-03 18:42:03 +00:00
aramis_acg 45d6647ffe + implement export support into AssimpView 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@937 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-04-03 14:25:18 +00:00
kimmi 45fca4b005 BUGFIX : Fix compile error on SunOS xentros 5.11: symbol conflict. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@896 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-01-23 22:49:02 +00:00
aramis_acg 693a3a039d BlenderLoader: don't output diffuse color if it is all black. Seems to be Blenders way of telling us there is no diffuse color. 
AssimpView: add 'no transparency' option in UI and implement underlying logic.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@811 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-08-31 17:24:04 +00:00
aramis_acg 827b00226e Fix 3029892: assimpview crashes if the animation slider is touched while no asset is loaded. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@786 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-07-18 21:16:40 +00:00
aramis_acg c29e985f12 AssimpView now displays meshes and mroe detailled statistics in the scene browser. 
Improve the user interface. takes more screen space now, but provides more information and less clumsy buttons.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@731 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-21 20:04:45 +00:00
aramis_acg 7cea2eb497 Change date in license header to 2006-2010. This involves updating quite a few files, sorry. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@661 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-10 15:30:22 +00:00
aramis_acg bcf0ddc086 - don't delete the null logger. 
- don't leak LogStreamInfo when detaching streams from DefaultLogger.
- detach the stream before deleting it in aiDetachAllLogStreams.
Thanks to Bart Botta for the patch.

- DefaultLogger does not properly delete log streams if they're still attached to it when the logger is destroyed. This is the behaviour specified in the documentation.
- Adapt AssimpView's logger usage, which didn't follow the spec as well.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@659 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-10 15:00:36 +00:00
aramis_acg 84c6b4fde6 AssimpView: 
- postprocessing configuration is no (partially) configurable.
 - adding linsk to Assimp homepage/bugtracker/forums.
 - updating about dialog.  
 - fixing colors of texture view (tiny array overrun ...).
 - minor UI theme adjustments.
 - 'setup file extensions' works again.
 - normal smooth limit is now used for primary import, too.
 - minor spelling fixes in the UI.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@417 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-05-09 23:27:48 +00:00