Skip to content

/ godot-scene_merge-module

forked from godot-extended-libraries/scene_merge
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Patched to compile with latest version of xatlas and Godot 3.2 #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+2 −1
Open

Patched to compile with latest version of xatlas and Godot 3.2 #2

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3264e21
Patched to compile with latest version of xatlas and Godot 3.2
SaracenOne Feb 4, 2021
19e2085
Merge branch 'master' of https://github.com/V-Sekai/godot-scene_merge…
SaracenOne Feb 4, 2021
File filter
Filter file types
Clear filters
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev
Merge branch 'master' of https://github.com/V-Sekai/godot-scene_merge… 
…-module into update_latest_xatlas
  • Loading branch information
@SaracenOne
SaracenOne committed Feb 4, 2021
commit 19e208596f5ce82f85985aaecb71094434f08770
2 merge.cpp
View file
Open in desktop
@@ -817,7 +817,7 @@ void MeshMergeMaterialRepack::_generate_atlas(const int32_t p_num_meshes, Vector
pack_options.blockAlign = true;
pack_options.resolution = 2048;
pack_options.rotateCharts = false;
xatlas::PackCharts(atlas, pack_options);
xatlas::Generate(atlas, xatlas::ChartOptions(), pack_options);
}

void MeshMergeMaterialRepack::scale_uvs_by_texture_dimension(const Vector<MeshState> &original_mesh_items, Vector<MeshState> &mesh_items, Vector<Vector<Vector2> > &uv_groups, Array &r_mesh_to_index_to_material, Vector<Vector<ModelVertex> > &r_model_vertices) {
You are viewing a condensed version of this merge commit. You can view the full changes here.
ProTip! Use n and p to navigate between commits in a pull request.