max/MA_TextureAtlasser
1
0
Fork 0
mirror of https://github.com/maxartz15/MA_TextureAtlasser.git synced 2025-04-02 23:36:18 +02:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: max:1.8.1
Branches Tags
max:master
max:1.8.5
max:1.8.4
max:1.8.3
max:1.8.2
max:1.8.1
max:1.8.0
max:1.7.5
max:1.7.4
max:1.7.3
max:1.7.2
max:1.7.1
max:1.7
max:1.6
max:1.6.1
max:1.5
max:1.4
max:1.3
max:1.2
max:1.1
max:1.0
...
compare: max:master
Branches Tags
max:master
max:1.8.5
max:1.8.4
max:1.8.3
max:1.8.2
max:1.8.1
max:1.8.0
max:1.7.5
max:1.7.4
max:1.7.3
max:1.7.2
max:1.7.1
max:1.7
max:1.6
max:1.6.1
max:1.5
max:1.4
max:1.3
max:1.2
max:1.1
max:1.0

6 Commits
1.8.1 ... master

Author SHA1 Message Date
max
b2a005356d Update MA_TextureAtlasserProInspectorView.cs 2022-11-09 20:51:48 +01:00
max
05b4ea9f80 Update MA_TextureAtlasserProInspectorView.cs 
Fix 2020.2+ mesh input fields.
 2021-04-08 23:51:05 +02:00
max
0933abdace Update MA_TextureAtlasserProInspectorView.cs 2021-04-03 17:09:27 +02:00
max
5d112a2ced Update MA_TextureAtlasserProInspectorView.cs 
Dirty fix for 2020.2+ versions with reordable list.
 2021-04-02 17:31:24 +02:00
max
650600fac3 Delete launch.json 2021-03-26 11:42:54 +01:00
max
b2ccdb2273 Copy over all UV channels. 
The duplicate function now copies all 8 UV channels. So your lightmap UV's don't get lost!
 2021-03-26 11:41:19 +01:00
2 changed files with 154 additions and 140 deletions
Show Stats Expand all files Collapse all files

13
Assets/MA_ToolBox/MA_TextureAtlasserPro/Scripts/Editor/Views/MA_TextureAtlasserProInspectorView.cs
View File

@ -13,6 +13,7 @@ namespace MA_TextureAtlasserPro
private MA_TextureAtlasserProQuad lastSelectedQuad;
private bool isEditing = false;
private GUIStyle labelStyle = new GUIStyle(GUI.skin.label);
private Vector2 scrollPos = Vector2.zero;
public MA_TextureAtlasserProInspectorView(MA_TextureAtlasserProWindow currentEditorWindow, string title) : base(currentEditorWindow, title)
{
@ -37,6 +38,10 @@ namespace MA_TextureAtlasserPro
}
GUILayout.BeginArea(editorViewRect, EditorStyles.helpBox);
using (var scrollViewScope = new EditorGUILayout.ScrollViewScope(scrollPos, false, false))
{
scrollPos = scrollViewScope.scrollPosition;
GUILayout.BeginVertical(GUILayout.ExpandWidth(true));
GUILayout.Label("Quad Name");
@ -90,6 +95,7 @@ namespace MA_TextureAtlasserPro
SerializedObject serializedObject = new SerializedObject(curWindow.textureAtlas.selectedTextureQuad);
serializedObject.Update();
if (curWindow.textureAtlas.selectedTextureQuad.modelGroups != null)
{
SerializedProperty modelGroupsSP = serializedObject.FindProperty("modelGroups");
@ -109,8 +115,11 @@ namespace MA_TextureAtlasserPro
}
SerializedProperty meshesSP = modelGroupsSP.GetArrayElementAtIndex(i).FindPropertyRelative("meshes");
#if UNITY_2020_2_OR_NEWER
meshesSP.isExpanded = EditorGUILayout.Foldout(meshesSP.isExpanded, "Meshes", true);
#else
EditorGUILayout.PropertyField(meshesSP, false, GUILayout.ExpandWidth(false), GUILayout.MaxWidth(editorViewRect.width * 0.5f));
#endif
if (meshesSP.isExpanded)
{
for (int j = 0; j < curWindow.textureAtlas.selectedTextureQuad.modelGroups[i].meshes.Count; j++)
@ -161,7 +170,7 @@ namespace MA_TextureAtlasserPro
GUILayout.Label("x " + curWindow.textureAtlas.selectedTextureQuad.guiRect.x.ToString() + ", y " + curWindow.textureAtlas.selectedTextureQuad.guiRect.y.ToString());
GUILayout.Label("w " + curWindow.textureAtlas.selectedTextureQuad.guiRect.width.ToString() + ", h " + curWindow.textureAtlas.selectedTextureQuad.guiRect.height.ToString(), labelStyle);
}
GUILayout.EndVertical();
GUILayout.EndArea();
}

7
Assets/MA_ToolBox/MA_Utilities/MeshUtils/MA_MeshUtils.cs
View File

@ -84,7 +84,12 @@ namespace MA_Mesh
newMesh.SetTriangles(mesh.GetTriangles(i), i);
}
newMesh.SetNormals(new List<Vector3>(mesh.normals));
newMesh.SetUVs(0, new List<Vector2>(mesh.uv));
for (int i = 0; i < 8; i++)
{
List<Vector2> uvs = new List<Vector2>();
mesh.GetUVs(i, uvs);
newMesh.SetUVs(i, uvs);
}
newMesh.SetTangents(new List<Vector4>(mesh.tangents));
newMesh.SetColors(new List<Color>(mesh.colors));