Skip to content
This repository was archived by the owner on Nov 14, 2023. It is now read-only.

Mouse wheel events #164

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

Mouse wheel events #164

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f6097e7
File sceneCSS.js case correction
erenard Dec 6, 2013
f40e7e3
Adding mouse wheel
erenard Dec 9, 2013
23af7eb
Updated build script for Linux compatibility
erenard Dec 11, 2013
be3e049
Mouse wheel integration, demo, minor comments and tutorial corrections
erenard Dec 11, 2013
63ab872
Build files and generated jsdoc update
erenard Dec 11, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated build script for Linux compatibility
  • Loading branch information
@erenard
erenard committed Dec 11, 2013
commit 23af7ebdc49ec7b246c61c0273eb34f960b9d843
53 changes: 27 additions & 26 deletions version.compile.pack.sh
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,8 @@
source ./version.compile.variables.sh
./version.sh
VERSION=`cat version.nfo`
echo "New generated version: ${VERSION}"

echo -e "New generated version: ${VERSION}"

CAAT_DST="/tmp/caat"

@@ -17,13 +18,13 @@ FILE_CAAT="${DST_FILE_NAME}.js"
FILE_CAAT_CSS="${DST_FILE_NAME}-css.js"
FILE_CAAT_BOX2D="${DST_FILE_NAME}-box2d.js"

echo "Packing ${FILE_CAAT}"
echo "/*" > "${FILE_CAAT}"
echo -e "Packing ${FILE_CAAT}"
echo -e "/*" > "${FILE_CAAT}"
cat LICENSE >> "${FILE_CAAT}"
echo "\nVersion: ${VERSION}\n" >> "${FILE_CAAT}"
echo "Created on:" >> "${FILE_CAAT}"
echo -e "\nVersion: ${VERSION}\n" >> "${FILE_CAAT}"
echo -e "Created on:" >> "${FILE_CAAT}"
date "+DATE: %Y-%m-%d%nTIME: %H:%M:%S" >> "${FILE_CAAT}"
echo "*/\n\n" >> "${FILE_CAAT}"
echo -e "*/\n\n" >> "${FILE_CAAT}"

more ./src/Core/ModuleManager.js >> "${FILE_CAAT}"
more ./src/Core/Constants.js >> "${FILE_CAAT}"
@@ -121,30 +122,30 @@ more ./src/Foundation/UI/ShapeActor.js >> "${FILE_CAAT}"
more ./src/Foundation/UI/StarActor.js >> "${FILE_CAAT}"
more ./src/Foundation/UI/TextActor.js >> "${FILE_CAAT}"

echo "CAAT.ModuleManager.solveAll();" >> "${FILE_CAAT}"
echo -e "CAAT.ModuleManager.solveAll();" >> "${FILE_CAAT}"

# Distribute resulting compiled files
#
echo "\nCopying:"
echo "\tCopying results to ${CAAT_BUILD_DIR}"
echo -e "\nCopying:"
echo -e "\tCopying results to ${CAAT_BUILD_DIR}"
cp ${FILE_CAAT} ${CAAT_BUILD_DIR}



#
# CSS
#
echo "Packing ${FILE_CAAT_CSS}"
echo "/*" > "${FILE_CAAT_CSS}"
echo -e "Packing ${FILE_CAAT_CSS}"
echo -e "/*" > "${FILE_CAAT_CSS}"
cat LICENSE >> "${FILE_CAAT_CSS}"
echo "\nVersion: ${VERSION}\n" >> "${FILE_CAAT_CSS}"
echo "Created on:" >> "${FILE_CAAT_CSS}"
echo -e "\nVersion: ${VERSION}\n" >> "${FILE_CAAT_CSS}"
echo -e "Created on:" >> "${FILE_CAAT_CSS}"
date "+DATE: %Y-%m-%d%nTIME: %H:%M:%S" >> "${FILE_CAAT_CSS}"
echo "*/\n\n" >> "${FILE_CAAT_CSS}"
echo -e "*/\n\n" >> "${FILE_CAAT_CSS}"


