OSDN Git Service

Merge branch 'mmdwork2' into work3
authorkobayasi <kobayasi@pscnet.co.jp>
Sun, 7 Jul 2013 14:21:22 +0000 (23:21 +0900)
committerkobayasi <kobayasi@pscnet.co.jp>
Sun, 7 Jul 2013 14:21:22 +0000 (23:21 +0900)
77 files changed:
1  2 
MMDLoaderJME/build.xml
MMDLoaderJME/nbproject/project.properties
MMDLoaderJME/src/MatDefs/pmd/PreShadow_pmd.vert
MMDLoaderJME/src/MatDefs/pmd/pmd.frag
MMDLoaderJME/src/MatDefs/pmd/pmd.j3md
MMDLoaderJME/src/MatDefs/pmd/pmd.vert
MMDLoaderJME/src/MatDefs/pmd/pmd_alpha.j3md
MMDLoaderJME/src/MatDefs/pmd/pmd_cartoon.frag
MMDLoaderJME/src/MatDefs/pmd/pmd_cartoon.vert
MMDLoaderJME/src/MatDefs/pmd/pmd_no_skinning.j3md
MMDLoaderJME/src/MatDefs/pmd/pmd_no_skinning.vert
MMDLoaderJME/src/MatDefs/pmd/pmd_no_skinning_alpha.j3md
MMDLoaderJME/src/MatDefs/pmd/pmd_non_adero.frag
MMDLoaderJME/src/info/projectkyoto/mms/asset/manifest/FileNode.java
MMDLoaderJME/src/info/projectkyoto/mms/asset/manifest/Manifest.java
MMDLoaderJME/src/info/projectkyoto/mms/asset/manifest/ManifestUtil.java
MMDLoaderJME/src/info/projectkyoto/mms/asset/manifest/ProductNode.java
MMDLoaderJME/src/projectkyoto/jme3/mmd/GeometryOptimizer.java
MMDLoaderJME/src/projectkyoto/jme3/mmd/PMDGeometry.java
MMDLoaderJME/src/projectkyoto/jme3/mmd/PMDLoaderGLSLSkinning2.java
MMDLoaderJME/src/projectkyoto/jme3/mmd/PMDMesh.java
MMDLoaderJME/src/projectkyoto/jme3/mmd/PMDModelKey.java
MMDLoaderJME/src/projectkyoto/jme3/mmd/PMDNode.java
MMDLoaderJME/src/projectkyoto/jme3/mmd/PMDSkinMesh.java
MMDLoaderJME/src/projectkyoto/jme3/mmd/PmdUtil.java
MMDLoaderJME/src/projectkyoto/jme3/mmd/SkeletonControl.java
MMDLoaderJME/src/projectkyoto/jme3/mmd/Skin.java
MMDLoaderJME/src/projectkyoto/jme3/mmd/UpdateControl.java
MMDLoaderJME/src/projectkyoto/jme3/mmd/VMDLoader.java
MMDLoaderJME/src/projectkyoto/jme3/mmd/ik/IKControl.java
MMDLoaderJME/src/projectkyoto/jme3/mmd/nativebullet/PMDPhysicsWorld.java
MMDLoaderJME/src/projectkyoto/jme3/mmd/nativebullet/PMDRigidBody.java
MMDLoaderJME/src/projectkyoto/jme3/mmd/nativebullet/PhysicsControl.java
MMDLoaderJME/src/projectkyoto/jme3/mmd/vmd/IPUtil.java
MMDLoaderJME/src/projectkyoto/jme3/mmd/vmd/VMDCallable.java
MMDLoaderJME/src/projectkyoto/jme3/mmd/vmd/VMDControl.java
MMDLoaderJME/src/projectkyoto/jme3/mmd/vmd/VMDControlMT.java
MMDLoaderJME/src/projectkyoto/mmd/file/Coords2d.java
MMDLoaderJME/src/projectkyoto/mmd/file/DataInputStreamLittleEndian.java
MMDLoaderJME/src/projectkyoto/mmd/file/DataOutputStreamLittleEndian.java
MMDLoaderJME/src/projectkyoto/mmd/file/PMDBone.java
MMDLoaderJME/src/projectkyoto/mmd/file/PMDBoneDisp.java
MMDLoaderJME/src/projectkyoto/mmd/file/PMDBoneDispList.java
MMDLoaderJME/src/projectkyoto/mmd/file/PMDBoneDispNameList.java
MMDLoaderJME/src/projectkyoto/mmd/file/PMDBoneList.java
MMDLoaderJME/src/projectkyoto/mmd/file/PMDHeaderEnglish.java
MMDLoaderJME/src/projectkyoto/mmd/file/PMDIKData.java
MMDLoaderJME/src/projectkyoto/mmd/file/PMDIKList.java
MMDLoaderJME/src/projectkyoto/mmd/file/PMDJoint.java
MMDLoaderJME/src/projectkyoto/mmd/file/PMDJointList.java
MMDLoaderJME/src/projectkyoto/mmd/file/PMDMaterial.java
MMDLoaderJME/src/projectkyoto/mmd/file/PMDModel.java
MMDLoaderJME/src/projectkyoto/mmd/file/PMDRigidBody.java
MMDLoaderJME/src/projectkyoto/mmd/file/PMDRigidBodyList.java
MMDLoaderJME/src/projectkyoto/mmd/file/PMDSkinData.java
MMDLoaderJME/src/projectkyoto/mmd/file/PMDSkinDispList.java
MMDLoaderJME/src/projectkyoto/mmd/file/PMDSkinVertData.java
MMDLoaderJME/src/projectkyoto/mmd/file/PMDToonTextureList.java
MMDLoaderJME/src/projectkyoto/mmd/file/PMDUtil.java
MMDLoaderJME/src/projectkyoto/mmd/file/PMDVertex.java
MMDLoaderJME/src/projectkyoto/mmd/file/TooManyBonesException.java
MMDLoaderJME/src/projectkyoto/mmd/file/VMDFile.java
MMDLoaderJME/src/projectkyoto/mmd/file/VMDMotion.java
MMDLoaderJME/src/projectkyoto/mmd/file/VMDSkin.java
MMDLoaderJME/src/projectkyoto/mmd/file/XColorRGB.java
MMDLoaderJME/src/projectkyoto/mmd/file/XColorRGBA.java
MMDLoaderJME/src/projectkyoto/mmd/file/XMaterial.java
MMDLoaderJME/src/projectkyoto/mmd/file/pmn/PMNData.java
MMDLoaderJME/src/projectkyoto/mmd/file/pmn/PMNMesh.java
MMDLoaderJME/src/projectkyoto/mmd/file/pmn/PMNSkinMesh.java
MMDLoaderJME/src/projectkyoto/mmd/file/util/MeshData.java
MMDLoaderJME/src/projectkyoto/mmd/file/util2/BufferUtil.java
MMDLoaderJME/src/projectkyoto/mmd/file/util2/MeshConverter.java
MMDLoaderJME/src/projectkyoto/mmd/file/util2/MeshData.java
MMDLoaderJME/src/projectkyoto/mmd/file/util2/PMDFileUtil.java
MMDLoaderJME/src/projectkyoto/mmd/file/util2/SavableUtil.java
MMDLoaderJME/src/projectkyoto/mmd/file/util2/SkinMeshData.java

