Skip to content

Add ss7.1 #144

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

Draft
Naruto wants to merge 10 commits into
base: develop
Choose a base branch
from
Draft

Add ss7.1 #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3ee4330
SS7.1追加機能の実装
Kurooka Feb 9, 2023
57d8517
コンバーター側のネームスペース変更
Kurooka Feb 9, 2023
0ce1084
フォントデータの追加
Kurooka Feb 9, 2023
bc8a739
ヘッダーファイルのパスを変更した
SpriteStudio Feb 9, 2023
f4c028f
不要ファイルの削除
Kurooka Feb 10, 2023
2a0c9fc
フォントリソースの解放などの修正
Kurooka Feb 10, 2023
3abab8e
テクスチャ作成に関するstdoutへのデバッグ出力をカット
May 31, 2023
a395a86
Revert "テクスチャ作成に関するstdoutへのデバッグ出力をカット"
May 31, 2023
22fe55d
一時デバッグログの解除
May 31, 2023
d3d0e86
Mac デフォルトのターゲットOSバージョンを明示 → 10.15
May 31, 2023
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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,6 @@ Build/Converter/cppfs/
Build/Ss6ConverterGUI/build-Ss6ConverterGUI-Desktop_Qt_5_15_2_clang_64bit-Debug/
Build/Ss6ConverterGUI/build-Ss6ConverterGUI-Desktop_Qt_5_15_2_clang_64bit-Debug/
Build/Ss6ConverterGUI/build-Ss6ConverterGUI-Desktop_Qt_5_15_2_clang_64bit-Release/
Build/Converter/flatbuffers/_build/
Build/Converter/flatbuffers/tests/FlatBuffers.Test/
Build/vcpkg/
6 changes: 3 additions & 3 deletions Build/Converter/BackGroudRender.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@



static spritestudio6::SSTextureFactory* texfactory = nullptr;
static SpriteStudio::SSTextureFactory* texfactory = nullptr;


GLuint FramebufferName = 0;
Expand Down Expand Up @@ -87,8 +87,8 @@ bool ConverterOpenGLInit()
isGPUInit = true;


spritestudio6::SsCurrentRenderer::SetCurrentRender(new spritestudio6::SsRenderGL());
texfactory = new spritestudio6::SSTextureFactory(new spritestudio6::SSTextureGL());
SpriteStudio::SsCurrentRenderer::SetCurrentRender(new SpriteStudio::SsRenderGL());
texfactory = new SpriteStudio::SSTextureFactory(new SpriteStudio::SSTextureGL());

glGenFramebuffers(1, &FramebufferName);
glBindFramebuffer(GL_FRAMEBUFFER, FramebufferName);
Expand Down
4 changes: 4 additions & 0 deletions Build/Converter/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,8 @@ if(WIN32 OR APPLE)
${CMAKE_CURRENT_SOURCE_DIR}/../../Common/Drawer/ssplayer_render_gl.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../../Common/Drawer/ssplayer_shader_gl.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../../Common/Helper/OpenGL/SSTextureGL.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../../Common/Drawer/ssopenglninesdrawer.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../../Common/Drawer/ssopenglshapedrawer.cpp
)

list(APPEND Ss6Converter_HEADERS
Expand All @@ -179,6 +181,8 @@ if(WIN32 OR APPLE)
${CMAKE_CURRENT_SOURCE_DIR}/../../Common/Drawer/ssplayer_shader_gl.h
${CMAKE_CURRENT_SOURCE_DIR}/../../Common/Helper/OpenGL/SSTextureGL.h
${CMAKE_CURRENT_SOURCE_DIR}/../../Common/Helper/stb_image_write.h
${CMAKE_CURRENT_SOURCE_DIR}/../../Common/Drawer/ssopenglninesdrawer.h
${CMAKE_CURRENT_SOURCE_DIR}/../../Common/Drawer/ssopenglshapedrawer.h
)

