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

7501 Commits (f009c216b663d7a27f4aa10170920d664fa65112)

Author SHA1 Message Date
kimkulling de088328aa replace typo by comment statement. 2018-06-05 11:27:24 +02:00
Kim Kulling c313d5a3e9
Update script.iss 
Fix folders ... again
 2018-06-05 10:55:51 +02:00
Kim Kulling d55525d16b
Update script.iss 
Fix folders to DX-dlls.
 2018-06-05 10:25:35 +02:00
Kim Kulling 12438bcdb2
Update script.iss 
Typ fix
 2018-06-04 22:37:05 +02:00
Kim Kulling ab301c1acc
Update script.iss 
- Fix x64-folders shwing to DirectX dlls
- Remove dead code
- Put doc copy ops for installer into brackets.
 2018-06-04 22:08:20 +02:00
Kim Kulling c46008055c
Update script.iss 
Directx: Use install path on appyevor image.
 2018-06-04 21:41:58 +02:00
Kim Kulling 37ed614b70
Update appveyor.yml 
Run inno script after build.
 2018-06-04 15:02:37 +02:00
Kim Kulling 20bfb3662f
Update script.iss 
FIx  buggy names of dlls.
 2018-06-04 11:53:44 +02:00
Sebastian Maisch fbdb4b17fd Merge branch 'force_generate_normals' 
# solved Conflicts:
#	code/GenFaceNormalsProcess.cpp
#	code/GenVertexNormalsProcess.cpp
 2018-06-04 10:51:12 +02:00
Kim Kulling a2a7877939
Merge branch 'master' into make_tools 2018-06-04 09:12:11 +02:00
Kim Kulling 24d49b0cc7
Update appveyor.yml 
Add download request for the redistributables.
 2018-06-04 09:01:17 +02:00
microm8 87315883b5
Merge branch 'master' into master 2018-06-04 08:17:50 +02:00
Kim Kulling 90549e9680
Update script.iss 
Adapt names of dll only for VS2017
 2018-06-03 21:29:23 +02:00
Kim Kulling 5f820fb6d6
Update appveyor.yml 
Add Inno setup path to PATH variable.
 2018-06-03 17:21:46 +02:00
Doron Adler d86a0e3adb Merge branch 'master' into ios-build-script 
* master:
  LWOMaterial: Fix strict aliasing violations
  3DS: Fix strict aliasing violations
  Fix strict aliasing violation in MaterialSystem
  Replace type punning with explicit memcpys
  Update FBXConverter.cpp
  Update Readme.md
  FBX: LayeredTextures now work with embedded texture data
  [pyassimp] README.{md->rst} to please distutils. Bumped to 4.1.3
  [pyassimp] Updated setup.py
  Properly reads in glTF/2.0 sampler address modes.
  does not access undefined memory area anymore.
 2018-06-03 14:25:36 +03:00
Kim Kulling 29e269ff95
Merge pull request #1989 from assimp/kimkulling-net-doc 
Update Readme.md
 2018-06-03 01:35:12 +02:00
Kim Kulling d112095a83
Merge branch 'master' into kimkulling-net-doc 2018-06-03 00:54:56 +02:00
Turo Lamminen 42b1ea0d65
Merge pull request #1992 from turol/strict-aliasing 
Fix some strict aliasing warnings
 2018-06-01 23:23:25 +03:00
Sebastian Maisch f15dcf7663 Added forced generation of normals with extra flag. 2018-06-01 17:32:02 +02:00
microm8 9064c983ad
Merge branch 'master' into master 2018-06-01 13:42:35 +02:00
Turo Lamminen b0b6048502 LWOMaterial: Fix strict aliasing violations 2018-06-01 12:37:21 +03:00
Turo Lamminen 6788d7b18b 3DS: Fix strict aliasing violations 2018-06-01 12:28:33 +03:00
Turo Lamminen bbb60c29f0 Fix strict aliasing violation in MaterialSystem 2018-06-01 12:20:16 +03:00
Turo Lamminen 6aa32b41a1 Replace type punning with explicit memcpys 2018-06-01 12:05:54 +03:00
Michael Roer Pedersen 4af69dbeb9 undo .gitignore 2018-06-01 09:33:28 +02:00
Michael Roer Pedersen b176513efa FBX export. to_ktime ticks was ok. 2018-06-01 09:24:53 +02:00
Kim Kulling bcf8a90b8b
Merge branch 'master' into kimkulling-net-doc 2018-05-31 21:39:18 +02:00
Kim Kulling fd2a71b3fd
Merge pull request #1988 from kebby/master 
FBX: LayeredTextures now work with embedded texture data
 2018-05-31 21:38:57 +02:00
