Commit Graph

248 Commits

Author SHA1 Message Date
Wojtek Figat
6e92d3103c Replace ImportedModelData with ModelData for model importing 2023-11-30 11:46:07 +01:00
Wojtek Figat
c5df7ad689 Add various improvements to models importing code 2023-11-30 11:31:58 +01:00
Wojtek Figat
cf8b7a20c2 Improve 47b8c9978f to handle non-vec4 cases
#2000
2023-11-28 14:55:26 +01:00
Wojtek Figat
47b8c9978f Fix missing channel masking in material Scene Texture node
#2000
2023-11-28 11:30:04 +01:00
Wojtek Figat
be90f47585 Documentation improvements from https://github.com/FlaxEngine/FlaxDocs/pull/125 2023-11-11 15:37:12 +01:00
Wojtek Figat
d90b723487 Code cleanup and usability tweaks for #1600 2023-11-08 21:30:31 +01:00
Wojtek Figat
67c22cf3d4 Merge branch 'Nodes' of https://github.com/NoriteSC/FlaxEngineFork into NoriteSC-Nodes 2023-11-08 21:19:08 +01:00
Wojtek Figat
0fe46457c6 Merge branch 'center-import' of https://github.com/Tryibion/FlaxEngine into Tryibion-center-import 2023-11-08 15:07:38 +01:00
Wojtek Figat
a685918e10 Add default value for material Sphere Mask node to create blob gradient around UV center
#1830
2023-11-06 23:57:54 +01:00
Wojtek Figat
c5d3954bc8 Add CalculateBoneOffsetMatrices option to fix some animated model skeletons rendering
#1862
2023-11-05 14:11:28 +01:00
Chandler Cox
66a709f09e small fixes 2023-10-25 10:46:04 -05:00
Chandler Cox
bfaae46c7e remove not needed variable. 2023-10-25 10:35:12 -05:00
Chandler Cox
b8921fd990 clean up 2023-10-25 09:58:02 -05:00
Chandler Cox
73694cba6c Add being able to set origin of mesh to the local mesh origin. fix centering several meshes. 2023-10-25 09:57:51 -05:00
NoriteSC
210c5a5bb2 Merge branch 'FlaxEngine:master' into Nodes 2023-10-25 07:03:46 +02:00
Wojtek Figat
52a621de42 Add color, emissive and opacity parameters setup for auto-imported material instances 2023-10-17 22:45:22 +02:00
Wojtek Figat
90427da42f Add SubAssetFolder to model import option to redirect auto-imported materials and textures location 2023-10-17 09:59:21 +02:00
Wojtek Figat
2f3929efe0 Fix Height Layer Blend material node codegen when alpha is constant
#1705
2023-10-14 18:03:51 +02:00
Wojtek Figat
09f2be907e Merge remote-tracking branch 'origin/master' into 1.7
# Conflicts:
#	Flax.flaxproj
2023-10-09 12:40:47 +02:00
NoriteSC
004e2ab5e8 Update Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Material.cpp
Co-authored-by: stefnotch <stefnotch@users.noreply.github.com>
2023-10-06 23:07:19 +02:00
NoriteSC
d5c0ad0487 Merge branch 'FlaxEngine:master' into Nodes 2023-10-06 22:15:35 +02:00
NoriteSC
d07a5e9823 Merge branch 'FlaxEngine:master' into Nodes 2023-10-06 17:03:32 +02:00
Wojtek Figat
cd889604e1 Fix build regression 2023-10-06 16:02:31 +02:00
Wojtek Figat
e29d3d02a2 Refactor audio clip import settings to use auto-generated bindings via AudioTool 2023-10-06 14:08:48 +02:00
Wojtek Figat
560f699dd8 Fix various issues with OpenAL buffers playback (do proper bit convertion) 2023-10-06 13:59:03 +02:00
Wojtek Figat
e6c45fccb3 Merge remote-tracking branch 'origin/master' into 1.7
# Conflicts:
#	Source/Engine/Level/Actors/AnimatedModel.cpp
2023-10-05 10:44:03 +02:00
Wojtek Figat
7777f73c26 Fix warning 2023-10-04 20:20:35 +02:00
Wojtek Figat
f46cc32715 Cleanup code #1115 2023-10-04 20:15:23 +02:00
Wojtek Figat
c46303018e Merge branch 'material_import' of https://github.com/Menotdan/FlaxEngine into Menotdan-material_import 2023-10-04 19:59:42 +02:00
Wojtek Figat
a5374920bd Merge branch 'import_mesh_with_collision_type_as_convex' of https://github.com/RuanLucasGD/FlaxEngine into RuanLucasGD-import_mesh_with_collision_type_as_convex 2023-10-04 17:39:39 +02:00
Wojtek Figat
bed736a8ee Add support for importing embedded textures via Assimp importer
#669
2023-10-04 15:16:10 +02:00
Wojtek Figat
d68c65d9d6 Fix build regression from 9fa709aa79 2023-10-04 13:50:15 +02:00
Wojtek Figat
25e1c3deaf Merge branch 'restore_message_clearer' of https://github.com/Menotdan/FlaxEngine into Menotdan-restore_message_clearer 2023-10-04 13:28:40 +02:00
NoriteSC
d7b9056d94 added AAStep and resolved stefnotch reviewe 2023-10-04 13:15:17 +02:00
Wojtek Figat
9fa709aa79 Fix importing skinned models with meshes that don't have valid skinning to properly link into the node's bone
#1525
2023-10-04 12:42:11 +02:00
NoriteSC
367eaf2f89 adjustment to nodes size 2023-10-04 10:28:48 +02:00
Wojtek Figat
52b9a995ad Fix bone Offset Matrix from fbx when using root RotationMatrix
#1525
2023-10-04 10:01:17 +02:00
NoriteSC
70ca1996c5 added Ratangle Mask and FWidth 2023-10-04 10:00:47 +02:00
Wojtek Figat
68a713fb95 Fix model importer to use precomputed Offset Matrix for skeletal model bones
#1525
2023-10-03 22:30:58 +02:00
Wojtek Figat
2caa168dd9 Fix using DefaultFrameRate for animation imported with Assimp
#1444
2023-10-03 10:00:57 +02:00
Wojtek Figat
8007417fe5 Fix applying scale to imported models with Assimp
#1445 #1443
2023-10-03 09:50:50 +02:00
Wojtek Figat
8bafdb0b78 Remove std::function usage from ArrayExtensions 2023-10-02 12:52:44 +02:00
Menotdan
10ea0b0665 Make it clearer what "Restore Materials on Reimport" means. 2023-10-02 03:32:11 -04:00
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
Wojtek Figat
1c20398d8c Merge remote-tracking branch 'origin/master' into 1.7 2023-09-22 22:43:29 +02:00
Wojtek Figat
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
Wojtek Figat
9f97787099 Merge remote-tracking branch 'origin/master' into 1.7 2023-09-20 16:02:48 +02:00
Wojtek Figat
a56ce92867 Fix crash when importing model with materials and Split Objects enabled 2023-09-19 23:07:10 +02:00