Skip to content

Commit

Permalink
Merge branch 'master' of github.com:JimSangwine/JigLibJS into main
Browse files Browse the repository at this point in the history 
Conflicts:
	cof/jconfig.js
	data/OctreeCell.js
	geometry/JOctree.js
	geometry/JTriangleMesh.js
	physics/physicssystem.js
  • Loading branch information
@supereggbert
supereggbert committed Mar 19, 2011
2 parents eaa294a + 4febdb7 commit 8e4545c
Show file tree
Hide file tree
Showing 348 changed files with 38,769 additions and 25,704 deletions.
Binary file modified .DS_Store
View file
Binary file not shown.
1 change: 1 addition & 0 deletions .gitignore
View file
@@ -0,0 +1 @@
/test
48 changes: 39 additions & 9 deletions build/build.xml
View file
Expand Up @@ -18,36 +18,65 @@
preserveallsemicolons="true" outputfolder="${basedir}/build/output/code/">
<fileset dir="${basedir}">
<exclude name="build/**" />
<exclude name="tests/**" />
<exclude name="test/**" />
<exclude name="official_demos/**" />
<include name="**/*.js" />
<!--include name="**/*.css" / -->
</fileset>
</yuicompress>

<!-- Concatenated version -->

<!-- Concatenated versions -->
<delete file="${basedir}/build/output/jiglib.all.min.js" />

<concat destfile="${basedir}/build/output/jiglib.all.min.js">
<filelist dir="${basedir}/build/output/code" files="jiglib.js" />
<filelist dir="${basedir}/build/output/code/cof" files="jconfig.js" />
<fileset dir="${basedir}/build/output/code/cof" includes="*.js" />
<filelist dir="${basedir}/build/output/code/events" files="JEvent.js" />
<fileset dir="${basedir}/build/output/code/events" includes="*.js" excludes="JEvent.js" />
<filelist dir="${basedir}/build/output/code/maths" files="glmatrix.js,vector3dutil.js,matrix3d.js,jnumber3d.js,jmatrix3d.js,jmaths3d.js" />
<fileset dir="${basedir}/build/output/code/data" includes="*.js" />
<filelist dir="${basedir}/build/output/code/data" files="CollOutData.js" />
<fileset dir="${basedir}/build/output/code/data" includes="*.js" excludes="CollOutData.js" />
<fileset dir="${basedir}/build/output/code/plugins" includes="*.js" />
<filelist dir="${basedir}/build/output/code/geometry" files="jaabox.js" />
<fileset dir="${basedir}/build/output/code/physics" includes="*.js" excludes="hingejoint.js,physicssystem.js" />
<filelist dir="${basedir}/build/output/code/physics/effect" files="jeffect.js" />
<fileset dir="${basedir}/build/output/code/physics/effect" includes="*.js" excludes="jeffect.js" />
<fileset dir="${basedir}/build/output/code/geometry" includes="*.js" excludes="jaabox.js" />
<filelist dir="${basedir}/build/output/code/collision" files="collpointinfo.js,collisioninfo.js,colldetectinfo.js,colldetectfunctor.js" />
<fileset dir="${basedir}/build/output/code/collision" includes="*.js" excludes="collpointinfo.js,collisioninfo.js,colldetectinfo.js,colldetectfunctor.js,collisionsystem.js" />
<filelist dir="${basedir}/build/output/code/collision" files="collisionsystem.js" />
<fileset dir="${basedir}/build/output/code/collision" includes="colldetect*.js" />
<filelist dir="${basedir}/build/output/code/collision" files="collisionsystem.js,collisionsystemabstract.js,collisionsystembrute.js,collisionsystemgrid.js" />
<fileset dir="${basedir}/build/output/code/physics/constraint" includes="*.js" />
<filelist dir="${basedir}/build/output/code/physics" files="hingejoint.js" />
<filelist dir="${basedir}/build/output/code/physics" files="physicssystem.js" />
<fileset dir="${basedir}/build/output/code/vehicles" includes="*.js" />
</concat>

<delete file="${basedir}/build/output/jiglib.all.full.js" />