Kim Kulling 31e75b9d54
Update FBXConverter.cpp 
Replaces a 0 by nullptr.
 2018-05-31 20:18:17 +02:00
Kim Kulling 339cc2e951 Some review findings. 2018-05-31 20:15:13 +02:00
Kim Kulling 64ba839f47
Update Readme.md 
Fix the link to the active repo containing the assimp-net-code.
 2018-05-31 20:04:48 +02:00
Michael Roer Pedersen fceeaa72f4 FBX animation export: Assimp animation time is already in seconds. Just convert to FBX time. 2018-05-31 15:07:00 +02:00
Tammo Hinrichs ffb6756d2a FBX: LayeredTextures now work with embedded texture data 2018-05-30 14:56:53 +02:00
Kim Kulling dd0d602681
Merge pull request #1985 from severin-lemaignan/master 
[pyassimp] Minor changes to setup.py to make it slightly more compliant
 2018-05-30 11:10:09 +02:00
Kim Kulling 2b18903f12
Merge branch 'master' into master 2018-05-30 10:36:21 +02:00
Kim Kulling 948e915a4c
Merge pull request #1980 from gstanlo/master 
Properly reads in glTF/2.0 sampler address modes.
 2018-05-30 09:19:04 +02:00
Doron Adler 6e49d288c3 now only x86_64 builds :( 2018-05-30 09:40:18 +03:00
Doron Adler e3847b7996 Default to release builds, update CC/LD/etc flags 2018-05-30 09:21:28 +03:00
Doron Adler 1ee9200277 smallerMax 2018-05-30 08:49:11 +03:00
Kim Kulling 1883d44b9b
Merge branch 'master' into master 2018-05-29 19:02:40 +02:00
Sebastian Maisch c6eda67296 Changed assimp to force regeneration of normals. 2018-05-29 13:01:11 +02:00
Séverin Lemaignan c12c56d33e [pyassimp] README.{md->rst} to please distutils. Bumped to 4.1.3 2018-05-29 10:47:40 +01:00
Séverin Lemaignan b6888962ed [pyassimp] Updated setup.py 2018-05-28 23:53:28 +01:00
Kim Kulling bbe9973425
Merge pull request #1979 from TinyTinni/fix-vector-out-of-bound-access 
Fix STL unittest in Debug mode
 2018-05-28 22:26:06 +02:00
Doron Adler 3023df8f7e Norod: Configurable from script parameters: dynamic libraries and debug/release build type 2018-05-28 17:36:43 +03:00
Doron Adler 27b989fd36 Merge branch 'master' into ios-build-script 
* master: (148 commits)
  Update Importer.cpp
  [-] Trace print removed.
  [F] Get return "like true" when error occured.
  [*] qt_assimp_viewer can be built with Qt4 or Qt5. [F] Working in doule precision.
  [F] List of importers can be empty.
  [F] More correct control by a mouse
  [F] React on mouse pressing ig view only.
  [F] One alignment for labels. [-] Unused checkbox.
  [+] QtCreator temporary file.
  [*] Refactoring of "draw axes" procedure. [-] Removed not working part of code for reloading textures. That do nothing, just show checkbox. As Yoda said: "Do. Or do not. There is no try."
  [-] Function "GetExtension" always return lowercase string. Using uppercase extension in desc is not needed.
  glTF/2.0: Pick scene zero as scene to recursively load if no "scene" property is specified.
  Fix GenVertexNormals
  [F] Wrong type in equation.
  [F] Uninitialized variables.
  Fix #1587 : add validation to LWS unit test
  Fix #1970: stl with empty solid
  Add test for issue 1970: STL with empty solid
  Add mesh name to ValidateDataStructure log
  Read and write the KHR_materials_unlit glTF/2.0 extension.
  ...

# Conflicts:
#	CMakeLists.txt
#	port/iOS/build.sh
 2018-05-28 16:27:00 +03:00
Doron Adler 323d59c7aa Check for null 2018-05-28 16:12:54 +03:00
Kim Kulling bf7ec7d130
Merge branch 'master' into fix-vector-out-of-bound-access 2018-05-26 13:25:57 +02:00
Kim Kulling 48100d0016
Merge pull request #1981 from smalcom/qt_assimp_viewer 
Qt assimp viewer and few fixes in another places
 2018-05-26 11:04:30 +02:00
Kim Kulling aa18e8a2a5
Update Importer.cpp 
Make check more expressive.
 2018-05-25 21:43:39 +02:00