more ./src/Core/ModuleManager.js >> "${FILE_CAAT_CSS}"
echo "CAAT.__CSS__=1;" >> "${FILE_CAAT_CSS}"
echo -e "CAAT.__CSS__=1;" >> "${FILE_CAAT_CSS}"
more ./src/Core/Constants.js >> "${FILE_CAAT_CSS}"
more ./src/Core/Class.js >> "${FILE_CAAT_CSS}"

@@ -236,34 +237,34 @@ more ./src/Foundation/UI/ShapeActor.js >> "${FILE_CAAT_CSS}"
more ./src/Foundation/UI/StarActor.js >> "${FILE_CAAT_CSS}"
more ./src/Foundation/UI/TextActor.js >> "${FILE_CAAT_CSS}"

echo "CAAT.ModuleManager.solveAll();" >> "${FILE_CAAT_CSS}"
echo -e "CAAT.ModuleManager.solveAll();" >> "${FILE_CAAT_CSS}"

# Distribute resulting compiled files
#
echo "\nCopying:"
echo "\tCopying results to ${CAAT_BUILD_DIR}"
echo -e "\nCopying:"
echo -e "\tCopying results to ${CAAT_BUILD_DIR}"
cp ${FILE_CAAT_CSS} ${CAAT_BUILD_DIR}



# box2d

echo "Packing ${FILE_CAAT_BOX2D}"
echo "/*" > "${FILE_CAAT_BOX2D}"
echo -e "Packing ${FILE_CAAT_BOX2D}"
echo -e "/*" > "${FILE_CAAT_BOX2D}"
cat LICENSE >> "${FILE_CAAT_BOX2D}"
echo "\nVersion: ${VERSION}\n" >> "${FILE_CAAT_BOX2D}"
echo "Created on:" >> "${FILE_CAAT_BOX2D}"
echo -e "\nVersion: ${VERSION}\n" >> "${FILE_CAAT_BOX2D}"
echo -e "Created on:" >> "${FILE_CAAT_BOX2D}"
date "+DATE: %Y-%m-%d%nTIME: %H:%M:%S" >> "${FILE_CAAT_BOX2D}"
echo "*/\n\n" >> "${FILE_CAAT_BOX2D}"
echo -e "*/\n\n" >> "${FILE_CAAT_BOX2D}"

more ./src/Foundation/Box2D/B2DBodyActor.js >> "${FILE_CAAT_BOX2D}"
more ./src/Foundation/Box2D/B2DCircularBody.js >> "${FILE_CAAT_BOX2D}"
more ./src/Foundation/Box2D/B2DPolygonBody.js >> "${FILE_CAAT_BOX2D}"

echo "CAAT.ModuleManager.solveAll();" >> "${FILE_CAAT_BOX2D}"
echo -e "CAAT.ModuleManager.solveAll();" >> "${FILE_CAAT_BOX2D}"

# Distribute resulting compiled files
#
echo "\nCopying:"
echo "\tCopying results to ${CAAT_BUILD_DIR}"
echo -e "\nCopying:"
echo -e "\tCopying results to ${CAAT_BUILD_DIR}"
cp ${FILE_CAAT_BOX2D} ${CAAT_BUILD_DIR}
62 changes: 31 additions & 31 deletions version.compile.sh
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ source ./version.compile.variables.sh

CAAT_DST="/tmp/caat"

echo "\n\nCompilation process\n\n"
echo -e "\n\nCompilation process\n\n"

#
# define CAAT products files.
@@ -21,9 +21,9 @@ FILE_CAAT_BOX2D="${DST_FILE_NAME}-box2d-min.js"
# + DST_FILE-css.js
# + DST_FILE-box2d.js
#
echo "" > "${FILE_CAAT}"
echo "" > "${FILE_CAAT_CSS}"
echo "" > "${FILE_CAAT_BOX2D}"
echo -e "" > "${FILE_CAAT}"
echo -e "" > "${FILE_CAAT_CSS}"
echo -e "" > "${FILE_CAAT_BOX2D}"

