Skip to content

Commit 0d72139

Browse files
authored
Merge pull request #2 from tsgcpp/feature/1.0.0
Update to 1.0.0
2 parents 79acbfa + d4e514d commit 0d72139

File tree

77 files changed

+1393
-404
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+1393
-404
lines changed

Assets/Editor/CubemapFileGenerator/CubemapFileGeneratorWizard.cs

Lines changed: 0 additions & 96 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Editor.meta renamed to Assets/Plugins/TSCubemapGenerator/Editor.meta

File renamed without changes.

Assets/Plugins/TSCubemapGenerator/Editor/Converter.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Editor/CubemapFileGenerator/Cubemap2HorizontalPngConverter.cs renamed to Assets/Plugins/TSCubemapGenerator/Editor/Converter/Cubemap2HorizontalPngConverter.cs

Lines changed: 38 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,38 @@
1-
using UnityEngine;
2-
3-
namespace CubemapFileGenerator
4-
{
5-
public class Cubemap2HorizontalPngConverter : ICubemapConverter
6-
{
7-
public byte[] Convert(Cubemap cubemap)
8-
{
9-
int width = cubemap.width;
10-
int height = cubemap.height;
11-
12-
Texture2D texture = new Texture2D(
13-
width * 6, height,
14-
TextureFormat.RGB24, false);
15-
16-
var faces = new CubemapFace[] {
17-
CubemapFace.PositiveX,
18-
CubemapFace.NegativeX,
19-
CubemapFace.PositiveY,
20-
CubemapFace.NegativeY,
21-
CubemapFace.PositiveZ,
22-
CubemapFace.NegativeZ,
23-
};
24-
25-
int x = 0;
26-
foreach (var face in faces) {
27-
texture.SetPixels(x, 0, width, height, cubemap, face);
28-
x += width;
29-
}
30-
texture.Apply();
31-
32-
return ImageConversion.EncodeToPNG(texture);
33-
}
34-
}
35-
}
1+
using UnityEngine;
2+
3+
namespace TSCubemapGenerator
4+
{
5+
public class Cubemap2HorizontalPngConverter : ICubemapConverter
6+
{
7+
public string FileExtension => "png";
8+
9+
public byte[] ConvertFrom(Cubemap cubemap)
10+
{
11+
int width = cubemap.width;
12+
int height = cubemap.height;
13+
14+
Texture2D texture = new Texture2D(
15+
width * 6, height,
16+
TextureFormat.RGB24, false);
17+
18+
var faces = new CubemapFace[] {
19+
CubemapFace.PositiveX,
20+
CubemapFace.NegativeX,
21+
CubemapFace.PositiveY,
22+
CubemapFace.NegativeY,
23+
CubemapFace.PositiveZ,
24+
CubemapFace.NegativeZ,
25+
};
26+
27+
int x = 0;
28+
foreach (var face in faces)
29+
{
30+
texture.SetPixels(x, 0, width, height, cubemap, face);
31+
x += width;
32+
}
33+
texture.Apply();
34+
35+
return ImageConversion.EncodeToPNG(texture);
36+
}
37+
}
38+
}

Assets/Editor/CubemapFileGenerator/Cubemap2HorizontalPngConverter.cs.meta renamed to Assets/Plugins/TSCubemapGenerator/Editor/Converter/Cubemap2HorizontalPngConverter.cs.meta

File renamed without changes.

Assets/Editor/CubemapFileGenerator/Cubemap2VerticalPngConverter.cs renamed to Assets/Plugins/TSCubemapGenerator/Editor/Converter/Cubemap2VerticalPngConverter.cs

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,40 @@
1-
using UnityEngine;
2-
3-
namespace CubemapFileGenerator
4-
{
5-
public class Cubemap2VerticalPngConverter : ICubemapConverter
6-
{
7-
public byte[] Convert(Cubemap cubemap)
8-
{
9-
int width = cubemap.width;
10-
int height = cubemap.height;
11-
12-
Texture2D texture = new Texture2D(
13-
width, height * 6,
14-
TextureFormat.RGB24, false);
15-
16-
// SetPixelsが画像の左下から右上に描画していくため、
17-
// 下から上の順番でコピー
18-
var faces = new CubemapFace[] {
19-
CubemapFace.NegativeZ,
20-
CubemapFace.PositiveZ,
21-
CubemapFace.NegativeY,
22-
CubemapFace.PositiveY,
23-
CubemapFace.NegativeX,
24-
CubemapFace.PositiveX,
25-
};
26-
27-
int y = 0;
28-
foreach (var face in faces) {
29-
texture.SetPixels(0, y, width, height, cubemap, face);
30-
y += height;
31-
}
32-
texture.Apply();
33-
34-
return ImageConversion.EncodeToPNG(texture);
35-
}
36-
}
37-
}
1+
using UnityEngine;
2+
3+
namespace TSCubemapGenerator
4+
{
5+
public class Cubemap2VerticalPngConverter : ICubemapConverter
6+
{
7+
public string FileExtension => "png";
8+
9+
public byte[] ConvertFrom(Cubemap cubemap)
10+
{
11+
int width = cubemap.width;
12+
int height = cubemap.height;
13+
14+
Texture2D texture = new Texture2D(
15+
width, height * 6,
16+
TextureFormat.RGB24, false);
17+
18+
// SetPixelsが画像の左下から右上に描画していくため、
19+
// 下から上の順番でコピー
20+
var faces = new CubemapFace[] {
21+
CubemapFace.NegativeZ,
22+
CubemapFace.PositiveZ,
23+
CubemapFace.NegativeY,
24+
CubemapFace.PositiveY,
25+
CubemapFace.NegativeX,
26+
CubemapFace.PositiveX,
27+
};
28+
29+
int y = 0;
30+
foreach (var face in faces)
31+
{
32+
texture.SetPixels(0, y, width, height, cubemap, face);
33+
y += height;
34+
}
35+
texture.Apply();
36+
37+
return ImageConversion.EncodeToPNG(texture);
38+
}
39+
}
40+
}

Assets/Editor/CubemapFileGenerator/Cubemap2VerticalPngConverter.cs.meta renamed to Assets/Plugins/TSCubemapGenerator/Editor/Converter/Cubemap2VerticalPngConverter.cs.meta

File renamed without changes.

Assets/Editor/CubemapFileGenerator/ICubemapConverter.cs renamed to Assets/Plugins/TSCubemapGenerator/Editor/Converter/ICubemapConverter.cs

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
using System.Collections;
2-
using System.Collections.Generic;
3-
using UnityEngine;
4-
5-
namespace CubemapFileGenerator
6-
{
7-
public interface ICubemapConverter
8-
{
9-
byte[] Convert(Cubemap cubemap);
10-
}
11-
}
1+
using System.Collections;
2+
using System.Collections.Generic;
3+
using UnityEngine;
4+
5+
namespace TSCubemapGenerator
6+
{
7+
public interface ICubemapConverter
8+
{
9+
string FileExtension { get; }
10+
11+
byte[] ConvertFrom(Cubemap cubemap);
12+
}
13+
}

0 commit comments

Comments
 (0)