<concat destfile="${basedir}/build/output/jiglib.all.full.js">
<filelist dir="${basedir}" files="jiglib.js" />
<fileset dir="${basedir}/cof" includes="*.js" />
<filelist dir="${basedir}/events" files="JEvent.js" />
<fileset dir="${basedir}/events" includes="*.js" excludes="JEvent.js" />
<filelist dir="${basedir}/maths" files="glmatrix.js,vector3dutil.js,matrix3d.js,jnumber3d.js,jmatrix3d.js,jmaths3d.js" />
<filelist dir="${basedir}/data" files="CollOutData.js" />
<fileset dir="${basedir}/data" includes="*.js" excludes="CollOutData.js" />
<fileset dir="${basedir}/plugins" includes="*.js" />
<filelist dir="${basedir}/geometry" files="jaabox.js" />
<fileset dir="${basedir}/physics" includes="*.js" excludes="hingejoint.js,physicssystem.js" />
<filelist dir="${basedir}/physics/effect" files="jeffect.js" />
<fileset dir="${basedir}/physics/effect" includes="*.js" excludes="jeffect.js" />
<fileset dir="${basedir}/geometry" includes="*.js" excludes="jaabox.js" />
<filelist dir="${basedir}/collision" files="collpointinfo.js,collisioninfo.js,colldetectinfo.js,colldetectfunctor.js" />
<fileset dir="${basedir}/collision" includes="colldetect*.js" />
<filelist dir="${basedir}/collision" files="collisionsystem.js,collisionsystemabstract.js,collisionsystembrute.js,collisionsystemgrid.js" />
<fileset dir="${basedir}/physics/constraint" includes="*.js" />
<filelist dir="${basedir}/physics" files="hingejoint.js" />
<filelist dir="${basedir}/physics" files="physicssystem.js" />
<fileset dir="${basedir}/vehicles" includes="*.js" />
</concat>

<!-- JSDoc Documentation -->

<delete dir="${basedir}/build/output/docs" />
Expand All @@ -66,7 +95,8 @@
includeundocumented="false">
<fileset dir="${basedir}">
<exclude name="build/**" />
<exclude name="tests/**" />
<exclude name="test/**" />
<exclude name="official_demos/**" />
<include name="**/*.js" />
</fileset>
</jsdoctoolkit>
Expand Down
82 changes: 61 additions & 21 deletions build/buildtodemo.xml
View file
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="YUICompression" basedir="../">
<target name="default" description="Minifiy a set of files">
<target name="default" description="Minifiy and output to the official_demos directory">

<!-- YUICompress -->

<delete dir="${basedir}/official_demos/jiglib" />
<mkdir dir="${basedir}/official_demos/jiglib" />

<taskdef name="yuicompress"
classname="com.yahoo.platform.yui.compressor.YUICompressTask">
<classpath>
Expand All @@ -9,31 +15,65 @@
</classpath>
</taskdef>
<yuicompress linebreak="16000" warn="false" munge="yes"
preserveallsemicolons="true" outputfolder="${basedir}/tests/demo/jiglib/">
preserveallsemicolons="true" outputfolder="${basedir}/official_demos/jiglib/">
<fileset dir="${basedir}">
<exclude name="build/**" />
<exclude name="tests/**" />
<exclude name="test/**" />
<exclude name="official_demos/**" />
<include name="**/*.js" />
</fileset>
</yuicompress>
<concat destfile="${basedir}/tests/demo/jiglib/jiglib.all.min.js">
<filelist dir="${basedir}/tests/demo/jiglib" files="jiglib.js" />
<filelist dir="${basedir}/tests/demo/jiglib/cof" files="jconfig.js" />
<filelist dir="${basedir}/tests/demo/jiglib/maths" files="glmatrix.js,vector3dutil.js,matrix3d.js,jnumber3d.js,jmatrix3d.js,jmaths3d.js" />
<fileset dir="${basedir}/tests/demo/jiglib/data" includes="*.js" />
<fileset dir="${basedir}/tests/demo/jiglib/plugins" includes="*.js" />
<filelist dir="${basedir}/tests/demo/jiglib/geometry" files="jaabox.js" />
<fileset dir="${basedir}/tests/demo/jiglib/physics" includes="*.js" excludes="hingejoint.js,physicssystem.js" />
<filelist dir="${basedir}/tests/demo/jiglib/physics/effect" files="jeffect.js" />
<fileset dir="${basedir}/tests/demo/jiglib/physics/effect" includes="*.js" excludes="jeffect.js" />
<fileset dir="${basedir}/tests/demo/jiglib/geometry" includes="*.js" excludes="jaabox.js" />
<filelist dir="${basedir}/tests/demo/jiglib/collision" files="collpointinfo.js,collisioninfo.js,colldetectinfo.js,colldetectfunctor.js" />
<fileset dir="${basedir}/tests/demo/jiglib/collision" includes="*.js" excludes="collpointinfo.js,collisioninfo.js,colldetectinfo.js,colldetectfunctor.js,collisionsystem.js" />
<filelist dir="${basedir}/tests/demo/jiglib/collision" files="collisionsystem.js" />
<fileset dir="${basedir}/tests/demo/jiglib/physics/constraint" includes="*.js" />
<filelist dir="${basedir}/tests/demo/jiglib/physics" files="hingejoint.js" />
<filelist dir="${basedir}/tests/demo/jiglib/physics" files="physicssystem.js" />
<fileset dir="${basedir}/tests/demo/jiglib/vehicles" includes="*.js" />