index 15119f7,0000000..20fdb27
mode 100755,000000..100755
--- /dev/null
@@@ -1,74 -1,0 +1,80 @@@
 +<?xml version="1.0" encoding="UTF-8"?>\r
 +<!-- You may freely edit this file. See commented blocks below for -->\r
 +<!-- some examples of how to customize the build. -->\r
 +<!-- (If you delete it and reopen the project it will be recreated.) -->\r
 +<!-- By default, only the Clean and Build commands use this build script. -->\r
 +<!-- Commands such as Run, Debug, and Test only use this build script if -->\r
 +<!-- the Compile on Save feature is turned off for the project. -->\r
 +<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->\r
 +<!-- in the project's Project Properties dialog box.-->\r
 +<project name="MMDLoaderJME3-lib" default="default" basedir=".">\r
 +    <description>Builds, tests, and runs the project MMDLoaderJME3-lib.</description>\r
 +    <import file="nbproject/build-impl.xml"/>\r
 +    <!--\r
 +\r
 +    There exist several targets which are by default empty and which can be \r
 +    used for execution of your tasks. These targets are usually executed \r
 +    before and after some main targets. They are: \r
 +\r
 +      -pre-init:                 called before initialization of project properties\r
 +      -post-init:                called after initialization of project properties\r
 +      -pre-compile:              called before javac compilation\r
 +      -post-compile:             called after javac compilation\r
 +      -pre-compile-single:       called before javac compilation of single file\r
 +      -post-compile-single:      called after javac compilation of single file\r
 +      -pre-compile-test:         called before javac compilation of JUnit tests\r
 +      -post-compile-test:        called after javac compilation of JUnit tests\r
 +      -pre-compile-test-single:  called before javac compilation of single JUnit test\r
 +      -post-compile-test-single: called after javac compilation of single JUunit test\r
 +      -pre-jar:                  called before JAR building\r
 +      -post-jar:                 called after JAR building\r
 +      -post-clean:               called after cleaning build products\r
 +\r
 +    (Targets beginning with '-' are not intended to be called on their own.)\r
 +\r
 +    Example of inserting an obfuscator after compilation could look like this:\r
 +\r
 +        <target name="-post-compile">\r
 +            <obfuscate>\r
 +                <fileset dir="${build.classes.dir}"/>\r
 +            </obfuscate>\r
 +        </target>\r
 +\r
 +    For list of available properties check the imported \r
 +    nbproject/build-impl.xml file. \r
 +\r
 +\r
 +    Another way to customize the build is by overriding existing main targets.\r
 +    The targets of interest are: \r
 +\r
 +      -init-macrodef-javac:     defines macro for javac compilation\r
 +      -init-macrodef-junit:     defines macro for junit execution\r
 +      -init-macrodef-debug:     defines macro for class debugging\r
 +      -init-macrodef-java:      defines macro for class execution\r
 +      -do-jar-with-manifest:    JAR building (if you are using a manifest)\r
 +      -do-jar-without-manifest: JAR building (if you are not using a manifest)\r
 +      run:                      execution of project \r
 +      -javadoc-build:           Javadoc generation\r
 +      test-report:              JUnit report generation\r
 +\r
 +    An example of overriding the target for project execution could look like this:\r
 +\r
 +        <target name="run" depends="MMDLoaderJME3-lib-impl.jar">\r
 +            <exec dir="bin" executable="launcher.exe">\r
 +                <arg file="${dist.jar}"/>\r
 +            </exec>\r
 +        </target>\r
 +\r
 +    Notice that the overridden target depends on the jar target and not only on \r
 +    the compile target as the regular run target does. Again, for a list of available \r
 +    properties which you can use, check the target you are overriding in the\r
 +    nbproject/build-impl.xml file. \r
 +\r
 +    -->\r
++    <target name="src-jar" depends="init">\r
++        <jar basedir="src" jarfile="${dist.dir}/MMDLoaderJME3-source.jar"/>\r
++    </target>\r
++    <target name="javadoc-jar" depends="javadoc">\r
++        <jar basedir="${dist.dir}/javadoc" jarfile="${dist.dir}/MMDLoaderJME3-javadoc.jar"/>\r
++    </target>\r
 +</project>\r
Simple merge
Simple merge
Simple merge