Commit Graph

259 Commits (109f6feb6ee85435fd342883780145db2f750128)

Author SHA1 Message Date
Kim Kulling 524834c307 Fix line endings. 2015-08-08 18:02:37 +02:00
Wil Shipley 227a08d2b7 - These were Xcode's git control files and will vary from person to person. 2015-07-26 19:50:32 -07:00
Wil Shipley f7a8c80fc2 - Previous merge accidentally copied OpenDDL C++ files into include directory. 2015-07-26 19:35:14 -07: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
Wil Shipley eef960c6b2 - iOS target 9.0 2015-06-14 18:09:03 -07:00
Wil Shipley b581ae9c3d - Opened in latest Xcode. 2015-06-12 16:12:36 -07:00
Wil Shipley d1f36bf947 - Removed '/Users/wjs' from a path (that snuck in). 2015-05-12 16:10:09 -07:00
Wil Shipley 9e95fda002 - Turn off "-Wshorten-64-to-32" so we don't have TEN MILLION warnings when compiling with assimp.
- Sure, it'd be better if this code were clean, but these warnings
ONLY appear when we build for the simulator, NOT for iOS or OS X for
real, so f' em.
2015-05-08 17:50:31 -07:00
Wil Shipley 39c6622697 - Added a generic renderToImage() function to SCNRenderer, so we can share with StackOverflow / Goossens. 2015-05-05 15:42:01 -07:00
U-ORADEV\albihern 7043551068 Modifying files to let assimp build under cygwin. 2015-04-20 17:36:47 -05:00
Wil Shipley 5164b1bd24 Turned off several warnings so code doesn't explode with them.
Someone who speaks C++ should maybe go back through and see if these
warning are really relevant!
2015-03-26 13:47:53 -07:00
Ser Lev Arris 947429152f finishing.
also skip filtering C4D importer due fixed in 14324c60cf
2015-03-22 18:27:06 +01:00
Ser Lev Arris db7f9fc54d closes assimp/assimp#506 2015-03-21 17:00:43 +01:00
Ser Lev Arris 527bf8c255 bit cleanup and wait untip issue #506 is fixed 2015-03-21 12:35:29 +01:00
Ser Lev Arris 3e6043de70 use correct variable for compiler selection... 2015-03-21 10:54:46 +01:00
Ser Lev Arris f3ed79ab41 make use of travis languages, build java jar too.
https://github.com/assimp/assimp/pull/505#issuecomment-84198261
2015-03-21 10:32:15 +01:00
Ser Lev Arris 54dcc64d33 enable some importers, skip otherbuild for test/discuss 2015-03-20 22:36:57 +01:00
Ser Lev Arris 23797dc8cc for sure jassimp needs the assimp lib too 2015-03-20 21:15:57 +01:00
Wil Shipley e37b306234 - Build as static library FOR REAL, not dylib. 2015-03-14 15:59:48 -07:00
Wil Shipley 1b06d55975 - Needed quotes around path in case of spaces in it. 2015-03-13 18:47:31 -07:00
Wil Shipley 5438b75c60 - committing the workspace data inside the project file, too, who knows if this is correct 2015-03-13 18:47:10 -07:00
Wil Shipley ca463fca9a - Rearranged groups, link against C++ lib explicitly. 2015-03-13 00:37:02 -07:00
Wil Shipley 73174b7081 Hard-coded project to build static library for iOS / OS X
- This may not appeal to everyone, but I wanted a simple static library
Project I could include in a Xcode Workspace that would auto-build when
I built an iOS or OS X app.
- If you drag this project file into your Workspace and then add the
libassimp.x.x.a file as a dependency in your project inspector, it
should auto-build in the architecture of your choice.
2015-03-12 20:23:21 -07:00
Alexander Gessler 8328f79b1e Drop VC solutions. Fixes #292. 2014-06-14 17:14:12 +02:00
Alice 01a6ec9059 Adding tessellation support for new Blender 2.6 polygons
- Added BlenderBMesh.cpp/h which contains a class to convert a BMesh to an old style tri/quad mesh
- Added BlenderTessellator.cpp/h which contains a class to tessellate the poly loops contained within a BMesh
2013-11-22 13:17:21 +01: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
Alexander Gessler b392322454 Remove M3Importer from vc9 solution. 2013-06-25 00:12:03 +02:00
Willy Blandin 27767031e6 make all targets build under OSX 10.8.2 and add iOS target 2013-03-31 21:48:38 +09:00
Alexander Gessler f7680f7f28 - Ifc: refactor code, move opening generation and boolean clipping code to separate units. 2013-02-07 09:51:33 +01:00
Alexander Gessler 35128a7251 - update vc9 workspace. 2013-01-30 13:00:51 +01:00
Alexander Gessler b993509087 - update vc9 workspace after merge. 2012-12-21 16:28:30 +01:00
Alexander Gessler bae9db2f03 Merge branch 'master' of git://github.com/assimp/assimp 2012-12-21 16:24:05 +01:00
aramis_acg f507994299 - Ifc: vastly improved algorithm for fixing up window caps.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1345 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-12-19 02:24:06 +00:00
Alexander Gessler ef0dcaaea2 - fbx: refactor, move DOM utility functions to separate unit. 2012-08-10 23:02:38 +02:00
Alexander Gessler ffbac847ef - fbx: add DOM classes for light and camera node attachments. Devise a new macro-based system to easily define dynamic fbx properties. 2012-08-10 22:58:54 +02:00
Alexander Gessler 24ce9495fd - fbx: add binary reading draft. Started from scratch after my first attempt had design flaws. The binary reader now sits on the lexer stage (really) and generates a (fake) token sequence similar to the text lexer's output - this means most parsing code can go unaffected. 2012-08-09 02:08:12 +02:00
Alexander Gessler 06acead438 - fbx: read deformers (Skin and Cluster). 2012-07-26 18:05:24 +02:00
Alexander Gessler b66dfc85e1 - fbx: read NodeAttribute and Camera. 2012-07-26 03:42:02 +02:00
Alexander Gessler 67c55990cd - fbx: initial code to read animations plus the accompanying DOM classes. 2012-07-21 00:45:37 +02:00
Alexander Gessler bf79c83bf2 - fbx: read node hierarchy and assign model material indices. Cache already converted materials and meshes to make FBX instancing work as intended. 2012-07-04 16:33:21 +02:00
acgessler 00f249b8dd - fbx: add property system 2012-07-02 15:57:51 +02:00
acgessler 6ddb1c9aa7 - fbx: refactor code 2012-07-01 14:38:14 +02:00
acgessler 8ce0a3df9f Merge branch 'master' of github.com:acgessler/assimp-gsoc2012-fbx
Conflicts:
	code/FBXImporter.cpp
	code/FBXTokenizer.cpp
	code/FBXTokenizer.h
	code/FBXUtil.h