SOURCE_DIR=${CAAT_SOURCE_DIR}

@@ -33,20 +33,20 @@ SOURCE_DIR=${CAAT_SOURCE_DIR}
COMPILATION_LEVEL=$1
if [ "${COMPILATION_LEVEL}" ]; then
if [[ "${COMPILATION_LEVEL}" == "simple" ]]; then
echo "Compilation level set to simple"
echo -e "Compilation level set to simple"
COMPILATION_LEVEL="SIMPLE_OPTIMIZATIONS"
elif [[ "${COMPILATION_LEVEL}" == "advanced" ]]; then
echo "Compilation level set to advanced"
echo -e "Compilation level set to advanced"
COMPILATION_LECEL="ADVANCED_OPTIMIZATIONS"
elif [[ "${COMPILATION_LEVEL}" == "spaces" ]]; then
echo "Compilation level set to white spaces"
echo -e "Compilation level set to white spaces"
COMPILATION_LEVEL="WHITESPACE_ONLY"
else
echo "Compilation level unknown: '${COMPILATION_LEVEL}'. Change to SIMPLE_OPTIMIZATIONS"
echo -e "Compilation level unknown: '${COMPILATION_LEVEL}'. Change to SIMPLE_OPTIMIZATIONS"
COMPILATION_LEVEL="SIMPLE_OPTIMIZATIONS"
fi
else
echo "Compilation level defaults to simple optimizations."
echo -e "Compilation level defaults to simple optimizations."
COMPILATION_LEVEL="SIMPLE_OPTIMIZATIONS"
fi

@@ -56,62 +56,62 @@ fi
#
./version.sh
VERSION=`cat version.nfo`
echo "New generated version: ${VERSION}"
echo "Generated at: ${DST_FILE_NAME}"
echo "From files at: ${SOURCE_DIR}"
echo -e "New generated version: ${VERSION}"
echo -e "Generated at: ${DST_FILE_NAME}"
echo -e "From files at: ${SOURCE_DIR}"

#
# create stub files for all CAAT products.
#
echo "/*" >> "${FILE_CAAT}"
echo -e "/*" >> "${FILE_CAAT}"
cat LICENSE >> "${FILE_CAAT}"
echo "\nVersion: ${VERSION}\n" >> "${FILE_CAAT}"
echo "Created on:" >> "${FILE_CAAT}"
echo -e "\nVersion: ${VERSION}\n" >> "${FILE_CAAT}"
echo -e "Created on:" >> "${FILE_CAAT}"
date "+DATE: %Y-%m-%d%nTIME: %H:%M:%S" >> "${FILE_CAAT}"
echo "*/\n\n" >> "${FILE_CAAT}"
echo -e "*/\n\n" >> "${FILE_CAAT}"

echo "/*" >> "${FILE_CAAT_CSS}"
echo -e "/*" >> "${FILE_CAAT_CSS}"
cat LICENSE >> "${FILE_CAAT_CSS}"
echo "\nVersion: ${VERSION}\n" >> "${FILE_CAAT_CSS}"
echo "Created on:" >> "${FILE_CAAT_CSS}"
echo -e "\nVersion: ${VERSION}\n" >> "${FILE_CAAT_CSS}"
echo -e "Created on:" >> "${FILE_CAAT_CSS}"
date "+DATE: %Y-%m-%d%nTIME: %H:%M:%S" >> "${FILE_CAAT_CSS}"
echo "*/\n\n" >> "${FILE_CAAT_CSS}"
echo -e "*/\n\n" >> "${FILE_CAAT_CSS}"

