Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
6,571 Commits 15 Branches 23 Tags
0f53c486ede20258d564c1927a1e444a8bdd8a8f
Commit Graph

83 Commits

Author SHA1 Message Date
Menotdan 0f53c486ed Fixed formatting to match master branch 2023-09-26 00:05:50 -04:00
Menotdan fdf760f483 Merge branch 'master' of https://github.com/Menotdan/FlaxEngine into material_import 
Merge Upstream Changes.
 2023-09-25 23:51:34 -04:00
mafiesto4 248304a78f Fix regression of importing only a single material for models with split objects enabled 
#1483
 2023-09-22 19:43:00 +02:00
Menotdan 2b1266147c Add new condition from split object bugfix on master. 2023-09-20 11:02:19 -04:00
mafiesto4 a56ce92867 Fix crash when importing model with materials and Split Objects enabled 2023-09-19 23:07:10 +02:00
mafiesto4 255e47fa1e Fix crash due to invalid message in Assimp 2023-09-19 14:00:37 +02:00
Menotdan 451900b7ee Merge branch 'FlaxEngine:master' into material_import 2023-09-15 02:17:34 -04:00
Tryibion 44598d4741 Small change in showing target error 2023-08-26 17:07:04 -05:00
Tryibion 8e1cac7d2f Add to be able to choose sloppy mesh simplification or not in model import settings for LODs. 2023-08-15 21:34:07 -05:00
Menotdan af3d9d0eb3 Re-implement functionality for importing materials as instances. 2023-08-09 15:28:47 -04:00
Menotdan 9156e7727b Merge commit 'refs/pull/1115/head' of https://github.com/FlaxEngine/FlaxEngine into material_import1.6 
Repair merge
 2023-08-09 15:28:15 -04:00
mafiesto4 979168e82c Refactor various Editor APIs to use auto-generated bindings instead of manual code 2023-06-12 14:34:07 +02:00
mafiesto4 f552dd0c28 Merge remote-tracking branch 'origin/master' into 1.6 2023-06-10 23:29:22 +02:00
Ruan Lucas c22eae0e2d fix crash when import model with option to generate lod and lods amount = 1 2023-06-03 22:18:18 -04:00
Menotdan 284c3d832a fix a couple of bugs with importing without material instances 2023-05-22 14:26:20 -04:00
Menotdan 4acfffeaf4 Make it so the material instances get linked to the material slots. 2023-05-22 13:51:13 -04:00
Menotdan 37fe1154a3 Importing as instances works now 2023-05-22 10:12:00 -04:00
Menotdan f03bb60d5b Figured out where I actually need to add code, and added code there. 2023-05-21 00:20:54 -04:00
Menotdan 89ce2b087e Add parameter for AddMaterial() as an experiment, messing around with ideas. 2023-05-20 00:13:45 -04:00
Menotdan 9a71e0274f Add required options for material instance importing. 2023-05-20 00:03:40 -04:00
mafiesto4 71a5d56105 Add support for importing skeleton-only as Skinned Model (eg. from animation file to have skeleton for retargeting) 2023-05-04 15:43:44 +02:00
mafiesto4 7a2023ead6 Add option for importing scale tracking to animation asset 2023-02-07 09:39:31 +01:00
mafiesto4 f127bbebe1 Refactor enum flags with __underlying_type and new EnumHasAnyFlags/EnumHasAllFlags 
Fixes #832
Closes #886
 2023-01-15 12:44:39 +01:00
mafiesto4 a7e428a21c Merge branch 'master' into 1.5 
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/GI/GlobalSurfaceAtlas.flax
#	Content/Shaders/TAA.flax
#	Content/Shaders/VolumetricFog.flax
#	Source/Editor/CustomEditors/Editors/ActorTagEditor.cs
#	Source/Engine/Core/Config/GraphicsSettings.cpp
#	Source/Engine/Engine/PostProcessEffect.cs
#	Source/Engine/Graphics/GPUResourcesCollection.cpp
#	Source/Engine/Graphics/GPUResourcesCollection.h
#	Source/Engine/Graphics/PostProcessBase.h
#	Source/FlaxEngine.Gen.cs
 2023-01-10 15:37:55 +01:00
