Skip to content

Added Layer Group Support, Different Pivot Points, Disabled Atlas #7

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.

Sign up for GitHub

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

Open
ChemiKhazi wants to merge 31 commits into
base: master
Choose a base branch
from
Open

Added Layer Group Support, Different Pivot Points, Disabled Atlas #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
d86a41b
Layer displays in the same order as Photoshop.
ChemiKhazi Aug 14, 2014
a811bf1
Disabled atlas support.
ChemiKhazi Aug 14, 2014
d492ae8
Added a DLL build
ChemiKhazi Aug 14, 2014
517e4b6
Separated exporter to another file.
ChemiKhazi Aug 14, 2014
11cb943
Fix Layer Group node object not being created when group visibility s…
ChemiKhazi Aug 14, 2014
d503911
Attempted to fix pivot settings.
ChemiKhazi Aug 18, 2014
4b63bb0
Moved main code to a module, this repo becomes a holder for the proje…
ChemiKhazi Aug 18, 2014
993c4df
Updated submodule version.
ChemiKhazi Nov 17, 2014
c6075a1
Updated README, new DLL build.
ChemiKhazi Nov 17, 2014
ccc797c
Latest DLL build
ChemiKhazi Nov 18, 2014
63b1be2
New build, trying different method for getting sorting layer names.
ChemiKhazi Nov 18, 2014
fe3f876
New DLL build with packing tag field.
ChemiKhazi Nov 20, 2014
d5e9c10
Updated submodule
ChemiKhazi Apr 20, 2015
7809dcb
New build
ChemiKhazi Apr 20, 2015
04b34ed
Added PSDPostProcessor to project.
ChemiKhazi Apr 20, 2015
d404481
Updated PSD Module
ChemiKhazi Sep 5, 2015
ca9c84b
Fixed references to Unity 5 DLLs
ChemiKhazi Sep 5, 2015
7dd9785
Fixed post build event
ChemiKhazi Sep 5, 2015
e0ca004
Latest DLL build
ChemiKhazi Sep 5, 2015
67aac9c
Renamed project assembly name to PhotoShopImporter
ChemiKhazi Sep 5, 2015
d78638c
Updated documentation.
ChemiKhazi Sep 5, 2015
01fab95
Updated PSD Module
ChemiKhazi Sep 8, 2015
55eb3db
Updated documentation
ChemiKhazi Sep 8, 2015
cad2909
Updated importer DLL
ChemiKhazi Sep 8, 2015
00f9a50
Updated readme
ChemiKhazi Sep 9, 2015
cf2ed4c
Updated readme with acknowledgements and demo/tutorial videos
ChemiKhazi Sep 10, 2015
df85ae0
Pulled submodule fix to UI layer order bug
ChemiKhazi Sep 10, 2015
f4195b9
New DLL build, fixes UI layer order bug
ChemiKhazi Sep 10, 2015
58a64da
Updated readme
ChemiKhazi Sep 10, 2015
d38354f
New DLL build, with extensible PSD constructor.
ChemiKhazi Nov 9, 2015
5d1bbfb
Update README.md
ChemiKhazi Jun 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "PhotoShopFileType/PSDModule"]
path = PhotoShopFileType/PSDModule
url = https://github.com/ChemiKhazi/UnityPSDImporterModule.git
Binary file added Documentation/Group-Selection.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Documentation/Import-Settings.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Documentation/Install.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Documentation/Launch-Importer.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Documentation/Layers-Display-Thumb.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Documentation/Layers-Display.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Documentation/Sprite-Creation.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Documentation/UI-Creation.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 5 additions & 3 deletions PSDPlugin.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
# Visual Studio 2013
VisualStudioVersion = 12.0.40629.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhotoShop", "PhotoShopFileType\PhotoShop.csproj", "{A04EEDD9-E164-4941-9846-722ACF2FCCA1}"
EndProject
Global
Expand All @@ -9,8 +11,8 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A04EEDD9-E164-4941-9846-722ACF2FCCA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A04EEDD9-E164-4941-9846-722ACF2FCCA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A04EEDD9-E164-4941-9846-722ACF2FCCA1}.Debug|Any CPU.ActiveCfg = Release|Any CPU
{A04EEDD9-E164-4941-9846-722ACF2FCCA1}.Debug|Any CPU.Build.0 = Release|Any CPU
{A04EEDD9-E164-4941-9846-722ACF2FCCA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A04EEDD9-E164-4941-9846-722ACF2FCCA1}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
Expand Down
267 changes: 0 additions & 267 deletions PhotoShopFileType/Editor/PSDEditorWindow.cs
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions PhotoShopFileType/PSDModule
Open in desktop
Submodule PSDModule added at aec84e
72 changes: 42 additions & 30 deletions PhotoShopFileType/PhotoShop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PhotoShop</RootNamespace>
<AssemblyName>PhotoShop</AssemblyName>
<AssemblyName>PhotoShopImporter</AssemblyName>
<SignAssembly>false</SignAssembly>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
Expand Down Expand Up @@ -41,40 +41,52 @@
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="UnityEditor">
<HintPath>C:\Program Files (x86)\Unity\Editor\Data\Managed\UnityEditor.dll</HintPath>
<HintPath>..\..\..\..\Program Files\Unity\Editor\Data\Managed\UnityEditor.dll</HintPath>
</Reference>
<Reference Include="UnityEngine">
<HintPath>C:\Program Files (x86)\Unity\Editor\Data\Managed\UnityEngine.dll</HintPath>
<HintPath>..\..\..\..\Program Files\Unity\Editor\Data\Managed\UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UI">
<HintPath>..\..\..\..\Program Files\Unity\Editor\Data\UnityExtensions\Unity\GUISystem\UnityEngine.UI.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Editor\PSDEditorWindow.cs" />
<Compile Include="PSDModule\Editor\Reconstructor\IPsdConstructor.cs" />
<Compile Include="PSDModule\Editor\Reconstructor\PsdBuilder.cs" />
<Compile Include="PSDModule\Editor\Reconstructor\SpriteConstructor.cs" />
<Compile Include="PSDModule\Editor\Reconstructor\UiImgConstructor.cs" />
<Compile Include="PSDModule\Editor\PSDEditorWindow.cs" />
<Compile Include="PSDModule\Editor\PSDExporter.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="PsdFile\Exceptions.cs" />
<Compile Include="PsdFile\ImageResource.cs" />
<Compile Include="PsdFile\ImageResources\AlphaChannelNames.cs" />
<Compile Include="PsdFile\ImageResources\RawImageResource.cs" />
<Compile Include="PsdFile\ImageResources\ResolutionInfo.cs" />
<Compile Include="PsdFile\ImageResources\Thumbnail.cs" />
<Compile Include="PsdFile\ImageResources\UnicodeAlphaNames.cs" />
<Compile Include="PsdFile\ImageResources\VersionInfo.cs" />
<Compile Include="PsdFile\Layers\BlendingRanges.cs" />
<Compile Include="PsdFile\Layers\Channel.cs" />
<Compile Include="PsdFile\Layers\Layer.cs" />
<Compile Include="PsdFile\Layers\LayerInfo.cs" />
<Compile Include="PsdFile\Layers\LayerInfo\LayerSectionInfo.cs" />
<Compile Include="PsdFile\Layers\LayerInfo\LayerUnicodeName.cs" />
<Compile Include="PsdFile\Layers\LayerInfo\RawLayerInfo.cs" />
<Compile Include="PsdFile\Layers\Mask.cs" />
<Compile Include="PsdFile\PsdBinaryReader.cs" />
<Compile Include="PsdFile\PsdBinaryWriter.cs" />
<Compile Include="PsdFile\PsdBlendMode.cs" />
<Compile Include="PsdFile\PsdBlockLengthWriter.cs" />
<Compile Include="PsdFile\PsdFile.cs" />
<Compile Include="PsdFile\RleReader.cs" />
<Compile Include="PsdFile\RleRowLengths.cs" />
<Compile Include="PsdFile\RleWriter.cs" />
<Compile Include="PsdFile\Util.cs" />
<Compile Include="PSDModule\Editor\PsdExportSettings.cs" />
<Compile Include="PSDModule\Editor\PsdFileInfo.cs" />
<Compile Include="PSDModule\Editor\PSDLayerGroupInfo.cs" />
<Compile Include="PSDModule\Editor\PSDPostProcessor.cs" />
<Compile Include="PSDModule\PsdFile\Exceptions.cs" />
<Compile Include="PSDModule\PsdFile\ImageResource.cs" />
<Compile Include="PSDModule\PsdFile\ImageResources\AlphaChannelNames.cs" />
<Compile Include="PSDModule\PsdFile\ImageResources\RawImageResource.cs" />
<Compile Include="PSDModule\PsdFile\ImageResources\ResolutionInfo.cs" />
<Compile Include="PSDModule\PsdFile\ImageResources\Thumbnail.cs" />
<Compile Include="PSDModule\PsdFile\ImageResources\UnicodeAlphaNames.cs" />
<Compile Include="PSDModule\PsdFile\ImageResources\VersionInfo.cs" />
<Compile Include="PSDModule\PsdFile\Layers\BlendingRanges.cs" />
<Compile Include="PSDModule\PsdFile\Layers\Channel.cs" />
<Compile Include="PSDModule\PsdFile\Layers\Layer.cs" />
<Compile Include="PSDModule\PsdFile\Layers\LayerInfo.cs" />
<Compile Include="PSDModule\PsdFile\Layers\LayerInfo\LayerSectionInfo.cs" />
<Compile Include="PSDModule\PsdFile\Layers\LayerInfo\LayerUnicodeName.cs" />
<Compile Include="PSDModule\PsdFile\Layers\LayerInfo\RawLayerInfo.cs" />
<Compile Include="PSDModule\PsdFile\Layers\Mask.cs" />
<Compile Include="PSDModule\PsdFile\PsdBinaryReader.cs" />
<Compile Include="PSDModule\PsdFile\PsdBinaryWriter.cs" />
<Compile Include="PSDModule\PsdFile\PsdBlendMode.cs" />
<Compile Include="PSDModule\PsdFile\PsdBlockLengthWriter.cs" />
<Compile Include="PSDModule\PsdFile\PsdFile.cs" />
<Compile Include="PSDModule\PsdFile\RleReader.cs" />
<Compile Include="PSDModule\PsdFile\RleRowLengths.cs" />
<Compile Include="PSDModule\PsdFile\RleWriter.cs" />
<Compile Include="PSDModule\PsdFile\Util.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources.resx">
Expand All @@ -86,7 +98,7 @@
<ItemGroup />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy "$(TargetPath)" "z:\Unity\projects\PSDFiles\Assets\PSDSprites\Scripts\" /Y /R</PostBuildEvent>
<PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)bin" /Y /R</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
Loading