echo "/*" >> "${FILE_CAAT_BOX2D}"
echo -e "/*" >> "${FILE_CAAT_BOX2D}"
cat LICENSE >> "${FILE_CAAT_BOX2D}"
echo "\nVersion: ${VERSION}\n" >> "${FILE_CAAT_BOX2D}"
echo "Created on:" >> "${FILE_CAAT_BOX2D}"
echo -e "\nVersion: ${VERSION}\n" >> "${FILE_CAAT_BOX2D}"
echo -e "Created on:" >> "${FILE_CAAT_BOX2D}"
date "+DATE: %Y-%m-%d%nTIME: %H:%M:%S" >> "${FILE_CAAT_BOX2D}"
echo "*/\n\n" >> "${FILE_CAAT_BOX2D}"
echo -e "*/\n\n" >> "${FILE_CAAT_BOX2D}"


#
# Compile canvas/GL
#
echo "\nCreating CAAT canvas/webGL"
echo -e "\nCreating CAAT canvas/webGL"
/usr/bin/java -jar ${CAAT_CLOSURE_PATH}/compiler.jar --compilation_level "${COMPILATION_LEVEL}" \
--js ${CAAT_BUILD_DIR}/caat.js \
>> "${FILE_CAAT}"

#
# Compile box2d
#
echo "Creating CAAT Box2d"
echo -e "Creating CAAT Box2d"
/usr/bin/java -jar ${CAAT_CLOSURE_PATH}/compiler.jar --compilation_level "${COMPILATION_LEVEL}" --js ${CAAT_BUILD_DIR}/caat-box2d.js >> "${FILE_CAAT_BOX2D}"

#
# Compile css
#
echo "Creating CAAT CSS"
echo "CAAT.__CSS__=1;" >> /tmp/__css.js
echo -e "Creating CAAT CSS"
echo -e "CAAT.__CSS__=1;" >> /tmp/__css.js
java -jar ${CAAT_CLOSURE_PATH}/compiler.jar --compilation_level "${COMPILATION_LEVEL}" \
--js ${CAAT_BUILD_DIR}/caat-css.js >> "${FILE_CAAT_CSS}"

#
# Distribute resulting compiled files
#
echo "\nCopying:"
echo "\tCopying results to ${CAAT_BUILD_DIR}"
echo -e "\nCopying:"
echo -e "\tCopying results to ${CAAT_BUILD_DIR}"
cp ${FILE_CAAT} ${CAAT_BUILD_DIR}
cp ${FILE_CAAT_CSS} ${CAAT_BUILD_DIR}
cp ${FILE_CAAT_BOX2D} ${CAAT_BUILD_DIR}
@@ -120,5 +120,5 @@ cp ${FILE_CAAT_BOX2D} ${CAAT_BUILD_DIR}
#
# Generating JSDoc.
#
echo "\nGenerating JSDoc"
echo -e "\nGenerating JSDoc"
./version.compile.doc.sh
4 changes: 2 additions & 2 deletions version.compile.variables.sh
View file
Original file line number Diff line number Diff line change
@@ -3,5 +3,5 @@ CAAT_BUILD_DIR=${CAAT_BUILD_DIR:-./build}
CAAT_JSDOC_OUTPUT=${CAAT_JSDOC_OUTPUT:-./documentation/jsdoc}

CAAT_DST=${CAAT_DST:-/tmp/caat}
CAAT_CLOSURE_PATH=${CAAT_CLOSURE_PATH:-/Users/ibon/applications/closure}
CAAT_JSDOC_TOOLKIT_PATH=${CAAT_JSDOC_TOOLKIT_PATH:-/Users/ibon/applications/jsdoc-toolkit}
CAAT_CLOSURE_PATH=${CAAT_CLOSURE_PATH:-/applis/renarderi/closure}
CAAT_JSDOC_TOOLKIT_PATH=${CAAT_JSDOC_TOOLKIT_PATH:-/applis/renarderi/jsdoc-toolkit}