include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../Common/Drawer)
Expand Down
2 changes: 1 addition & 1 deletion Build/Converter/LumpExporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ static std::string encode(const std::string& str, StringEncoding encoding)
{
switch (encoding) {
case UTF8: return str;
case SJIS: return spritestudio6::SsCharConverter::utf8_to_sjis(str); // TODO:
case SJIS: return SpriteStudio::SsCharConverter::utf8_to_sjis(str); // TODO:
default:
break;
}
Expand Down
346 changes: 173 additions & 173 deletions Build/Converter/main.cpp
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Build/Converter/simpleFileLogger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Logger
std::string OSLocaleString(std::string str)
{
#if _WIN32
str = spritestudio6::SsCharConverter::sjis_to_utf8(str);
str = SpriteStudio::SsCharConverter::sjis_to_utf8(str);
#endif
return str;
}
Expand Down
2 changes: 1 addition & 1 deletion Build/Converter/sspkg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

using json = nlohmann::json;

using sscc = spritestudio6::SsCharConverter;
using sscc = SpriteStudio::SsCharConverter;

int CreateZipFile(std::string zippath , std::vector<std::string> paths , std::string remove_path )
{
Expand Down
Binary file added Build/TestData/allAttributeV7/9slice_64tile.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.
62 changes: 62 additions & 0 deletions Build/TestData/allAttributeV7/NewEffect.ssee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<SpriteStudioEffect version="2.00.00">
<name>NewEffect</name>
<exportPath></exportPath>
<effectData>
<lockRandSeed>0</lockRandSeed>
<isLockRandSeed>0</isLockRandSeed>
<fps>30</fps>
<bgcolor>FF000000</bgcolor>
<renderVersion>2</renderVersion>
<layoutScaleX>100</layoutScaleX>
<layoutScaleY>100</layoutScaleY>
<nodeList>
<node>
<name>Root</name>
<type>Root</type>
<arrayIndex>0</arrayIndex>
<parentIndex>-1</parentIndex>
<visible>1</visible>
</node>
<node>
<name>Emitter_1</name>
<type>Emmiter</type>
<arrayIndex>1</arrayIndex>
<parentIndex>0</parentIndex>
<visible>1</visible>
<behavior>
<CellName>NewCell_9</CellName>
<CellMapName>color_bar.ssce</CellMapName>
<BlendType>Add</BlendType>
<list>
<value name="Basic">
<name>Basic</name>
<priority>64</priority>
<maximumParticle>20</maximumParticle>
<attimeCreate>1</attimeCreate>
<interval>1</interval>
<lifetime>30</lifetime>
<speed value="5" subvalue="5" />
<lifespan value="30" subvalue="30" />
<angle>0</angle>
<angleVariance>45</angleVariance>
</value>
</list>
</behavior>
</node>
<node>
<name>Particle_1</name>
<type>Particle</type>
<arrayIndex>2</arrayIndex>
<parentIndex>1</parentIndex>
<visible>1</visible>
<behavior>
<CellName></CellName>
<CellMapName></CellMapName>
<BlendType>Add</BlendType>
<list />
</behavior>
</node>
</nodeList>
</effectData>
</SpriteStudioEffect>
252 changes: 252 additions & 0 deletions Build/TestData/allAttributeV7/allAttributeV7.sspj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,252 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<SpriteStudioProject version="2.01.00" editorVersion="7.1.0">
<name>allAttributeV7</name>
<exportPath></exportPath>
<settings>
<animeBaseDirectory></animeBaseDirectory>
<cellMapBaseDirectory></cellMapBaseDirectory>
<imageBaseDirectory></imageBaseDirectory>
<effectBaseDirectory></effectBaseDirectory>
<exportBaseDirectory>Export</exportBaseDirectory>
<queryExportBaseDirectory>1</queryExportBaseDirectory>
<copyWhenImportImageIsOutside>1</copyWhenImportImageIsOutside>
<exportAnimeFileFormat>SSAX</exportAnimeFileFormat>
<exportCellMapFileFormat>invalid</exportCellMapFileFormat>
<exportCellMap>0</exportCellMap>
<copyImageWhenExportCellmap>1</copyImageWhenExportCellmap>
<ssConverterOptions></ssConverterOptions>
<player>any</player>
<signal></signal>
<strictVer4>0</strictVer4>
<dontUseMatrixForTransform>0</dontUseMatrixForTransform>
<rootPartFunctionAsVer4>0</rootPartFunctionAsVer4>
<interpolateColorBlendAsVer4>1</interpolateColorBlendAsVer4>
<interpolateVertexOffsetAsVer4>1</interpolateVertexOffsetAsVer4>
<restrictXYAsInteger>0</restrictXYAsInteger>
<inheritRatesNoKeySave>1</inheritRatesNoKeySave>
<availableInterpolationTypes>
<item>none</item>
<item>linear</item>
<item>hermite</item>
<item>bezier</item>
<item>acceleration</item>
<item>deceleration</item>
</availableInterpolationTypes>
<availableAttributes>
<item>CELL</item>
<item>POSX</item>
<item>POSY</item>
<item>POSZ</item>
<item>ROTX</item>
<item>ROTY</item>
<item>ROTZ</item>
<item>SCLX</item>
<item>SCLY</item>
<item>LSCX</item>
<item>LSCY</item>
<item>ALPH</item>
<item>LALP</item>
<item>PRIO</item>
<item>IFLH</item>
<item>IFLV</item>
<item>FLPH</item>
<item>FLPV</item>
<item>HIDE</item>
<item>PCOL</item>
<item>VCOL</item>
<item>VERT</item>
<item>PVTX</item>
<item>PVTY</item>
<item>ANCX</item>
<item>ANCY</item>
<item>SIZX</item>
<item>SIZY</item>
<item>UVTX</item>
<item>UVTY</item>
<item>UVRZ</item>
<item>UVSX</item>
<item>UVSY</item>
<item>BNDR</item>
<item>MASK</item>
<item>USER</item>
<item>IPRM</item>
<item>EFCT</item>
</availableAttributes>
<availableFeatures>
<value>bone</value>
<value>effect</value>
<value>mask</value>
<value>mesh</value>
<value>nines</value>
<value>shape</value>
<value>sound</value>
<value>text</value>
</availableFeatures>
<defaultSetAttributes>
<item>POSX</item>
<item>POSY</item>
<item>ROTZ</item>
<item>PRIO</item>
<item>HIDE</item>
</defaultSetAttributes>
<wrapMode>clamp</wrapMode>
<filterMode>linear</filterMode>
<interpolationType>linear</interpolationType>
<coordUnit>rate</coordUnit>
<renderingSettings>
<outputFolder></outputFolder>
<outputType>AVI</outputType>
<bgColor>FF606060</bgColor>
<addAnimeName>0</addAnimeName>
<addTimeStamp>0</addTimeStamp>
<addAlphaChanel>1</addAlphaChanel>
<imageSizeRatioW>100</imageSizeRatioW>
<imageSizeRatioH>100</imageSizeRatioH>
<imageSizeRatioFix>1</imageSizeRatioFix>
<imageSizeIsPixcel>1</imageSizeIsPixcel>
<imageSizeExpansion0>0</imageSizeExpansion0>
<imageSizeExpansion1>0</imageSizeExpansion1>
<imageSizeExpansion2>0</imageSizeExpansion2>
<imageSizeExpansion3>0</imageSizeExpansion3>
<webpSettings>
<lossyType>lossless</lossyType>
<qualityFactor>75</qualityFactor>
<compMethod>4</compMethod>
<useLoselessPreset>1</useLoselessPreset>
<losslessPreset>0</losslessPreset>
</webpSettings>
<mp4Settings>
<bitrate>1536000</bitrate>
</mp4Settings>
</renderingSettings>
<effectSettings>
<gridSize>50</gridSize>
</effectSettings>
<cellTags />
<useDecimalDigit>2</useDecimalDigit>
<opacifyOutsideCanvasFrame>1</opacifyOutsideCanvasFrame>
<convertImageToPMA>0</convertImageToPMA>
<blendImageAsPMA>0</blendImageAsPMA>
<unpremultiplyAlpha>0</unpremultiplyAlpha>
<vertexAnimeFloat>0</vertexAnimeFloat>
<allowNPOT>0</allowNPOT>
<maxLoadableImageWidth>8192</maxLoadableImageWidth>
<maxLoadableImageHeight>8192</maxLoadableImageHeight>
<maxLoadableImageFileSize>73400320</maxLoadableImageFileSize>
<instanceStackMax>100</instanceStackMax>
<selectedAttrSelPreset>0</selectedAttrSelPreset>
<attrSelPresetNameA></attrSelPresetNameA>
<attrSelPresetA />
<attrSelPresetNameB></attrSelPresetNameB>
<attrSelPresetB />
<attrSelPresetNameC></attrSelPresetNameC>
<attrSelPresetC />
<attrSelPresetNameD></attrSelPresetNameD>
<attrSelPresetD />
<attrSelPresetNameE></attrSelPresetNameE>
<attrSelPresetE />
<attrSelPresetNameF></attrSelPresetNameF>
<attrSelPresetF />
<attrSelPresetNameG></attrSelPresetNameG>
<attrSelPresetG />
<attrSelPresetNameH></attrSelPresetNameH>
<attrSelPresetH />
<attrSelPresetNameI></attrSelPresetNameI>
<attrSelPresetI />
<attrSelPresetNameJ></attrSelPresetNameJ>
<attrSelPresetJ />
</settings>
<animeSettings>
<fps>60</fps>
<frameCount>60</frameCount>
<sortMode>prio</sortMode>
<canvasSize>1280 720</canvasSize>
<pivot>0 0</pivot>
<bgColor>FF323232</bgColor>
<gridSize>32</gridSize>
<gridColor>FF808080</gridColor>
<ik_depth>3</ik_depth>
<startFrame>0</startFrame>
<endFrame>59</endFrame>
<bgSettings>
<value>
<imagePath></imagePath>
<imageDisp>1</imageDisp>
<imageOffset>0 0</imageOffset>
<imageCanvas>0 0</imageCanvas>
<imagePivot>0 0</imagePivot>
</value>
<value>
<imagePath></imagePath>
<imageDisp>1</imageDisp>
<imageOffset>0 0</imageOffset>
<imageCanvas>0 0</imageCanvas>
<imagePivot>0 0</imagePivot>
</value>
</bgSettings>
<outStartNum>0</outStartNum>
</animeSettings>
<texPackSettings>
<maxSize>4096 4096</maxSize>
<forcePo2>1</forcePo2>
<forceSquare>0</forceSquare>
<margin>0</margin>
<padding>1</padding>
</texPackSettings>
<cellmapNames>
<value>color_bar.ssce</value>
</cellmapNames>
<animepackNames>
<value>alpha.ssae</value>
<value>boundr.ssae</value>
<value>cell.ssae</value>
<value>deform.ssae</value>
<value>deform_bone.ssae</value>
<value>easing.ssae</value>
<value>effect.ssae</value>
<value>hide.ssae</value>
<value>imgflip.ssae</value>
<value>instance.ssae</value>
<value>instance_flag.ssae</value>
<value>iptype.ssae</value>
<value>loalpha.ssae</value>
<value>loscl.ssae</value>
<value>mask.ssae</value>
<value>partsColor.ssae</value>
<value>pivot.ssae</value>
<value>pos.ssae</value>
<value>prio.ssae</value>
<value>rot.ssae</value>
<value>scl.ssae</value>
<value>setupdata.ssae</value>
<value>size.ssae</value>
<value>startend.ssae</value>
<value>textureChange.ssae</value>
<value>userdata.ssae</value>
<value>uvs.ssae</value>
<value>uvt.ssae</value>
<value>vertex.ssae</value>
</animepackNames>
<effectFileNames>
<value>NewEffect.ssee</value>
</effectFileNames>
<ExternalTextures>
<files>
<value>
<PathName>9slice_64tile.png</PathName>
<index>0</index>
<flags>0</flags>
</value>
</files>
</ExternalTextures>
<lastAnimeFile>easing.ssae</lastAnimeFile>
<lastAnimeName>anime_1</lastAnimeName>
<lastPart>イーズイン</lastPart>
<lastCellMapFile>color_bar.ssce</lastCellMapFile>
<lastCell>NewCell_9</lastCell>
<lastCharMapFile></lastCharMapFile>
<lastEffectFile>NewEffect.ssee</lastEffectFile>
<setupmode>0</setupmode>
<expandAnimation />
<expandSequence />
</SpriteStudioProject>
Loading