mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-02-04 14:24:53 +08:00
spine-cpp is no longer supported. Use spine-c.
This commit is contained in:
parent
e454021503
commit
5aa58c5a9b
@ -1,156 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<?fileVersion 4.0.0?>
|
|
||||||
|
|
||||||
<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
|
|
||||||
<storageModule moduleId="org.eclipse.cdt.core.settings">
|
|
||||||
<cconfiguration id="cdt.managedbuild.config.gnu.mingw.exe.debug.804921154">
|
|
||||||
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.debug.804921154" moduleId="org.eclipse.cdt.core.settings" name="Debug">
|
|
||||||
<externalSettings>
|
|
||||||
<externalSetting>
|
|
||||||
<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/spine-cpp/include"/>
|
|
||||||
<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/spine-cpp/Debug"/>
|
|
||||||
<entry flags="" kind="libraryFile" name="spine-cpp" srcPrefixMapping="" srcRootPath=""/>
|
|
||||||
</externalSetting>
|
|
||||||
</externalSettings>
|
|
||||||
<extensions>
|
|
||||||
<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
|
|
||||||
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
|
||||||
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
|
||||||
</extensions>
|
|
||||||
</storageModule>
|
|
||||||
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
|
||||||
<configuration artifactExtension="a" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.staticLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.mingw.exe.debug.804921154" name="Debug" parent="cdt.managedbuild.config.gnu.mingw.exe.debug">
|
|
||||||
<folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.debug.804921154." name="/" resourcePath="">
|
|
||||||
<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.debug.1440800193" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.debug">
|
|
||||||
<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.debug.797088945" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.debug"/>
|
|
||||||
<builder buildPath="${workspace_loc:/cpp-generic/Debug}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.1296203303" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
|
|
||||||
<tool id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug.1487845826" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug">
|
|
||||||
<option id="gnu.both.asm.option.include.paths.1112183959" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths"/>
|
|
||||||
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.339251819" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
|
|
||||||
</tool>
|
|
||||||
<tool id="cdt.managedbuild.tool.gnu.archiver.mingw.base.1265146112" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.mingw.base"/>
|
|
||||||
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.debug.1111247076" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.debug">
|
|
||||||
<option id="gnu.cpp.compiler.mingw.exe.debug.option.optimization.level.1284147695" name="Optimization Level" superClass="gnu.cpp.compiler.mingw.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
|
|
||||||
<option id="gnu.cpp.compiler.mingw.exe.debug.option.debugging.level.1570084302" name="Debug Level" superClass="gnu.cpp.compiler.mingw.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
|
|
||||||
<option id="gnu.cpp.compiler.option.include.paths.934414518" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
|
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/include}""/>
|
|
||||||
</option>
|
|
||||||
<option id="gnu.cpp.compiler.option.warnings.allwarn.2053349441" name="All warnings (-Wall)" superClass="gnu.cpp.compiler.option.warnings.allwarn" value="true" valueType="boolean"/>
|
|
||||||
<option id="gnu.cpp.compiler.option.preprocessor.def.1463772359" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def"/>
|
|
||||||
<option id="gnu.cpp.compiler.option.warnings.pedantic.762186482" name="Pedantic (-pedantic)" superClass="gnu.cpp.compiler.option.warnings.pedantic" value="false" valueType="boolean"/>
|
|
||||||
<option id="gnu.cpp.compiler.option.warnings.extrawarn.2104256953" name="Extra warnings (-Wextra)" superClass="gnu.cpp.compiler.option.warnings.extrawarn" value="false" valueType="boolean"/>
|
|
||||||
<option id="gnu.cpp.compiler.option.warnings.wconversion.2109535628" name="Implicit conversion warnings (-Wconversion)" superClass="gnu.cpp.compiler.option.warnings.wconversion" value="false" valueType="boolean"/>
|
|
||||||
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1445618618" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
|
|
||||||
</tool>
|
|
||||||
<tool id="cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.debug.344670633" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.debug">
|
|
||||||
<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.mingw.exe.debug.option.optimization.level.1455011160" name="Optimization Level" superClass="gnu.c.compiler.mingw.exe.debug.option.optimization.level" valueType="enumerated"/>
|
|
||||||
<option id="gnu.c.compiler.mingw.exe.debug.option.debugging.level.242859432" name="Debug Level" superClass="gnu.c.compiler.mingw.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
|
|
||||||
<option id="gnu.c.compiler.option.include.paths.991681732" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths"/>
|
|
||||||
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.753970334" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
|
|
||||||
</tool>
|
|
||||||
<tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.exe.debug.913061526" name="MinGW C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.exe.debug"/>
|
|
||||||
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.debug.1697744244" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.debug">
|
|
||||||
<option id="gnu.cpp.link.option.paths.1569606245" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths"/>
|
|
||||||
<option id="gnu.cpp.link.option.libs.43946887" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs"/>
|
|
||||||
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.241907813" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
|
|
||||||
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
|
|
||||||
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
|
|
||||||
</inputType>
|
|
||||||
</tool>
|
|
||||||
</toolChain>
|
|
||||||
</folderInfo>
|
|
||||||
<sourceEntries>
|
|
||||||
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
|
|
||||||
</sourceEntries>
|
|
||||||
</configuration>
|
|
||||||
</storageModule>
|
|
||||||
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
|
|
||||||
</cconfiguration>
|
|
||||||
<cconfiguration id="cdt.managedbuild.config.gnu.mingw.exe.release.165980790">
|
|
||||||
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.release.165980790" moduleId="org.eclipse.cdt.core.settings" name="Release">
|
|
||||||
<externalSettings/>
|
|
||||||
<extensions>
|
|
||||||
<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
|
|
||||||
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
|
||||||
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
|
||||||
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
|
||||||
</extensions>
|
|
||||||
</storageModule>
|
|
||||||
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
|
||||||
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.mingw.exe.release.165980790" name="Release" parent="cdt.managedbuild.config.gnu.mingw.exe.release">
|
|
||||||
<folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.release.165980790." name="/" resourcePath="">
|
|
||||||
<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.release.1562355563" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.release">
|
|
||||||
<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.release.532329562" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.release"/>
|
|
||||||
<builder buildPath="${workspace_loc:/cpp-generic/Release}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.1379215371" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
|
|
||||||
<tool id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.release.1078317821" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.exe.release">
|
|
||||||
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1307271372" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
|
|
||||||
</tool>
|
|
||||||
<tool id="cdt.managedbuild.tool.gnu.archiver.mingw.base.687579974" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.mingw.base"/>
|
|
||||||
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.release.1002197508" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.release">
|
|
||||||
<option id="gnu.cpp.compiler.mingw.exe.release.option.optimization.level.1999365576" name="Optimization Level" superClass="gnu.cpp.compiler.mingw.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
|
|
||||||
<option id="gnu.cpp.compiler.mingw.exe.release.option.debugging.level.1315352624" name="Debug Level" superClass="gnu.cpp.compiler.mingw.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
|
|
||||||
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.708689179" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
|
|
||||||
</tool>
|
|
||||||
<tool id="cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.release.1909158038" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.release">
|
|
||||||
<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.mingw.exe.release.option.optimization.level.1039575328" name="Optimization Level" superClass="gnu.c.compiler.mingw.exe.release.option.optimization.level" valueType="enumerated"/>
|
|
||||||
<option id="gnu.c.compiler.mingw.exe.release.option.debugging.level.1692329610" name="Debug Level" superClass="gnu.c.compiler.mingw.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
|
|
||||||
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.448919077" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
|
|
||||||
</tool>
|
|
||||||
<tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.exe.release.1949432007" name="MinGW C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.exe.release"/>
|
|
||||||
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.release.169613949" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.release">
|
|
||||||
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.2036848420" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
|
|
||||||
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
|
|
||||||
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
|
|
||||||
</inputType>
|
|
||||||
</tool>
|
|
||||||
</toolChain>
|
|
||||||
</folderInfo>
|
|
||||||
<sourceEntries>
|
|
||||||
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
|
|
||||||
</sourceEntries>
|
|
||||||
</configuration>
|
|
||||||
</storageModule>
|
|
||||||
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
|
|
||||||
</cconfiguration>
|
|
||||||
</storageModule>
|
|
||||||
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
|
||||||
<project id="cpp-generic.cdt.managedbuild.target.gnu.mingw.exe.530358707" name="Executable" projectType="cdt.managedbuild.target.gnu.mingw.exe"/>
|
|
||||||
</storageModule>
|
|
||||||
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
|
|
||||||
<storageModule moduleId="refreshScope" versionNumber="2">
|
|
||||||
<configuration configurationName="Release">
|
|
||||||
<resource resourceType="PROJECT" workspacePath="/cpp-generic"/>
|
|
||||||
</configuration>
|
|
||||||
<configuration configurationName="Debug">
|
|
||||||
<resource resourceType="PROJECT" workspacePath="/spine-cpp"/>
|
|
||||||
</configuration>
|
|
||||||
</storageModule>
|
|
||||||
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
|
|
||||||
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
|
|
||||||
<buildTargets>
|
|
||||||
<target name="moo" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
|
|
||||||
<buildCommand>make</buildCommand>
|
|
||||||
<buildArguments/>
|
|
||||||
<buildTarget>moo</buildTarget>
|
|
||||||
<stopOnError>true</stopOnError>
|
|
||||||
<useDefaultCommand>true</useDefaultCommand>
|
|
||||||
<runAllBuilders>true</runAllBuilders>
|
|
||||||
</target>
|
|
||||||
</buildTargets>
|
|
||||||
</storageModule>
|
|
||||||
<storageModule moduleId="scannerConfiguration">
|
|
||||||
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
|
|
||||||
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.release.165980790;cdt.managedbuild.config.gnu.mingw.exe.release.165980790.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.release.1002197508;cdt.managedbuild.tool.gnu.cpp.compiler.input.708689179">
|
|
||||||
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
|
|
||||||
</scannerConfigBuildInfo>
|
|
||||||
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.804921154;cdt.managedbuild.config.gnu.mingw.exe.debug.804921154.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.debug.1111247076;cdt.managedbuild.tool.gnu.cpp.compiler.input.1445618618">
|
|
||||||
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
|
|
||||||
</scannerConfigBuildInfo>
|
|
||||||
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.release.165980790;cdt.managedbuild.config.gnu.mingw.exe.release.165980790.;cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.release.1909158038;cdt.managedbuild.tool.gnu.c.compiler.input.448919077">
|
|
||||||
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
|
|
||||||
</scannerConfigBuildInfo>
|
|
||||||
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.804921154;cdt.managedbuild.config.gnu.mingw.exe.debug.804921154.;cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.debug.344670633;cdt.managedbuild.tool.gnu.c.compiler.input.753970334">
|
|
||||||
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
|
|
||||||
</scannerConfigBuildInfo>
|
|
||||||
</storageModule>
|
|
||||||
</cproject>
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<projectDescription>
|
|
||||||
<name>spine-cpp</name>
|
|
||||||
<comment></comment>
|
|
||||||
<projects>
|
|
||||||
</projects>
|
|
||||||
<buildSpec>
|
|
||||||
<buildCommand>
|
|
||||||
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
|
|
||||||
<triggers>clean,full,incremental,</triggers>
|
|
||||||
<arguments>
|
|
||||||
</arguments>
|
|
||||||
</buildCommand>
|
|
||||||
<buildCommand>
|
|
||||||
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
|
|
||||||
<triggers>full,incremental,</triggers>
|
|
||||||
<arguments>
|
|
||||||
</arguments>
|
|
||||||
</buildCommand>
|
|
||||||
</buildSpec>
|
|
||||||
<natures>
|
|
||||||
<nature>org.eclipse.cdt.core.cnature</nature>
|
|
||||||
<nature>org.eclipse.cdt.core.ccnature</nature>
|
|
||||||
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
|
|
||||||
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
|
|
||||||
</natures>
|
|
||||||
</projectDescription>
|
|
||||||
@ -1,68 +0,0 @@
|
|||||||
eclipse.preferences.version=1
|
|
||||||
org.eclipse.cdt.codan.checkers.errnoreturn=Warning
|
|
||||||
org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
|
|
||||||
org.eclipse.cdt.codan.checkers.errreturnvalue=Error
|
|
||||||
org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
|
|
||||||
org.eclipse.cdt.codan.checkers.noreturn=Error
|
|
||||||
org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=-Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.CatchByReference=Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={fileScope\=>inclusion\=>(),exclusion\=>("json/*"),launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.InvalidArguments=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.OverloadProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=Warning
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")}
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=Error
|
|
||||||
org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
|
|
||||||
useParentScope=false
|
|
||||||
@ -1,163 +0,0 @@
|
|||||||
eclipse.preferences.version=1
|
|
||||||
org.eclipse.cdt.core.formatter.alignment_for_arguments_in_method_invocation=16
|
|
||||||
org.eclipse.cdt.core.formatter.alignment_for_assignment=16
|
|
||||||
org.eclipse.cdt.core.formatter.alignment_for_base_clause_in_type_declaration=80
|
|
||||||
org.eclipse.cdt.core.formatter.alignment_for_binary_expression=16
|
|
||||||
org.eclipse.cdt.core.formatter.alignment_for_compact_if=16
|
|
||||||
org.eclipse.cdt.core.formatter.alignment_for_conditional_expression=34
|
|
||||||
org.eclipse.cdt.core.formatter.alignment_for_conditional_expression_chain=18
|
|
||||||
org.eclipse.cdt.core.formatter.alignment_for_constructor_initializer_list=49
|
|
||||||
org.eclipse.cdt.core.formatter.alignment_for_declarator_list=16
|
|
||||||
org.eclipse.cdt.core.formatter.alignment_for_enumerator_list=48
|
|
||||||
org.eclipse.cdt.core.formatter.alignment_for_expression_list=0
|
|
||||||
org.eclipse.cdt.core.formatter.alignment_for_expressions_in_array_initializer=16
|
|
||||||
org.eclipse.cdt.core.formatter.alignment_for_member_access=0
|
|
||||||
org.eclipse.cdt.core.formatter.alignment_for_overloaded_left_shift_chain=16
|
|
||||||
org.eclipse.cdt.core.formatter.alignment_for_parameters_in_method_declaration=16
|
|
||||||
org.eclipse.cdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
|
|
||||||
org.eclipse.cdt.core.formatter.brace_position_for_array_initializer=end_of_line
|
|
||||||
org.eclipse.cdt.core.formatter.brace_position_for_block=end_of_line
|
|
||||||
org.eclipse.cdt.core.formatter.brace_position_for_block_in_case=end_of_line
|
|
||||||
org.eclipse.cdt.core.formatter.brace_position_for_method_declaration=end_of_line
|
|
||||||
org.eclipse.cdt.core.formatter.brace_position_for_namespace_declaration=end_of_line
|
|
||||||
org.eclipse.cdt.core.formatter.brace_position_for_switch=end_of_line
|
|
||||||
org.eclipse.cdt.core.formatter.brace_position_for_type_declaration=end_of_line
|
|
||||||
org.eclipse.cdt.core.formatter.comment.min_distance_between_code_and_line_comment=1
|
|
||||||
org.eclipse.cdt.core.formatter.comment.never_indent_line_comments_on_first_column=true
|
|
||||||
org.eclipse.cdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=true
|
|
||||||
org.eclipse.cdt.core.formatter.compact_else_if=true
|
|
||||||
org.eclipse.cdt.core.formatter.continuation_indentation=2
|
|
||||||
org.eclipse.cdt.core.formatter.continuation_indentation_for_array_initializer=2
|
|
||||||
org.eclipse.cdt.core.formatter.format_guardian_clause_on_one_line=false
|
|
||||||
org.eclipse.cdt.core.formatter.indent_access_specifier_compare_to_type_header=false
|
|
||||||
org.eclipse.cdt.core.formatter.indent_access_specifier_extra_spaces=0
|
|
||||||
org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_access_specifier=true
|
|
||||||
org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_namespace_header=false
|
|
||||||
org.eclipse.cdt.core.formatter.indent_breaks_compare_to_cases=true
|
|
||||||
org.eclipse.cdt.core.formatter.indent_declaration_compare_to_template_header=false
|
|
||||||
org.eclipse.cdt.core.formatter.indent_empty_lines=false
|
|
||||||
org.eclipse.cdt.core.formatter.indent_statements_compare_to_block=true
|
|
||||||
org.eclipse.cdt.core.formatter.indent_statements_compare_to_body=true
|
|
||||||
org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_cases=true
|
|
||||||
org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_switch=false
|
|
||||||
org.eclipse.cdt.core.formatter.indentation.size=4
|
|
||||||
org.eclipse.cdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_new_line_after_template_declaration=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_new_line_before_colon_in_constructor_initializer_list=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_new_line_before_identifier_in_function_declaration=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_new_line_in_empty_block=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_assignment_operator=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_binary_operator=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_arguments=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_parameters=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_closing_brace_in_block=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_colon_in_base_clause=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_colon_in_case=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_colon_in_conditional=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_comma_in_base_types=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_comma_in_declarator_list=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_comma_in_expression_list=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_arguments=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_parameters=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_arguments=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_parameters=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_opening_bracket=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_exception_specification=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_postfix_operator=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_prefix_operator=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_question_in_conditional=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_semicolon_in_for=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_after_unary_operator=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_assignment_operator=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_binary_operator=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_arguments=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_parameters=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_closing_bracket=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_exception_specification=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_colon_in_base_clause=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_colon_in_case=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_colon_in_conditional=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_colon_in_default=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_comma_in_base_types=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_comma_in_declarator_list=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_comma_in_expression_list=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_arguments=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_parameters=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_arguments=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_parameters=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_block=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_namespace_declaration=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_opening_bracket=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_exception_specification=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_for=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_if=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_while=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_postfix_operator=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_prefix_operator=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_question_in_conditional=insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_semicolon=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_before_unary_operator=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_between_empty_brackets=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_exception_specification=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
|
|
||||||
org.eclipse.cdt.core.formatter.join_wrapped_lines=true
|
|
||||||
org.eclipse.cdt.core.formatter.keep_else_statement_on_same_line=false
|
|
||||||
org.eclipse.cdt.core.formatter.keep_empty_array_initializer_on_one_line=false
|
|
||||||
org.eclipse.cdt.core.formatter.keep_imple_if_on_one_line=true
|
|
||||||
org.eclipse.cdt.core.formatter.keep_then_statement_on_same_line=false
|
|
||||||
org.eclipse.cdt.core.formatter.lineSplit=130
|
|
||||||
org.eclipse.cdt.core.formatter.number_of_empty_lines_to_preserve=1
|
|
||||||
org.eclipse.cdt.core.formatter.put_empty_statement_on_new_line=true
|
|
||||||
org.eclipse.cdt.core.formatter.tabulation.char=tab
|
|
||||||
org.eclipse.cdt.core.formatter.tabulation.size=3
|
|
||||||
org.eclipse.cdt.core.formatter.use_tabs_only_for_leading_indentations=false
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
eclipse.preferences.version=1
|
|
||||||
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.debug.804921154/CPATH/delimiter=;
|
|
||||||
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.debug.804921154/CPATH/operation=remove
|
|
||||||
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.debug.804921154/CPLUS_INCLUDE_PATH/delimiter=;
|
|
||||||
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.debug.804921154/CPLUS_INCLUDE_PATH/operation=remove
|
|
||||||
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.debug.804921154/C_INCLUDE_PATH/delimiter=;
|
|
||||||
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.debug.804921154/C_INCLUDE_PATH/operation=remove
|
|
||||||
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.debug.804921154/append=true
|
|
||||||
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.debug.804921154/appendContributed=true
|
|
||||||
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.release.165980790/CPATH/delimiter=;
|
|
||||||
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.release.165980790/CPATH/operation=remove
|
|
||||||
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.release.165980790/CPLUS_INCLUDE_PATH/delimiter=;
|
|
||||||
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.release.165980790/CPLUS_INCLUDE_PATH/operation=remove
|
|
||||||
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.release.165980790/C_INCLUDE_PATH/delimiter=;
|
|
||||||
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.release.165980790/C_INCLUDE_PATH/operation=remove
|
|
||||||
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.release.165980790/append=true
|
|
||||||
environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.mingw.exe.release.165980790/appendContributed=true
|
|
||||||
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.mingw.exe.debug.804921154/append=true
|
|
||||||
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.mingw.exe.debug.804921154/appendContributed=true
|
|
||||||
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.mingw.exe.release.165980790/LIBRARY_PATH/delimiter=;
|
|
||||||
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.mingw.exe.release.165980790/LIBRARY_PATH/operation=remove
|
|
||||||
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.mingw.exe.release.165980790/append=true
|
|
||||||
environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.mingw.exe.release.165980790/appendContributed=true
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
eclipse.preferences.version=1
|
|
||||||
formatter_profile=_Nate
|
|
||||||
formatter_settings_version=1
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
eclipse.preferences.version=1
|
|
||||||
org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
#ifndef JSON_AUTOLINK_H_INCLUDED
|
|
||||||
# define JSON_AUTOLINK_H_INCLUDED
|
|
||||||
|
|
||||||
# include "config.h"
|
|
||||||
|
|
||||||
# ifdef JSON_IN_CPPTL
|
|
||||||
# include <cpptl/cpptl_autolink.h>
|
|
||||||
# endif
|
|
||||||
|
|
||||||
# if !defined(JSON_NO_AUTOLINK) && !defined(JSON_DLL_BUILD) && !defined(JSON_IN_CPPTL)
|
|
||||||
# define CPPTL_AUTOLINK_NAME "json"
|
|
||||||
# undef CPPTL_AUTOLINK_DLL
|
|
||||||
# ifdef JSON_DLL
|
|
||||||
# define CPPTL_AUTOLINK_DLL
|
|
||||||
# endif
|
|
||||||
# include "autolink.h"
|
|
||||||
# endif
|
|
||||||
|
|
||||||
#endif // JSON_AUTOLINK_H_INCLUDED
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
#ifndef JSON_CONFIG_H_INCLUDED
|
|
||||||
# define JSON_CONFIG_H_INCLUDED
|
|
||||||
|
|
||||||
/// If defined, indicates that json library is embedded in CppTL library.
|
|
||||||
//# define JSON_IN_CPPTL 1
|
|
||||||
|
|
||||||
/// If defined, indicates that json may leverage CppTL library
|
|
||||||
//# define JSON_USE_CPPTL 1
|
|
||||||
/// If defined, indicates that cpptl vector based map should be used instead of std::map
|
|
||||||
/// as Value container.
|
|
||||||
//# define JSON_USE_CPPTL_SMALLMAP 1
|
|
||||||
/// If defined, indicates that Json specific container should be used
|
|
||||||
/// (hash table & simple deque container with customizable allocator).
|
|
||||||
/// THIS FEATURE IS STILL EXPERIMENTAL!
|
|
||||||
//# define JSON_VALUE_USE_INTERNAL_MAP 1
|
|
||||||
/// Force usage of standard new/malloc based allocator instead of memory pool based allocator.
|
|
||||||
/// The memory pools allocator used optimization (initializing Value and ValueInternalLink
|
|
||||||
/// as if it was a POD) that may cause some validation tool to report errors.
|
|
||||||
/// Only has effects if JSON_VALUE_USE_INTERNAL_MAP is defined.
|
|
||||||
//# define JSON_USE_SIMPLE_INTERNAL_ALLOCATOR 1
|
|
||||||
|
|
||||||
/// If defined, indicates that Json use exception to report invalid type manipulation
|
|
||||||
/// instead of C assert macro.
|
|
||||||
# define JSON_USE_EXCEPTION 1
|
|
||||||
|
|
||||||
# ifdef JSON_IN_CPPTL
|
|
||||||
# include <cpptl/config.h>
|
|
||||||
# ifndef JSON_USE_CPPTL
|
|
||||||
# define JSON_USE_CPPTL 1
|
|
||||||
# endif
|
|
||||||
# endif
|
|
||||||
|
|
||||||
# ifdef JSON_IN_CPPTL
|
|
||||||
# define JSON_API CPPTL_API
|
|
||||||
# elif defined(JSON_DLL_BUILD)
|
|
||||||
# define JSON_API __declspec(dllexport)
|
|
||||||
# elif defined(JSON_DLL)
|
|
||||||
# define JSON_API __declspec(dllimport)
|
|
||||||
# else
|
|
||||||
# define JSON_API
|
|
||||||
# endif
|
|
||||||
|
|
||||||
#endif // JSON_CONFIG_H_INCLUDED
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
#ifndef CPPTL_JSON_FEATURES_H_INCLUDED
|
|
||||||
# define CPPTL_JSON_FEATURES_H_INCLUDED
|
|
||||||
|
|
||||||
# include "forwards.h"
|
|
||||||
|
|
||||||
namespace Json {
|
|
||||||
|
|
||||||
/** \brief Configuration passed to reader and writer.
|
|
||||||
* This configuration object can be used to force the Reader or Writer
|
|
||||||
* to behave in a standard conforming way.
|
|
||||||
*/
|
|
||||||
class JSON_API Features
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
/** \brief A configuration that allows all features and assumes all strings are UTF-8.
|
|
||||||
* - C & C++ comments are allowed
|
|
||||||
* - Root object can be any JSON value
|
|
||||||
* - Assumes Value strings are encoded in UTF-8
|
|
||||||
*/
|
|
||||||
static Features all();
|
|
||||||
|
|
||||||
/** \brief A configuration that is strictly compatible with the JSON specification.
|
|
||||||
* - Comments are forbidden.
|
|
||||||
* - Root object must be either an array or an object value.
|
|
||||||
* - Assumes Value strings are encoded in UTF-8
|
|
||||||
*/
|
|
||||||
static Features strictMode();
|
|
||||||
|
|
||||||
/** \brief Initialize the configuration like JsonConfig::allFeatures;
|
|
||||||
*/
|
|
||||||
Features();
|
|
||||||
|
|
||||||
/// \c true if comments are allowed. Default: \c true.
|
|
||||||
bool allowComments_;
|
|
||||||
|
|
||||||
/// \c true if root must be either an array or an object value. Default: \c false.
|
|
||||||
bool strictRoot_;
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace Json
|
|
||||||
|
|
||||||
#endif // CPPTL_JSON_FEATURES_H_INCLUDED
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
#ifndef JSON_FORWARDS_H_INCLUDED
|
|
||||||
# define JSON_FORWARDS_H_INCLUDED
|
|
||||||
|
|
||||||
# include "config.h"
|
|
||||||
|
|
||||||
namespace Json {
|
|
||||||
|
|
||||||
// writer.h
|
|
||||||
class FastWriter;
|
|
||||||
class StyledWriter;
|
|
||||||
|
|
||||||
// reader.h
|
|
||||||
class Reader;
|
|
||||||
|
|
||||||
// features.h
|
|
||||||
class Features;
|
|
||||||
|
|
||||||
// value.h
|
|
||||||
typedef int Int;
|
|
||||||
typedef unsigned int UInt;
|
|
||||||
class StaticString;
|
|
||||||
class Path;
|
|
||||||
class PathArgument;
|
|
||||||
class Value;
|
|
||||||
class ValueIteratorBase;
|
|
||||||
class ValueIterator;
|
|
||||||
class ValueConstIterator;
|
|
||||||
#ifdef JSON_VALUE_USE_INTERNAL_MAP
|
|
||||||
class ValueAllocator;
|
|
||||||
class ValueMapAllocator;
|
|
||||||
class ValueInternalLink;
|
|
||||||
class ValueInternalArray;
|
|
||||||
class ValueInternalMap;
|
|
||||||
#endif // #ifdef JSON_VALUE_USE_INTERNAL_MAP
|
|
||||||
|
|
||||||
} // namespace Json
|
|
||||||
|
|
||||||
|
|
||||||
#endif // JSON_FORWARDS_H_INCLUDED
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
#ifndef JSON_JSON_H_INCLUDED
|
|
||||||
# define JSON_JSON_H_INCLUDED
|
|
||||||
|
|
||||||
# include "autolink.h"
|
|
||||||
# include "value.h"
|
|
||||||
# include "reader.h"
|
|
||||||
# include "writer.h"
|
|
||||||
# include "features.h"
|
|
||||||
|
|
||||||
#endif // JSON_JSON_H_INCLUDED
|
|
||||||
@ -1,196 +0,0 @@
|
|||||||
#ifndef CPPTL_JSON_READER_H_INCLUDED
|
|
||||||
# define CPPTL_JSON_READER_H_INCLUDED
|
|
||||||
|
|
||||||
# include "features.h"
|
|
||||||
# include "value.h"
|
|
||||||
# include <deque>
|
|
||||||
# include <stack>
|
|
||||||
# include <string>
|
|
||||||
# include <iostream>
|
|
||||||
|
|
||||||
namespace Json {
|
|
||||||
|
|
||||||
/** \brief Unserialize a <a HREF="http://www.json.org">JSON</a> document into a Value.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
class JSON_API Reader
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
typedef char Char;
|
|
||||||
typedef const Char *Location;
|
|
||||||
|
|
||||||
/** \brief Constructs a Reader allowing all features
|
|
||||||
* for parsing.
|
|
||||||
*/
|
|
||||||
Reader();
|
|
||||||
|
|
||||||
/** \brief Constructs a Reader allowing the specified feature set
|
|
||||||
* for parsing.
|
|
||||||
*/
|
|
||||||
Reader( const Features &features );
|
|
||||||
|
|
||||||
/** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a> document.
|
|
||||||
* \param document UTF-8 encoded string containing the document to read.
|
|
||||||
* \param root [out] Contains the root value of the document if it was
|
|
||||||
* successfully parsed.
|
|
||||||
* \param collectComments \c true to collect comment and allow writing them back during
|
|
||||||
* serialization, \c false to discard comments.
|
|
||||||
* This parameter is ignored if Features::allowComments_
|
|
||||||
* is \c false.
|
|
||||||
* \return \c true if the document was successfully parsed, \c false if an error occurred.
|
|
||||||
*/
|
|
||||||
bool parse( const std::string &document,
|
|
||||||
Value &root,
|
|
||||||
bool collectComments = true );
|
|
||||||
|
|
||||||
/** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a> document.
|
|
||||||
* \param document UTF-8 encoded string containing the document to read.
|
|
||||||
* \param root [out] Contains the root value of the document if it was
|
|
||||||
* successfully parsed.
|
|
||||||
* \param collectComments \c true to collect comment and allow writing them back during
|
|
||||||
* serialization, \c false to discard comments.
|
|
||||||
* This parameter is ignored if Features::allowComments_
|
|
||||||
* is \c false.
|
|
||||||
* \return \c true if the document was successfully parsed, \c false if an error occurred.
|
|
||||||
*/
|
|
||||||
bool parse( const char *beginDoc, const char *endDoc,
|
|
||||||
Value &root,
|
|
||||||
bool collectComments = true );
|
|
||||||
|
|
||||||
/// \brief Parse from input stream.
|
|
||||||
/// \see Json::operator>>(std::istream&, Json::Value&).
|
|
||||||
bool parse( std::istream &is,
|
|
||||||
Value &root,
|
|
||||||
bool collectComments = true );
|
|
||||||
|
|
||||||
/** \brief Returns a user friendly string that list errors in the parsed document.
|
|
||||||
* \return Formatted error message with the list of errors with their location in
|
|
||||||
* the parsed document. An empty string is returned if no error occurred
|
|
||||||
* during parsing.
|
|
||||||
*/
|
|
||||||
std::string getFormatedErrorMessages() const;
|
|
||||||
|
|
||||||
private:
|
|
||||||
enum TokenType
|
|
||||||
{
|
|
||||||
tokenEndOfStream = 0,
|
|
||||||
tokenObjectBegin,
|
|
||||||
tokenObjectEnd,
|
|
||||||
tokenArrayBegin,
|
|
||||||
tokenArrayEnd,
|
|
||||||
tokenString,
|
|
||||||
tokenNumber,
|
|
||||||
tokenTrue,
|
|
||||||
tokenFalse,
|
|
||||||
tokenNull,
|
|
||||||
tokenArraySeparator,
|
|
||||||
tokenMemberSeparator,
|
|
||||||
tokenComment,
|
|
||||||
tokenError
|
|
||||||
};
|
|
||||||
|
|
||||||
class Token
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
TokenType type_;
|
|
||||||
Location start_;
|
|
||||||
Location end_;
|
|
||||||
};
|
|
||||||
|
|
||||||
class ErrorInfo
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
Token token_;
|
|
||||||
std::string message_;
|
|
||||||
Location extra_;
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef std::deque<ErrorInfo> Errors;
|
|
||||||
|
|
||||||
bool expectToken( TokenType type, Token &token, const char *message );
|
|
||||||
bool readToken( Token &token );
|
|
||||||
void skipSpaces();
|
|
||||||
bool match( Location pattern,
|
|
||||||
int patternLength );
|
|
||||||
bool readComment();
|
|
||||||
bool readCStyleComment();
|
|
||||||
bool readCppStyleComment();
|
|
||||||
bool readString();
|
|
||||||
void readNumber();
|
|
||||||
bool readValue();
|
|
||||||
bool readObject( Token &token );
|
|
||||||
bool readArray( Token &token );
|
|
||||||
bool decodeNumber( Token &token );
|
|
||||||
bool decodeString( Token &token );
|
|
||||||
bool decodeString( Token &token, std::string &decoded );
|
|
||||||
bool decodeDouble( Token &token );
|
|
||||||
bool decodeUnicodeCodePoint( Token &token,
|
|
||||||
Location ¤t,
|
|
||||||
Location end,
|
|
||||||
unsigned int &unicode );
|
|
||||||
bool decodeUnicodeEscapeSequence( Token &token,
|
|
||||||
Location ¤t,
|
|
||||||
Location end,
|
|
||||||
unsigned int &unicode );
|
|
||||||
bool addError( const std::string &message,
|
|
||||||
Token &token,
|
|
||||||
Location extra = 0 );
|
|
||||||
bool recoverFromError( TokenType skipUntilToken );
|
|
||||||
bool addErrorAndRecover( const std::string &message,
|
|
||||||
Token &token,
|
|
||||||
TokenType skipUntilToken );
|
|
||||||
void skipUntilSpace();
|
|
||||||
Value ¤tValue();
|
|
||||||
Char getNextChar();
|
|
||||||
void getLocationLineAndColumn( Location location,
|
|
||||||
int &line,
|
|
||||||
int &column ) const;
|
|
||||||
std::string getLocationLineAndColumn( Location location ) const;
|
|
||||||
void addComment( Location begin,
|
|
||||||
Location end,
|
|
||||||
CommentPlacement placement );
|
|
||||||
void skipCommentTokens( Token &token );
|
|
||||||
|
|
||||||
typedef std::stack<Value *> Nodes;
|
|
||||||
Nodes nodes_;
|
|
||||||
Errors errors_;
|
|
||||||
std::string document_;
|
|
||||||
Location begin_;
|
|
||||||
Location end_;
|
|
||||||
Location current_;
|
|
||||||
Location lastValueEnd_;
|
|
||||||
Value *lastValue_;
|
|
||||||
std::string commentsBefore_;
|
|
||||||
Features features_;
|
|
||||||
bool collectComments_;
|
|
||||||
};
|
|
||||||
|
|
||||||
/** \brief Read from 'sin' into 'root'.
|
|
||||||
|
|
||||||
Always keep comments from the input JSON.
|
|
||||||
|
|
||||||
This can be used to read a file into a particular sub-object.
|
|
||||||
For example:
|
|
||||||
\code
|
|
||||||
Json::Value root;
|
|
||||||
cin >> root["dir"]["file"];
|
|
||||||
cout << root;
|
|
||||||
\endcode
|
|
||||||
Result:
|
|
||||||
\verbatim
|
|
||||||
{
|
|
||||||
"dir": {
|
|
||||||
"file": {
|
|
||||||
// The input stream JSON would be nested here.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
\endverbatim
|
|
||||||
\throw std::exception on parse error.
|
|
||||||
\see Json::operator<<()
|
|
||||||
*/
|
|
||||||
std::istream& operator>>( std::istream&, Value& );
|
|
||||||
|
|
||||||
} // namespace Json
|
|
||||||
|
|
||||||
#endif // CPPTL_JSON_READER_H_INCLUDED
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,174 +0,0 @@
|
|||||||
#ifndef JSON_WRITER_H_INCLUDED
|
|
||||||
# define JSON_WRITER_H_INCLUDED
|
|
||||||
|
|
||||||
# include "value.h"
|
|
||||||
# include <vector>
|
|
||||||
# include <string>
|
|
||||||
# include <iostream>
|
|
||||||
|
|
||||||
namespace Json {
|
|
||||||
|
|
||||||
class Value;
|
|
||||||
|
|
||||||
/** \brief Abstract class for writers.
|
|
||||||
*/
|
|
||||||
class JSON_API Writer
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
virtual ~Writer();
|
|
||||||
|
|
||||||
virtual std::string write( const Value &root ) = 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
/** \brief Outputs a Value in <a HREF="http://www.json.org">JSON</a> format without formatting (not human friendly).
|
|
||||||
*
|
|
||||||
* The JSON document is written in a single line. It is not intended for 'human' consumption,
|
|
||||||
* but may be usefull to support feature such as RPC where bandwith is limited.
|
|
||||||
* \sa Reader, Value
|
|
||||||
*/
|
|
||||||
class JSON_API FastWriter : public Writer
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
FastWriter();
|
|
||||||
virtual ~FastWriter(){}
|
|
||||||
|
|
||||||
void enableYAMLCompatibility();
|
|
||||||
|
|
||||||
public: // overridden from Writer
|
|
||||||
virtual std::string write( const Value &root );
|
|
||||||
|
|
||||||
private:
|
|
||||||
void writeValue( const Value &value );
|
|
||||||
|
|
||||||
std::string document_;
|
|
||||||
bool yamlCompatiblityEnabled_;
|
|
||||||
};
|
|
||||||
|
|
||||||
/** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a human friendly way.
|
|
||||||
*
|
|
||||||
* The rules for line break and indent are as follow:
|
|
||||||
* - Object value:
|
|
||||||
* - if empty then print {} without indent and line break
|
|
||||||
* - if not empty the print '{', line break & indent, print one value per line
|
|
||||||
* and then unindent and line break and print '}'.
|
|
||||||
* - Array value:
|
|
||||||
* - if empty then print [] without indent and line break
|
|
||||||
* - if the array contains no object value, empty array or some other value types,
|
|
||||||
* and all the values fit on one lines, then print the array on a single line.
|
|
||||||
* - otherwise, it the values do not fit on one line, or the array contains
|
|
||||||
* object or non empty array, then print one value per line.
|
|
||||||
*
|
|
||||||
* If the Value have comments then they are outputed according to their #CommentPlacement.
|
|
||||||
*
|
|
||||||
* \sa Reader, Value, Value::setComment()
|
|
||||||
*/
|
|
||||||
class JSON_API StyledWriter: public Writer
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
StyledWriter();
|
|
||||||
virtual ~StyledWriter(){}
|
|
||||||
|
|
||||||
public: // overridden from Writer
|
|
||||||
/** \brief Serialize a Value in <a HREF="http://www.json.org">JSON</a> format.
|
|
||||||
* \param root Value to serialize.
|
|
||||||
* \return String containing the JSON document that represents the root value.
|
|
||||||
*/
|
|
||||||
virtual std::string write( const Value &root );
|
|
||||||
|
|
||||||
private:
|
|
||||||
void writeValue( const Value &value );
|
|
||||||
void writeArrayValue( const Value &value );
|
|
||||||
bool isMultineArray( const Value &value );
|
|
||||||
void pushValue( const std::string &value );
|
|
||||||
void writeIndent();
|
|
||||||
void writeWithIndent( const std::string &value );
|
|
||||||
void indent();
|
|
||||||
void unindent();
|
|
||||||
void writeCommentBeforeValue( const Value &root );
|
|
||||||
void writeCommentAfterValueOnSameLine( const Value &root );
|
|
||||||
bool hasCommentForValue( const Value &value );
|
|
||||||
static std::string normalizeEOL( const std::string &text );
|
|
||||||
|
|
||||||
typedef std::vector<std::string> ChildValues;
|
|
||||||
|
|
||||||
ChildValues childValues_;
|
|
||||||
std::string document_;
|
|
||||||
std::string indentString_;
|
|
||||||
int rightMargin_;
|
|
||||||
int indentSize_;
|
|
||||||
bool addChildValues_;
|
|
||||||
};
|
|
||||||
|
|
||||||
/** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a human friendly way,
|
|
||||||
to a stream rather than to a string.
|
|
||||||
*
|
|
||||||
* The rules for line break and indent are as follow:
|
|
||||||
* - Object value:
|
|
||||||
* - if empty then print {} without indent and line break
|
|
||||||
* - if not empty the print '{', line break & indent, print one value per line
|
|
||||||
* and then unindent and line break and print '}'.
|
|
||||||
* - Array value:
|
|
||||||
* - if empty then print [] without indent and line break
|
|
||||||
* - if the array contains no object value, empty array or some other value types,
|
|
||||||
* and all the values fit on one lines, then print the array on a single line.
|
|
||||||
* - otherwise, it the values do not fit on one line, or the array contains
|
|
||||||
* object or non empty array, then print one value per line.
|
|
||||||
*
|
|
||||||
* If the Value have comments then they are outputed according to their #CommentPlacement.
|
|
||||||
*
|
|
||||||
* \param indentation Each level will be indented by this amount extra.
|
|
||||||
* \sa Reader, Value, Value::setComment()
|
|
||||||
*/
|
|
||||||
class JSON_API StyledStreamWriter
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
StyledStreamWriter( std::string indentation="\t" );
|
|
||||||
~StyledStreamWriter(){}
|
|
||||||
|
|
||||||
public:
|
|
||||||
/** \brief Serialize a Value in <a HREF="http://www.json.org">JSON</a> format.
|
|
||||||
* \param out Stream to write to. (Can be ostringstream, e.g.)
|
|
||||||
* \param root Value to serialize.
|
|
||||||
* \note There is no point in deriving from Writer, since write() should not return a value.
|
|
||||||
*/
|
|
||||||
void write( std::ostream &out, const Value &root );
|
|
||||||
|
|
||||||
private:
|
|
||||||
void writeValue( const Value &value );
|
|
||||||
void writeArrayValue( const Value &value );
|
|
||||||
bool isMultineArray( const Value &value );
|
|
||||||
void pushValue( const std::string &value );
|
|
||||||
void writeIndent();
|
|
||||||
void writeWithIndent( const std::string &value );
|
|
||||||
void indent();
|
|
||||||
void unindent();
|
|
||||||
void writeCommentBeforeValue( const Value &root );
|
|
||||||
void writeCommentAfterValueOnSameLine( const Value &root );
|
|
||||||
bool hasCommentForValue( const Value &value );
|
|
||||||
static std::string normalizeEOL( const std::string &text );
|
|
||||||
|
|
||||||
typedef std::vector<std::string> ChildValues;
|
|
||||||
|
|
||||||
ChildValues childValues_;
|
|
||||||
std::ostream* document_;
|
|
||||||
std::string indentString_;
|
|
||||||
int rightMargin_;
|
|
||||||
std::string indentation_;
|
|
||||||
bool addChildValues_;
|
|
||||||
};
|
|
||||||
|
|
||||||
std::string JSON_API valueToString( Int value );
|
|
||||||
std::string JSON_API valueToString( UInt value );
|
|
||||||
std::string JSON_API valueToString( double value );
|
|
||||||
std::string JSON_API valueToString( bool value );
|
|
||||||
std::string JSON_API valueToQuotedString( const char *value );
|
|
||||||
|
|
||||||
/// \brief Output using the StyledStreamWriter.
|
|
||||||
/// \see Json::operator>>()
|
|
||||||
std::ostream& operator<<( std::ostream&, const Value &root );
|
|
||||||
|
|
||||||
} // namespace Json
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endif // JSON_WRITER_H_INCLUDED
|
|
||||||
@ -1,157 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#ifndef SPINE_ANIMATION_H_
|
|
||||||
#define SPINE_ANIMATION_H_
|
|
||||||
|
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
class BaseSkeleton;
|
|
||||||
class Timeline;
|
|
||||||
|
|
||||||
class Animation {
|
|
||||||
public:
|
|
||||||
std::vector<Timeline*> timelines;
|
|
||||||
float duration;
|
|
||||||
|
|
||||||
Animation (const std::vector<Timeline*> &timelines, float duration);
|
|
||||||
~Animation ();
|
|
||||||
|
|
||||||
void apply (BaseSkeleton *skeleton, float time, bool loop = false) const;
|
|
||||||
void mix (BaseSkeleton *skeleton, float time, bool loop, float alpha) const;
|
|
||||||
};
|
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
class Timeline {
|
|
||||||
public:
|
|
||||||
virtual ~Timeline () {
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void apply (BaseSkeleton *skeleton, float time, float alpha = 1) const = 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
class CurveTimeline: public Timeline {
|
|
||||||
public:
|
|
||||||
float *curves; // dfx, dfy, ddfx, ddfy, dddfx, dddfy, ...
|
|
||||||
|
|
||||||
CurveTimeline (int keyframeCount);
|
|
||||||
virtual ~CurveTimeline ();
|
|
||||||
|
|
||||||
void setLinear (int keyframeIndex);
|
|
||||||
|
|
||||||
void setStepped (int keyframeIndex);
|
|
||||||
|
|
||||||
/** Sets the control handle positions for an interpolation bezier curve used to transition from this keyframe to the next.
|
|
||||||
* cx1 and cx2 are from 0 to 1, representing the percent of time between the two keyframes. cy1 and cy2 are the percent of
|
|
||||||
* the difference between the keyframe's values. */
|
|
||||||
void setCurve (int keyframeIndex, float cx1, float cy1, float cx2, float cy2);
|
|
||||||
|
|
||||||
float getCurvePercent (int keyframeIndex, float percent) const;
|
|
||||||
};
|
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
class RotateTimeline: public CurveTimeline {
|
|
||||||
public:
|
|
||||||
int framesLength;
|
|
||||||
float *frames; // time, value, ...
|
|
||||||
int boneIndex;
|
|
||||||
|
|
||||||
RotateTimeline (int keyframeCount);
|
|
||||||
virtual ~RotateTimeline ();
|
|
||||||
|
|
||||||
virtual void apply (BaseSkeleton *skeleton, float time, float alpha = 1) const;
|
|
||||||
|
|
||||||
void setKeyframe (int keyframeIndex, float time, float value);
|
|
||||||
};
|
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
class TranslateTimeline: public CurveTimeline {
|
|
||||||
public:
|
|
||||||
int framesLength;
|
|
||||||
float *frames; // time, value, value, ...
|
|
||||||
int boneIndex;
|
|
||||||
|
|
||||||
TranslateTimeline (int keyframeCount);
|
|
||||||
virtual ~TranslateTimeline ();
|
|
||||||
|
|
||||||
virtual void apply (BaseSkeleton *skeleton, float time, float alpha = 1) const;
|
|
||||||
|
|
||||||
void setKeyframe (int keyframeIndex, float time, float x, float y);
|
|
||||||
};
|
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
class ScaleTimeline: public TranslateTimeline {
|
|
||||||
public:
|
|
||||||
ScaleTimeline (int keyframeCount);
|
|
||||||
|
|
||||||
virtual void apply (BaseSkeleton *skeleton, float time, float alpha = 1) const;
|
|
||||||
};
|
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
class ColorTimeline: public CurveTimeline {
|
|
||||||
public:
|
|
||||||
int framesLength;
|
|
||||||
float* frames; // time, r, g, b, a, ...
|
|
||||||
int slotIndex;
|
|
||||||
|
|
||||||
ColorTimeline (int keyframeCount);
|
|
||||||
virtual ~ColorTimeline ();
|
|
||||||
|
|
||||||
virtual void apply (BaseSkeleton *skeleton, float time, float alpha = 1) const;
|
|
||||||
|
|
||||||
void setKeyframe (int keyframeIndex, float time, float r, float g, float b, float a);
|
|
||||||
};
|
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
class AttachmentTimeline: public Timeline {
|
|
||||||
public:
|
|
||||||
int framesLength;
|
|
||||||
float *frames; // time, ...
|
|
||||||
std::string **attachmentNames;
|
|
||||||
int slotIndex;
|
|
||||||
|
|
||||||
AttachmentTimeline (int keyframeCount);
|
|
||||||
virtual ~AttachmentTimeline ();
|
|
||||||
|
|
||||||
virtual void apply (BaseSkeleton *skeleton, float time, float alpha = 1) const;
|
|
||||||
|
|
||||||
/** The AttachmentTimeline owns the attachmentName.
|
|
||||||
* @param attachmentName May be null to clear the image for a slot. */
|
|
||||||
void setKeyframe (int keyframeIndex, float time, std::string *attachmentName);
|
|
||||||
};
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
#endif /* SPINE_ANIMATION_H_ */
|
|
||||||
@ -1,60 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#ifndef SPINE_ANIMATIONSTATE_H_
|
|
||||||
#define SPINE_ANIMATIONSTATE_H_
|
|
||||||
|
|
||||||
#include <map>
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
class Animation;
|
|
||||||
class AnimationStateData;
|
|
||||||
class BaseSkeleton;
|
|
||||||
|
|
||||||
class AnimationState {
|
|
||||||
private:
|
|
||||||
Animation *previous;
|
|
||||||
float previousTime;
|
|
||||||
bool previousLoop;
|
|
||||||
float mixTime, mixDuration;
|
|
||||||
|
|
||||||
public:
|
|
||||||
AnimationStateData *data;
|
|
||||||
Animation *animation;
|
|
||||||
float time;
|
|
||||||
bool loop;
|
|
||||||
|
|
||||||
AnimationState (AnimationStateData *data = 0);
|
|
||||||
|
|
||||||
void update (float delta);
|
|
||||||
void apply (BaseSkeleton *skeleton);
|
|
||||||
|
|
||||||
void setAnimation (Animation *newAnimation, bool loop, float time);
|
|
||||||
void setAnimation (Animation *animation, bool loop = false);
|
|
||||||
};
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
#endif /* SPINE_ANIMATIONSTATE_H_ */
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#ifndef SPINE_ANIMATIONSTATEDATA_H_
|
|
||||||
#define SPINE_ANIMATIONSTATEDATA_H_
|
|
||||||
|
|
||||||
#include <map>
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
class Animation;
|
|
||||||
|
|
||||||
class AnimationStateData {
|
|
||||||
private:
|
|
||||||
std::map<std::pair<Animation*, Animation*>, float> animationToMixTime;
|
|
||||||
|
|
||||||
public:
|
|
||||||
/** Set the mixing duration between two animations. */
|
|
||||||
void setMixing (Animation *from, Animation *to, float duration);
|
|
||||||
float getMixing (Animation *from, Animation *to);
|
|
||||||
};
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
#endif /* SPINE_ANIMATIONSTATEDATA_H_ */
|
|
||||||
@ -1,47 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#ifndef SPINE_ATTACHMENT_H_
|
|
||||||
#define SPINE_ATTACHMENT_H_
|
|
||||||
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
class BaseSkeleton;
|
|
||||||
class Slot;
|
|
||||||
|
|
||||||
class Attachment {
|
|
||||||
public:
|
|
||||||
std::string name;
|
|
||||||
|
|
||||||
virtual ~Attachment () {
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void draw (Slot *slot) = 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
#endif /* SPINE_ATTACHMENT_H_ */
|
|
||||||
@ -1,103 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#ifndef SPINE_BASEATLAS_H_
|
|
||||||
#define SPINE_BASEATLAS_H_
|
|
||||||
|
|
||||||
#include <istream>
|
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
class BaseAtlasPage;
|
|
||||||
class BaseAtlasRegion;
|
|
||||||
|
|
||||||
class BaseAtlas {
|
|
||||||
public:
|
|
||||||
std::vector<BaseAtlasPage*> pages;
|
|
||||||
std::vector<BaseAtlasRegion*> regions;
|
|
||||||
|
|
||||||
virtual BaseAtlasRegion* findRegion (const std::string &name);
|
|
||||||
|
|
||||||
protected:
|
|
||||||
virtual ~BaseAtlas ();
|
|
||||||
|
|
||||||
void load (std::istream &input);
|
|
||||||
void load (const std::string &path);
|
|
||||||
void load (const char *begin, const char *end);
|
|
||||||
|
|
||||||
private:
|
|
||||||
virtual BaseAtlasPage* newAtlasPage (const std::string &name) = 0;
|
|
||||||
virtual BaseAtlasRegion* newAtlasRegion (BaseAtlasPage *page) = 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
enum Format {
|
|
||||||
alpha, intensity, luminanceAlpha, rgb565, rgba4444, rgb888, rgba8888
|
|
||||||
};
|
|
||||||
|
|
||||||
enum TextureFilter {
|
|
||||||
nearest, linear, mipMap, mipMapNearestNearest, mipMapLinearNearest, mipMapNearestLinear, mipMapLinearLinear
|
|
||||||
};
|
|
||||||
|
|
||||||
enum TextureWrap {
|
|
||||||
mirroredRepeat, clampToEdge, repeat
|
|
||||||
};
|
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
class BaseAtlasPage {
|
|
||||||
public:
|
|
||||||
std::string name;
|
|
||||||
Format format;
|
|
||||||
TextureFilter minFilter, magFilter;
|
|
||||||
TextureWrap uWrap, vWrap;
|
|
||||||
|
|
||||||
virtual ~BaseAtlasPage () {
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
class BaseAtlasRegion {
|
|
||||||
public:
|
|
||||||
std::string name;
|
|
||||||
int x, y, width, height;
|
|
||||||
float offsetX, offsetY;
|
|
||||||
int originalWidth, originalHeight;
|
|
||||||
int index;
|
|
||||||
bool rotate;
|
|
||||||
bool flip;
|
|
||||||
int *splits;
|
|
||||||
int *pads;
|
|
||||||
|
|
||||||
BaseAtlasRegion ();
|
|
||||||
virtual ~BaseAtlasRegion ();
|
|
||||||
};
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
#endif /* SPINE_BASEATLAS_H_ */
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#ifndef SPINE_BASEATTACHMENTLOADER_H_
|
|
||||||
#define SPINE_BASEATTACHMENTLOADER_H_
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
class Attachment;
|
|
||||||
|
|
||||||
enum AttachmentType {
|
|
||||||
region, regionSequence
|
|
||||||
};
|
|
||||||
|
|
||||||
class BaseAttachmentLoader {
|
|
||||||
public:
|
|
||||||
virtual ~BaseAttachmentLoader () {
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual Attachment* newAttachment (AttachmentType type, const std::string &name) = 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
#endif /* SPINE_BASEATTACHMENTLOADER_H_ */
|
|
||||||
@ -1,49 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#ifndef SPINE_BASEREGIONATTACHMENT_H_
|
|
||||||
#define SPINE_BASEREGIONATTACHMENT_H_
|
|
||||||
|
|
||||||
#include <spine/Attachment.h>
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
class Bone;
|
|
||||||
class Slot;
|
|
||||||
|
|
||||||
class BaseRegionAttachment: public Attachment {
|
|
||||||
public:
|
|
||||||
float x, y, scaleX, scaleY, rotation, width, height;
|
|
||||||
float offset[8];
|
|
||||||
|
|
||||||
BaseRegionAttachment ();
|
|
||||||
|
|
||||||
void updateOffset ();
|
|
||||||
|
|
||||||
virtual void updateWorldVertices (Bone *bone) = 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
#endif /* SPINE_BASEREGIONATTACHMENT_H_ */
|
|
||||||
@ -1,80 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#ifndef SPINE_BASESKELETON_H_
|
|
||||||
#define SPINE_BASESKELETON_H_
|
|
||||||
|
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
class Skin;
|
|
||||||
class SkeletonData;
|
|
||||||
class Slot;
|
|
||||||
class Bone;
|
|
||||||
class Attachment;
|
|
||||||
|
|
||||||
class BaseSkeleton {
|
|
||||||
public:
|
|
||||||
SkeletonData *data;
|
|
||||||
std::vector<Bone*> bones;
|
|
||||||
std::vector<Slot*> slots;
|
|
||||||
std::vector<Slot*> drawOrder;
|
|
||||||
Skin *skin;
|
|
||||||
float r, g, b, a;
|
|
||||||
float time;
|
|
||||||
bool flipX, flipY;
|
|
||||||
|
|
||||||
/** The BaseSkeleton owns the SkeletonData. */
|
|
||||||
BaseSkeleton (SkeletonData *data);
|
|
||||||
virtual ~BaseSkeleton ();
|
|
||||||
|
|
||||||
void updateWorldTransform ();
|
|
||||||
|
|
||||||
void setToBindPose ();
|
|
||||||
void setBonesToBindPose ();
|
|
||||||
void setSlotsToBindPose ();
|
|
||||||
|
|
||||||
Bone *getRootBone () const;
|
|
||||||
Bone* findBone (const std::string &boneName) const;
|
|
||||||
int findBoneIndex (const std::string &boneName) const;
|
|
||||||
|
|
||||||
Slot* findSlot (const std::string &slotName) const;
|
|
||||||
int findSlotIndex (const std::string &slotName) const;
|
|
||||||
|
|
||||||
void setSkin (const std::string &skinName);
|
|
||||||
/** @param skin May be null. */
|
|
||||||
void setSkin (Skin *skin);
|
|
||||||
|
|
||||||
Attachment* getAttachment (const std::string &slotName, const std::string &attachmentName) const;
|
|
||||||
Attachment* getAttachment (int slotIndex, const std::string &attachmentName) const;
|
|
||||||
void setAttachment (const std::string &slotName, const std::string &attachmentName);
|
|
||||||
|
|
||||||
void update (float deltaTime);
|
|
||||||
};
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
#endif /* SPINE_BASESKELETON_H_ */
|
|
||||||
@ -1,57 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#ifndef SPINE_BASESKELETONJSON_H_
|
|
||||||
#define SPINE_BASESKELETONJSON_H_
|
|
||||||
|
|
||||||
#include <istream>
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
class BaseAttachmentLoader;
|
|
||||||
class SkeletonData;
|
|
||||||
class Animation;
|
|
||||||
|
|
||||||
class BaseSkeletonJson {
|
|
||||||
public:
|
|
||||||
BaseAttachmentLoader *attachmentLoader;
|
|
||||||
float scale;
|
|
||||||
bool yDown;
|
|
||||||
|
|
||||||
/** The BaseSkeletonJson owns the attachmentLoader. */
|
|
||||||
BaseSkeletonJson (BaseAttachmentLoader *attachmentLoader);
|
|
||||||
virtual ~BaseSkeletonJson ();
|
|
||||||
|
|
||||||
SkeletonData* readSkeletonData (const std::string &path) const;
|
|
||||||
SkeletonData* readSkeletonData (std::istream &input) const;
|
|
||||||
SkeletonData* readSkeletonData (const char *begin, const char *end) const;
|
|
||||||
|
|
||||||
Animation* readAnimation (const std::string &path, const SkeletonData *skeletonData) const;
|
|
||||||
Animation* readAnimation (std::istream &input, const SkeletonData *skeletonData) const;
|
|
||||||
Animation* readAnimation (const char *begin, const char *end, const SkeletonData *skeletonData) const;
|
|
||||||
};
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
#endif /* SPINE_BASESKELETONJSON_H_ */
|
|
||||||
@ -1,55 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#ifndef SPINE_BONE_H_
|
|
||||||
#define SPINE_BONE_H_
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
class BoneData;
|
|
||||||
|
|
||||||
class Bone {
|
|
||||||
public:
|
|
||||||
BoneData *data;
|
|
||||||
/** May be null. */
|
|
||||||
Bone *parent;
|
|
||||||
float x, y;
|
|
||||||
float rotation;
|
|
||||||
float scaleX, scaleY;
|
|
||||||
|
|
||||||
float m00, m01, worldX; // a b x
|
|
||||||
float m10, m11, worldY; // c d y
|
|
||||||
float worldRotation;
|
|
||||||
float worldScaleX, worldScaleY;
|
|
||||||
|
|
||||||
Bone (BoneData *data);
|
|
||||||
|
|
||||||
void setToBindPose ();
|
|
||||||
|
|
||||||
void updateWorldTransform (bool flipX, bool flipY);
|
|
||||||
};
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
#endif /* SPINE_BONE_H_ */
|
|
||||||
@ -1,47 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#ifndef SPINE_BONEDATA_H_
|
|
||||||
#define SPINE_BONEDATA_H_
|
|
||||||
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
class BoneData {
|
|
||||||
public:
|
|
||||||
std::string name;
|
|
||||||
BoneData* parent;
|
|
||||||
float length;
|
|
||||||
float x, y;
|
|
||||||
float rotation;
|
|
||||||
float scaleX, scaleY;
|
|
||||||
float yDown;
|
|
||||||
|
|
||||||
BoneData (const std::string &name);
|
|
||||||
};
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
#endif /* SPINE_BONEDATA_H_ */
|
|
||||||
@ -1,62 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#ifndef SPINE_SKELETONDATA_H_
|
|
||||||
#define SPINE_SKELETONDATA_H_
|
|
||||||
|
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
class BoneData;
|
|
||||||
class SlotData;
|
|
||||||
class Skin;
|
|
||||||
|
|
||||||
class SkeletonData {
|
|
||||||
public:
|
|
||||||
/** The SkeletonData owns the bones. */
|
|
||||||
std::vector<BoneData*> bones;
|
|
||||||
/** The SkeletonData owns the slots. */
|
|
||||||
std::vector<SlotData*> slots;
|
|
||||||
/** The SkeletonData owns the skins. */
|
|
||||||
std::vector<Skin*> skins;
|
|
||||||
/** May be null. */
|
|
||||||
Skin *defaultSkin;
|
|
||||||
|
|
||||||
SkeletonData ();
|
|
||||||
~SkeletonData ();
|
|
||||||
|
|
||||||
BoneData* findBone (const std::string &boneName) const;
|
|
||||||
int findBoneIndex (const std::string &boneName) const;
|
|
||||||
|
|
||||||
SlotData* findSlot (const std::string &slotName) const;
|
|
||||||
int findSlotIndex (const std::string &slotName) const;
|
|
||||||
|
|
||||||
Skin* findSkin (const std::string &skinName) const;
|
|
||||||
};
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
#endif /* SPINE_SKELETONDATA_H_ */
|
|
||||||
@ -1,68 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#ifndef SPINE_SKIN_H_
|
|
||||||
#define SPINE_SKIN_H_
|
|
||||||
|
|
||||||
#include <string>
|
|
||||||
#include <map>
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
class BaseSkeleton;
|
|
||||||
class Attachment;
|
|
||||||
|
|
||||||
class Skin {
|
|
||||||
friend class BaseSkeleton;
|
|
||||||
|
|
||||||
private:
|
|
||||||
struct Key {
|
|
||||||
int slotIndex;
|
|
||||||
std::string name;
|
|
||||||
|
|
||||||
friend bool operator< (const Key &key1, const Key &key2) {
|
|
||||||
if (key1.slotIndex == key2.slotIndex) return key1.name < key2.name;
|
|
||||||
return key1.slotIndex < key2.slotIndex;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
std::map<Key, Attachment*> attachments;
|
|
||||||
|
|
||||||
/** Attach all attachments from this skin if the corresponding attachment from the old skin is currently attached. */
|
|
||||||
void attachAll (BaseSkeleton *skeleton, Skin *oldSkin);
|
|
||||||
|
|
||||||
public:
|
|
||||||
std::string name;
|
|
||||||
|
|
||||||
Skin (const std::string &name);
|
|
||||||
~Skin ();
|
|
||||||
|
|
||||||
/** The Skin owns the attachment. */
|
|
||||||
void addAttachment (int slotIndex, const std::string &name, Attachment *attachment);
|
|
||||||
|
|
||||||
Attachment* getAttachment (int slotIndex, const std::string &name);
|
|
||||||
};
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
#endif /* SPINE_SKIN_H_ */
|
|
||||||
@ -1,63 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#ifndef SPINE_SLOT_H_
|
|
||||||
#define SPINE_SLOT_H_
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
class BaseSkeleton;
|
|
||||||
class SlotData;
|
|
||||||
class Bone;
|
|
||||||
class Attachment;
|
|
||||||
|
|
||||||
class Slot {
|
|
||||||
friend class BaseSkeleton;
|
|
||||||
|
|
||||||
private:
|
|
||||||
float attachmentTime;
|
|
||||||
|
|
||||||
void setToBindPose (int slotIndex);
|
|
||||||
|
|
||||||
public:
|
|
||||||
SlotData *data;
|
|
||||||
BaseSkeleton *skeleton;
|
|
||||||
Bone *bone;
|
|
||||||
float r, g, b, a;
|
|
||||||
Attachment *attachment;
|
|
||||||
|
|
||||||
Slot (SlotData *data, BaseSkeleton *skeleton, Bone *bone);
|
|
||||||
|
|
||||||
/** @param attachment May be null. */
|
|
||||||
void setAttachment (Attachment *attachment);
|
|
||||||
|
|
||||||
void setAttachmentTime (float time);
|
|
||||||
float getAttachmentTime () const;
|
|
||||||
|
|
||||||
void setToBindPose ();
|
|
||||||
};
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
#endif /* SPINE_SLOT_H_ */
|
|
||||||
@ -1,47 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#ifndef SPINE_SLOTDATA_H_
|
|
||||||
#define SPINE_SLOTDATA_H_
|
|
||||||
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
class BoneData;
|
|
||||||
|
|
||||||
class SlotData {
|
|
||||||
public:
|
|
||||||
std::string name;
|
|
||||||
BoneData *boneData;
|
|
||||||
float r, g, b, a;
|
|
||||||
std::string *attachmentName;
|
|
||||||
|
|
||||||
SlotData (const std::string &name, BoneData *boneData);
|
|
||||||
~SlotData ();
|
|
||||||
};
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
#endif /* SPINE_SLOTDATA_H_ */
|
|
||||||
@ -1,125 +0,0 @@
|
|||||||
#ifndef JSONCPP_BATCHALLOCATOR_H_INCLUDED
|
|
||||||
# define JSONCPP_BATCHALLOCATOR_H_INCLUDED
|
|
||||||
|
|
||||||
# include <stdlib.h>
|
|
||||||
# include <assert.h>
|
|
||||||
|
|
||||||
# ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
|
|
||||||
|
|
||||||
namespace Json {
|
|
||||||
|
|
||||||
/* Fast memory allocator.
|
|
||||||
*
|
|
||||||
* This memory allocator allocates memory for a batch of object (specified by
|
|
||||||
* the page size, the number of object in each page).
|
|
||||||
*
|
|
||||||
* It does not allow the destruction of a single object. All the allocated objects
|
|
||||||
* can be destroyed at once. The memory can be either released or reused for future
|
|
||||||
* allocation.
|
|
||||||
*
|
|
||||||
* The in-place new operator must be used to construct the object using the pointer
|
|
||||||
* returned by allocate.
|
|
||||||
*/
|
|
||||||
template<typename AllocatedType
|
|
||||||
,const unsigned int objectPerAllocation>
|
|
||||||
class BatchAllocator
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
typedef AllocatedType Type;
|
|
||||||
|
|
||||||
BatchAllocator( unsigned int objectsPerPage = 255 )
|
|
||||||
: freeHead_( 0 )
|
|
||||||
, objectsPerPage_( objectsPerPage )
|
|
||||||
{
|
|
||||||
// printf( "Size: %d => %s\n", sizeof(AllocatedType), typeid(AllocatedType).name() );
|
|
||||||
assert( sizeof(AllocatedType) * objectPerAllocation >= sizeof(AllocatedType *) ); // We must be able to store a slist in the object free space.
|
|
||||||
assert( objectsPerPage >= 16 );
|
|
||||||
batches_ = allocateBatch( 0 ); // allocated a dummy page
|
|
||||||
currentBatch_ = batches_;
|
|
||||||
}
|
|
||||||
|
|
||||||
~BatchAllocator()
|
|
||||||
{
|
|
||||||
for ( BatchInfo *batch = batches_; batch; )
|
|
||||||
{
|
|
||||||
BatchInfo *nextBatch = batch->next_;
|
|
||||||
free( batch );
|
|
||||||
batch = nextBatch;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// allocate space for an array of objectPerAllocation object.
|
|
||||||
/// @warning it is the responsability of the caller to call objects constructors.
|
|
||||||
AllocatedType *allocate()
|
|
||||||
{
|
|
||||||
if ( freeHead_ ) // returns node from free list.
|
|
||||||
{
|
|
||||||
AllocatedType *object = freeHead_;
|
|
||||||
freeHead_ = *(AllocatedType **)object;
|
|
||||||
return object;
|
|
||||||
}
|
|
||||||
if ( currentBatch_->used_ == currentBatch_->end_ )
|
|
||||||
{
|
|
||||||
currentBatch_ = currentBatch_->next_;
|
|
||||||
while ( currentBatch_ && currentBatch_->used_ == currentBatch_->end_ )
|
|
||||||
currentBatch_ = currentBatch_->next_;
|
|
||||||
|
|
||||||
if ( !currentBatch_ ) // no free batch found, allocate a new one
|
|
||||||
{
|
|
||||||
currentBatch_ = allocateBatch( objectsPerPage_ );
|
|
||||||
currentBatch_->next_ = batches_; // insert at the head of the list
|
|
||||||
batches_ = currentBatch_;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
AllocatedType *allocated = currentBatch_->used_;
|
|
||||||
currentBatch_->used_ += objectPerAllocation;
|
|
||||||
return allocated;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Release the object.
|
|
||||||
/// @warning it is the responsability of the caller to actually destruct the object.
|
|
||||||
void release( AllocatedType *object )
|
|
||||||
{
|
|
||||||
assert( object != 0 );
|
|
||||||
*(AllocatedType **)object = freeHead_;
|
|
||||||
freeHead_ = object;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
struct BatchInfo
|
|
||||||
{
|
|
||||||
BatchInfo *next_;
|
|
||||||
AllocatedType *used_;
|
|
||||||
AllocatedType *end_;
|
|
||||||
AllocatedType buffer_[objectPerAllocation];
|
|
||||||
};
|
|
||||||
|
|
||||||
// disabled copy constructor and assignement operator.
|
|
||||||
BatchAllocator( const BatchAllocator & );
|
|
||||||
void operator =( const BatchAllocator &);
|
|
||||||
|
|
||||||
static BatchInfo *allocateBatch( unsigned int objectsPerPage )
|
|
||||||
{
|
|
||||||
const unsigned int mallocSize = sizeof(BatchInfo) - sizeof(AllocatedType)* objectPerAllocation
|
|
||||||
+ sizeof(AllocatedType) * objectPerAllocation * objectsPerPage;
|
|
||||||
BatchInfo *batch = static_cast<BatchInfo*>( malloc( mallocSize ) );
|
|
||||||
batch->next_ = 0;
|
|
||||||
batch->used_ = batch->buffer_;
|
|
||||||
batch->end_ = batch->buffer_ + objectsPerPage;
|
|
||||||
return batch;
|
|
||||||
}
|
|
||||||
|
|
||||||
BatchInfo *batches_;
|
|
||||||
BatchInfo *currentBatch_;
|
|
||||||
/// Head of a single linked list within the allocated space of freeed object
|
|
||||||
AllocatedType *freeHead_;
|
|
||||||
unsigned int objectsPerPage_;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
} // namespace Json
|
|
||||||
|
|
||||||
# endif // ifndef JSONCPP_DOC_INCLUDE_IMPLEMENTATION
|
|
||||||
|
|
||||||
#endif // JSONCPP_BATCHALLOCATOR_H_INCLUDED
|
|
||||||
|
|
||||||
@ -1,448 +0,0 @@
|
|||||||
// included by json_value.cpp
|
|
||||||
// everything is within Json namespace
|
|
||||||
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// class ValueInternalArray
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
ValueArrayAllocator::~ValueArrayAllocator()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// class DefaultValueArrayAllocator
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
#ifdef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
|
|
||||||
class DefaultValueArrayAllocator : public ValueArrayAllocator
|
|
||||||
{
|
|
||||||
public: // overridden from ValueArrayAllocator
|
|
||||||
virtual ~DefaultValueArrayAllocator()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual ValueInternalArray *newArray()
|
|
||||||
{
|
|
||||||
return new ValueInternalArray();
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual ValueInternalArray *newArrayCopy( const ValueInternalArray &other )
|
|
||||||
{
|
|
||||||
return new ValueInternalArray( other );
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void destructArray( ValueInternalArray *array )
|
|
||||||
{
|
|
||||||
delete array;
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void reallocateArrayPageIndex( Value **&indexes,
|
|
||||||
ValueInternalArray::PageIndex &indexCount,
|
|
||||||
ValueInternalArray::PageIndex minNewIndexCount )
|
|
||||||
{
|
|
||||||
ValueInternalArray::PageIndex newIndexCount = (indexCount*3)/2 + 1;
|
|
||||||
if ( minNewIndexCount > newIndexCount )
|
|
||||||
newIndexCount = minNewIndexCount;
|
|
||||||
void *newIndexes = realloc( indexes, sizeof(Value*) * newIndexCount );
|
|
||||||
if ( !newIndexes )
|
|
||||||
throw std::bad_alloc();
|
|
||||||
indexCount = newIndexCount;
|
|
||||||
indexes = static_cast<Value **>( newIndexes );
|
|
||||||
}
|
|
||||||
virtual void releaseArrayPageIndex( Value **indexes,
|
|
||||||
ValueInternalArray::PageIndex indexCount )
|
|
||||||
{
|
|
||||||
if ( indexes )
|
|
||||||
free( indexes );
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual Value *allocateArrayPage()
|
|
||||||
{
|
|
||||||
return static_cast<Value *>( malloc( sizeof(Value) * ValueInternalArray::itemsPerPage ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void releaseArrayPage( Value *value )
|
|
||||||
{
|
|
||||||
if ( value )
|
|
||||||
free( value );
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
#else // #ifdef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
|
|
||||||
/// @todo make this thread-safe (lock when accessign batch allocator)
|
|
||||||
class DefaultValueArrayAllocator : public ValueArrayAllocator
|
|
||||||
{
|
|
||||||
public: // overridden from ValueArrayAllocator
|
|
||||||
virtual ~DefaultValueArrayAllocator()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual ValueInternalArray *newArray()
|
|
||||||
{
|
|
||||||
ValueInternalArray *array = arraysAllocator_.allocate();
|
|
||||||
new (array) ValueInternalArray(); // placement new
|
|
||||||
return array;
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual ValueInternalArray *newArrayCopy( const ValueInternalArray &other )
|
|
||||||
{
|
|
||||||
ValueInternalArray *array = arraysAllocator_.allocate();
|
|
||||||
new (array) ValueInternalArray( other ); // placement new
|
|
||||||
return array;
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void destructArray( ValueInternalArray *array )
|
|
||||||
{
|
|
||||||
if ( array )
|
|
||||||
{
|
|
||||||
array->~ValueInternalArray();
|
|
||||||
arraysAllocator_.release( array );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void reallocateArrayPageIndex( Value **&indexes,
|
|
||||||
ValueInternalArray::PageIndex &indexCount,
|
|
||||||
ValueInternalArray::PageIndex minNewIndexCount )
|
|
||||||
{
|
|
||||||
ValueInternalArray::PageIndex newIndexCount = (indexCount*3)/2 + 1;
|
|
||||||
if ( minNewIndexCount > newIndexCount )
|
|
||||||
newIndexCount = minNewIndexCount;
|
|
||||||
void *newIndexes = realloc( indexes, sizeof(Value*) * newIndexCount );
|
|
||||||
if ( !newIndexes )
|
|
||||||
throw std::bad_alloc();
|
|
||||||
indexCount = newIndexCount;
|
|
||||||
indexes = static_cast<Value **>( newIndexes );
|
|
||||||
}
|
|
||||||
virtual void releaseArrayPageIndex( Value **indexes,
|
|
||||||
ValueInternalArray::PageIndex indexCount )
|
|
||||||
{
|
|
||||||
if ( indexes )
|
|
||||||
free( indexes );
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual Value *allocateArrayPage()
|
|
||||||
{
|
|
||||||
return static_cast<Value *>( pagesAllocator_.allocate() );
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void releaseArrayPage( Value *value )
|
|
||||||
{
|
|
||||||
if ( value )
|
|
||||||
pagesAllocator_.release( value );
|
|
||||||
}
|
|
||||||
private:
|
|
||||||
BatchAllocator<ValueInternalArray,1> arraysAllocator_;
|
|
||||||
BatchAllocator<Value,ValueInternalArray::itemsPerPage> pagesAllocator_;
|
|
||||||
};
|
|
||||||
#endif // #ifdef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
|
|
||||||
|
|
||||||
static ValueArrayAllocator *&arrayAllocator()
|
|
||||||
{
|
|
||||||
static DefaultValueArrayAllocator defaultAllocator;
|
|
||||||
static ValueArrayAllocator *arrayAllocator = &defaultAllocator;
|
|
||||||
return arrayAllocator;
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct DummyArrayAllocatorInitializer {
|
|
||||||
DummyArrayAllocatorInitializer()
|
|
||||||
{
|
|
||||||
arrayAllocator(); // ensure arrayAllocator() statics are initialized before main().
|
|
||||||
}
|
|
||||||
} dummyArrayAllocatorInitializer;
|
|
||||||
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// class ValueInternalArray
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
bool
|
|
||||||
ValueInternalArray::equals( const IteratorState &x,
|
|
||||||
const IteratorState &other )
|
|
||||||
{
|
|
||||||
return x.array_ == other.array_
|
|
||||||
&& x.currentItemIndex_ == other.currentItemIndex_
|
|
||||||
&& x.currentPageIndex_ == other.currentPageIndex_;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
ValueInternalArray::increment( IteratorState &it )
|
|
||||||
{
|
|
||||||
JSON_ASSERT_MESSAGE( it.array_ &&
|
|
||||||
(it.currentPageIndex_ - it.array_->pages_)*itemsPerPage + it.currentItemIndex_
|
|
||||||
!= it.array_->size_,
|
|
||||||
"ValueInternalArray::increment(): moving iterator beyond end" );
|
|
||||||
++(it.currentItemIndex_);
|
|
||||||
if ( it.currentItemIndex_ == itemsPerPage )
|
|
||||||
{
|
|
||||||
it.currentItemIndex_ = 0;
|
|
||||||
++(it.currentPageIndex_);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
ValueInternalArray::decrement( IteratorState &it )
|
|
||||||
{
|
|
||||||
JSON_ASSERT_MESSAGE( it.array_ && it.currentPageIndex_ == it.array_->pages_
|
|
||||||
&& it.currentItemIndex_ == 0,
|
|
||||||
"ValueInternalArray::decrement(): moving iterator beyond end" );
|
|
||||||
if ( it.currentItemIndex_ == 0 )
|
|
||||||
{
|
|
||||||
it.currentItemIndex_ = itemsPerPage-1;
|
|
||||||
--(it.currentPageIndex_);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
--(it.currentItemIndex_);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Value &
|
|
||||||
ValueInternalArray::unsafeDereference( const IteratorState &it )
|
|
||||||
{
|
|
||||||
return (*(it.currentPageIndex_))[it.currentItemIndex_];
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Value &
|
|
||||||
ValueInternalArray::dereference( const IteratorState &it )
|
|
||||||
{
|
|
||||||
JSON_ASSERT_MESSAGE( it.array_ &&
|
|
||||||
(it.currentPageIndex_ - it.array_->pages_)*itemsPerPage + it.currentItemIndex_
|
|
||||||
< it.array_->size_,
|
|
||||||
"ValueInternalArray::dereference(): dereferencing invalid iterator" );
|
|
||||||
return unsafeDereference( it );
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
ValueInternalArray::makeBeginIterator( IteratorState &it ) const
|
|
||||||
{
|
|
||||||
it.array_ = const_cast<ValueInternalArray *>( this );
|
|
||||||
it.currentItemIndex_ = 0;
|
|
||||||
it.currentPageIndex_ = pages_;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
ValueInternalArray::makeIterator( IteratorState &it, ArrayIndex index ) const
|
|
||||||
{
|
|
||||||
it.array_ = const_cast<ValueInternalArray *>( this );
|
|
||||||
it.currentItemIndex_ = index % itemsPerPage;
|
|
||||||
it.currentPageIndex_ = pages_ + index / itemsPerPage;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
ValueInternalArray::makeEndIterator( IteratorState &it ) const
|
|
||||||
{
|
|
||||||
makeIterator( it, size_ );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
ValueInternalArray::ValueInternalArray()
|
|
||||||
: pages_( 0 )
|
|
||||||
, size_( 0 )
|
|
||||||
, pageCount_( 0 )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
ValueInternalArray::ValueInternalArray( const ValueInternalArray &other )
|
|
||||||
: pages_( 0 )
|
|
||||||
, pageCount_( 0 )
|
|
||||||
, size_( other.size_ )
|
|
||||||
{
|
|
||||||
PageIndex minNewPages = other.size_ / itemsPerPage;
|
|
||||||
arrayAllocator()->reallocateArrayPageIndex( pages_, pageCount_, minNewPages );
|
|
||||||
JSON_ASSERT_MESSAGE( pageCount_ >= minNewPages,
|
|
||||||
"ValueInternalArray::reserve(): bad reallocation" );
|
|
||||||
IteratorState itOther;
|
|
||||||
other.makeBeginIterator( itOther );
|
|
||||||
Value *value;
|
|
||||||
for ( ArrayIndex index = 0; index < size_; ++index, increment(itOther) )
|
|
||||||
{
|
|
||||||
if ( index % itemsPerPage == 0 )
|
|
||||||
{
|
|
||||||
PageIndex pageIndex = index / itemsPerPage;
|
|
||||||
value = arrayAllocator()->allocateArrayPage();
|
|
||||||
pages_[pageIndex] = value;
|
|
||||||
}
|
|
||||||
new (value) Value( dereference( itOther ) );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
ValueInternalArray &
|
|
||||||
ValueInternalArray::operator =( const ValueInternalArray &other )
|
|
||||||
{
|
|
||||||
ValueInternalArray temp( other );
|
|
||||||
swap( temp );
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
ValueInternalArray::~ValueInternalArray()
|
|
||||||
{
|
|
||||||
// destroy all constructed items
|
|
||||||
IteratorState it;
|
|
||||||
IteratorState itEnd;
|
|
||||||
makeBeginIterator( it);
|
|
||||||
makeEndIterator( itEnd );
|
|
||||||
for ( ; !equals(it,itEnd); increment(it) )
|
|
||||||
{
|
|
||||||
Value *value = &dereference(it);
|
|
||||||
value->~Value();
|
|
||||||
}
|
|
||||||
// release all pages
|
|
||||||
PageIndex lastPageIndex = size_ / itemsPerPage;
|
|
||||||
for ( PageIndex pageIndex = 0; pageIndex < lastPageIndex; ++pageIndex )
|
|
||||||
arrayAllocator()->releaseArrayPage( pages_[pageIndex] );
|
|
||||||
// release pages index
|
|
||||||
arrayAllocator()->releaseArrayPageIndex( pages_, pageCount_ );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
ValueInternalArray::swap( ValueInternalArray &other )
|
|
||||||
{
|
|
||||||
Value **tempPages = pages_;
|
|
||||||
pages_ = other.pages_;
|
|
||||||
other.pages_ = tempPages;
|
|
||||||
ArrayIndex tempSize = size_;
|
|
||||||
size_ = other.size_;
|
|
||||||
other.size_ = tempSize;
|
|
||||||
PageIndex tempPageCount = pageCount_;
|
|
||||||
pageCount_ = other.pageCount_;
|
|
||||||
other.pageCount_ = tempPageCount;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
ValueInternalArray::clear()
|
|
||||||
{
|
|
||||||
ValueInternalArray dummy;
|
|
||||||
swap( dummy );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
ValueInternalArray::resize( ArrayIndex newSize )
|
|
||||||
{
|
|
||||||
if ( newSize == 0 )
|
|
||||||
clear();
|
|
||||||
else if ( newSize < size_ )
|
|
||||||
{
|
|
||||||
IteratorState it;
|
|
||||||
IteratorState itEnd;
|
|
||||||
makeIterator( it, newSize );
|
|
||||||
makeIterator( itEnd, size_ );
|
|
||||||
for ( ; !equals(it,itEnd); increment(it) )
|
|
||||||
{
|
|
||||||
Value *value = &dereference(it);
|
|
||||||
value->~Value();
|
|
||||||
}
|
|
||||||
PageIndex pageIndex = (newSize + itemsPerPage - 1) / itemsPerPage;
|
|
||||||
PageIndex lastPageIndex = size_ / itemsPerPage;
|
|
||||||
for ( ; pageIndex < lastPageIndex; ++pageIndex )
|
|
||||||
arrayAllocator()->releaseArrayPage( pages_[pageIndex] );
|
|
||||||
size_ = newSize;
|
|
||||||
}
|
|
||||||
else if ( newSize > size_ )
|
|
||||||
resolveReference( newSize );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
ValueInternalArray::makeIndexValid( ArrayIndex index )
|
|
||||||
{
|
|
||||||
// Need to enlarge page index ?
|
|
||||||
if ( index >= pageCount_ * itemsPerPage )
|
|
||||||
{
|
|
||||||
PageIndex minNewPages = (index + 1) / itemsPerPage;
|
|
||||||
arrayAllocator()->reallocateArrayPageIndex( pages_, pageCount_, minNewPages );
|
|
||||||
JSON_ASSERT_MESSAGE( pageCount_ >= minNewPages, "ValueInternalArray::reserve(): bad reallocation" );
|
|
||||||
}
|
|
||||||
|
|
||||||
// Need to allocate new pages ?
|
|
||||||
ArrayIndex nextPageIndex =
|
|
||||||
(size_ % itemsPerPage) != 0 ? size_ - (size_%itemsPerPage) + itemsPerPage
|
|
||||||
: size_;
|
|
||||||
if ( nextPageIndex <= index )
|
|
||||||
{
|
|
||||||
PageIndex pageIndex = nextPageIndex / itemsPerPage;
|
|
||||||
PageIndex pageToAllocate = (index - nextPageIndex) / itemsPerPage + 1;
|
|
||||||
for ( ; pageToAllocate-- > 0; ++pageIndex )
|
|
||||||
pages_[pageIndex] = arrayAllocator()->allocateArrayPage();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Initialize all new entries
|
|
||||||
IteratorState it;
|
|
||||||
IteratorState itEnd;
|
|
||||||
makeIterator( it, size_ );
|
|
||||||
size_ = index + 1;
|
|
||||||
makeIterator( itEnd, size_ );
|
|
||||||
for ( ; !equals(it,itEnd); increment(it) )
|
|
||||||
{
|
|
||||||
Value *value = &dereference(it);
|
|
||||||
new (value) Value(); // Construct a default value using placement new
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Value &
|
|
||||||
ValueInternalArray::resolveReference( ArrayIndex index )
|
|
||||||
{
|
|
||||||
if ( index >= size_ )
|
|
||||||
makeIndexValid( index );
|
|
||||||
return pages_[index/itemsPerPage][index%itemsPerPage];
|
|
||||||
}
|
|
||||||
|
|
||||||
Value *
|
|
||||||
ValueInternalArray::find( ArrayIndex index ) const
|
|
||||||
{
|
|
||||||
if ( index >= size_ )
|
|
||||||
return 0;
|
|
||||||
return &(pages_[index/itemsPerPage][index%itemsPerPage]);
|
|
||||||
}
|
|
||||||
|
|
||||||
ValueInternalArray::ArrayIndex
|
|
||||||
ValueInternalArray::size() const
|
|
||||||
{
|
|
||||||
return size_;
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
ValueInternalArray::distance( const IteratorState &x, const IteratorState &y )
|
|
||||||
{
|
|
||||||
return indexOf(y) - indexOf(x);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
ValueInternalArray::ArrayIndex
|
|
||||||
ValueInternalArray::indexOf( const IteratorState &iterator )
|
|
||||||
{
|
|
||||||
if ( !iterator.array_ )
|
|
||||||
return ArrayIndex(-1);
|
|
||||||
return ArrayIndex(
|
|
||||||
(iterator.currentPageIndex_ - iterator.array_->pages_) * itemsPerPage
|
|
||||||
+ iterator.currentItemIndex_ );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int
|
|
||||||
ValueInternalArray::compare( const ValueInternalArray &other ) const
|
|
||||||
{
|
|
||||||
int sizeDiff( size_ - other.size_ );
|
|
||||||
if ( sizeDiff != 0 )
|
|
||||||
return sizeDiff;
|
|
||||||
|
|
||||||
for ( ArrayIndex index =0; index < size_; ++index )
|
|
||||||
{
|
|
||||||
int diff = pages_[index/itemsPerPage][index%itemsPerPage].compare(
|
|
||||||
other.pages_[index/itemsPerPage][index%itemsPerPage] );
|
|
||||||
if ( diff != 0 )
|
|
||||||
return diff;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
@ -1,607 +0,0 @@
|
|||||||
// included by json_value.cpp
|
|
||||||
// everything is within Json namespace
|
|
||||||
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// class ValueInternalMap
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
/** \internal MUST be safely initialized using memset( this, 0, sizeof(ValueInternalLink) );
|
|
||||||
* This optimization is used by the fast allocator.
|
|
||||||
*/
|
|
||||||
ValueInternalLink::ValueInternalLink()
|
|
||||||
: previous_( 0 )
|
|
||||||
, next_( 0 )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ValueInternalLink::~ValueInternalLink()
|
|
||||||
{
|
|
||||||
for ( int index =0; index < itemPerLink; ++index )
|
|
||||||
{
|
|
||||||
if ( !items_[index].isItemAvailable() )
|
|
||||||
{
|
|
||||||
if ( !items_[index].isMemberNameStatic() )
|
|
||||||
free( keys_[index] );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ValueMapAllocator::~ValueMapAllocator()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
|
|
||||||
class DefaultValueMapAllocator : public ValueMapAllocator
|
|
||||||
{
|
|
||||||
public: // overridden from ValueMapAllocator
|
|
||||||
virtual ValueInternalMap *newMap()
|
|
||||||
{
|
|
||||||
return new ValueInternalMap();
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual ValueInternalMap *newMapCopy( const ValueInternalMap &other )
|
|
||||||
{
|
|
||||||
return new ValueInternalMap( other );
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void destructMap( ValueInternalMap *map )
|
|
||||||
{
|
|
||||||
delete map;
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual ValueInternalLink *allocateMapBuckets( unsigned int size )
|
|
||||||
{
|
|
||||||
return new ValueInternalLink[size];
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void releaseMapBuckets( ValueInternalLink *links )
|
|
||||||
{
|
|
||||||
delete [] links;
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual ValueInternalLink *allocateMapLink()
|
|
||||||
{
|
|
||||||
return new ValueInternalLink();
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void releaseMapLink( ValueInternalLink *link )
|
|
||||||
{
|
|
||||||
delete link;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
#else
|
|
||||||
/// @todo make this thread-safe (lock when accessign batch allocator)
|
|
||||||
class DefaultValueMapAllocator : public ValueMapAllocator
|
|
||||||
{
|
|
||||||
public: // overridden from ValueMapAllocator
|
|
||||||
virtual ValueInternalMap *newMap()
|
|
||||||
{
|
|
||||||
ValueInternalMap *map = mapsAllocator_.allocate();
|
|
||||||
new (map) ValueInternalMap(); // placement new
|
|
||||||
return map;
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual ValueInternalMap *newMapCopy( const ValueInternalMap &other )
|
|
||||||
{
|
|
||||||
ValueInternalMap *map = mapsAllocator_.allocate();
|
|
||||||
new (map) ValueInternalMap( other ); // placement new
|
|
||||||
return map;
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void destructMap( ValueInternalMap *map )
|
|
||||||
{
|
|
||||||
if ( map )
|
|
||||||
{
|
|
||||||
map->~ValueInternalMap();
|
|
||||||
mapsAllocator_.release( map );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual ValueInternalLink *allocateMapBuckets( unsigned int size )
|
|
||||||
{
|
|
||||||
return new ValueInternalLink[size];
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void releaseMapBuckets( ValueInternalLink *links )
|
|
||||||
{
|
|
||||||
delete [] links;
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual ValueInternalLink *allocateMapLink()
|
|
||||||
{
|
|
||||||
ValueInternalLink *link = linksAllocator_.allocate();
|
|
||||||
memset( link, 0, sizeof(ValueInternalLink) );
|
|
||||||
return link;
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual void releaseMapLink( ValueInternalLink *link )
|
|
||||||
{
|
|
||||||
link->~ValueInternalLink();
|
|
||||||
linksAllocator_.release( link );
|
|
||||||
}
|
|
||||||
private:
|
|
||||||
BatchAllocator<ValueInternalMap,1> mapsAllocator_;
|
|
||||||
BatchAllocator<ValueInternalLink,1> linksAllocator_;
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static ValueMapAllocator *&mapAllocator()
|
|
||||||
{
|
|
||||||
static DefaultValueMapAllocator defaultAllocator;
|
|
||||||
static ValueMapAllocator *mapAllocator = &defaultAllocator;
|
|
||||||
return mapAllocator;
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct DummyMapAllocatorInitializer {
|
|
||||||
DummyMapAllocatorInitializer()
|
|
||||||
{
|
|
||||||
mapAllocator(); // ensure mapAllocator() statics are initialized before main().
|
|
||||||
}
|
|
||||||
} dummyMapAllocatorInitializer;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// h(K) = value * K >> w ; with w = 32 & K prime w.r.t. 2^32.
|
|
||||||
|
|
||||||
/*
|
|
||||||
use linked list hash map.
|
|
||||||
buckets array is a container.
|
|
||||||
linked list element contains 6 key/values. (memory = (16+4) * 6 + 4 = 124)
|
|
||||||
value have extra state: valid, available, deleted
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
ValueInternalMap::ValueInternalMap()
|
|
||||||
: buckets_( 0 )
|
|
||||||
, tailLink_( 0 )
|
|
||||||
, bucketsSize_( 0 )
|
|
||||||
, itemCount_( 0 )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
ValueInternalMap::ValueInternalMap( const ValueInternalMap &other )
|
|
||||||
: buckets_( 0 )
|
|
||||||
, tailLink_( 0 )
|
|
||||||
, bucketsSize_( 0 )
|
|
||||||
, itemCount_( 0 )
|
|
||||||
{
|
|
||||||
reserve( other.itemCount_ );
|
|
||||||
IteratorState it;
|
|
||||||
IteratorState itEnd;
|
|
||||||
other.makeBeginIterator( it );
|
|
||||||
other.makeEndIterator( itEnd );
|
|
||||||
for ( ; !equals(it,itEnd); increment(it) )
|
|
||||||
{
|
|
||||||
bool isStatic;
|
|
||||||
const char *memberName = key( it, isStatic );
|
|
||||||
const Value &aValue = value( it );
|
|
||||||
resolveReference(memberName, isStatic) = aValue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
ValueInternalMap &
|
|
||||||
ValueInternalMap::operator =( const ValueInternalMap &other )
|
|
||||||
{
|
|
||||||
ValueInternalMap dummy( other );
|
|
||||||
swap( dummy );
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
ValueInternalMap::~ValueInternalMap()
|
|
||||||
{
|
|
||||||
if ( buckets_ )
|
|
||||||
{
|
|
||||||
for ( BucketIndex bucketIndex =0; bucketIndex < bucketsSize_; ++bucketIndex )
|
|
||||||
{
|
|
||||||
ValueInternalLink *link = buckets_[bucketIndex].next_;
|
|
||||||
while ( link )
|
|
||||||
{
|
|
||||||
ValueInternalLink *linkToRelease = link;
|
|
||||||
link = link->next_;
|
|
||||||
mapAllocator()->releaseMapLink( linkToRelease );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
mapAllocator()->releaseMapBuckets( buckets_ );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
ValueInternalMap::swap( ValueInternalMap &other )
|
|
||||||
{
|
|
||||||
ValueInternalLink *tempBuckets = buckets_;
|
|
||||||
buckets_ = other.buckets_;
|
|
||||||
other.buckets_ = tempBuckets;
|
|
||||||
ValueInternalLink *tempTailLink = tailLink_;
|
|
||||||
tailLink_ = other.tailLink_;
|
|
||||||
other.tailLink_ = tempTailLink;
|
|
||||||
BucketIndex tempBucketsSize = bucketsSize_;
|
|
||||||
bucketsSize_ = other.bucketsSize_;
|
|
||||||
other.bucketsSize_ = tempBucketsSize;
|
|
||||||
BucketIndex tempItemCount = itemCount_;
|
|
||||||
itemCount_ = other.itemCount_;
|
|
||||||
other.itemCount_ = tempItemCount;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
ValueInternalMap::clear()
|
|
||||||
{
|
|
||||||
ValueInternalMap dummy;
|
|
||||||
swap( dummy );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
ValueInternalMap::BucketIndex
|
|
||||||
ValueInternalMap::size() const
|
|
||||||
{
|
|
||||||
return itemCount_;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool
|
|
||||||
ValueInternalMap::reserveDelta( BucketIndex growth )
|
|
||||||
{
|
|
||||||
return reserve( itemCount_ + growth );
|
|
||||||
}
|
|
||||||
|
|
||||||
bool
|
|
||||||
ValueInternalMap::reserve( BucketIndex newItemCount )
|
|
||||||
{
|
|
||||||
if ( !buckets_ && newItemCount > 0 )
|
|
||||||
{
|
|
||||||
buckets_ = mapAllocator()->allocateMapBuckets( 1 );
|
|
||||||
bucketsSize_ = 1;
|
|
||||||
tailLink_ = &buckets_[0];
|
|
||||||
}
|
|
||||||
// BucketIndex idealBucketCount = (newItemCount + ValueInternalLink::itemPerLink) / ValueInternalLink::itemPerLink;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
const Value *
|
|
||||||
ValueInternalMap::find( const char *key ) const
|
|
||||||
{
|
|
||||||
if ( !bucketsSize_ )
|
|
||||||
return 0;
|
|
||||||
HashKey hashedKey = hash( key );
|
|
||||||
BucketIndex bucketIndex = hashedKey % bucketsSize_;
|
|
||||||
for ( const ValueInternalLink *current = &buckets_[bucketIndex];
|
|
||||||
current != 0;
|
|
||||||
current = current->next_ )
|
|
||||||
{
|
|
||||||
for ( BucketIndex index=0; index < ValueInternalLink::itemPerLink; ++index )
|
|
||||||
{
|
|
||||||
if ( current->items_[index].isItemAvailable() )
|
|
||||||
return 0;
|
|
||||||
if ( strcmp( key, current->keys_[index] ) == 0 )
|
|
||||||
return ¤t->items_[index];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Value *
|
|
||||||
ValueInternalMap::find( const char *key )
|
|
||||||
{
|
|
||||||
const ValueInternalMap *constThis = this;
|
|
||||||
return const_cast<Value *>( constThis->find( key ) );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Value &
|
|
||||||
ValueInternalMap::resolveReference( const char *key,
|
|
||||||
bool isStatic )
|
|
||||||
{
|
|
||||||
HashKey hashedKey = hash( key );
|
|
||||||
if ( bucketsSize_ )
|
|
||||||
{
|
|
||||||
BucketIndex bucketIndex = hashedKey % bucketsSize_;
|
|
||||||
ValueInternalLink **previous = 0;
|
|
||||||
BucketIndex index;
|
|
||||||
for ( ValueInternalLink *current = &buckets_[bucketIndex];
|
|
||||||
current != 0;
|
|
||||||
previous = ¤t->next_, current = current->next_ )
|
|
||||||
{
|
|
||||||
for ( index=0; index < ValueInternalLink::itemPerLink; ++index )
|
|
||||||
{
|
|
||||||
if ( current->items_[index].isItemAvailable() )
|
|
||||||
return setNewItem( key, isStatic, current, index );
|
|
||||||
if ( strcmp( key, current->keys_[index] ) == 0 )
|
|
||||||
return current->items_[index];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
reserveDelta( 1 );
|
|
||||||
return unsafeAdd( key, isStatic, hashedKey );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
ValueInternalMap::remove( const char *key )
|
|
||||||
{
|
|
||||||
HashKey hashedKey = hash( key );
|
|
||||||
if ( !bucketsSize_ )
|
|
||||||
return;
|
|
||||||
BucketIndex bucketIndex = hashedKey % bucketsSize_;
|
|
||||||
for ( ValueInternalLink *link = &buckets_[bucketIndex];
|
|
||||||
link != 0;
|
|
||||||
link = link->next_ )
|
|
||||||
{
|
|
||||||
BucketIndex index;
|
|
||||||
for ( index =0; index < ValueInternalLink::itemPerLink; ++index )
|
|
||||||
{
|
|
||||||
if ( link->items_[index].isItemAvailable() )
|
|
||||||
return;
|
|
||||||
if ( strcmp( key, link->keys_[index] ) == 0 )
|
|
||||||
{
|
|
||||||
doActualRemove( link, index, bucketIndex );
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
ValueInternalMap::doActualRemove( ValueInternalLink *link,
|
|
||||||
BucketIndex index,
|
|
||||||
BucketIndex bucketIndex )
|
|
||||||
{
|
|
||||||
// find last item of the bucket and swap it with the 'removed' one.
|
|
||||||
// set removed items flags to 'available'.
|
|
||||||
// if last page only contains 'available' items, then desallocate it (it's empty)
|
|
||||||
ValueInternalLink *&lastLink = getLastLinkInBucket( index );
|
|
||||||
BucketIndex lastItemIndex = 1; // a link can never be empty, so start at 1
|
|
||||||
for ( ;
|
|
||||||
lastItemIndex < ValueInternalLink::itemPerLink;
|
|
||||||
++lastItemIndex ) // may be optimized with dicotomic search
|
|
||||||
{
|
|
||||||
if ( lastLink->items_[lastItemIndex].isItemAvailable() )
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
BucketIndex lastUsedIndex = lastItemIndex - 1;
|
|
||||||
Value *valueToDelete = &link->items_[index];
|
|
||||||
Value *valueToPreserve = &lastLink->items_[lastUsedIndex];
|
|
||||||
if ( valueToDelete != valueToPreserve )
|
|
||||||
valueToDelete->swap( *valueToPreserve );
|
|
||||||
if ( lastUsedIndex == 0 ) // page is now empty
|
|
||||||
{ // remove it from bucket linked list and delete it.
|
|
||||||
ValueInternalLink *linkPreviousToLast = lastLink->previous_;
|
|
||||||
if ( linkPreviousToLast != 0 ) // can not deleted bucket link.
|
|
||||||
{
|
|
||||||
mapAllocator()->releaseMapLink( lastLink );
|
|
||||||
linkPreviousToLast->next_ = 0;
|
|
||||||
lastLink = linkPreviousToLast;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Value dummy;
|
|
||||||
valueToPreserve->swap( dummy ); // restore deleted to default Value.
|
|
||||||
valueToPreserve->setItemUsed( false );
|
|
||||||
}
|
|
||||||
--itemCount_;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
ValueInternalLink *&
|
|
||||||
ValueInternalMap::getLastLinkInBucket( BucketIndex bucketIndex )
|
|
||||||
{
|
|
||||||
if ( bucketIndex == bucketsSize_ - 1 )
|
|
||||||
return tailLink_;
|
|
||||||
ValueInternalLink *&previous = buckets_[bucketIndex+1].previous_;
|
|
||||||
if ( !previous )
|
|
||||||
previous = &buckets_[bucketIndex];
|
|
||||||
return previous;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Value &
|
|
||||||
ValueInternalMap::setNewItem( const char *key,
|
|
||||||
bool isStatic,
|
|
||||||
ValueInternalLink *link,
|
|
||||||
BucketIndex index )
|
|
||||||
{
|
|
||||||
char *duplicatedKey = valueAllocator()->makeMemberName( key );
|
|
||||||
++itemCount_;
|
|
||||||
link->keys_[index] = duplicatedKey;
|
|
||||||
link->items_[index].setItemUsed();
|
|
||||||
link->items_[index].setMemberNameIsStatic( isStatic );
|
|
||||||
return link->items_[index]; // items already default constructed.
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Value &
|
|
||||||
ValueInternalMap::unsafeAdd( const char *key,
|
|
||||||
bool isStatic,
|
|
||||||
HashKey hashedKey )
|
|
||||||
{
|
|
||||||
JSON_ASSERT_MESSAGE( bucketsSize_ > 0, "ValueInternalMap::unsafeAdd(): internal logic error." );
|
|
||||||
BucketIndex bucketIndex = hashedKey % bucketsSize_;
|
|
||||||
ValueInternalLink *&previousLink = getLastLinkInBucket( bucketIndex );
|
|
||||||
ValueInternalLink *link = previousLink;
|
|
||||||
BucketIndex index;
|
|
||||||
for ( index =0; index < ValueInternalLink::itemPerLink; ++index )
|
|
||||||
{
|
|
||||||
if ( link->items_[index].isItemAvailable() )
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if ( index == ValueInternalLink::itemPerLink ) // need to add a new page
|
|
||||||
{
|
|
||||||
ValueInternalLink *newLink = mapAllocator()->allocateMapLink();
|
|
||||||
index = 0;
|
|
||||||
link->next_ = newLink;
|
|
||||||
previousLink = newLink;
|
|
||||||
link = newLink;
|
|
||||||
}
|
|
||||||
return setNewItem( key, isStatic, link, index );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
ValueInternalMap::HashKey
|
|
||||||
ValueInternalMap::hash( const char *key ) const
|
|
||||||
{
|
|
||||||
HashKey hash = 0;
|
|
||||||
while ( *key )
|
|
||||||
hash += *key++ * 37;
|
|
||||||
return hash;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int
|
|
||||||
ValueInternalMap::compare( const ValueInternalMap &other ) const
|
|
||||||
{
|
|
||||||
int sizeDiff( itemCount_ - other.itemCount_ );
|
|
||||||
if ( sizeDiff != 0 )
|
|
||||||
return sizeDiff;
|
|
||||||
// Strict order guaranty is required. Compare all keys FIRST, then compare values.
|
|
||||||
IteratorState it;
|
|
||||||
IteratorState itEnd;
|
|
||||||
makeBeginIterator( it );
|
|
||||||
makeEndIterator( itEnd );
|
|
||||||
for ( ; !equals(it,itEnd); increment(it) )
|
|
||||||
{
|
|
||||||
if ( !other.find( key( it ) ) )
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
// All keys are equals, let's compare values
|
|
||||||
makeBeginIterator( it );
|
|
||||||
for ( ; !equals(it,itEnd); increment(it) )
|
|
||||||
{
|
|
||||||
const Value *otherValue = other.find( key( it ) );
|
|
||||||
int valueDiff = value(it).compare( *otherValue );
|
|
||||||
if ( valueDiff != 0 )
|
|
||||||
return valueDiff;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
ValueInternalMap::makeBeginIterator( IteratorState &it ) const
|
|
||||||
{
|
|
||||||
it.map_ = const_cast<ValueInternalMap *>( this );
|
|
||||||
it.bucketIndex_ = 0;
|
|
||||||
it.itemIndex_ = 0;
|
|
||||||
it.link_ = buckets_;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
ValueInternalMap::makeEndIterator( IteratorState &it ) const
|
|
||||||
{
|
|
||||||
it.map_ = const_cast<ValueInternalMap *>( this );
|
|
||||||
it.bucketIndex_ = bucketsSize_;
|
|
||||||
it.itemIndex_ = 0;
|
|
||||||
it.link_ = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
ValueInternalMap::equals( const IteratorState &x, const IteratorState &other )
|
|
||||||
{
|
|
||||||
return x.map_ == other.map_
|
|
||||||
&& x.bucketIndex_ == other.bucketIndex_
|
|
||||||
&& x.link_ == other.link_
|
|
||||||
&& x.itemIndex_ == other.itemIndex_;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
ValueInternalMap::incrementBucket( IteratorState &iterator )
|
|
||||||
{
|
|
||||||
++iterator.bucketIndex_;
|
|
||||||
JSON_ASSERT_MESSAGE( iterator.bucketIndex_ <= iterator.map_->bucketsSize_,
|
|
||||||
"ValueInternalMap::increment(): attempting to iterate beyond end." );
|
|
||||||
if ( iterator.bucketIndex_ == iterator.map_->bucketsSize_ )
|
|
||||||
iterator.link_ = 0;
|
|
||||||
else
|
|
||||||
iterator.link_ = &(iterator.map_->buckets_[iterator.bucketIndex_]);
|
|
||||||
iterator.itemIndex_ = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
ValueInternalMap::increment( IteratorState &iterator )
|
|
||||||
{
|
|
||||||
JSON_ASSERT_MESSAGE( iterator.map_, "Attempting to iterator using invalid iterator." );
|
|
||||||
++iterator.itemIndex_;
|
|
||||||
if ( iterator.itemIndex_ == ValueInternalLink::itemPerLink )
|
|
||||||
{
|
|
||||||
JSON_ASSERT_MESSAGE( iterator.link_ != 0,
|
|
||||||
"ValueInternalMap::increment(): attempting to iterate beyond end." );
|
|
||||||
iterator.link_ = iterator.link_->next_;
|
|
||||||
if ( iterator.link_ == 0 )
|
|
||||||
incrementBucket( iterator );
|
|
||||||
}
|
|
||||||
else if ( iterator.link_->items_[iterator.itemIndex_].isItemAvailable() )
|
|
||||||
{
|
|
||||||
incrementBucket( iterator );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
ValueInternalMap::decrement( IteratorState &iterator )
|
|
||||||
{
|
|
||||||
if ( iterator.itemIndex_ == 0 )
|
|
||||||
{
|
|
||||||
JSON_ASSERT_MESSAGE( iterator.map_, "Attempting to iterate using invalid iterator." );
|
|
||||||
if ( iterator.link_ == &iterator.map_->buckets_[iterator.bucketIndex_] )
|
|
||||||
{
|
|
||||||
JSON_ASSERT_MESSAGE( iterator.bucketIndex_ > 0, "Attempting to iterate beyond beginning." );
|
|
||||||
--(iterator.bucketIndex_);
|
|
||||||
}
|
|
||||||
iterator.link_ = iterator.link_->previous_;
|
|
||||||
iterator.itemIndex_ = ValueInternalLink::itemPerLink - 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
const char *
|
|
||||||
ValueInternalMap::key( const IteratorState &iterator )
|
|
||||||
{
|
|
||||||
JSON_ASSERT_MESSAGE( iterator.link_, "Attempting to iterate using invalid iterator." );
|
|
||||||
return iterator.link_->keys_[iterator.itemIndex_];
|
|
||||||
}
|
|
||||||
|
|
||||||
const char *
|
|
||||||
ValueInternalMap::key( const IteratorState &iterator, bool &isStatic )
|
|
||||||
{
|
|
||||||
JSON_ASSERT_MESSAGE( iterator.link_, "Attempting to iterate using invalid iterator." );
|
|
||||||
isStatic = iterator.link_->items_[iterator.itemIndex_].isMemberNameStatic();
|
|
||||||
return iterator.link_->keys_[iterator.itemIndex_];
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Value &
|
|
||||||
ValueInternalMap::value( const IteratorState &iterator )
|
|
||||||
{
|
|
||||||
JSON_ASSERT_MESSAGE( iterator.link_, "Attempting to iterate using invalid iterator." );
|
|
||||||
return iterator.link_->items_[iterator.itemIndex_];
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int
|
|
||||||
ValueInternalMap::distance( const IteratorState &x, const IteratorState &y )
|
|
||||||
{
|
|
||||||
int offset = 0;
|
|
||||||
IteratorState it = x;
|
|
||||||
while ( !equals( it, y ) )
|
|
||||||
increment( it );
|
|
||||||
return offset;
|
|
||||||
}
|
|
||||||
@ -1,885 +0,0 @@
|
|||||||
#include <json/reader.h>
|
|
||||||
#include <json/value.h>
|
|
||||||
#include <utility>
|
|
||||||
#include <cstdio>
|
|
||||||
#include <cassert>
|
|
||||||
#include <cstring>
|
|
||||||
#include <iostream>
|
|
||||||
#include <stdexcept>
|
|
||||||
|
|
||||||
#if _MSC_VER >= 1400 // VC++ 8.0
|
|
||||||
#pragma warning( disable : 4996 ) // disable warning about strdup being deprecated.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace Json {
|
|
||||||
|
|
||||||
// Implementation of class Features
|
|
||||||
// ////////////////////////////////
|
|
||||||
|
|
||||||
Features::Features()
|
|
||||||
: allowComments_( true )
|
|
||||||
, strictRoot_( false )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Features
|
|
||||||
Features::all()
|
|
||||||
{
|
|
||||||
return Features();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Features
|
|
||||||
Features::strictMode()
|
|
||||||
{
|
|
||||||
Features features;
|
|
||||||
features.allowComments_ = false;
|
|
||||||
features.strictRoot_ = true;
|
|
||||||
return features;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Implementation of class Reader
|
|
||||||
// ////////////////////////////////
|
|
||||||
|
|
||||||
|
|
||||||
static inline bool
|
|
||||||
in( Reader::Char c, Reader::Char c1, Reader::Char c2, Reader::Char c3, Reader::Char c4 )
|
|
||||||
{
|
|
||||||
return c == c1 || c == c2 || c == c3 || c == c4;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline bool
|
|
||||||
in( Reader::Char c, Reader::Char c1, Reader::Char c2, Reader::Char c3, Reader::Char c4, Reader::Char c5 )
|
|
||||||
{
|
|
||||||
return c == c1 || c == c2 || c == c3 || c == c4 || c == c5;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static bool
|
|
||||||
containsNewLine( Reader::Location begin,
|
|
||||||
Reader::Location end )
|
|
||||||
{
|
|
||||||
for ( ;begin < end; ++begin )
|
|
||||||
if ( *begin == '\n' || *begin == '\r' )
|
|
||||||
return true;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
static std::string codePointToUTF8(unsigned int cp)
|
|
||||||
{
|
|
||||||
std::string result;
|
|
||||||
|
|
||||||
// based on description from http://en.wikipedia.org/wiki/UTF-8
|
|
||||||
|
|
||||||
if (cp <= 0x7f)
|
|
||||||
{
|
|
||||||
result.resize(1);
|
|
||||||
result[0] = static_cast<char>(cp);
|
|
||||||
}
|
|
||||||
else if (cp <= 0x7FF)
|
|
||||||
{
|
|
||||||
result.resize(2);
|
|
||||||
result[1] = static_cast<char>(0x80 | (0x3f & cp));
|
|
||||||
result[0] = static_cast<char>(0xC0 | (0x1f & (cp >> 6)));
|
|
||||||
}
|
|
||||||
else if (cp <= 0xFFFF)
|
|
||||||
{
|
|
||||||
result.resize(3);
|
|
||||||
result[2] = static_cast<char>(0x80 | (0x3f & cp));
|
|
||||||
result[1] = 0x80 | static_cast<char>((0x3f & (cp >> 6)));
|
|
||||||
result[0] = 0xE0 | static_cast<char>((0xf & (cp >> 12)));
|
|
||||||
}
|
|
||||||
else if (cp <= 0x10FFFF)
|
|
||||||
{
|
|
||||||
result.resize(4);
|
|
||||||
result[3] = static_cast<char>(0x80 | (0x3f & cp));
|
|
||||||
result[2] = static_cast<char>(0x80 | (0x3f & (cp >> 6)));
|
|
||||||
result[1] = static_cast<char>(0x80 | (0x3f & (cp >> 12)));
|
|
||||||
result[0] = static_cast<char>(0xF0 | (0x7 & (cp >> 18)));
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Class Reader
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
Reader::Reader()
|
|
||||||
: features_( Features::all() )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Reader::Reader( const Features &features )
|
|
||||||
: features_( features )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
Reader::parse( const std::string &document,
|
|
||||||
Value &root,
|
|
||||||
bool collectComments )
|
|
||||||
{
|
|
||||||
document_ = document;
|
|
||||||
const char *begin = document_.c_str();
|
|
||||||
const char *end = begin + document_.length();
|
|
||||||
return parse( begin, end, root, collectComments );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
Reader::parse( std::istream& sin,
|
|
||||||
Value &root,
|
|
||||||
bool collectComments )
|
|
||||||
{
|
|
||||||
//std::istream_iterator<char> begin(sin);
|
|
||||||
//std::istream_iterator<char> end;
|
|
||||||
// Those would allow streamed input from a file, if parse() were a
|
|
||||||
// template function.
|
|
||||||
|
|
||||||
// Since std::string is reference-counted, this at least does not
|
|
||||||
// create an extra copy.
|
|
||||||
std::string doc;
|
|
||||||
std::getline(sin, doc, (char)EOF);
|
|
||||||
return parse( doc, root, collectComments );
|
|
||||||
}
|
|
||||||
|
|
||||||
bool
|
|
||||||
Reader::parse( const char *beginDoc, const char *endDoc,
|
|
||||||
Value &root,
|
|
||||||
bool collectComments )
|
|
||||||
{
|
|
||||||
if ( !features_.allowComments_ )
|
|
||||||
{
|
|
||||||
collectComments = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
begin_ = beginDoc;
|
|
||||||
end_ = endDoc;
|
|
||||||
collectComments_ = collectComments;
|
|
||||||
current_ = begin_;
|
|
||||||
lastValueEnd_ = 0;
|
|
||||||
lastValue_ = 0;
|
|
||||||
commentsBefore_ = "";
|
|
||||||
errors_.clear();
|
|
||||||
while ( !nodes_.empty() )
|
|
||||||
nodes_.pop();
|
|
||||||
nodes_.push( &root );
|
|
||||||
|
|
||||||
bool successful = readValue();
|
|
||||||
Token token;
|
|
||||||
skipCommentTokens( token );
|
|
||||||
if ( collectComments_ && !commentsBefore_.empty() )
|
|
||||||
root.setComment( commentsBefore_, commentAfter );
|
|
||||||
if ( features_.strictRoot_ )
|
|
||||||
{
|
|
||||||
if ( !root.isArray() && !root.isObject() )
|
|
||||||
{
|
|
||||||
// Set error location to start of doc, ideally should be first token found in doc
|
|
||||||
token.type_ = tokenError;
|
|
||||||
token.start_ = beginDoc;
|
|
||||||
token.end_ = endDoc;
|
|
||||||
addError( "A valid JSON document must be either an array or an object value.",
|
|
||||||
token );
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return successful;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
Reader::readValue()
|
|
||||||
{
|
|
||||||
Token token;
|
|
||||||
skipCommentTokens( token );
|
|
||||||
bool successful = true;
|
|
||||||
|
|
||||||
if ( collectComments_ && !commentsBefore_.empty() )
|
|
||||||
{
|
|
||||||
currentValue().setComment( commentsBefore_, commentBefore );
|
|
||||||
commentsBefore_ = "";
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
switch ( token.type_ )
|
|
||||||
{
|
|
||||||
case tokenObjectBegin:
|
|
||||||
successful = readObject( token );
|
|
||||||
break;
|
|
||||||
case tokenArrayBegin:
|
|
||||||
successful = readArray( token );
|
|
||||||
break;
|
|
||||||
case tokenNumber:
|
|
||||||
successful = decodeNumber( token );
|
|
||||||
break;
|
|
||||||
case tokenString:
|
|
||||||
successful = decodeString( token );
|
|
||||||
break;
|
|
||||||
case tokenTrue:
|
|
||||||
currentValue() = true;
|
|
||||||
break;
|
|
||||||
case tokenFalse:
|
|
||||||
currentValue() = false;
|
|
||||||
break;
|
|
||||||
case tokenNull:
|
|
||||||
currentValue() = Value();
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
return addError( "Syntax error: value, object or array expected.", token );
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( collectComments_ )
|
|
||||||
{
|
|
||||||
lastValueEnd_ = current_;
|
|
||||||
lastValue_ = ¤tValue();
|
|
||||||
}
|
|
||||||
|
|
||||||
return successful;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
Reader::skipCommentTokens( Token &token )
|
|
||||||
{
|
|
||||||
if ( features_.allowComments_ )
|
|
||||||
{
|
|
||||||
do
|
|
||||||
{
|
|
||||||
readToken( token );
|
|
||||||
}
|
|
||||||
while ( token.type_ == tokenComment );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
readToken( token );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
Reader::expectToken( TokenType type, Token &token, const char *message )
|
|
||||||
{
|
|
||||||
readToken( token );
|
|
||||||
if ( token.type_ != type )
|
|
||||||
return addError( message, token );
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
Reader::readToken( Token &token )
|
|
||||||
{
|
|
||||||
skipSpaces();
|
|
||||||
token.start_ = current_;
|
|
||||||
Char c = getNextChar();
|
|
||||||
bool ok = true;
|
|
||||||
switch ( c )
|
|
||||||
{
|
|
||||||
case '{':
|
|
||||||
token.type_ = tokenObjectBegin;
|
|
||||||
break;
|
|
||||||
case '}':
|
|
||||||
token.type_ = tokenObjectEnd;
|
|
||||||
break;
|
|
||||||
case '[':
|
|
||||||
token.type_ = tokenArrayBegin;
|
|
||||||
break;
|
|
||||||
case ']':
|
|
||||||
token.type_ = tokenArrayEnd;
|
|
||||||
break;
|
|
||||||
case '"':
|
|
||||||
token.type_ = tokenString;
|
|
||||||
ok = readString();
|
|
||||||
break;
|
|
||||||
case '/':
|
|
||||||
token.type_ = tokenComment;
|
|
||||||
ok = readComment();
|
|
||||||
break;
|
|
||||||
case '0':
|
|
||||||
case '1':
|
|
||||||
case '2':
|
|
||||||
case '3':
|
|
||||||
case '4':
|
|
||||||
case '5':
|
|
||||||
case '6':
|
|
||||||
case '7':
|
|
||||||
case '8':
|
|
||||||
case '9':
|
|
||||||
case '-':
|
|
||||||
token.type_ = tokenNumber;
|
|
||||||
readNumber();
|
|
||||||
break;
|
|
||||||
case 't':
|
|
||||||
token.type_ = tokenTrue;
|
|
||||||
ok = match( "rue", 3 );
|
|
||||||
break;
|
|
||||||
case 'f':
|
|
||||||
token.type_ = tokenFalse;
|
|
||||||
ok = match( "alse", 4 );
|
|
||||||
break;
|
|
||||||
case 'n':
|
|
||||||
token.type_ = tokenNull;
|
|
||||||
ok = match( "ull", 3 );
|
|
||||||
break;
|
|
||||||
case ',':
|
|
||||||
token.type_ = tokenArraySeparator;
|
|
||||||
break;
|
|
||||||
case ':':
|
|
||||||
token.type_ = tokenMemberSeparator;
|
|
||||||
break;
|
|
||||||
case 0:
|
|
||||||
token.type_ = tokenEndOfStream;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
ok = false;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if ( !ok )
|
|
||||||
token.type_ = tokenError;
|
|
||||||
token.end_ = current_;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
Reader::skipSpaces()
|
|
||||||
{
|
|
||||||
while ( current_ != end_ )
|
|
||||||
{
|
|
||||||
Char c = *current_;
|
|
||||||
if ( c == ' ' || c == '\t' || c == '\r' || c == '\n' )
|
|
||||||
++current_;
|
|
||||||
else
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
Reader::match( Location pattern,
|
|
||||||
int patternLength )
|
|
||||||
{
|
|
||||||
if ( end_ - current_ < patternLength )
|
|
||||||
return false;
|
|
||||||
int index = patternLength;
|
|
||||||
while ( index-- )
|
|
||||||
if ( current_[index] != pattern[index] )
|
|
||||||
return false;
|
|
||||||
current_ += patternLength;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
Reader::readComment()
|
|
||||||
{
|
|
||||||
Location commentBegin = current_ - 1;
|
|
||||||
Char c = getNextChar();
|
|
||||||
bool successful = false;
|
|
||||||
if ( c == '*' )
|
|
||||||
successful = readCStyleComment();
|
|
||||||
else if ( c == '/' )
|
|
||||||
successful = readCppStyleComment();
|
|
||||||
if ( !successful )
|
|
||||||
return false;
|
|
||||||
|
|
||||||
if ( collectComments_ )
|
|
||||||
{
|
|
||||||
CommentPlacement placement = commentBefore;
|
|
||||||
if ( lastValueEnd_ && !containsNewLine( lastValueEnd_, commentBegin ) )
|
|
||||||
{
|
|
||||||
if ( c != '*' || !containsNewLine( commentBegin, current_ ) )
|
|
||||||
placement = commentAfterOnSameLine;
|
|
||||||
}
|
|
||||||
|
|
||||||
addComment( commentBegin, current_, placement );
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
Reader::addComment( Location begin,
|
|
||||||
Location end,
|
|
||||||
CommentPlacement placement )
|
|
||||||
{
|
|
||||||
assert( collectComments_ );
|
|
||||||
if ( placement == commentAfterOnSameLine )
|
|
||||||
{
|
|
||||||
assert( lastValue_ != 0 );
|
|
||||||
lastValue_->setComment( std::string( begin, end ), placement );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if ( !commentsBefore_.empty() )
|
|
||||||
commentsBefore_ += "\n";
|
|
||||||
commentsBefore_ += std::string( begin, end );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
Reader::readCStyleComment()
|
|
||||||
{
|
|
||||||
while ( current_ != end_ )
|
|
||||||
{
|
|
||||||
Char c = getNextChar();
|
|
||||||
if ( c == '*' && *current_ == '/' )
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return getNextChar() == '/';
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
Reader::readCppStyleComment()
|
|
||||||
{
|
|
||||||
while ( current_ != end_ )
|
|
||||||
{
|
|
||||||
Char c = getNextChar();
|
|
||||||
if ( c == '\r' || c == '\n' )
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
Reader::readNumber()
|
|
||||||
{
|
|
||||||
while ( current_ != end_ )
|
|
||||||
{
|
|
||||||
if ( !(*current_ >= '0' && *current_ <= '9') &&
|
|
||||||
!in( *current_, '.', 'e', 'E', '+', '-' ) )
|
|
||||||
break;
|
|
||||||
++current_;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bool
|
|
||||||
Reader::readString()
|
|
||||||
{
|
|
||||||
Char c = 0;
|
|
||||||
while ( current_ != end_ )
|
|
||||||
{
|
|
||||||
c = getNextChar();
|
|
||||||
if ( c == '\\' )
|
|
||||||
getNextChar();
|
|
||||||
else if ( c == '"' )
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return c == '"';
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
Reader::readObject( Token &tokenStart )
|
|
||||||
{
|
|
||||||
Token tokenName;
|
|
||||||
std::string name;
|
|
||||||
currentValue() = Value( objectValue );
|
|
||||||
while ( readToken( tokenName ) )
|
|
||||||
{
|
|
||||||
bool initialTokenOk = true;
|
|
||||||
while ( tokenName.type_ == tokenComment && initialTokenOk )
|
|
||||||
initialTokenOk = readToken( tokenName );
|
|
||||||
if ( !initialTokenOk )
|
|
||||||
break;
|
|
||||||
if ( tokenName.type_ == tokenObjectEnd && name.empty() ) // empty object
|
|
||||||
return true;
|
|
||||||
if ( tokenName.type_ != tokenString )
|
|
||||||
break;
|
|
||||||
|
|
||||||
name = "";
|
|
||||||
if ( !decodeString( tokenName, name ) )
|
|
||||||
return recoverFromError( tokenObjectEnd );
|
|
||||||
|
|
||||||
Token colon;
|
|
||||||
if ( !readToken( colon ) || colon.type_ != tokenMemberSeparator )
|
|
||||||
{
|
|
||||||
return addErrorAndRecover( "Missing ':' after object member name",
|
|
||||||
colon,
|
|
||||||
tokenObjectEnd );
|
|
||||||
}
|
|
||||||
Value &value = currentValue()[ name ];
|
|
||||||
nodes_.push( &value );
|
|
||||||
bool ok = readValue();
|
|
||||||
nodes_.pop();
|
|
||||||
if ( !ok ) // error already set
|
|
||||||
return recoverFromError( tokenObjectEnd );
|
|
||||||
|
|
||||||
Token comma;
|
|
||||||
if ( !readToken( comma )
|
|
||||||
|| ( comma.type_ != tokenObjectEnd &&
|
|
||||||
comma.type_ != tokenArraySeparator &&
|
|
||||||
comma.type_ != tokenComment ) )
|
|
||||||
{
|
|
||||||
return addErrorAndRecover( "Missing ',' or '}' in object declaration",
|
|
||||||
comma,
|
|
||||||
tokenObjectEnd );
|
|
||||||
}
|
|
||||||
bool finalizeTokenOk = true;
|
|
||||||
while ( comma.type_ == tokenComment &&
|
|
||||||
finalizeTokenOk )
|
|
||||||
finalizeTokenOk = readToken( comma );
|
|
||||||
if ( comma.type_ == tokenObjectEnd )
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return addErrorAndRecover( "Missing '}' or object member name",
|
|
||||||
tokenName,
|
|
||||||
tokenObjectEnd );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
Reader::readArray( Token &tokenStart )
|
|
||||||
{
|
|
||||||
currentValue() = Value( arrayValue );
|
|
||||||
skipSpaces();
|
|
||||||
if ( *current_ == ']' ) // empty array
|
|
||||||
{
|
|
||||||
Token endArray;
|
|
||||||
readToken( endArray );
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
int index = 0;
|
|
||||||
while ( true )
|
|
||||||
{
|
|
||||||
Value &value = currentValue()[ index++ ];
|
|
||||||
nodes_.push( &value );
|
|
||||||
bool ok = readValue();
|
|
||||||
nodes_.pop();
|
|
||||||
if ( !ok ) // error already set
|
|
||||||
return recoverFromError( tokenArrayEnd );
|
|
||||||
|
|
||||||
Token token;
|
|
||||||
// Accept Comment after last item in the array.
|
|
||||||
ok = readToken( token );
|
|
||||||
while ( token.type_ == tokenComment && ok )
|
|
||||||
{
|
|
||||||
ok = readToken( token );
|
|
||||||
}
|
|
||||||
bool badTokenType = ( token.type_ == tokenArraySeparator &&
|
|
||||||
token.type_ == tokenArrayEnd );
|
|
||||||
if ( !ok || badTokenType )
|
|
||||||
{
|
|
||||||
return addErrorAndRecover( "Missing ',' or ']' in array declaration",
|
|
||||||
token,
|
|
||||||
tokenArrayEnd );
|
|
||||||
}
|
|
||||||
if ( token.type_ == tokenArrayEnd )
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
Reader::decodeNumber( Token &token )
|
|
||||||
{
|
|
||||||
bool isDouble = false;
|
|
||||||
for ( Location inspect = token.start_; inspect != token.end_; ++inspect )
|
|
||||||
{
|
|
||||||
isDouble = isDouble
|
|
||||||
|| in( *inspect, '.', 'e', 'E', '+' )
|
|
||||||
|| ( *inspect == '-' && inspect != token.start_ );
|
|
||||||
}
|
|
||||||
if ( isDouble )
|
|
||||||
return decodeDouble( token );
|
|
||||||
Location current = token.start_;
|
|
||||||
bool isNegative = *current == '-';
|
|
||||||
if ( isNegative )
|
|
||||||
++current;
|
|
||||||
Value::UInt threshold = (isNegative ? Value::UInt(-Value::minInt)
|
|
||||||
: Value::maxUInt) / 10;
|
|
||||||
Value::UInt value = 0;
|
|
||||||
while ( current < token.end_ )
|
|
||||||
{
|
|
||||||
Char c = *current++;
|
|
||||||
if ( c < '0' || c > '9' )
|
|
||||||
return addError( "'" + std::string( token.start_, token.end_ ) + "' is not a number.", token );
|
|
||||||
if ( value >= threshold )
|
|
||||||
return decodeDouble( token );
|
|
||||||
value = value * 10 + Value::UInt(c - '0');
|
|
||||||
}
|
|
||||||
if ( isNegative )
|
|
||||||
currentValue() = -Value::Int( value );
|
|
||||||
else if ( value <= Value::UInt(Value::maxInt) )
|
|
||||||
currentValue() = Value::Int( value );
|
|
||||||
else
|
|
||||||
currentValue() = value;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
Reader::decodeDouble( Token &token )
|
|
||||||
{
|
|
||||||
double value = 0;
|
|
||||||
const int bufferSize = 32;
|
|
||||||
int count;
|
|
||||||
int length = int(token.end_ - token.start_);
|
|
||||||
if ( length <= bufferSize )
|
|
||||||
{
|
|
||||||
Char buffer[bufferSize];
|
|
||||||
memcpy( buffer, token.start_, length );
|
|
||||||
buffer[length] = 0;
|
|
||||||
count = sscanf( buffer, "%lf", &value );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
std::string buffer( token.start_, token.end_ );
|
|
||||||
count = sscanf( buffer.c_str(), "%lf", &value );
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( count != 1 )
|
|
||||||
return addError( "'" + std::string( token.start_, token.end_ ) + "' is not a number.", token );
|
|
||||||
currentValue() = value;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
Reader::decodeString( Token &token )
|
|
||||||
{
|
|
||||||
std::string decoded;
|
|
||||||
if ( !decodeString( token, decoded ) )
|
|
||||||
return false;
|
|
||||||
currentValue() = decoded;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
Reader::decodeString( Token &token, std::string &decoded )
|
|
||||||
{
|
|
||||||
decoded.reserve( token.end_ - token.start_ - 2 );
|
|
||||||
Location current = token.start_ + 1; // skip '"'
|
|
||||||
Location end = token.end_ - 1; // do not include '"'
|
|
||||||
while ( current != end )
|
|
||||||
{
|
|
||||||
Char c = *current++;
|
|
||||||
if ( c == '"' )
|
|
||||||
break;
|
|
||||||
else if ( c == '\\' )
|
|
||||||
{
|
|
||||||
if ( current == end )
|
|
||||||
return addError( "Empty escape sequence in string", token, current );
|
|
||||||
Char escape = *current++;
|
|
||||||
switch ( escape )
|
|
||||||
{
|
|
||||||
case '"': decoded += '"'; break;
|
|
||||||
case '/': decoded += '/'; break;
|
|
||||||
case '\\': decoded += '\\'; break;
|
|
||||||
case 'b': decoded += '\b'; break;
|
|
||||||
case 'f': decoded += '\f'; break;
|
|
||||||
case 'n': decoded += '\n'; break;
|
|
||||||
case 'r': decoded += '\r'; break;
|
|
||||||
case 't': decoded += '\t'; break;
|
|
||||||
case 'u':
|
|
||||||
{
|
|
||||||
unsigned int unicode;
|
|
||||||
if ( !decodeUnicodeCodePoint( token, current, end, unicode ) )
|
|
||||||
return false;
|
|
||||||
decoded += codePointToUTF8(unicode);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
return addError( "Bad escape sequence in string", token, current );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
decoded += c;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool
|
|
||||||
Reader::decodeUnicodeCodePoint( Token &token,
|
|
||||||
Location ¤t,
|
|
||||||
Location end,
|
|
||||||
unsigned int &unicode )
|
|
||||||
{
|
|
||||||
|
|
||||||
if ( !decodeUnicodeEscapeSequence( token, current, end, unicode ) )
|
|
||||||
return false;
|
|
||||||
if (unicode >= 0xD800 && unicode <= 0xDBFF)
|
|
||||||
{
|
|
||||||
// surrogate pairs
|
|
||||||
if (end - current < 6)
|
|
||||||
return addError( "additional six characters expected to parse unicode surrogate pair.", token, current );
|
|
||||||
unsigned int surrogatePair;
|
|
||||||
if (*(current++) == '\\' && *(current++)== 'u')
|
|
||||||
{
|
|
||||||
if (decodeUnicodeEscapeSequence( token, current, end, surrogatePair ))
|
|
||||||
{
|
|
||||||
unicode = 0x10000 + ((unicode & 0x3FF) << 10) + (surrogatePair & 0x3FF);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
return addError( "expecting another \\u token to begin the second half of a unicode surrogate pair", token, current );
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool
|
|
||||||
Reader::decodeUnicodeEscapeSequence( Token &token,
|
|
||||||
Location ¤t,
|
|
||||||
Location end,
|
|
||||||
unsigned int &unicode )
|
|
||||||
{
|
|
||||||
if ( end - current < 4 )
|
|
||||||
return addError( "Bad unicode escape sequence in string: four digits expected.", token, current );
|
|
||||||
unicode = 0;
|
|
||||||
for ( int index =0; index < 4; ++index )
|
|
||||||
{
|
|
||||||
Char c = *current++;
|
|
||||||
unicode *= 16;
|
|
||||||
if ( c >= '0' && c <= '9' )
|
|
||||||
unicode += c - '0';
|
|
||||||
else if ( c >= 'a' && c <= 'f' )
|
|
||||||
unicode += c - 'a' + 10;
|
|
||||||
else if ( c >= 'A' && c <= 'F' )
|
|
||||||
unicode += c - 'A' + 10;
|
|
||||||
else
|
|
||||||
return addError( "Bad unicode escape sequence in string: hexadecimal digit expected.", token, current );
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
Reader::addError( const std::string &message,
|
|
||||||
Token &token,
|
|
||||||
Location extra )
|
|
||||||
{
|
|
||||||
ErrorInfo info;
|
|
||||||
info.token_ = token;
|
|
||||||
info.message_ = message;
|
|
||||||
info.extra_ = extra;
|
|
||||||
errors_.push_back( info );
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
Reader::recoverFromError( TokenType skipUntilToken )
|
|
||||||
{
|
|
||||||
int errorCount = int(errors_.size());
|
|
||||||
Token skip;
|
|
||||||
while ( true )
|
|
||||||
{
|
|
||||||
if ( !readToken(skip) )
|
|
||||||
errors_.resize( errorCount ); // discard errors caused by recovery
|
|
||||||
if ( skip.type_ == skipUntilToken || skip.type_ == tokenEndOfStream )
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
errors_.resize( errorCount );
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
Reader::addErrorAndRecover( const std::string &message,
|
|
||||||
Token &token,
|
|
||||||
TokenType skipUntilToken )
|
|
||||||
{
|
|
||||||
addError( message, token );
|
|
||||||
return recoverFromError( skipUntilToken );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Value &
|
|
||||||
Reader::currentValue()
|
|
||||||
{
|
|
||||||
return *(nodes_.top());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Reader::Char
|
|
||||||
Reader::getNextChar()
|
|
||||||
{
|
|
||||||
if ( current_ == end_ )
|
|
||||||
return 0;
|
|
||||||
return *current_++;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
Reader::getLocationLineAndColumn( Location location,
|
|
||||||
int &line,
|
|
||||||
int &column ) const
|
|
||||||
{
|
|
||||||
Location current = begin_;
|
|
||||||
Location lastLineStart = current;
|
|
||||||
line = 0;
|
|
||||||
while ( current < location && current != end_ )
|
|
||||||
{
|
|
||||||
Char c = *current++;
|
|
||||||
if ( c == '\r' )
|
|
||||||
{
|
|
||||||
if ( *current == '\n' )
|
|
||||||
++current;
|
|
||||||
lastLineStart = current;
|
|
||||||
++line;
|
|
||||||
}
|
|
||||||
else if ( c == '\n' )
|
|
||||||
{
|
|
||||||
lastLineStart = current;
|
|
||||||
++line;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// column & line start at 1
|
|
||||||
column = int(location - lastLineStart) + 1;
|
|
||||||
++line;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
std::string
|
|
||||||
Reader::getLocationLineAndColumn( Location location ) const
|
|
||||||
{
|
|
||||||
int line, column;
|
|
||||||
getLocationLineAndColumn( location, line, column );
|
|
||||||
char buffer[18+16+16+1];
|
|
||||||
sprintf( buffer, "Line %d, Column %d", line, column );
|
|
||||||
return buffer;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
std::string
|
|
||||||
Reader::getFormatedErrorMessages() const
|
|
||||||
{
|
|
||||||
std::string formattedMessage;
|
|
||||||
for ( Errors::const_iterator itError = errors_.begin();
|
|
||||||
itError != errors_.end();
|
|
||||||
++itError )
|
|
||||||
{
|
|
||||||
const ErrorInfo &error = *itError;
|
|
||||||
formattedMessage += "* " + getLocationLineAndColumn( error.token_.start_ ) + "\n";
|
|
||||||
formattedMessage += " " + error.message_ + "\n";
|
|
||||||
if ( error.extra_ )
|
|
||||||
formattedMessage += "See " + getLocationLineAndColumn( error.extra_ ) + " for detail.\n";
|
|
||||||
}
|
|
||||||
return formattedMessage;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
std::istream& operator>>( std::istream &sin, Value &root )
|
|
||||||
{
|
|
||||||
Json::Reader reader;
|
|
||||||
bool ok = reader.parse(sin, root, true);
|
|
||||||
//JSON_ASSERT( ok );
|
|
||||||
if (!ok) throw std::runtime_error(reader.getFormatedErrorMessages());
|
|
||||||
return sin;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
} // namespace Json
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,292 +0,0 @@
|
|||||||
// included by json_value.cpp
|
|
||||||
// everything is within Json namespace
|
|
||||||
|
|
||||||
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// class ValueIteratorBase
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
ValueIteratorBase::ValueIteratorBase()
|
|
||||||
#ifndef JSON_VALUE_USE_INTERNAL_MAP
|
|
||||||
: current_()
|
|
||||||
, isNull_( true )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
: isArray_( true )
|
|
||||||
, isNull_( true )
|
|
||||||
{
|
|
||||||
iterator_.array_ = ValueInternalArray::IteratorState();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef JSON_VALUE_USE_INTERNAL_MAP
|
|
||||||
ValueIteratorBase::ValueIteratorBase( const Value::ObjectValues::iterator ¤t )
|
|
||||||
: current_( current )
|
|
||||||
, isNull_( false )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
ValueIteratorBase::ValueIteratorBase( const ValueInternalArray::IteratorState &state )
|
|
||||||
: isArray_( true )
|
|
||||||
{
|
|
||||||
iterator_.array_ = state;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
ValueIteratorBase::ValueIteratorBase( const ValueInternalMap::IteratorState &state )
|
|
||||||
: isArray_( false )
|
|
||||||
{
|
|
||||||
iterator_.map_ = state;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
Value &
|
|
||||||
ValueIteratorBase::deref() const
|
|
||||||
{
|
|
||||||
#ifndef JSON_VALUE_USE_INTERNAL_MAP
|
|
||||||
return current_->second;
|
|
||||||
#else
|
|
||||||
if ( isArray_ )
|
|
||||||
return ValueInternalArray::dereference( iterator_.array_ );
|
|
||||||
return ValueInternalMap::value( iterator_.map_ );
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
ValueIteratorBase::increment()
|
|
||||||
{
|
|
||||||
#ifndef JSON_VALUE_USE_INTERNAL_MAP
|
|
||||||
++current_;
|
|
||||||
#else
|
|
||||||
if ( isArray_ )
|
|
||||||
ValueInternalArray::increment( iterator_.array_ );
|
|
||||||
ValueInternalMap::increment( iterator_.map_ );
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
ValueIteratorBase::decrement()
|
|
||||||
{
|
|
||||||
#ifndef JSON_VALUE_USE_INTERNAL_MAP
|
|
||||||
--current_;
|
|
||||||
#else
|
|
||||||
if ( isArray_ )
|
|
||||||
ValueInternalArray::decrement( iterator_.array_ );
|
|
||||||
ValueInternalMap::decrement( iterator_.map_ );
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
ValueIteratorBase::difference_type
|
|
||||||
ValueIteratorBase::computeDistance( const SelfType &other ) const
|
|
||||||
{
|
|
||||||
#ifndef JSON_VALUE_USE_INTERNAL_MAP
|
|
||||||
# ifdef JSON_USE_CPPTL_SMALLMAP
|
|
||||||
return current_ - other.current_;
|
|
||||||
# else
|
|
||||||
// Iterator for null value are initialized using the default
|
|
||||||
// constructor, which initialize current_ to the default
|
|
||||||
// std::map::iterator. As begin() and end() are two instance
|
|
||||||
// of the default std::map::iterator, they can not be compared.
|
|
||||||
// To allow this, we handle this comparison specifically.
|
|
||||||
if ( isNull_ && other.isNull_ )
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Usage of std::distance is not portable (does not compile with Sun Studio 12 RogueWave STL,
|
|
||||||
// which is the one used by default).
|
|
||||||
// Using a portable hand-made version for non random iterator instead:
|
|
||||||
// return difference_type( std::distance( current_, other.current_ ) );
|
|
||||||
difference_type myDistance = 0;
|
|
||||||
for ( Value::ObjectValues::iterator it = current_; it != other.current_; ++it )
|
|
||||||
{
|
|
||||||
++myDistance;
|
|
||||||
}
|
|
||||||
return myDistance;
|
|
||||||
# endif
|
|
||||||
#else
|
|
||||||
if ( isArray_ )
|
|
||||||
return ValueInternalArray::distance( iterator_.array_, other.iterator_.array_ );
|
|
||||||
return ValueInternalMap::distance( iterator_.map_, other.iterator_.map_ );
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
ValueIteratorBase::isEqual( const SelfType &other ) const
|
|
||||||
{
|
|
||||||
#ifndef JSON_VALUE_USE_INTERNAL_MAP
|
|
||||||
if ( isNull_ )
|
|
||||||
{
|
|
||||||
return other.isNull_;
|
|
||||||
}
|
|
||||||
return current_ == other.current_;
|
|
||||||
#else
|
|
||||||
if ( isArray_ )
|
|
||||||
return ValueInternalArray::equals( iterator_.array_, other.iterator_.array_ );
|
|
||||||
return ValueInternalMap::equals( iterator_.map_, other.iterator_.map_ );
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
ValueIteratorBase::copy( const SelfType &other )
|
|
||||||
{
|
|
||||||
#ifndef JSON_VALUE_USE_INTERNAL_MAP
|
|
||||||
current_ = other.current_;
|
|
||||||
#else
|
|
||||||
if ( isArray_ )
|
|
||||||
iterator_.array_ = other.iterator_.array_;
|
|
||||||
iterator_.map_ = other.iterator_.map_;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
Value
|
|
||||||
ValueIteratorBase::key() const
|
|
||||||
{
|
|
||||||
#ifndef JSON_VALUE_USE_INTERNAL_MAP
|
|
||||||
const Value::CZString czstring = (*current_).first;
|
|
||||||
if ( czstring.c_str() )
|
|
||||||
{
|
|
||||||
if ( czstring.isStaticString() )
|
|
||||||
return Value( StaticString( czstring.c_str() ) );
|
|
||||||
return Value( czstring.c_str() );
|
|
||||||
}
|
|
||||||
return Value( czstring.index() );
|
|
||||||
#else
|
|
||||||
if ( isArray_ )
|
|
||||||
return Value( ValueInternalArray::indexOf( iterator_.array_ ) );
|
|
||||||
bool isStatic;
|
|
||||||
const char *memberName = ValueInternalMap::key( iterator_.map_, isStatic );
|
|
||||||
if ( isStatic )
|
|
||||||
return Value( StaticString( memberName ) );
|
|
||||||
return Value( memberName );
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
UInt
|
|
||||||
ValueIteratorBase::index() const
|
|
||||||
{
|
|
||||||
#ifndef JSON_VALUE_USE_INTERNAL_MAP
|
|
||||||
const Value::CZString czstring = (*current_).first;
|
|
||||||
if ( !czstring.c_str() )
|
|
||||||
return czstring.index();
|
|
||||||
return Value::UInt( -1 );
|
|
||||||
#else
|
|
||||||
if ( isArray_ )
|
|
||||||
return Value::UInt( ValueInternalArray::indexOf( iterator_.array_ ) );
|
|
||||||
return Value::UInt( -1 );
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
const char *
|
|
||||||
ValueIteratorBase::memberName() const
|
|
||||||
{
|
|
||||||
#ifndef JSON_VALUE_USE_INTERNAL_MAP
|
|
||||||
const char *name = (*current_).first.c_str();
|
|
||||||
return name ? name : "";
|
|
||||||
#else
|
|
||||||
if ( !isArray_ )
|
|
||||||
return ValueInternalMap::key( iterator_.map_ );
|
|
||||||
return "";
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// class ValueConstIterator
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
ValueConstIterator::ValueConstIterator()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef JSON_VALUE_USE_INTERNAL_MAP
|
|
||||||
ValueConstIterator::ValueConstIterator( const Value::ObjectValues::iterator ¤t )
|
|
||||||
: ValueIteratorBase( current )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
ValueConstIterator::ValueConstIterator( const ValueInternalArray::IteratorState &state )
|
|
||||||
: ValueIteratorBase( state )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ValueConstIterator::ValueConstIterator( const ValueInternalMap::IteratorState &state )
|
|
||||||
: ValueIteratorBase( state )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ValueConstIterator &
|
|
||||||
ValueConstIterator::operator =( const ValueIteratorBase &other )
|
|
||||||
{
|
|
||||||
copy( other );
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// class ValueIterator
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
ValueIterator::ValueIterator()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef JSON_VALUE_USE_INTERNAL_MAP
|
|
||||||
ValueIterator::ValueIterator( const Value::ObjectValues::iterator ¤t )
|
|
||||||
: ValueIteratorBase( current )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
ValueIterator::ValueIterator( const ValueInternalArray::IteratorState &state )
|
|
||||||
: ValueIteratorBase( state )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ValueIterator::ValueIterator( const ValueInternalMap::IteratorState &state )
|
|
||||||
: ValueIteratorBase( state )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
ValueIterator::ValueIterator( const ValueConstIterator &other )
|
|
||||||
: ValueIteratorBase( other )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ValueIterator::ValueIterator( const ValueIterator &other )
|
|
||||||
: ValueIteratorBase( other )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ValueIterator &
|
|
||||||
ValueIterator::operator =( const SelfType &other )
|
|
||||||
{
|
|
||||||
copy( other );
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
@ -1,829 +0,0 @@
|
|||||||
#include <json/writer.h>
|
|
||||||
#include <utility>
|
|
||||||
#include <assert.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <iostream>
|
|
||||||
#include <sstream>
|
|
||||||
#include <iomanip>
|
|
||||||
|
|
||||||
#if _MSC_VER >= 1400 // VC++ 8.0
|
|
||||||
#pragma warning( disable : 4996 ) // disable warning about strdup being deprecated.
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace Json {
|
|
||||||
|
|
||||||
static bool isControlCharacter(char ch)
|
|
||||||
{
|
|
||||||
return ch > 0 && ch <= 0x1F;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool containsControlCharacter( const char* str )
|
|
||||||
{
|
|
||||||
while ( *str )
|
|
||||||
{
|
|
||||||
if ( isControlCharacter( *(str++) ) )
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
static void uintToString( unsigned int value,
|
|
||||||
char *¤t )
|
|
||||||
{
|
|
||||||
*--current = 0;
|
|
||||||
do
|
|
||||||
{
|
|
||||||
*--current = (value % 10) + '0';
|
|
||||||
value /= 10;
|
|
||||||
}
|
|
||||||
while ( value != 0 );
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string valueToString( Int value )
|
|
||||||
{
|
|
||||||
char buffer[32];
|
|
||||||
char *current = buffer + sizeof(buffer);
|
|
||||||
bool isNegative = value < 0;
|
|
||||||
if ( isNegative )
|
|
||||||
value = -value;
|
|
||||||
uintToString( UInt(value), current );
|
|
||||||
if ( isNegative )
|
|
||||||
*--current = '-';
|
|
||||||
assert( current >= buffer );
|
|
||||||
return current;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
std::string valueToString( UInt value )
|
|
||||||
{
|
|
||||||
char buffer[32];
|
|
||||||
char *current = buffer + sizeof(buffer);
|
|
||||||
uintToString( value, current );
|
|
||||||
assert( current >= buffer );
|
|
||||||
return current;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string valueToString( double value )
|
|
||||||
{
|
|
||||||
char buffer[32];
|
|
||||||
#if defined(_MSC_VER) && defined(__STDC_SECURE_LIB__) // Use secure version with visual studio 2005 to avoid warning.
|
|
||||||
sprintf_s(buffer, sizeof(buffer), "%#.16g", value);
|
|
||||||
#else
|
|
||||||
sprintf(buffer, "%#.16g", value);
|
|
||||||
#endif
|
|
||||||
char* ch = buffer + strlen(buffer) - 1;
|
|
||||||
if (*ch != '0') return buffer; // nothing to truncate, so save time
|
|
||||||
while(ch > buffer && *ch == '0'){
|
|
||||||
--ch;
|
|
||||||
}
|
|
||||||
char* last_nonzero = ch;
|
|
||||||
while(ch >= buffer){
|
|
||||||
switch(*ch){
|
|
||||||
case '0':
|
|
||||||
case '1':
|
|
||||||
case '2':
|
|
||||||
case '3':
|
|
||||||
case '4':
|
|
||||||
case '5':
|
|
||||||
case '6':
|
|
||||||
case '7':
|
|
||||||
case '8':
|
|
||||||
case '9':
|
|
||||||
--ch;
|
|
||||||
continue;
|
|
||||||
case '.':
|
|
||||||
// Truncate zeroes to save bytes in output, but keep one.
|
|
||||||
*(last_nonzero+2) = '\0';
|
|
||||||
return buffer;
|
|
||||||
default:
|
|
||||||
return buffer;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return buffer;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
std::string valueToString( bool value )
|
|
||||||
{
|
|
||||||
return value ? "true" : "false";
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string valueToQuotedString( const char *value )
|
|
||||||
{
|
|
||||||
// Not sure how to handle unicode...
|
|
||||||
if (strpbrk(value, "\"\\\b\f\n\r\t") == NULL && !containsControlCharacter( value ))
|
|
||||||
return std::string("\"") + value + "\"";
|
|
||||||
// We have to walk value and escape any special characters.
|
|
||||||
// Appending to std::string is not efficient, but this should be rare.
|
|
||||||
// (Note: forward slashes are *not* rare, but I am not escaping them.)
|
|
||||||
unsigned maxsize = strlen(value)*2 + 3; // allescaped+quotes+NULL
|
|
||||||
std::string result;
|
|
||||||
result.reserve(maxsize); // to avoid lots of mallocs
|
|
||||||
result += "\"";
|
|
||||||
for (const char* c=value; *c != 0; ++c)
|
|
||||||
{
|
|
||||||
switch(*c)
|
|
||||||
{
|
|
||||||
case '\"':
|
|
||||||
result += "\\\"";
|
|
||||||
break;
|
|
||||||
case '\\':
|
|
||||||
result += "\\\\";
|
|
||||||
break;
|
|
||||||
case '\b':
|
|
||||||
result += "\\b";
|
|
||||||
break;
|
|
||||||
case '\f':
|
|
||||||
result += "\\f";
|
|
||||||
break;
|
|
||||||
case '\n':
|
|
||||||
result += "\\n";
|
|
||||||
break;
|
|
||||||
case '\r':
|
|
||||||
result += "\\r";
|
|
||||||
break;
|
|
||||||
case '\t':
|
|
||||||
result += "\\t";
|
|
||||||
break;
|
|
||||||
//case '/':
|
|
||||||
// Even though \/ is considered a legal escape in JSON, a bare
|
|
||||||
// slash is also legal, so I see no reason to escape it.
|
|
||||||
// (I hope I am not misunderstanding something.
|
|
||||||
// blep notes: actually escaping \/ may be useful in javascript to avoid </
|
|
||||||
// sequence.
|
|
||||||
// Should add a flag to allow this compatibility mode and prevent this
|
|
||||||
// sequence from occurring.
|
|
||||||
default:
|
|
||||||
if ( isControlCharacter( *c ) )
|
|
||||||
{
|
|
||||||
std::ostringstream oss;
|
|
||||||
oss << "\\u" << std::hex << std::uppercase << std::setfill('0') << std::setw(4) << static_cast<int>(*c);
|
|
||||||
result += oss.str();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
result += *c;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
result += "\"";
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Class Writer
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
Writer::~Writer()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Class FastWriter
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
FastWriter::FastWriter()
|
|
||||||
: yamlCompatiblityEnabled_( false )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
FastWriter::enableYAMLCompatibility()
|
|
||||||
{
|
|
||||||
yamlCompatiblityEnabled_ = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
std::string
|
|
||||||
FastWriter::write( const Value &root )
|
|
||||||
{
|
|
||||||
document_ = "";
|
|
||||||
writeValue( root );
|
|
||||||
document_ += "\n";
|
|
||||||
return document_;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
FastWriter::writeValue( const Value &value )
|
|
||||||
{
|
|
||||||
switch ( value.type() )
|
|
||||||
{
|
|
||||||
case nullValue:
|
|
||||||
document_ += "null";
|
|
||||||
break;
|
|
||||||
case intValue:
|
|
||||||
document_ += valueToString( value.asInt() );
|
|
||||||
break;
|
|
||||||
case uintValue:
|
|
||||||
document_ += valueToString( value.asUInt() );
|
|
||||||
break;
|
|
||||||
case realValue:
|
|
||||||
document_ += valueToString( value.asDouble() );
|
|
||||||
break;
|
|
||||||
case stringValue:
|
|
||||||
document_ += valueToQuotedString( value.asCString() );
|
|
||||||
break;
|
|
||||||
case booleanValue:
|
|
||||||
document_ += valueToString( value.asBool() );
|
|
||||||
break;
|
|
||||||
case arrayValue:
|
|
||||||
{
|
|
||||||
document_ += "[";
|
|
||||||
int size = value.size();
|
|
||||||
for ( int index =0; index < size; ++index )
|
|
||||||
{
|
|
||||||
if ( index > 0 )
|
|
||||||
document_ += ",";
|
|
||||||
writeValue( value[index] );
|
|
||||||
}
|
|
||||||
document_ += "]";
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case objectValue:
|
|
||||||
{
|
|
||||||
Value::Members members( value.getMemberNames() );
|
|
||||||
document_ += "{";
|
|
||||||
for ( Value::Members::iterator it = members.begin();
|
|
||||||
it != members.end();
|
|
||||||
++it )
|
|
||||||
{
|
|
||||||
const std::string &name = *it;
|
|
||||||
if ( it != members.begin() )
|
|
||||||
document_ += ",";
|
|
||||||
document_ += valueToQuotedString( name.c_str() );
|
|
||||||
document_ += yamlCompatiblityEnabled_ ? ": "
|
|
||||||
: ":";
|
|
||||||
writeValue( value[name] );
|
|
||||||
}
|
|
||||||
document_ += "}";
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Class StyledWriter
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
StyledWriter::StyledWriter()
|
|
||||||
: rightMargin_( 74 )
|
|
||||||
, indentSize_( 3 )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
std::string
|
|
||||||
StyledWriter::write( const Value &root )
|
|
||||||
{
|
|
||||||
document_ = "";
|
|
||||||
addChildValues_ = false;
|
|
||||||
indentString_ = "";
|
|
||||||
writeCommentBeforeValue( root );
|
|
||||||
writeValue( root );
|
|
||||||
writeCommentAfterValueOnSameLine( root );
|
|
||||||
document_ += "\n";
|
|
||||||
return document_;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
StyledWriter::writeValue( const Value &value )
|
|
||||||
{
|
|
||||||
switch ( value.type() )
|
|
||||||
{
|
|
||||||
case nullValue:
|
|
||||||
pushValue( "null" );
|
|
||||||
break;
|
|
||||||
case intValue:
|
|
||||||
pushValue( valueToString( value.asInt() ) );
|
|
||||||
break;
|
|
||||||
case uintValue:
|
|
||||||
pushValue( valueToString( value.asUInt() ) );
|
|
||||||
break;
|
|
||||||
case realValue:
|
|
||||||
pushValue( valueToString( value.asDouble() ) );
|
|
||||||
break;
|
|
||||||
case stringValue:
|
|
||||||
pushValue( valueToQuotedString( value.asCString() ) );
|
|
||||||
break;
|
|
||||||
case booleanValue:
|
|
||||||
pushValue( valueToString( value.asBool() ) );
|
|
||||||
break;
|
|
||||||
case arrayValue:
|
|
||||||
writeArrayValue( value);
|
|
||||||
break;
|
|
||||||
case objectValue:
|
|
||||||
{
|
|
||||||
Value::Members members( value.getMemberNames() );
|
|
||||||
if ( members.empty() )
|
|
||||||
pushValue( "{}" );
|
|
||||||
else
|
|
||||||
{
|
|
||||||
writeWithIndent( "{" );
|
|
||||||
indent();
|
|
||||||
Value::Members::iterator it = members.begin();
|
|
||||||
while ( true )
|
|
||||||
{
|
|
||||||
const std::string &name = *it;
|
|
||||||
const Value &childValue = value[name];
|
|
||||||
writeCommentBeforeValue( childValue );
|
|
||||||
writeWithIndent( valueToQuotedString( name.c_str() ) );
|
|
||||||
document_ += " : ";
|
|
||||||
writeValue( childValue );
|
|
||||||
if ( ++it == members.end() )
|
|
||||||
{
|
|
||||||
writeCommentAfterValueOnSameLine( childValue );
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
document_ += ",";
|
|
||||||
writeCommentAfterValueOnSameLine( childValue );
|
|
||||||
}
|
|
||||||
unindent();
|
|
||||||
writeWithIndent( "}" );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
StyledWriter::writeArrayValue( const Value &value )
|
|
||||||
{
|
|
||||||
unsigned size = value.size();
|
|
||||||
if ( size == 0 )
|
|
||||||
pushValue( "[]" );
|
|
||||||
else
|
|
||||||
{
|
|
||||||
bool isArrayMultiLine = isMultineArray( value );
|
|
||||||
if ( isArrayMultiLine )
|
|
||||||
{
|
|
||||||
writeWithIndent( "[" );
|
|
||||||
indent();
|
|
||||||
bool hasChildValue = !childValues_.empty();
|
|
||||||
unsigned index =0;
|
|
||||||
while ( true )
|
|
||||||
{
|
|
||||||
const Value &childValue = value[index];
|
|
||||||
writeCommentBeforeValue( childValue );
|
|
||||||
if ( hasChildValue )
|
|
||||||
writeWithIndent( childValues_[index] );
|
|
||||||
else
|
|
||||||
{
|
|
||||||
writeIndent();
|
|
||||||
writeValue( childValue );
|
|
||||||
}
|
|
||||||
if ( ++index == size )
|
|
||||||
{
|
|
||||||
writeCommentAfterValueOnSameLine( childValue );
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
document_ += ",";
|
|
||||||
writeCommentAfterValueOnSameLine( childValue );
|
|
||||||
}
|
|
||||||
unindent();
|
|
||||||
writeWithIndent( "]" );
|
|
||||||
}
|
|
||||||
else // output on a single line
|
|
||||||
{
|
|
||||||
assert( childValues_.size() == size );
|
|
||||||
document_ += "[ ";
|
|
||||||
for ( unsigned index =0; index < size; ++index )
|
|
||||||
{
|
|
||||||
if ( index > 0 )
|
|
||||||
document_ += ", ";
|
|
||||||
document_ += childValues_[index];
|
|
||||||
}
|
|
||||||
document_ += " ]";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
StyledWriter::isMultineArray( const Value &value )
|
|
||||||
{
|
|
||||||
int size = value.size();
|
|
||||||
bool isMultiLine = size*3 >= rightMargin_ ;
|
|
||||||
childValues_.clear();
|
|
||||||
for ( int index =0; index < size && !isMultiLine; ++index )
|
|
||||||
{
|
|
||||||
const Value &childValue = value[index];
|
|
||||||
isMultiLine = isMultiLine ||
|
|
||||||
( (childValue.isArray() || childValue.isObject()) &&
|
|
||||||
childValue.size() > 0 );
|
|
||||||
}
|
|
||||||
if ( !isMultiLine ) // check if line length > max line length
|
|
||||||
{
|
|
||||||
childValues_.reserve( size );
|
|
||||||
addChildValues_ = true;
|
|
||||||
int lineLength = 4 + (size-1)*2; // '[ ' + ', '*n + ' ]'
|
|
||||||
for ( int index =0; index < size && !isMultiLine; ++index )
|
|
||||||
{
|
|
||||||
writeValue( value[index] );
|
|
||||||
lineLength += int( childValues_[index].length() );
|
|
||||||
isMultiLine = isMultiLine && hasCommentForValue( value[index] );
|
|
||||||
}
|
|
||||||
addChildValues_ = false;
|
|
||||||
isMultiLine = isMultiLine || lineLength >= rightMargin_;
|
|
||||||
}
|
|
||||||
return isMultiLine;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
StyledWriter::pushValue( const std::string &value )
|
|
||||||
{
|
|
||||||
if ( addChildValues_ )
|
|
||||||
childValues_.push_back( value );
|
|
||||||
else
|
|
||||||
document_ += value;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
StyledWriter::writeIndent()
|
|
||||||
{
|
|
||||||
if ( !document_.empty() )
|
|
||||||
{
|
|
||||||
char last = document_[document_.length()-1];
|
|
||||||
if ( last == ' ' ) // already indented
|
|
||||||
return;
|
|
||||||
if ( last != '\n' ) // Comments may add new-line
|
|
||||||
document_ += '\n';
|
|
||||||
}
|
|
||||||
document_ += indentString_;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
StyledWriter::writeWithIndent( const std::string &value )
|
|
||||||
{
|
|
||||||
writeIndent();
|
|
||||||
document_ += value;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
StyledWriter::indent()
|
|
||||||
{
|
|
||||||
indentString_ += std::string( indentSize_, ' ' );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
StyledWriter::unindent()
|
|
||||||
{
|
|
||||||
assert( int(indentString_.size()) >= indentSize_ );
|
|
||||||
indentString_.resize( indentString_.size() - indentSize_ );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
StyledWriter::writeCommentBeforeValue( const Value &root )
|
|
||||||
{
|
|
||||||
if ( !root.hasComment( commentBefore ) )
|
|
||||||
return;
|
|
||||||
document_ += normalizeEOL( root.getComment( commentBefore ) );
|
|
||||||
document_ += "\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
StyledWriter::writeCommentAfterValueOnSameLine( const Value &root )
|
|
||||||
{
|
|
||||||
if ( root.hasComment( commentAfterOnSameLine ) )
|
|
||||||
document_ += " " + normalizeEOL( root.getComment( commentAfterOnSameLine ) );
|
|
||||||
|
|
||||||
if ( root.hasComment( commentAfter ) )
|
|
||||||
{
|
|
||||||
document_ += "\n";
|
|
||||||
document_ += normalizeEOL( root.getComment( commentAfter ) );
|
|
||||||
document_ += "\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
StyledWriter::hasCommentForValue( const Value &value )
|
|
||||||
{
|
|
||||||
return value.hasComment( commentBefore )
|
|
||||||
|| value.hasComment( commentAfterOnSameLine )
|
|
||||||
|| value.hasComment( commentAfter );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
std::string
|
|
||||||
StyledWriter::normalizeEOL( const std::string &text )
|
|
||||||
{
|
|
||||||
std::string normalized;
|
|
||||||
normalized.reserve( text.length() );
|
|
||||||
const char *begin = text.c_str();
|
|
||||||
const char *end = begin + text.length();
|
|
||||||
const char *current = begin;
|
|
||||||
while ( current != end )
|
|
||||||
{
|
|
||||||
char c = *current++;
|
|
||||||
if ( c == '\r' ) // mac or dos EOL
|
|
||||||
{
|
|
||||||
if ( *current == '\n' ) // convert dos EOL
|
|
||||||
++current;
|
|
||||||
normalized += '\n';
|
|
||||||
}
|
|
||||||
else // handle unix EOL & other char
|
|
||||||
normalized += c;
|
|
||||||
}
|
|
||||||
return normalized;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Class StyledStreamWriter
|
|
||||||
// //////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
StyledStreamWriter::StyledStreamWriter( std::string indentation )
|
|
||||||
: document_(NULL)
|
|
||||||
, rightMargin_( 74 )
|
|
||||||
, indentation_( indentation )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
StyledStreamWriter::write( std::ostream &out, const Value &root )
|
|
||||||
{
|
|
||||||
document_ = &out;
|
|
||||||
addChildValues_ = false;
|
|
||||||
indentString_ = "";
|
|
||||||
writeCommentBeforeValue( root );
|
|
||||||
writeValue( root );
|
|
||||||
writeCommentAfterValueOnSameLine( root );
|
|
||||||
*document_ << "\n";
|
|
||||||
document_ = NULL; // Forget the stream, for safety.
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
StyledStreamWriter::writeValue( const Value &value )
|
|
||||||
{
|
|
||||||
switch ( value.type() )
|
|
||||||
{
|
|
||||||
case nullValue:
|
|
||||||
pushValue( "null" );
|
|
||||||
break;
|
|
||||||
case intValue:
|
|
||||||
pushValue( valueToString( value.asInt() ) );
|
|
||||||
break;
|
|
||||||
case uintValue:
|
|
||||||
pushValue( valueToString( value.asUInt() ) );
|
|
||||||
break;
|
|
||||||
case realValue:
|
|
||||||
pushValue( valueToString( value.asDouble() ) );
|
|
||||||
break;
|
|
||||||
case stringValue:
|
|
||||||
pushValue( valueToQuotedString( value.asCString() ) );
|
|
||||||
break;
|
|
||||||
case booleanValue:
|
|
||||||
pushValue( valueToString( value.asBool() ) );
|
|
||||||
break;
|
|
||||||
case arrayValue:
|
|
||||||
writeArrayValue( value);
|
|
||||||
break;
|
|
||||||
case objectValue:
|
|
||||||
{
|
|
||||||
Value::Members members( value.getMemberNames() );
|
|
||||||
if ( members.empty() )
|
|
||||||
pushValue( "{}" );
|
|
||||||
else
|
|
||||||
{
|
|
||||||
writeWithIndent( "{" );
|
|
||||||
indent();
|
|
||||||
Value::Members::iterator it = members.begin();
|
|
||||||
while ( true )
|
|
||||||
{
|
|
||||||
const std::string &name = *it;
|
|
||||||
const Value &childValue = value[name];
|
|
||||||
writeCommentBeforeValue( childValue );
|
|
||||||
writeWithIndent( valueToQuotedString( name.c_str() ) );
|
|
||||||
*document_ << " : ";
|
|
||||||
writeValue( childValue );
|
|
||||||
if ( ++it == members.end() )
|
|
||||||
{
|
|
||||||
writeCommentAfterValueOnSameLine( childValue );
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
*document_ << ",";
|
|
||||||
writeCommentAfterValueOnSameLine( childValue );
|
|
||||||
}
|
|
||||||
unindent();
|
|
||||||
writeWithIndent( "}" );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
StyledStreamWriter::writeArrayValue( const Value &value )
|
|
||||||
{
|
|
||||||
unsigned size = value.size();
|
|
||||||
if ( size == 0 )
|
|
||||||
pushValue( "[]" );
|
|
||||||
else
|
|
||||||
{
|
|
||||||
bool isArrayMultiLine = isMultineArray( value );
|
|
||||||
if ( isArrayMultiLine )
|
|
||||||
{
|
|
||||||
writeWithIndent( "[" );
|
|
||||||
indent();
|
|
||||||
bool hasChildValue = !childValues_.empty();
|
|
||||||
unsigned index =0;
|
|
||||||
while ( true )
|
|
||||||
{
|
|
||||||
const Value &childValue = value[index];
|
|
||||||
writeCommentBeforeValue( childValue );
|
|
||||||
if ( hasChildValue )
|
|
||||||
writeWithIndent( childValues_[index] );
|
|
||||||
else
|
|
||||||
{
|
|
||||||
writeIndent();
|
|
||||||
writeValue( childValue );
|
|
||||||
}
|
|
||||||
if ( ++index == size )
|
|
||||||
{
|
|
||||||
writeCommentAfterValueOnSameLine( childValue );
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
*document_ << ",";
|
|
||||||
writeCommentAfterValueOnSameLine( childValue );
|
|
||||||
}
|
|
||||||
unindent();
|
|
||||||
writeWithIndent( "]" );
|
|
||||||
}
|
|
||||||
else // output on a single line
|
|
||||||
{
|
|
||||||
assert( childValues_.size() == size );
|
|
||||||
*document_ << "[ ";
|
|
||||||
for ( unsigned index =0; index < size; ++index )
|
|
||||||
{
|
|
||||||
if ( index > 0 )
|
|
||||||
*document_ << ", ";
|
|
||||||
*document_ << childValues_[index];
|
|
||||||
}
|
|
||||||
*document_ << " ]";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
StyledStreamWriter::isMultineArray( const Value &value )
|
|
||||||
{
|
|
||||||
int size = value.size();
|
|
||||||
bool isMultiLine = size*3 >= rightMargin_ ;
|
|
||||||
childValues_.clear();
|
|
||||||
for ( int index =0; index < size && !isMultiLine; ++index )
|
|
||||||
{
|
|
||||||
const Value &childValue = value[index];
|
|
||||||
isMultiLine = isMultiLine ||
|
|
||||||
( (childValue.isArray() || childValue.isObject()) &&
|
|
||||||
childValue.size() > 0 );
|
|
||||||
}
|
|
||||||
if ( !isMultiLine ) // check if line length > max line length
|
|
||||||
{
|
|
||||||
childValues_.reserve( size );
|
|
||||||
addChildValues_ = true;
|
|
||||||
int lineLength = 4 + (size-1)*2; // '[ ' + ', '*n + ' ]'
|
|
||||||
for ( int index =0; index < size && !isMultiLine; ++index )
|
|
||||||
{
|
|
||||||
writeValue( value[index] );
|
|
||||||
lineLength += int( childValues_[index].length() );
|
|
||||||
isMultiLine = isMultiLine && hasCommentForValue( value[index] );
|
|
||||||
}
|
|
||||||
addChildValues_ = false;
|
|
||||||
isMultiLine = isMultiLine || lineLength >= rightMargin_;
|
|
||||||
}
|
|
||||||
return isMultiLine;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
StyledStreamWriter::pushValue( const std::string &value )
|
|
||||||
{
|
|
||||||
if ( addChildValues_ )
|
|
||||||
childValues_.push_back( value );
|
|
||||||
else
|
|
||||||
*document_ << value;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
StyledStreamWriter::writeIndent()
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
Some comments in this method would have been nice. ;-)
|
|
||||||
|
|
||||||
if ( !document_.empty() )
|
|
||||||
{
|
|
||||||
char last = document_[document_.length()-1];
|
|
||||||
if ( last == ' ' ) // already indented
|
|
||||||
return;
|
|
||||||
if ( last != '\n' ) // Comments may add new-line
|
|
||||||
*document_ << '\n';
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
*document_ << '\n' << indentString_;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
StyledStreamWriter::writeWithIndent( const std::string &value )
|
|
||||||
{
|
|
||||||
writeIndent();
|
|
||||||
*document_ << value;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
StyledStreamWriter::indent()
|
|
||||||
{
|
|
||||||
indentString_ += indentation_;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
StyledStreamWriter::unindent()
|
|
||||||
{
|
|
||||||
assert( indentString_.size() >= indentation_.size() );
|
|
||||||
indentString_.resize( indentString_.size() - indentation_.size() );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
StyledStreamWriter::writeCommentBeforeValue( const Value &root )
|
|
||||||
{
|
|
||||||
if ( !root.hasComment( commentBefore ) )
|
|
||||||
return;
|
|
||||||
*document_ << normalizeEOL( root.getComment( commentBefore ) );
|
|
||||||
*document_ << "\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
StyledStreamWriter::writeCommentAfterValueOnSameLine( const Value &root )
|
|
||||||
{
|
|
||||||
if ( root.hasComment( commentAfterOnSameLine ) )
|
|
||||||
*document_ << " " + normalizeEOL( root.getComment( commentAfterOnSameLine ) );
|
|
||||||
|
|
||||||
if ( root.hasComment( commentAfter ) )
|
|
||||||
{
|
|
||||||
*document_ << "\n";
|
|
||||||
*document_ << normalizeEOL( root.getComment( commentAfter ) );
|
|
||||||
*document_ << "\n";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
|
||||||
StyledStreamWriter::hasCommentForValue( const Value &value )
|
|
||||||
{
|
|
||||||
return value.hasComment( commentBefore )
|
|
||||||
|| value.hasComment( commentAfterOnSameLine )
|
|
||||||
|| value.hasComment( commentAfter );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
std::string
|
|
||||||
StyledStreamWriter::normalizeEOL( const std::string &text )
|
|
||||||
{
|
|
||||||
std::string normalized;
|
|
||||||
normalized.reserve( text.length() );
|
|
||||||
const char *begin = text.c_str();
|
|
||||||
const char *end = begin + text.length();
|
|
||||||
const char *current = begin;
|
|
||||||
while ( current != end )
|
|
||||||
{
|
|
||||||
char c = *current++;
|
|
||||||
if ( c == '\r' ) // mac or dos EOL
|
|
||||||
{
|
|
||||||
if ( *current == '\n' ) // convert dos EOL
|
|
||||||
++current;
|
|
||||||
normalized += '\n';
|
|
||||||
}
|
|
||||||
else // handle unix EOL & other char
|
|
||||||
normalized += c;
|
|
||||||
}
|
|
||||||
return normalized;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
std::ostream& operator<<( std::ostream &sout, const Value &root )
|
|
||||||
{
|
|
||||||
Json::StyledStreamWriter writer;
|
|
||||||
writer.write(sout, root);
|
|
||||||
return sout;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
} // namespace Json
|
|
||||||
@ -1,426 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#include <cstring>
|
|
||||||
#include <iostream>
|
|
||||||
#include <stdexcept>
|
|
||||||
#include <math.h>
|
|
||||||
#include <spine/Animation.h>
|
|
||||||
#include <spine/Bone.h>
|
|
||||||
#include <spine/Slot.h>
|
|
||||||
#include <spine/BaseSkeleton.h>
|
|
||||||
#include <spine/BoneData.h>
|
|
||||||
|
|
||||||
using std::string;
|
|
||||||
using std::vector;
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
Animation::Animation (const vector<Timeline*> &timelines, float duration) :
|
|
||||||
timelines(timelines),
|
|
||||||
duration(duration) {
|
|
||||||
}
|
|
||||||
|
|
||||||
Animation::~Animation () {
|
|
||||||
for (int i = 0, n = timelines.size(); i < n; i++)
|
|
||||||
delete timelines[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
void Animation::apply (BaseSkeleton *skeleton, float time, bool loop) const {
|
|
||||||
if (loop && duration) time = fmodf(time, duration);
|
|
||||||
|
|
||||||
for (int i = 0, n = timelines.size(); i < n; i++)
|
|
||||||
timelines[i]->apply(skeleton, time);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Animation::mix (BaseSkeleton *skeleton, float time, bool loop, float alpha) const {
|
|
||||||
if (loop && duration) time = fmodf(time, duration);
|
|
||||||
|
|
||||||
for (int i = 0, n = timelines.size(); i < n; i++)
|
|
||||||
timelines[i]->apply(skeleton, time, alpha);
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
static const float LINEAR = 0;
|
|
||||||
static const float STEPPED = -1;
|
|
||||||
static const int BEZIER_SEGMENTS = 10;
|
|
||||||
|
|
||||||
CurveTimeline::CurveTimeline (int keyframeCount) :
|
|
||||||
curves(new float[(keyframeCount - 1) * 6]) {
|
|
||||||
memset(curves, 0, sizeof(float) * (keyframeCount - 1) * 6);
|
|
||||||
}
|
|
||||||
|
|
||||||
CurveTimeline::~CurveTimeline () {
|
|
||||||
delete[] curves;
|
|
||||||
}
|
|
||||||
|
|
||||||
void CurveTimeline::setLinear (int keyframeIndex) {
|
|
||||||
curves[keyframeIndex * 6] = LINEAR;
|
|
||||||
}
|
|
||||||
|
|
||||||
void CurveTimeline::setStepped (int keyframeIndex) {
|
|
||||||
curves[keyframeIndex * 6] = STEPPED;
|
|
||||||
}
|
|
||||||
|
|
||||||
void CurveTimeline::setCurve (int keyframeIndex, float cx1, float cy1, float cx2, float cy2) {
|
|
||||||
float subdiv_step = 1.0f / BEZIER_SEGMENTS;
|
|
||||||
float subdiv_step2 = subdiv_step * subdiv_step;
|
|
||||||
float subdiv_step3 = subdiv_step2 * subdiv_step;
|
|
||||||
float pre1 = 3 * subdiv_step;
|
|
||||||
float pre2 = 3 * subdiv_step2;
|
|
||||||
float pre4 = 6 * subdiv_step2;
|
|
||||||
float pre5 = 6 * subdiv_step3;
|
|
||||||
float tmp1x = -cx1 * 2 + cx2;
|
|
||||||
float tmp1y = -cy1 * 2 + cy2;
|
|
||||||
float tmp2x = (cx1 - cx2) * 3 + 1;
|
|
||||||
float tmp2y = (cy1 - cy2) * 3 + 1;
|
|
||||||
int i = keyframeIndex * 6;
|
|
||||||
curves[i] = cx1 * pre1 + tmp1x * pre2 + tmp2x * subdiv_step3;
|
|
||||||
curves[i + 1] = cy1 * pre1 + tmp1y * pre2 + tmp2y * subdiv_step3;
|
|
||||||
curves[i + 2] = tmp1x * pre4 + tmp2x * pre5;
|
|
||||||
curves[i + 3] = tmp1y * pre4 + tmp2y * pre5;
|
|
||||||
curves[i + 4] = tmp2x * pre5;
|
|
||||||
curves[i + 5] = tmp2y * pre5;
|
|
||||||
}
|
|
||||||
|
|
||||||
float CurveTimeline::getCurvePercent (int keyframeIndex, float percent) const {
|
|
||||||
int curveIndex = keyframeIndex * 6;
|
|
||||||
float dfx = curves[curveIndex];
|
|
||||||
if (dfx == LINEAR) return percent;
|
|
||||||
if (dfx == STEPPED) return 0;
|
|
||||||
float dfy = curves[curveIndex + 1];
|
|
||||||
float ddfx = curves[curveIndex + 2];
|
|
||||||
float ddfy = curves[curveIndex + 3];
|
|
||||||
float dddfx = curves[curveIndex + 4];
|
|
||||||
float dddfy = curves[curveIndex + 5];
|
|
||||||
float x = dfx, y = dfy;
|
|
||||||
int i = BEZIER_SEGMENTS - 2;
|
|
||||||
while (true) {
|
|
||||||
if (x >= percent) {
|
|
||||||
float lastX = x - dfx;
|
|
||||||
float lastY = y - dfy;
|
|
||||||
return lastY + (y - lastY) * (percent - lastX) / (x - lastX);
|
|
||||||
}
|
|
||||||
if (i == 0) break;
|
|
||||||
i--;
|
|
||||||
dfx += ddfx;
|
|
||||||
dfy += ddfy;
|
|
||||||
ddfx += dddfx;
|
|
||||||
ddfy += dddfy;
|
|
||||||
x += dfx;
|
|
||||||
y += dfy;
|
|
||||||
}
|
|
||||||
return y + (1 - y) * (percent - x) / (1 - x); // Last point is 1,1.
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
/** @param target After the first and before the last entry. */
|
|
||||||
static int binarySearch (float *values, int valuesLength, float target, int step) {
|
|
||||||
int low = 0;
|
|
||||||
int high = valuesLength / step - 2;
|
|
||||||
if (high == 0) return step;
|
|
||||||
int current = high >> 1;
|
|
||||||
while (true) {
|
|
||||||
if (values[(current + 1) * step] <= target)
|
|
||||||
low = current + 1;
|
|
||||||
else
|
|
||||||
high = current;
|
|
||||||
if (low == high) return (low + 1) * step;
|
|
||||||
current = (low + high) >> 1;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
static int linearSearch (float *values, int valuesLength, float target, int step) {
|
|
||||||
for (int i = 0, last = valuesLength - step; i <= last; i += step) {
|
|
||||||
if (values[i] <= target) continue;
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
static const int ROTATE_LAST_FRAME_TIME = -2;
|
|
||||||
static const int ROTATE_FRAME_VALUE = 1;
|
|
||||||
|
|
||||||
RotateTimeline::RotateTimeline (int keyframeCount) :
|
|
||||||
CurveTimeline(keyframeCount),
|
|
||||||
framesLength(keyframeCount * 2),
|
|
||||||
frames(new float[framesLength]),
|
|
||||||
boneIndex(0) {
|
|
||||||
memset(frames, 0, sizeof(float) * framesLength);
|
|
||||||
}
|
|
||||||
|
|
||||||
RotateTimeline::~RotateTimeline () {
|
|
||||||
delete[] frames;
|
|
||||||
}
|
|
||||||
|
|
||||||
void RotateTimeline::setKeyframe (int keyframeIndex, float time, float value) {
|
|
||||||
keyframeIndex *= 2;
|
|
||||||
frames[keyframeIndex] = time;
|
|
||||||
frames[keyframeIndex + 1] = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
void RotateTimeline::apply (BaseSkeleton *skeleton, float time, float alpha) const {
|
|
||||||
if (time < frames[0]) return; // Time is before first frame.
|
|
||||||
|
|
||||||
Bone *bone = skeleton->bones[boneIndex];
|
|
||||||
|
|
||||||
if (time >= frames[framesLength - 2]) { // Time is after last frame.
|
|
||||||
float amount = bone->data->rotation + frames[framesLength - 1] - bone->rotation;
|
|
||||||
while (amount > 180)
|
|
||||||
amount -= 360;
|
|
||||||
while (amount < -180)
|
|
||||||
amount += 360;
|
|
||||||
bone->rotation += amount * alpha;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Interpolate between the last frame and the current frame.
|
|
||||||
int frameIndex = binarySearch(frames, framesLength, time, 2);
|
|
||||||
float lastFrameValue = frames[frameIndex - 1];
|
|
||||||
float frameTime = frames[frameIndex];
|
|
||||||
float percent = 1 - (time - frameTime) / (frames[frameIndex + ROTATE_LAST_FRAME_TIME] - frameTime);
|
|
||||||
if (percent < 0)
|
|
||||||
percent = 0;
|
|
||||||
else if (percent > 1) //
|
|
||||||
percent = 1;
|
|
||||||
percent = getCurvePercent(frameIndex / 2 - 1, percent);
|
|
||||||
|
|
||||||
float amount = frames[frameIndex + ROTATE_FRAME_VALUE] - lastFrameValue;
|
|
||||||
while (amount > 180)
|
|
||||||
amount -= 360;
|
|
||||||
while (amount < -180)
|
|
||||||
amount += 360;
|
|
||||||
amount = bone->data->rotation + (lastFrameValue + amount * percent) - bone->rotation;
|
|
||||||
while (amount > 180)
|
|
||||||
amount -= 360;
|
|
||||||
while (amount < -180)
|
|
||||||
amount += 360;
|
|
||||||
bone->rotation += amount * alpha;
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
static const int TRANSLATE_LAST_FRAME_TIME = -3;
|
|
||||||
static const int TRANSLATE_FRAME_X = 1;
|
|
||||||
static const int TRANSLATE_FRAME_Y = 2;
|
|
||||||
|
|
||||||
TranslateTimeline::TranslateTimeline (int keyframeCount) :
|
|
||||||
CurveTimeline(keyframeCount),
|
|
||||||
framesLength(keyframeCount * 3),
|
|
||||||
frames(new float[framesLength]),
|
|
||||||
boneIndex(0) {
|
|
||||||
memset(frames, 0, sizeof(float) * framesLength);
|
|
||||||
}
|
|
||||||
|
|
||||||
TranslateTimeline::~TranslateTimeline () {
|
|
||||||
delete[] frames;
|
|
||||||
}
|
|
||||||
|
|
||||||
void TranslateTimeline::setKeyframe (int keyframeIndex, float time, float x, float y) {
|
|
||||||
keyframeIndex *= 3;
|
|
||||||
frames[keyframeIndex] = time;
|
|
||||||
frames[keyframeIndex + 1] = x;
|
|
||||||
frames[keyframeIndex + 2] = y;
|
|
||||||
}
|
|
||||||
|
|
||||||
void TranslateTimeline::apply (BaseSkeleton *skeleton, float time, float alpha) const {
|
|
||||||
if (time < frames[0]) return; // Time is before first frame.
|
|
||||||
|
|
||||||
Bone *bone = skeleton->bones[boneIndex];
|
|
||||||
|
|
||||||
if (time >= frames[framesLength - 3]) { // Time is after last frame.
|
|
||||||
bone->x += (bone->data->x + frames[framesLength - 2] - bone->x) * alpha;
|
|
||||||
bone->y += (bone->data->y + frames[framesLength - 1] - bone->y) * alpha;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Interpolate between the last frame and the current frame.
|
|
||||||
int frameIndex = binarySearch(frames, framesLength, time, 3);
|
|
||||||
float lastFrameX = frames[frameIndex - 2];
|
|
||||||
float lastFrameY = frames[frameIndex - 1];
|
|
||||||
float frameTime = frames[frameIndex];
|
|
||||||
float percent = 1 - (time - frameTime) / (frames[frameIndex + TRANSLATE_LAST_FRAME_TIME] - frameTime);
|
|
||||||
if (percent < 0)
|
|
||||||
percent = 0;
|
|
||||||
else if (percent > 1) //
|
|
||||||
percent = 1;
|
|
||||||
percent = getCurvePercent(frameIndex / 3 - 1, percent);
|
|
||||||
|
|
||||||
bone->x += (bone->data->x + lastFrameX + (frames[frameIndex + TRANSLATE_FRAME_X] - lastFrameX) * percent - bone->x) * alpha;
|
|
||||||
bone->y += (bone->data->y + lastFrameY + (frames[frameIndex + TRANSLATE_FRAME_Y] - lastFrameY) * percent - bone->y) * alpha;
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
ScaleTimeline::ScaleTimeline (int keyframeCount) :
|
|
||||||
TranslateTimeline(keyframeCount) {
|
|
||||||
}
|
|
||||||
|
|
||||||
void ScaleTimeline::apply (BaseSkeleton *skeleton, float time, float alpha) const {
|
|
||||||
if (time < frames[0]) return; // Time is before first frame.
|
|
||||||
|
|
||||||
Bone *bone = skeleton->bones[boneIndex];
|
|
||||||
if (time >= frames[framesLength - 3]) { // Time is after last frame.
|
|
||||||
bone->scaleX += (bone->data->scaleX - 1 + frames[framesLength - 2] - bone->scaleX) * alpha;
|
|
||||||
bone->scaleY += (bone->data->scaleY - 1 + frames[framesLength - 1] - bone->scaleY) * alpha;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Interpolate between the last frame and the current frame.
|
|
||||||
int frameIndex = binarySearch(frames, framesLength, time, 3);
|
|
||||||
float lastFrameX = frames[frameIndex - 2];
|
|
||||||
float lastFrameY = frames[frameIndex - 1];
|
|
||||||
float frameTime = frames[frameIndex];
|
|
||||||
float percent = 1 - (time - frameTime) / (frames[frameIndex + TRANSLATE_LAST_FRAME_TIME] - frameTime);
|
|
||||||
if (percent < 0)
|
|
||||||
percent = 0;
|
|
||||||
else if (percent > 1) //
|
|
||||||
percent = 1;
|
|
||||||
percent = getCurvePercent(frameIndex / 3 - 1, percent);
|
|
||||||
|
|
||||||
bone->scaleX += (bone->data->scaleX - 1 + lastFrameX + (frames[frameIndex + TRANSLATE_FRAME_X] - lastFrameX) * percent
|
|
||||||
- bone->scaleX) * alpha;
|
|
||||||
bone->scaleY += (bone->data->scaleY - 1 + lastFrameY + (frames[frameIndex + TRANSLATE_FRAME_Y] - lastFrameY) * percent
|
|
||||||
- bone->scaleY) * alpha;
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
static const int COLOR_LAST_FRAME_TIME = -5;
|
|
||||||
static const int COLOR_FRAME_R = 1;
|
|
||||||
static const int COLOR_FRAME_G = 2;
|
|
||||||
static const int COLOR_FRAME_B = 3;
|
|
||||||
static const int COLOR_FRAME_A = 4;
|
|
||||||
|
|
||||||
ColorTimeline::ColorTimeline (int keyframeCount) :
|
|
||||||
CurveTimeline(keyframeCount),
|
|
||||||
framesLength(keyframeCount * 5),
|
|
||||||
frames(new float[framesLength]),
|
|
||||||
slotIndex(0) {
|
|
||||||
memset(frames, 0, sizeof(float) * framesLength);
|
|
||||||
}
|
|
||||||
|
|
||||||
ColorTimeline::~ColorTimeline () {
|
|
||||||
delete[] frames;
|
|
||||||
}
|
|
||||||
|
|
||||||
void ColorTimeline::setKeyframe (int keyframeIndex, float time, float r, float g, float b, float a) {
|
|
||||||
keyframeIndex *= 5;
|
|
||||||
frames[keyframeIndex] = time;
|
|
||||||
frames[keyframeIndex + 1] = r;
|
|
||||||
frames[keyframeIndex + 2] = g;
|
|
||||||
frames[keyframeIndex + 3] = b;
|
|
||||||
frames[keyframeIndex + 4] = a;
|
|
||||||
}
|
|
||||||
|
|
||||||
void ColorTimeline::apply (BaseSkeleton *skeleton, float time, float alpha) const {
|
|
||||||
if (time < frames[0]) return; // Time is before first frame.
|
|
||||||
|
|
||||||
Slot *slot = skeleton->slots[slotIndex];
|
|
||||||
|
|
||||||
if (time >= frames[framesLength - 5]) { // Time is after last frame.
|
|
||||||
int i = framesLength - 1;
|
|
||||||
slot->r = frames[i - 3];
|
|
||||||
slot->g = frames[i - 2];
|
|
||||||
slot->b = frames[i - 1];
|
|
||||||
slot->a = frames[i];
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Interpolate between the last frame and the current frame.
|
|
||||||
int frameIndex = binarySearch(frames, framesLength, time, 5);
|
|
||||||
float lastFrameR = frames[frameIndex - 4];
|
|
||||||
float lastFrameG = frames[frameIndex - 3];
|
|
||||||
float lastFrameB = frames[frameIndex - 2];
|
|
||||||
float lastFrameA = frames[frameIndex - 1];
|
|
||||||
float frameTime = frames[frameIndex];
|
|
||||||
float percent = 1 - (time - frameTime) / (frames[frameIndex + COLOR_LAST_FRAME_TIME] - frameTime);
|
|
||||||
if (percent < 0)
|
|
||||||
percent = 0;
|
|
||||||
else if (percent > 1) //
|
|
||||||
percent = 1;
|
|
||||||
percent = getCurvePercent(frameIndex / 5 - 1, percent);
|
|
||||||
|
|
||||||
float r = lastFrameR + (frames[frameIndex + COLOR_FRAME_R] - lastFrameR) * percent;
|
|
||||||
float g = lastFrameG + (frames[frameIndex + COLOR_FRAME_G] - lastFrameG) * percent;
|
|
||||||
float b = lastFrameB + (frames[frameIndex + COLOR_FRAME_B] - lastFrameB) * percent;
|
|
||||||
float a = lastFrameA + (frames[frameIndex + COLOR_FRAME_A] - lastFrameA) * percent;
|
|
||||||
if (alpha < 1) {
|
|
||||||
slot->r += (r - slot->r) * alpha;
|
|
||||||
slot->g += (g - slot->g) * alpha;
|
|
||||||
slot->b += (b - slot->b) * alpha;
|
|
||||||
slot->a += (a - slot->a) * alpha;
|
|
||||||
} else {
|
|
||||||
slot->r = r;
|
|
||||||
slot->g = g;
|
|
||||||
slot->b = b;
|
|
||||||
slot->a = a;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
AttachmentTimeline::AttachmentTimeline (int keyframeCount) :
|
|
||||||
framesLength(keyframeCount),
|
|
||||||
frames(new float[keyframeCount]),
|
|
||||||
attachmentNames(new string*[keyframeCount]),
|
|
||||||
slotIndex(0) {
|
|
||||||
memset(frames, 0, sizeof(float) * keyframeCount);
|
|
||||||
memset(attachmentNames, 0, sizeof(string*) * keyframeCount);
|
|
||||||
}
|
|
||||||
|
|
||||||
AttachmentTimeline::~AttachmentTimeline () {
|
|
||||||
delete[] frames;
|
|
||||||
|
|
||||||
for (int i = 0; i < framesLength; i++)
|
|
||||||
if (attachmentNames[i]) delete attachmentNames[i];
|
|
||||||
delete[] attachmentNames;
|
|
||||||
}
|
|
||||||
|
|
||||||
void AttachmentTimeline::setKeyframe (int keyframeIndex, float time, string *attachmentName) {
|
|
||||||
frames[keyframeIndex] = time;
|
|
||||||
if (attachmentNames[keyframeIndex]) delete attachmentNames[keyframeIndex];
|
|
||||||
attachmentNames[keyframeIndex] = attachmentName;
|
|
||||||
}
|
|
||||||
|
|
||||||
void AttachmentTimeline::apply (BaseSkeleton *skeleton, float time, float alpha) const {
|
|
||||||
if (time < frames[0]) return; // Time is before first frame.
|
|
||||||
|
|
||||||
int frameIndex;
|
|
||||||
if (time >= frames[framesLength - 1]) // Time is after last frame.
|
|
||||||
frameIndex = framesLength - 1;
|
|
||||||
else
|
|
||||||
frameIndex = binarySearch(frames, framesLength, time, 1) - 1;
|
|
||||||
|
|
||||||
string *attachmentName = attachmentNames[frameIndex];
|
|
||||||
skeleton->slots[slotIndex]->setAttachment(attachmentName ? skeleton->getAttachment(slotIndex, *attachmentName) : 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
@ -1,84 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#include <stdexcept>
|
|
||||||
#include <spine/AnimationState.h>
|
|
||||||
#include <spine/AnimationStateData.h>
|
|
||||||
#include <spine/Animation.h>
|
|
||||||
#include <spine/BaseSkeleton.h>
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
AnimationState::AnimationState (AnimationStateData *data) :
|
|
||||||
previous(0),
|
|
||||||
previousTime(0),
|
|
||||||
previousLoop(false),
|
|
||||||
mixTime(0),
|
|
||||||
mixDuration(0),
|
|
||||||
data(data),
|
|
||||||
animation(0),
|
|
||||||
time(0),
|
|
||||||
loop(0) {
|
|
||||||
}
|
|
||||||
|
|
||||||
void AnimationState::update (float delta) {
|
|
||||||
time += delta;
|
|
||||||
previousTime += delta;
|
|
||||||
mixTime += delta;
|
|
||||||
}
|
|
||||||
|
|
||||||
void AnimationState::apply (BaseSkeleton *skeleton) {
|
|
||||||
if (!animation) return;
|
|
||||||
if (previous) {
|
|
||||||
previous->apply(skeleton, previousTime, previousLoop);
|
|
||||||
float alpha = mixTime / mixDuration;
|
|
||||||
if (alpha >= 1) {
|
|
||||||
alpha = 1;
|
|
||||||
previous = 0;
|
|
||||||
}
|
|
||||||
animation->mix(skeleton, time, loop, alpha);
|
|
||||||
} else
|
|
||||||
animation->apply(skeleton, time, loop);
|
|
||||||
}
|
|
||||||
|
|
||||||
void AnimationState::setAnimation (Animation *animation, bool loop) {
|
|
||||||
setAnimation(animation, loop, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
void AnimationState::setAnimation (Animation *newAnimation, bool loop, float time) {
|
|
||||||
previous = 0;
|
|
||||||
if (newAnimation && animation && data) {
|
|
||||||
mixDuration = data->getMixing(animation, newAnimation);
|
|
||||||
if (mixDuration > 0) {
|
|
||||||
mixTime = 0;
|
|
||||||
previous = animation;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
animation = newAnimation;
|
|
||||||
this->loop = loop;
|
|
||||||
this->time = time;
|
|
||||||
}
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#include <stdexcept>
|
|
||||||
#include <spine/AnimationStateData.h>
|
|
||||||
#include <spine/Animation.h>
|
|
||||||
|
|
||||||
using std::invalid_argument;
|
|
||||||
using std::make_pair;
|
|
||||||
using std::pair;
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
void AnimationStateData::setMixing (Animation *from, Animation *to, float duration) {
|
|
||||||
if (!from) throw invalid_argument("from cannot be null.");
|
|
||||||
if (!to) throw invalid_argument("to cannot be null.");
|
|
||||||
animationToMixTime[make_pair(from, to)] = duration;
|
|
||||||
}
|
|
||||||
|
|
||||||
float AnimationStateData::getMixing (Animation *from, Animation *to) {
|
|
||||||
if (!from) throw invalid_argument("from cannot be null.");
|
|
||||||
if (!to) throw invalid_argument("to cannot be null.");
|
|
||||||
pair<Animation*, Animation*> key = make_pair(from, to);
|
|
||||||
if (animationToMixTime.find(key) != animationToMixTime.end()) return animationToMixTime[key];
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
@ -1,227 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#include <cstdio>
|
|
||||||
#include <fstream>
|
|
||||||
#include <algorithm>
|
|
||||||
#include <functional>
|
|
||||||
#include <cctype>
|
|
||||||
#include <stdexcept>
|
|
||||||
#include <spine/BaseAtlas.h>
|
|
||||||
|
|
||||||
using std::string;
|
|
||||||
using std::runtime_error;
|
|
||||||
using std::invalid_argument;
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
static inline string& trim (string &s) {
|
|
||||||
s.erase(s.begin(), std::find_if(s.begin(), s.end(), std::not1(std::ptr_fun<int, int>(std::isspace))));
|
|
||||||
s.erase(std::find_if(s.rbegin(), s.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end());
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void readLine (const char *¤t, const char *end, string &value) {
|
|
||||||
const char *begin = current;
|
|
||||||
while (current != end) {
|
|
||||||
char c = *current++;
|
|
||||||
if (c == '\n') break;
|
|
||||||
}
|
|
||||||
value.clear();
|
|
||||||
value.append(begin, current - 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline string& readValue (const char *&begin, const char *end, string &value) {
|
|
||||||
readLine(begin, end, value);
|
|
||||||
int colon = value.find(':');
|
|
||||||
if (colon == -1) throw runtime_error("Invalid line: " + value);
|
|
||||||
value = value.substr(colon + 1);
|
|
||||||
return trim(value);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Returns the number of tuple values read (2 or 4). */
|
|
||||||
static inline int readTuple (const char *&begin, const char *end, string &value, string tuple[4]) {
|
|
||||||
readLine(begin, end, value);
|
|
||||||
int colon = value.find(':');
|
|
||||||
if (colon == -1) throw runtime_error("Invalid line: " + value);
|
|
||||||
int i = 0, lastMatch = colon + 1;
|
|
||||||
for (i = 0; i < 3; i++) {
|
|
||||||
int comma = value.find(',', lastMatch);
|
|
||||||
if (comma == -1) {
|
|
||||||
if (i == 0) throw runtime_error("Invalid line: " + value);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
tuple[i] = value.substr(lastMatch, comma - lastMatch);
|
|
||||||
trim(tuple[i]);
|
|
||||||
lastMatch = comma + 1;
|
|
||||||
}
|
|
||||||
tuple[i] = value.substr(lastMatch);
|
|
||||||
trim(tuple[i]);
|
|
||||||
return i + 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline int indexOf (const string *array, int count, const string &value) {
|
|
||||||
for (int i = count - 1; i >= 0; i--)
|
|
||||||
if (array[i] == value) return i;
|
|
||||||
throw runtime_error("Invalid value: " + value);
|
|
||||||
}
|
|
||||||
|
|
||||||
static string formatNames[] = {"Alpha", "Intensity", "LuminanceAlpha", "RGB565", "RGBA4444", "RGB888", "RGBA8888"};
|
|
||||||
static string textureFilterNames[] = {"Nearest", "Linear", "MipMap", "MipMapNearestNearest", "MipMapLinearNearest",
|
|
||||||
"MipMapNearestLinear", "MipMapLinearLinear"};
|
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
BaseAtlas::~BaseAtlas () {
|
|
||||||
for (int i = 0, n = pages.size(); i < n; i++)
|
|
||||||
delete pages[i];
|
|
||||||
for (int i = 0, n = regions.size(); i < n; i++)
|
|
||||||
delete regions[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
void BaseAtlas::load (const std::string &path) {
|
|
||||||
std::ifstream file(path.c_str());
|
|
||||||
if (!file) throw std::invalid_argument("Error reading atlas file: " + path);
|
|
||||||
load(file);
|
|
||||||
}
|
|
||||||
|
|
||||||
void BaseAtlas::load (std::istream &input) {
|
|
||||||
if (!input) throw invalid_argument("input cannot be null.");
|
|
||||||
|
|
||||||
string text;
|
|
||||||
std::getline(input, text, (char)EOF);
|
|
||||||
const char *begin = text.c_str();
|
|
||||||
const char *end = begin + text.length();
|
|
||||||
load(begin, end);
|
|
||||||
}
|
|
||||||
|
|
||||||
void BaseAtlas::load (const char *current, const char *end) {
|
|
||||||
if (!current) throw invalid_argument("current cannot be null.");
|
|
||||||
if (!end) throw invalid_argument("end cannot be null.");
|
|
||||||
|
|
||||||
string value;
|
|
||||||
string tuple[4];
|
|
||||||
BaseAtlasPage *page = 0;
|
|
||||||
while (current != end) {
|
|
||||||
readLine(current, end, value);
|
|
||||||
trim(value);
|
|
||||||
if (value.length() == 0) {
|
|
||||||
page = 0;
|
|
||||||
} else if (!page) {
|
|
||||||
page = newAtlasPage(value);
|
|
||||||
pages.push_back(page);
|
|
||||||
page->name = value;
|
|
||||||
page->format = static_cast<Format>(indexOf(formatNames, 7, readValue(current, end, value)));
|
|
||||||
|
|
||||||
readTuple(current, end, value, tuple);
|
|
||||||
page->minFilter = static_cast<TextureFilter>(indexOf(textureFilterNames, 7, tuple[0]));
|
|
||||||
page->magFilter = static_cast<TextureFilter>(indexOf(textureFilterNames, 7, tuple[1]));
|
|
||||||
|
|
||||||
readValue(current, end, value);
|
|
||||||
if (value == "x") {
|
|
||||||
page->uWrap = repeat;
|
|
||||||
page->vWrap = clampToEdge;
|
|
||||||
} else if (value == "y") {
|
|
||||||
page->uWrap = clampToEdge;
|
|
||||||
page->vWrap = repeat;
|
|
||||||
} else if (value == "xy") {
|
|
||||||
page->uWrap = repeat;
|
|
||||||
page->vWrap = repeat;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
BaseAtlasRegion *region = newAtlasRegion(page);
|
|
||||||
regions.push_back(region);
|
|
||||||
region->name = value;
|
|
||||||
|
|
||||||
region->rotate = readValue(current, end, value) == "true";
|
|
||||||
|
|
||||||
readTuple(current, end, value, tuple);
|
|
||||||
region->x = atoi(tuple[0].c_str());
|
|
||||||
region->y = atoi(tuple[1].c_str());
|
|
||||||
|
|
||||||
readTuple(current, end, value, tuple);
|
|
||||||
region->width = atoi(tuple[0].c_str());
|
|
||||||
region->height = atoi(tuple[1].c_str());
|
|
||||||
|
|
||||||
if (readTuple(current, end, value, tuple) == 4) { // split is optional
|
|
||||||
region->splits = new int[4];
|
|
||||||
region->splits[0] = atoi(tuple[0].c_str());
|
|
||||||
region->splits[1] = atoi(tuple[1].c_str());
|
|
||||||
region->splits[2] = atoi(tuple[2].c_str());
|
|
||||||
region->splits[3] = atoi(tuple[3].c_str());
|
|
||||||
|
|
||||||
if (readTuple(current, end, value, tuple) == 4) { // pad is optional, but only present with splits
|
|
||||||
region->pads = new int[4];
|
|
||||||
region->pads[0] = atoi(tuple[0].c_str());
|
|
||||||
region->pads[1] = atoi(tuple[1].c_str());
|
|
||||||
region->pads[2] = atoi(tuple[2].c_str());
|
|
||||||
region->pads[3] = atoi(tuple[3].c_str());
|
|
||||||
|
|
||||||
readTuple(current, end, value, tuple);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
region->originalWidth = atoi(tuple[0].c_str());
|
|
||||||
region->originalHeight = atoi(tuple[1].c_str());
|
|
||||||
|
|
||||||
readTuple(current, end, value, tuple);
|
|
||||||
region->offsetX = (float)atoi(tuple[0].c_str());
|
|
||||||
region->offsetY = (float)atoi(tuple[1].c_str());
|
|
||||||
|
|
||||||
region->index = atoi(readValue(current, end, value).c_str());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
BaseAtlasRegion* BaseAtlas::findRegion (const std::string &name) {
|
|
||||||
for (int i = 0, n = regions.size(); i < n; i++)
|
|
||||||
if (regions[i]->name == name) return regions[i];
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
BaseAtlasRegion::BaseAtlasRegion () :
|
|
||||||
x(0),
|
|
||||||
y(0),
|
|
||||||
width(0),
|
|
||||||
height(0),
|
|
||||||
offsetX(0),
|
|
||||||
offsetY(0),
|
|
||||||
originalWidth(0),
|
|
||||||
originalHeight(0),
|
|
||||||
index(0),
|
|
||||||
rotate(false),
|
|
||||||
flip(false),
|
|
||||||
splits(0),
|
|
||||||
pads(0) {
|
|
||||||
}
|
|
||||||
|
|
||||||
BaseAtlasRegion::~BaseAtlasRegion () {
|
|
||||||
if (splits) delete splits;
|
|
||||||
if (pads) delete pads;
|
|
||||||
}
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
@ -1,75 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#include <math.h>
|
|
||||||
#include <spine/BaseRegionAttachment.h>
|
|
||||||
|
|
||||||
#ifndef M_PI
|
|
||||||
#define M_PI 3.1415926535897932385
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
BaseRegionAttachment::BaseRegionAttachment () :
|
|
||||||
x(0),
|
|
||||||
y(0),
|
|
||||||
scaleX(1),
|
|
||||||
scaleY(1),
|
|
||||||
rotation(0),
|
|
||||||
width(0),
|
|
||||||
height(0) {
|
|
||||||
}
|
|
||||||
|
|
||||||
void BaseRegionAttachment::updateOffset () {
|
|
||||||
float localX2 = width / 2;
|
|
||||||
float localY2 = height / 2;
|
|
||||||
float localX = -localX2;
|
|
||||||
float localY = -localY2;
|
|
||||||
localX *= scaleX;
|
|
||||||
localY *= scaleY;
|
|
||||||
localX2 *= scaleX;
|
|
||||||
localY2 *= scaleY;
|
|
||||||
float radians = (float)(rotation * M_PI / 180);
|
|
||||||
float cos = cosf(radians);
|
|
||||||
float sin = sinf(radians);
|
|
||||||
float localXCos = localX * cos + x;
|
|
||||||
float localXSin = localX * sin;
|
|
||||||
float localYCos = localY * cos + y;
|
|
||||||
float localYSin = localY * sin;
|
|
||||||
float localX2Cos = localX2 * cos + x;
|
|
||||||
float localX2Sin = localX2 * sin;
|
|
||||||
float localY2Cos = localY2 * cos + y;
|
|
||||||
float localY2Sin = localY2 * sin;
|
|
||||||
offset[0] = localXCos - localYSin;
|
|
||||||
offset[1] = localYCos + localXSin;
|
|
||||||
offset[2] = localXCos - localY2Sin;
|
|
||||||
offset[3] = localY2Cos + localXSin;
|
|
||||||
offset[4] = localX2Cos - localY2Sin;
|
|
||||||
offset[5] = localY2Cos + localX2Sin;
|
|
||||||
offset[6] = localX2Cos - localYSin;
|
|
||||||
offset[7] = localYCos + localX2Sin;
|
|
||||||
}
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
@ -1,183 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#include <stdexcept>
|
|
||||||
#include <iostream>
|
|
||||||
#include <spine/BaseSkeleton.h>
|
|
||||||
#include <spine/SkeletonData.h>
|
|
||||||
#include <spine/SlotData.h>
|
|
||||||
#include <spine/Slot.h>
|
|
||||||
#include <spine/BoneData.h>
|
|
||||||
#include <spine/Bone.h>
|
|
||||||
#include <spine/Skin.h>
|
|
||||||
|
|
||||||
using std::string;
|
|
||||||
using std::invalid_argument;
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
BaseSkeleton::BaseSkeleton (SkeletonData *data) :
|
|
||||||
data(data),
|
|
||||||
skin(0),
|
|
||||||
r(1),
|
|
||||||
g(1),
|
|
||||||
b(1),
|
|
||||||
a(1),
|
|
||||||
time(0),
|
|
||||||
flipX(false),
|
|
||||||
flipY(false) {
|
|
||||||
if (!data) throw invalid_argument("data cannot be null.");
|
|
||||||
|
|
||||||
int boneCount = data->bones.size();
|
|
||||||
bones.reserve(boneCount);
|
|
||||||
for (int i = 0; i < boneCount; i++) {
|
|
||||||
BoneData *boneData = data->bones[i];
|
|
||||||
Bone *bone = new Bone(boneData);
|
|
||||||
if (boneData->parent) {
|
|
||||||
for (int ii = 0; ii < boneCount; ii++) {
|
|
||||||
if (data->bones[ii] == boneData->parent) {
|
|
||||||
bone->parent = bones[ii];
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
bones.push_back(bone);
|
|
||||||
}
|
|
||||||
|
|
||||||
int slotCount = data->slots.size();
|
|
||||||
slots.reserve(slotCount);
|
|
||||||
drawOrder.reserve(slotCount);
|
|
||||||
for (int i = 0; i < slotCount; i++) {
|
|
||||||
SlotData *slotData = data->slots[i];
|
|
||||||
// Find bone for the slotData's boneData.
|
|
||||||
Bone *bone;
|
|
||||||
for (int ii = 0; ii < boneCount; ii++) {
|
|
||||||
if (data->bones[ii] == slotData->boneData) {
|
|
||||||
bone = bones[ii];
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Slot *slot = new Slot(slotData, this, bone);
|
|
||||||
slots.push_back(slot);
|
|
||||||
drawOrder.push_back(slot);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
BaseSkeleton::~BaseSkeleton () {
|
|
||||||
for (int i = 0, n = bones.size(); i < n; i++)
|
|
||||||
delete bones[i];
|
|
||||||
for (int i = 0, n = slots.size(); i < n; i++)
|
|
||||||
delete slots[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
void BaseSkeleton::updateWorldTransform () {
|
|
||||||
for (int i = 0, n = bones.size(); i < n; i++)
|
|
||||||
bones[i]->updateWorldTransform(flipX, flipY);
|
|
||||||
}
|
|
||||||
|
|
||||||
void BaseSkeleton::setToBindPose () {
|
|
||||||
setBonesToBindPose();
|
|
||||||
setSlotsToBindPose();
|
|
||||||
}
|
|
||||||
|
|
||||||
void BaseSkeleton::setBonesToBindPose () {
|
|
||||||
for (int i = 0, n = bones.size(); i < n; i++)
|
|
||||||
bones[i]->setToBindPose();
|
|
||||||
}
|
|
||||||
|
|
||||||
void BaseSkeleton::setSlotsToBindPose () {
|
|
||||||
for (int i = 0, n = slots.size(); i < n; i++)
|
|
||||||
slots[i]->setToBindPose(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
Bone* BaseSkeleton::getRootBone () const {
|
|
||||||
if (bones.size() == 0) return 0;
|
|
||||||
return bones[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
Bone* BaseSkeleton::findBone (const string &boneName) const {
|
|
||||||
for (int i = 0, n = bones.size(); i < n; i++)
|
|
||||||
if (data->bones[i]->name == boneName) return bones[i];
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int BaseSkeleton::findBoneIndex (const string &boneName) const {
|
|
||||||
for (int i = 0, n = bones.size(); i < n; i++)
|
|
||||||
if (data->bones[i]->name == boneName) return i;
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
Slot* BaseSkeleton::findSlot (const string &slotName) const {
|
|
||||||
for (int i = 0, n = slots.size(); i < n; i++)
|
|
||||||
if (data->slots[i]->name == slotName) return slots[i];
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int BaseSkeleton::findSlotIndex (const string &slotName) const {
|
|
||||||
for (int i = 0, n = slots.size(); i < n; i++)
|
|
||||||
if (data->slots[i]->name == slotName) return i;
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
void BaseSkeleton::setSkin (const string &skinName) {
|
|
||||||
Skin *skin = data->findSkin(skinName);
|
|
||||||
if (!skin) throw invalid_argument("Skin not found: " + skinName);
|
|
||||||
setSkin(skin);
|
|
||||||
}
|
|
||||||
|
|
||||||
void BaseSkeleton::setSkin (Skin *newSkin) {
|
|
||||||
if (skin && newSkin) newSkin->attachAll(this, skin);
|
|
||||||
skin = newSkin;
|
|
||||||
}
|
|
||||||
|
|
||||||
Attachment* BaseSkeleton::getAttachment (const string &slotName, const string &attachmentName) const {
|
|
||||||
return getAttachment(data->findSlotIndex(slotName), attachmentName);
|
|
||||||
}
|
|
||||||
|
|
||||||
Attachment* BaseSkeleton::getAttachment (int slotIndex, const string &attachmentName) const {
|
|
||||||
if (skin) return skin->getAttachment(slotIndex, attachmentName);
|
|
||||||
if (data->defaultSkin) {
|
|
||||||
Attachment *attachment = data->defaultSkin->getAttachment(slotIndex, attachmentName);
|
|
||||||
if (attachment) return attachment;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void BaseSkeleton::setAttachment (const string &slotName, const string &attachmentName) {
|
|
||||||
for (int i = 0, n = slots.size(); i < n; i++) {
|
|
||||||
Slot *slot = slots[i];
|
|
||||||
if (slot->data->name == slotName) {
|
|
||||||
slot->setAttachment(getAttachment(i, attachmentName));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
throw invalid_argument("Slot not found: " + slotName);
|
|
||||||
}
|
|
||||||
|
|
||||||
void BaseSkeleton::update (float deltaTime) {
|
|
||||||
time += deltaTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
@ -1,366 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#include <spine/BaseSkeletonJson.h>
|
|
||||||
#include <cstdlib>
|
|
||||||
#include <fstream>
|
|
||||||
#include <stdexcept>
|
|
||||||
#include <algorithm>
|
|
||||||
#include <json/json.h>
|
|
||||||
#include <spine/BaseAttachmentLoader.h>
|
|
||||||
#include <spine/BaseRegionAttachment.h>
|
|
||||||
#include <spine/SkeletonData.h>
|
|
||||||
#include <spine/BoneData.h>
|
|
||||||
#include <spine/SlotData.h>
|
|
||||||
#include <spine/Skin.h>
|
|
||||||
#include <spine/Animation.h>
|
|
||||||
|
|
||||||
using std::string;
|
|
||||||
using std::vector;
|
|
||||||
using std::max;
|
|
||||||
using std::runtime_error;
|
|
||||||
using std::invalid_argument;
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
static float toColor (const string &value, int index) {
|
|
||||||
if (value.size() != 8) throw runtime_error("Error parsing color, length must be 8: " + value);
|
|
||||||
char *p;
|
|
||||||
string tmp = value.substr(index * 2, 2);
|
|
||||||
int color = strtoul(tmp.c_str(), &p, 16);
|
|
||||||
if (*p != 0) throw runtime_error("Error parsing color: " + value + ", invalid hex value: " + tmp);
|
|
||||||
return color / (float)255;
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
BaseSkeletonJson::BaseSkeletonJson (BaseAttachmentLoader *attachmentLoader) :
|
|
||||||
attachmentLoader(attachmentLoader),
|
|
||||||
scale(1),
|
|
||||||
yDown(false) {
|
|
||||||
if (!attachmentLoader) throw invalid_argument("attachmentLoader cannot be null.");
|
|
||||||
}
|
|
||||||
|
|
||||||
BaseSkeletonJson::~BaseSkeletonJson () {
|
|
||||||
delete attachmentLoader;
|
|
||||||
}
|
|
||||||
|
|
||||||
SkeletonData* BaseSkeletonJson::readSkeletonData (const string &path) const {
|
|
||||||
std::ifstream file(path.c_str());
|
|
||||||
if (!file) throw std::invalid_argument("Error reading skeleton file: " + path);
|
|
||||||
return readSkeletonData(file);
|
|
||||||
}
|
|
||||||
|
|
||||||
SkeletonData* BaseSkeletonJson::readSkeletonData (std::istream &input) const {
|
|
||||||
if (!input) throw invalid_argument("input cannot be null.");
|
|
||||||
|
|
||||||
string json;
|
|
||||||
std::getline(input, json, (char)EOF);
|
|
||||||
const char *begin = json.c_str();
|
|
||||||
const char *end = begin + json.length();
|
|
||||||
return readSkeletonData(begin, end);
|
|
||||||
}
|
|
||||||
|
|
||||||
SkeletonData* BaseSkeletonJson::readSkeletonData (const char *begin, const char *end) const {
|
|
||||||
if (!begin) throw invalid_argument("begin cannot be null.");
|
|
||||||
if (!end) throw invalid_argument("end cannot be null.");
|
|
||||||
|
|
||||||
static string const ATTACHMENT_REGION = "region";
|
|
||||||
static string const ATTACHMENT_REGION_SEQUENCE = "regionSequence";
|
|
||||||
|
|
||||||
Json::Value root;
|
|
||||||
Json::Reader reader;
|
|
||||||
if (!reader.parse(begin, end, root)) throw runtime_error("Error parsing skeleton JSON.\n" + reader.getFormatedErrorMessages());
|
|
||||||
|
|
||||||
SkeletonData *skeletonData = new SkeletonData();
|
|
||||||
|
|
||||||
Json::Value bones = root["bones"];
|
|
||||||
skeletonData->bones.reserve(bones.size());
|
|
||||||
for (int i = 0, n = bones.size(); i < n; ++i) {
|
|
||||||
Json::Value boneMap = bones[i];
|
|
||||||
string boneName = boneMap["name"].asString();
|
|
||||||
|
|
||||||
BoneData *boneData = new BoneData(boneName);
|
|
||||||
if (boneMap.isMember("parent")) {
|
|
||||||
boneData->parent = skeletonData->findBone(boneMap["parent"].asString());
|
|
||||||
if (!boneData->parent) throw runtime_error("Parent bone not found: " + boneName);
|
|
||||||
}
|
|
||||||
|
|
||||||
boneData->length = (float)(boneMap.get("length", 0).asDouble() * scale);
|
|
||||||
boneData->x = (float)(boneMap.get("x", 0).asDouble() * scale);
|
|
||||||
boneData->y = (float)(boneMap.get("y", 0).asDouble() * scale);
|
|
||||||
boneData->rotation = (float)(boneMap.get("rotation", 0).asDouble());
|
|
||||||
boneData->scaleX = (float)(boneMap.get("scaleX", 1).asDouble());
|
|
||||||
boneData->scaleY = (float)(boneMap.get("scaleY", 1).asDouble());
|
|
||||||
boneData->yDown = yDown;
|
|
||||||
|
|
||||||
skeletonData->bones.push_back(boneData);
|
|
||||||
}
|
|
||||||
|
|
||||||
Json::Value slots = root["slots"];
|
|
||||||
if (!slots.isNull()) {
|
|
||||||
skeletonData->slots.reserve(slots.size());
|
|
||||||
for (int i = 0, n = slots.size(); i < n; ++i) {
|
|
||||||
Json::Value slotMap = slots[i];
|
|
||||||
string slotName = slotMap["name"].asString();
|
|
||||||
|
|
||||||
string boneName = slotMap["bone"].asString();
|
|
||||||
BoneData* boneData = skeletonData->findBone(boneName);
|
|
||||||
if (!boneData) throw runtime_error("Slot bone not found: " + boneName);
|
|
||||||
|
|
||||||
SlotData *slotData = new SlotData(slotName, boneData);
|
|
||||||
|
|
||||||
if (slotMap.isMember("color")) {
|
|
||||||
string s = slotMap["color"].asString();
|
|
||||||
slotData->r = toColor(s, 0);
|
|
||||||
slotData->g = toColor(s, 1);
|
|
||||||
slotData->b = toColor(s, 2);
|
|
||||||
slotData->a = toColor(s, 3);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (slotMap.isMember("attachment")) slotData->attachmentName = new string(slotMap["attachment"].asString());
|
|
||||||
|
|
||||||
skeletonData->slots.push_back(slotData);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (root.isMember("skins")) {
|
|
||||||
Json::Value skinsMap = root["skins"];
|
|
||||||
vector<string> skinNames = skinsMap.getMemberNames();
|
|
||||||
skeletonData->skins.reserve(skinNames.size());
|
|
||||||
for (int i = 0, n = skinNames.size(); i < n; i++) {
|
|
||||||
string skinName = skinNames[i];
|
|
||||||
Skin *skin = new Skin(skinName);
|
|
||||||
skeletonData->skins.push_back(skin);
|
|
||||||
if (skinName == "default") skeletonData->defaultSkin = skin;
|
|
||||||
|
|
||||||
Json::Value slotMap = skinsMap[skinName];
|
|
||||||
vector<string> slotNames = slotMap.getMemberNames();
|
|
||||||
for (int i = 0, n = slotNames.size(); i < n; i++) {
|
|
||||||
string slotName = slotNames[i];
|
|
||||||
int slotIndex = skeletonData->findSlotIndex(slotName);
|
|
||||||
|
|
||||||
Json::Value attachmentsMap = slotMap[slotName];
|
|
||||||
vector<string> attachmentNames = attachmentsMap.getMemberNames();
|
|
||||||
for (int i = 0, n = attachmentNames.size(); i < n; i++) {
|
|
||||||
string attachmentName = attachmentNames[i];
|
|
||||||
Json::Value attachmentMap = attachmentsMap[attachmentName];
|
|
||||||
|
|
||||||
AttachmentType type;
|
|
||||||
string typeString = attachmentMap.get("type", ATTACHMENT_REGION).asString();
|
|
||||||
if (typeString == ATTACHMENT_REGION)
|
|
||||||
type = region;
|
|
||||||
else if (typeString == ATTACHMENT_REGION_SEQUENCE)
|
|
||||||
type = regionSequence;
|
|
||||||
else
|
|
||||||
throw runtime_error("Unknown attachment type: " + typeString + " (" + attachmentName + ")");
|
|
||||||
|
|
||||||
Attachment* attachment = attachmentLoader->newAttachment(type,
|
|
||||||
attachmentMap.get("name", attachmentName).asString());
|
|
||||||
|
|
||||||
if (type == region || type == regionSequence) {
|
|
||||||
BaseRegionAttachment *regionAttachment = reinterpret_cast<BaseRegionAttachment*>(attachment);
|
|
||||||
regionAttachment->x = (float)(attachmentMap.get("x", 0).asDouble() * scale);
|
|
||||||
regionAttachment->y = (float)(attachmentMap.get("y", 0).asDouble() * scale);
|
|
||||||
regionAttachment->scaleX = (float)(attachmentMap.get("scaleX", 1).asDouble());
|
|
||||||
regionAttachment->scaleY = (float)(attachmentMap.get("scaleY", 1).asDouble());
|
|
||||||
regionAttachment->rotation = (float)(attachmentMap.get("rotation", 0).asDouble());
|
|
||||||
regionAttachment->width = (float)(attachmentMap.get("width", 32).asDouble() * scale);
|
|
||||||
regionAttachment->height = (float)(attachmentMap.get("height", 32).asDouble() * scale);
|
|
||||||
regionAttachment->updateOffset();
|
|
||||||
}
|
|
||||||
|
|
||||||
skin->addAttachment(slotIndex, attachmentName, attachment);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return skeletonData;
|
|
||||||
}
|
|
||||||
|
|
||||||
Animation* BaseSkeletonJson::readAnimation (const string &path, const SkeletonData *skeletonData) const {
|
|
||||||
std::ifstream file(path.c_str());
|
|
||||||
if (!file) throw std::invalid_argument("Error reading animation file: " + path);
|
|
||||||
return readAnimation(file, skeletonData);
|
|
||||||
}
|
|
||||||
|
|
||||||
Animation* BaseSkeletonJson::readAnimation (std::istream &input, const SkeletonData *skeletonData) const {
|
|
||||||
if (!input) throw invalid_argument("input cannot be null.");
|
|
||||||
|
|
||||||
string json;
|
|
||||||
std::getline(input, json, (char)EOF);
|
|
||||||
const char *begin = json.c_str();
|
|
||||||
const char *end = begin + json.length();
|
|
||||||
return readAnimation(begin, end, skeletonData);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void readCurve (CurveTimeline *timeline, int keyframeIndex, const Json::Value &valueMap) {
|
|
||||||
Json::Value curve = valueMap["curve"];
|
|
||||||
if (curve.isNull()) return;
|
|
||||||
if (curve.isString() && curve.asString() == "stepped")
|
|
||||||
timeline->setStepped(keyframeIndex);
|
|
||||||
else if (curve.isArray())
|
|
||||||
timeline->setCurve(keyframeIndex, (float)curve[0u].asDouble(), (float)curve[1u].asDouble(), (float)curve[2u].asDouble(),
|
|
||||||
(float)curve[3u].asDouble());
|
|
||||||
}
|
|
||||||
|
|
||||||
Animation* BaseSkeletonJson::readAnimation (const char *begin, const char *end, const SkeletonData *skeletonData) const {
|
|
||||||
if (!begin) throw invalid_argument("begin cannot be null.");
|
|
||||||
if (!end) throw invalid_argument("end cannot be null.");
|
|
||||||
if (!skeletonData) throw invalid_argument("skeletonData cannot be null.");
|
|
||||||
|
|
||||||
static string const TIMELINE_SCALE = "scale";
|
|
||||||
static string const TIMELINE_ROTATE = "rotate";
|
|
||||||
static string const TIMELINE_TRANSLATE = "translate";
|
|
||||||
static string const TIMELINE_ATTACHMENT = "attachment";
|
|
||||||
static string const TIMELINE_COLOR = "color";
|
|
||||||
|
|
||||||
vector<Timeline*> timelines;
|
|
||||||
float duration = 0;
|
|
||||||
|
|
||||||
Json::Value root;
|
|
||||||
Json::Reader reader;
|
|
||||||
if (!reader.parse(begin, end, root))
|
|
||||||
throw runtime_error("Error parsing animation JSON.\n" + reader.getFormatedErrorMessages());
|
|
||||||
|
|
||||||
Json::Value bones = root["bones"];
|
|
||||||
vector<string> boneNames = bones.getMemberNames();
|
|
||||||
for (int i = 0, n = boneNames.size(); i < n; i++) {
|
|
||||||
string boneName = boneNames[i];
|
|
||||||
int boneIndex = skeletonData->findBoneIndex(boneName);
|
|
||||||
if (boneIndex == -1) throw runtime_error("Bone not found: " + boneName);
|
|
||||||
|
|
||||||
Json::Value timelineMap = bones[boneName];
|
|
||||||
vector<string> timelineNames = timelineMap.getMemberNames();
|
|
||||||
for (int i = 0, n = timelineNames.size(); i < n; i++) {
|
|
||||||
string timelineName = timelineNames[i];
|
|
||||||
Json::Value values = timelineMap[timelineName];
|
|
||||||
|
|
||||||
if (timelineName == TIMELINE_ROTATE) {
|
|
||||||
RotateTimeline *timeline = new RotateTimeline(values.size());
|
|
||||||
timeline->boneIndex = boneIndex;
|
|
||||||
|
|
||||||
int keyframeIndex = 0;
|
|
||||||
for (int i = 0, n = values.size(); i < n; i++) {
|
|
||||||
Json::Value valueMap = values[i];
|
|
||||||
|
|
||||||
float time = (float)valueMap["time"].asDouble();
|
|
||||||
timeline->setKeyframe(keyframeIndex, time, (float)valueMap["angle"].asDouble());
|
|
||||||
readCurve(timeline, keyframeIndex, valueMap);
|
|
||||||
keyframeIndex++;
|
|
||||||
}
|
|
||||||
timelines.push_back(timeline);
|
|
||||||
duration = max(duration, timeline->frames[values.size() * 2 - 2]);
|
|
||||||
|
|
||||||
} else if (timelineName == TIMELINE_TRANSLATE || timelineName == TIMELINE_SCALE) {
|
|
||||||
TranslateTimeline *timeline;
|
|
||||||
float timelineScale = 1;
|
|
||||||
if (timelineName == TIMELINE_SCALE)
|
|
||||||
timeline = new ScaleTimeline(values.size());
|
|
||||||
else {
|
|
||||||
timeline = new TranslateTimeline(values.size());
|
|
||||||
timelineScale = scale;
|
|
||||||
}
|
|
||||||
timeline->boneIndex = boneIndex;
|
|
||||||
|
|
||||||
int keyframeIndex = 0;
|
|
||||||
for (int i = 0, n = values.size(); i < n; i++) {
|
|
||||||
Json::Value valueMap = values[i];
|
|
||||||
|
|
||||||
timeline->setKeyframe(keyframeIndex, //
|
|
||||||
(float)valueMap["time"].asDouble(), //
|
|
||||||
(float)valueMap.get("x", 0).asDouble() * timelineScale, //
|
|
||||||
(float)valueMap.get("y", 0).asDouble() * timelineScale);
|
|
||||||
readCurve(timeline, keyframeIndex, valueMap);
|
|
||||||
keyframeIndex++;
|
|
||||||
}
|
|
||||||
timelines.push_back(timeline);
|
|
||||||
duration = max(duration, timeline->frames[values.size() * 3 - 3]);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
throw runtime_error("Invalid timeline type for a bone: " + timelineName + " (" + boneName + ")");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Json::Value slots = root["slots"];
|
|
||||||
if (!slots.isNull()) {
|
|
||||||
vector<string> slotNames = slots.getMemberNames();
|
|
||||||
for (int i = 0, n = slotNames.size(); i < n; i++) {
|
|
||||||
string slotName = slotNames[i];
|
|
||||||
int slotIndex = skeletonData->findSlotIndex(slotName);
|
|
||||||
if (slotIndex == -1) throw runtime_error("Slot not found: " + slotName);
|
|
||||||
|
|
||||||
Json::Value timelineMap = slots[slotName];
|
|
||||||
vector<string> timelineNames = timelineMap.getMemberNames();
|
|
||||||
for (int i = 0, n = timelineNames.size(); i < n; i++) {
|
|
||||||
string timelineName = timelineNames[i];
|
|
||||||
Json::Value values = timelineMap[timelineName];
|
|
||||||
|
|
||||||
if (timelineName == TIMELINE_COLOR) {
|
|
||||||
ColorTimeline *timeline = new ColorTimeline(values.size());
|
|
||||||
timeline->slotIndex = slotIndex;
|
|
||||||
|
|
||||||
int keyframeIndex = 0;
|
|
||||||
for (int i = 0, n = values.size(); i < n; i++) {
|
|
||||||
Json::Value valueMap = values[i];
|
|
||||||
|
|
||||||
string s = valueMap["color"].asString();
|
|
||||||
timeline->setKeyframe(keyframeIndex, (float)valueMap["time"].asDouble(), //
|
|
||||||
toColor(s, 0), toColor(s, 1), toColor(s, 2), toColor(s, 3));
|
|
||||||
readCurve(timeline, keyframeIndex, valueMap);
|
|
||||||
keyframeIndex++;
|
|
||||||
}
|
|
||||||
timelines.push_back(timeline);
|
|
||||||
duration = max(duration, timeline->frames[values.size() * 5 - 5]);
|
|
||||||
|
|
||||||
} else if (timelineName == TIMELINE_ATTACHMENT) {
|
|
||||||
AttachmentTimeline *timeline = new AttachmentTimeline(values.size());
|
|
||||||
timeline->slotIndex = slotIndex;
|
|
||||||
|
|
||||||
int keyframeIndex = 0;
|
|
||||||
for (int i = 0, n = values.size(); i < n; i++) {
|
|
||||||
Json::Value valueMap = values[i];
|
|
||||||
|
|
||||||
Json::Value nameValue = valueMap["name"];
|
|
||||||
timeline->setKeyframe(keyframeIndex++, (float)valueMap["time"].asDouble(),
|
|
||||||
nameValue.isNull() ? 0 : new string(nameValue.asString()));
|
|
||||||
}
|
|
||||||
timelines.push_back(timeline);
|
|
||||||
duration = max(duration, timeline->frames[values.size() - 1]);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
throw runtime_error("Invalid timeline type for a slot: " + timelineName + " (" + slotName + ")");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Animation *animation = new Animation(timelines, duration);
|
|
||||||
return animation;
|
|
||||||
}
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
@ -1,100 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#include <math.h>
|
|
||||||
#include <stdexcept>
|
|
||||||
#include <spine/Bone.h>
|
|
||||||
#include <spine/BoneData.h>
|
|
||||||
|
|
||||||
#ifndef M_PI
|
|
||||||
#define M_PI 3.1415926535897932385
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
Bone::Bone (BoneData *data) :
|
|
||||||
data(data),
|
|
||||||
parent(0),
|
|
||||||
x(data->x),
|
|
||||||
y(data->y),
|
|
||||||
rotation(data->rotation),
|
|
||||||
scaleX(data->scaleX),
|
|
||||||
scaleY(data->scaleY),
|
|
||||||
m00(0),
|
|
||||||
m01(0),
|
|
||||||
worldX(0),
|
|
||||||
m10(0),
|
|
||||||
m11(0),
|
|
||||||
worldY(0),
|
|
||||||
worldRotation(0),
|
|
||||||
worldScaleX(0),
|
|
||||||
worldScaleY(0) {
|
|
||||||
if (!data) throw std::invalid_argument("data cannot be null.");
|
|
||||||
}
|
|
||||||
|
|
||||||
void Bone::setToBindPose () {
|
|
||||||
x = data->x;
|
|
||||||
y = data->y;
|
|
||||||
rotation = data->rotation;
|
|
||||||
scaleX = data->scaleX;
|
|
||||||
scaleY = data->scaleY;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Bone::updateWorldTransform (bool flipX, bool flipY) {
|
|
||||||
if (parent) {
|
|
||||||
worldX = x * parent->m00 + y * parent->m01 + parent->worldX;
|
|
||||||
worldY = x * parent->m10 + y * parent->m11 + parent->worldY;
|
|
||||||
worldScaleX = parent->worldScaleX * scaleX;
|
|
||||||
worldScaleY = parent->worldScaleY * scaleY;
|
|
||||||
worldRotation = parent->worldRotation + rotation;
|
|
||||||
} else {
|
|
||||||
worldX = x;
|
|
||||||
worldY = y;
|
|
||||||
worldScaleX = scaleX;
|
|
||||||
worldScaleY = scaleY;
|
|
||||||
worldRotation = rotation;
|
|
||||||
}
|
|
||||||
float radians = (float)(worldRotation * M_PI / 180);
|
|
||||||
float cos = cosf(radians);
|
|
||||||
float sin = sinf(radians);
|
|
||||||
m00 = cos * worldScaleX;
|
|
||||||
m10 = sin * worldScaleX;
|
|
||||||
m01 = -sin * worldScaleY;
|
|
||||||
m11 = cos * worldScaleY;
|
|
||||||
if (flipX) {
|
|
||||||
m00 = -m00;
|
|
||||||
m01 = -m01;
|
|
||||||
}
|
|
||||||
if (flipY) {
|
|
||||||
m10 = -m10;
|
|
||||||
m11 = -m11;
|
|
||||||
}
|
|
||||||
if (data->yDown) {
|
|
||||||
m10 = -m10;
|
|
||||||
m11 = -m11;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#include <spine/BoneData.h>
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
BoneData::BoneData (const std::string &name) :
|
|
||||||
name(name),
|
|
||||||
parent(0),
|
|
||||||
length(0),
|
|
||||||
x(0),
|
|
||||||
y(0),
|
|
||||||
rotation(0),
|
|
||||||
scaleX(1),
|
|
||||||
scaleY(1),
|
|
||||||
yDown(false) {
|
|
||||||
}
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
@ -1,78 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#include <spine/SkeletonData.h>
|
|
||||||
#include <spine/BoneData.h>
|
|
||||||
#include <spine/SlotData.h>
|
|
||||||
#include <spine/Skin.h>
|
|
||||||
|
|
||||||
using std::string;
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
SkeletonData::SkeletonData () :
|
|
||||||
defaultSkin(0) {
|
|
||||||
}
|
|
||||||
|
|
||||||
SkeletonData::~SkeletonData () {
|
|
||||||
for (int i = 0, n = bones.size(); i < n; i++)
|
|
||||||
delete bones[i];
|
|
||||||
for (int i = 0, n = slots.size(); i < n; i++)
|
|
||||||
delete slots[i];
|
|
||||||
for (int i = 0, n = skins.size(); i < n; i++)
|
|
||||||
delete skins[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
BoneData* SkeletonData::findBone (const string &boneName) const {
|
|
||||||
for (int i = 0, n = bones.size(); i < n; i++)
|
|
||||||
if (bones[i]->name == boneName) return bones[i];
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int SkeletonData::findBoneIndex (const string &boneName) const {
|
|
||||||
for (int i = 0, n = bones.size(); i < n; i++)
|
|
||||||
if (bones[i]->name == boneName) return i;
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
SlotData* SkeletonData::findSlot (const string &slotName) const {
|
|
||||||
for (int i = 0, n = slots.size(); i < n; i++)
|
|
||||||
if (slots[i]->name == slotName) return slots[i];
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int SkeletonData::findSlotIndex (const string &slotName) const {
|
|
||||||
for (int i = 0, n = slots.size(); i < n; i++)
|
|
||||||
if (slots[i]->name == slotName) return i;
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
Skin* SkeletonData::findSkin (const string &skinName) const {
|
|
||||||
for (int i = 0, n = skins.size(); i < n; i++)
|
|
||||||
if (skins[i]->name == skinName) return skins[i];
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
@ -1,66 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#include <stdexcept>
|
|
||||||
#include <spine/Attachment.h>
|
|
||||||
#include <spine/Skin.h>
|
|
||||||
#include <spine/BaseSkeleton.h>
|
|
||||||
#include <spine/Slot.h>
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
Skin::Skin (const std::string &name) :
|
|
||||||
name(name) {
|
|
||||||
}
|
|
||||||
|
|
||||||
Skin::~Skin () {
|
|
||||||
for (std::map<Key, Attachment*>::iterator iter = attachments.begin(); iter != attachments.end(); iter++)
|
|
||||||
delete iter->second;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Skin::addAttachment (int slotIndex, const std::string &name, Attachment *attachment) {
|
|
||||||
if (!attachment) throw std::invalid_argument("attachment cannot be null.");
|
|
||||||
Key key = {slotIndex, name};
|
|
||||||
attachments[key] = attachment;
|
|
||||||
}
|
|
||||||
|
|
||||||
Attachment* Skin::getAttachment (int slotIndex, const std::string &name) {
|
|
||||||
Key key = {slotIndex, name};
|
|
||||||
if (attachments.find(key) != attachments.end()) return attachments[key];
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Skin::attachAll (BaseSkeleton *skeleton, Skin *oldSkin) {
|
|
||||||
for (std::map<Key, Attachment*>::iterator iter = oldSkin->attachments.begin(); iter != oldSkin->attachments.end(); iter++) {
|
|
||||||
const Key key = iter->first;
|
|
||||||
Slot *slot = skeleton->slots[key.slotIndex];
|
|
||||||
if (slot->attachment == iter->second) {
|
|
||||||
Attachment *attachment = getAttachment(key.slotIndex, key.name);
|
|
||||||
if (attachment) slot->setAttachment(attachment);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
@ -1,80 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#include <stdexcept>
|
|
||||||
#include <spine/Slot.h>
|
|
||||||
#include <spine/SlotData.h>
|
|
||||||
#include <spine/BaseSkeleton.h>
|
|
||||||
#include <spine/SkeletonData.h>
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
Slot::Slot (SlotData *data, BaseSkeleton *skeleton, Bone *bone) :
|
|
||||||
attachmentTime(0),
|
|
||||||
data(data),
|
|
||||||
skeleton(skeleton),
|
|
||||||
bone(bone),
|
|
||||||
r(1),
|
|
||||||
g(1),
|
|
||||||
b(1),
|
|
||||||
a(1),
|
|
||||||
attachment(0) {
|
|
||||||
if (!data) throw std::invalid_argument("data cannot be null.");
|
|
||||||
if (!skeleton) throw std::invalid_argument("skeleton cannot be null.");
|
|
||||||
if (!bone) throw std::invalid_argument("bone cannot be null.");
|
|
||||||
setToBindPose();
|
|
||||||
}
|
|
||||||
|
|
||||||
void Slot::setAttachment (Attachment *attachment) {
|
|
||||||
this->attachment = attachment;
|
|
||||||
attachmentTime = skeleton->time;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Slot::setAttachmentTime (float time) {
|
|
||||||
attachmentTime = skeleton->time - time;
|
|
||||||
}
|
|
||||||
|
|
||||||
float Slot::getAttachmentTime () const {
|
|
||||||
return skeleton->time - attachmentTime;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Slot::setToBindPose () {
|
|
||||||
for (int i = 0, n = skeleton->data->slots.size(); i < n; i++) {
|
|
||||||
if (data == skeleton->data->slots[i]) {
|
|
||||||
setToBindPose(i);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void Slot::setToBindPose (int slotIndex) {
|
|
||||||
r = data->r;
|
|
||||||
g = data->g;
|
|
||||||
b = data->b;
|
|
||||||
a = data->a;
|
|
||||||
setAttachment(data->attachmentName ? skeleton->getAttachment(slotIndex, *data->attachmentName) : 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
} /* namespace spine */
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
/*******************************************************************************
|
|
||||||
* Copyright (c) 2013, Esoteric Software
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
*
|
|
||||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
* list of conditions and the following disclaimer.
|
|
||||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
* this list of conditions and the following disclaimer in the documentation
|
|
||||||
* and/or other materials provided with the distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
******************************************************************************/
|
|
||||||
|
|
||||||
#include <stdexcept>
|
|
||||||
#include <spine/SlotData.h>
|
|
||||||
|
|
||||||
namespace spine {
|
|
||||||
|
|
||||||
SlotData::SlotData (const std::string &name, BoneData *boneData) :
|
|
||||||
name(name),
|
|
||||||
boneData(boneData),
|
|
||||||
r(1),
|
|
||||||
g(1),
|
|
||||||
b(1),
|
|
||||||
a(1),
|
|
||||||
attachmentName(0) {
|
|
||||||
if (!boneData) throw std::invalid_argument("boneData cannot be null.");
|
|
||||||
}
|
|
||||||
|
|
||||||
SlotData::~SlotData () {
|
|
||||||
if (attachmentName) {
|
|
||||||
delete attachmentName;
|
|
||||||
attachmentName = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
/* namespace spine */
|
|
||||||
Loading…
x
Reference in New Issue
Block a user