2012-07-01 14:18:16 +02:00
Alexander Gessler d7270aa278 - fbx: skeleton for DOM -> aiScene converter. 2012-06-28 20:02:09 +02:00
Alexander Gessler 05bc8ab684 - fbx: add ImportSettings to keep track of fbx-specific import settings. The settings are generated by the importer instance and injected into parser and DOM. 2012-06-28 19:16:14 +02:00
Alexander Gessler 25dfbdf58d - fbx: add DOM layer to represent the parsed FBX file in-memory, capturing the essential semantics we need for importing. 2012-06-26 18:31:19 +02:00
Alexander Gessler c9d9fcdfd1 - fbx: parser working now. Drop shared_ptr's in favour of raw pointers to reduce memory overhead (a pity - I want unique_ptr and move semantics in C++03). 2012-06-25 23:03:06 +02:00
acgessler 6c5efe471f - fbx: fix various issues with tokenizer. Stricter error checking and better debuggability. Do not use shared_ptr's for tokens, there are simply too many of them and ownership is always clear. 2012-06-25 17:31:42 +02:00
acgessler ff995307ac - fbx: further work on broadphase tokenization. 2012-06-25 16:10:35 +02:00
acgessler 18b2aebcb1 - FBX importer: basic interface and importer skeleton. Start tokenizer and parser. 2012-06-23 03:36:55 +02:00