mafiesto4 9626e9bbb6 Update copyright year 2023-01-10 15:29:37 +01:00
mafiesto4 8918c71312 Update old header usage 2022-12-22 19:31:01 +01:00
mafiesto4 7f0c73606c Improve naming various GPU resources 2022-12-09 11:27:41 +01:00
mafiesto4 66d01d8d7f Merge remote-tracking branch 'origin/master' into 1.5 2022-12-01 12:10:41 +01:00
mafiesto4 f5ed9292e7 Merge branch 'master' into 1.5 2022-11-29 23:19:01 +01:00
Preben Eriksen ee84d53cdc PE: Support normal generation when using assimp importer. 2022-11-29 11:09:34 +01:00
mafiesto4 3f3697fbfa Code style cleanup 
#837
 2022-11-28 23:35:27 +01:00
Preben Eriksen c73eb548c0 PE: FBX Import - Improved normal map detection using diffuse name, if normap map was not setup inside object. 2022-11-10 13:14:19 +01:00
Preben Eriksen 54ccf9edc7 PE: Fixed - Custom animation import, frame index start and end was not the actual index but depended on frames per second. Made it impossible to use, now use the real frame index. 2022-11-10 11:35:29 +01:00
mafiesto4 00be6ffb89 Merge branch 'master' into 1.5 2022-10-29 20:45:51 +02:00
mafiesto4 4ba93d9d86 Code cleanup #765 2022-10-29 12:04:42 +02:00
mafiesto4 5cfe3b88c7 Add unit test for ModelTool::DetectLodIndex and improve LOD index detection further 
#765
 2022-10-29 11:38:20 +02:00
mafiesto4 32e052a87b Refactor native Stream serialization to new API 2022-10-20 17:28:12 +02:00
Preben Eriksen ea9695ac16 Added - Support for LOD meshes using _ , like LOD_0... 2022-09-25 10:31:25 +02:00
Preben Eriksen e98d2c8a27 Added - aiProcess_SortByPType to importer, i seen many object that have a small mesh with point faces that are not part of the object, so just ignoring these make the objects import. 2022-09-25 09:33:23 +02:00
mafiesto4 b8922ee846 Fix 1px offset in Model SDFs 2022-08-12 16:00:38 +02:00
mafiesto4 ff1fba403d Various fixes to allow compiling negine with custom build configurations 2022-07-26 23:10:01 +02:00
mafiesto4 df48d71045 Skip SDF generation for transparent materials inside models 2022-07-08 15:28:22 +02:00
mafiesto4 a881c90b2e Refactor engine to support double-precision vectors 2022-06-13 00:40:32 +02:00
mafiesto4 f82e370392 Refactor Vector types to support 64-bit precision via define switch 2022-05-25 20:04:33 +02:00
mafiesto4 8428f28239 Various improvements for SDF rendering 2022-04-29 17:11:39 +02:00
mafiesto4 0a458d94c4 Add support for Volume textures to have residency changed as regular textures 2022-04-21 12:36:16 +02:00
mafiesto4 a5af0a1c81 Fix game build 2022-03-25 11:42:09 +01:00
mafiesto4 b08d2001fd Add Model SDF generation utilities 2022-03-24 11:32:02 +01:00
mafiesto4 6196bb31fe Post merge fixes 2022-03-22 13:20:07 +01:00
mafiesto4 92f5377f70 Merge remote-tracking branch 'origin/master' into gi 
# Conflicts:
#	Flax.flaxproj
#	Source/Engine/Core/Math/Vector3.h
#	Source/Engine/Graphics/Textures/GPUTexture.cpp
#	Source/Engine/GraphicsDevice/DirectX/DX11/GPUContextDX11.cpp
#	Source/Engine/Terrain/Terrain.cpp
#	Source/Engine/Tools/ModelTool/ModelTool.Build.cs
#	Source/FlaxEngine.Gen.cs
#	Source/FlaxEngine.Gen.h
 2022-03-22 13:00:21 +01:00