<!-- Concatenated versions -->

<delete file="${basedir}/official_demos/jiglib/jiglib.all.min.js" />

<concat destfile="${basedir}/official_demos/jiglib/jiglib.all.min.js">
<filelist dir="${basedir}/official_demos/jiglib" files="jiglib.js" />
<fileset dir="${basedir}/official_demos/jiglib/cof" includes="*.js" />
<filelist dir="${basedir}/official_demos/jiglib/events" files="JEvent.js" />
<fileset dir="${basedir}/official_demos/jiglib/events" includes="*.js" excludes="JEvent.js" />
<filelist dir="${basedir}/official_demos/jiglib/maths" files="glmatrix.js,vector3dutil.js,matrix3d.js,jnumber3d.js,jmatrix3d.js,jmaths3d.js" />
<filelist dir="${basedir}/official_demos/jiglib/data" files="CollOutData.js" />
<fileset dir="${basedir}/official_demos/jiglib/data" includes="*.js" excludes="CollOutData.js" />
<fileset dir="${basedir}/official_demos/jiglib/plugins" includes="*.js" />
<filelist dir="${basedir}/official_demos/jiglib/geometry" files="jaabox.js" />
<fileset dir="${basedir}/official_demos/jiglib/physics" includes="*.js" excludes="hingejoint.js,physicssystem.js" />
<filelist dir="${basedir}/official_demos/jiglib/physics/effect" files="jeffect.js" />
<fileset dir="${basedir}/official_demos/jiglib/physics/effect" includes="*.js" excludes="jeffect.js" />
<fileset dir="${basedir}/official_demos/jiglib/geometry" includes="*.js" excludes="jaabox.js" />
<filelist dir="${basedir}/official_demos/jiglib/collision" files="collpointinfo.js,collisioninfo.js,colldetectinfo.js,colldetectfunctor.js" />
<fileset dir="${basedir}/official_demos/jiglib/collision" includes="colldetect*.js" />
<filelist dir="${basedir}/official_demos/jiglib/collision" files="collisionsystem.js,collisionsystemabstract.js,collisionsystembrute.js,collisionsystemgrid.js" />
<fileset dir="${basedir}/official_demos/jiglib/physics/constraint" includes="*.js" />
<filelist dir="${basedir}/official_demos/jiglib/physics" files="hingejoint.js" />
<filelist dir="${basedir}/official_demos/jiglib/physics" files="physicssystem.js" />
<fileset dir="${basedir}/official_demos/jiglib/vehicles" includes="*.js" />
</concat>

<delete file="${basedir}/official_demos/jiglib/jiglib.all.full.js" />

<concat destfile="${basedir}/official_demos/jiglib/jiglib.all.full.js">
<filelist dir="${basedir}" files="jiglib.js" />
<fileset dir="${basedir}/cof" includes="*.js" />
<filelist dir="${basedir}/events" files="JEvent.js" />
<fileset dir="${basedir}/events" includes="*.js" excludes="JEvent.js" />
<filelist dir="${basedir}/maths" files="glmatrix.js,vector3dutil.js,matrix3d.js,jnumber3d.js,jmatrix3d.js,jmaths3d.js" />
<filelist dir="${basedir}/data" files="CollOutData.js" />
<fileset dir="${basedir}/data" includes="*.js" excludes="CollOutData.js" />
<fileset dir="${basedir}/plugins" includes="*.js" />
<filelist dir="${basedir}/geometry" files="jaabox.js" />
<fileset dir="${basedir}/physics" includes="*.js" excludes="hingejoint.js,physicssystem.js" />
<filelist dir="${basedir}/physics/effect" files="jeffect.js" />
<fileset dir="${basedir}/physics/effect" includes="*.js" excludes="jeffect.js" />
<fileset dir="${basedir}/geometry" includes="*.js" excludes="jaabox.js" />
<filelist dir="${basedir}/collision" files="collpointinfo.js,collisioninfo.js,colldetectinfo.js,colldetectfunctor.js" />
<fileset dir="${basedir}/collision" includes="colldetect*.js" />
<filelist dir="${basedir}/collision" files="collisionsystem.js,collisionsystemabstract.js,collisionsystembrute.js,collisionsystemgrid.js" />
<fileset dir="${basedir}/physics/constraint" includes="*.js" />
<filelist dir="${basedir}/physics" files="hingejoint.js" />
<filelist dir="${basedir}/physics" files="physicssystem.js" />
<fileset dir="${basedir}/vehicles" includes="*.js" />
</concat>
</target>
</project>
2 changes: 1 addition & 1 deletion build/output/code/cof/jconfig.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions build/output/code/collision/colldetectboxmesh.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions build/output/code/collision/colldetectspheremesh.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8e4545c

Please sign in to comment.