Merge branch 'master' of github.com:3dseals/Ejecta-X

Conflicts:
	sources/ejecta/EJApp.cpp
	sources/ejecta/EJApp.h
	sources/ejecta/EJUtils/EJBindingTouchInput.h

README.md

@@ -22,4 +22,4 @@ Android:
 4. run ndk-build complie libejecta.so and libJavaScriptCore.so
 5. run eclipse for android apk.
 
-For an example application in the `App` folder, rename `Ejecta-android.apk`.
+For an example application in the `sample` folder, name `Ejecta-X.apk`.

project/android/assets/build/ejecta.js

@@ -62,9 +62,9 @@ self = window = this;
 
  // The native Image, Audio, HttpRequest and LocalStorage class mimic the real elements
  window.Image = Ejecta.Image;
- //window.Audio = Ejecta.Audio;
- //window.XMLHttpRequest = Ejecta.HttpRequest;
- //window.localStorage = new Ejecta.LocalStorage();
+ window.Audio = Ejecta.Audio;
+ window.XMLHttpRequest = Ejecta.HttpRequest;
+ window.localStorage = new Ejecta.LocalStorage();
 
 
  // Set up a "fake" HTMLElement

project/android/assets/build/index.js

@@ -62,15 +62,20 @@ var animate = function() {
 // The vertical touch position controls the number of curves;
 // horizontal controls the line width
 var maxCurves = 70;
-// document.addEventListener( 'touchmove', function( ev ) {
-// 	ctx.lineWidth = (ev.touches[0].pageX/w) * 20;
-// 	maxCurves = Math.floor((ev.touches[0].pageY/h) * curves.length);
-// }, false );
+document.addEventListener( 'touchmove', function( ev ) {
+	ctx.lineWidth = (ev.touches[0].pageX/w) * 20;
+	maxCurves = Math.floor((ev.touches[0].pageY/h) * curves.length);
+}, false );
 
 
 ctx.fillStyle = '#000000';
 ctx.fillRect( 0, 0, w, h );
 
 ctx.globalAlpha = 0.5;
 ctx.lineWidth = 2;
-setInterval( animate, 16 );
+setInterval( animate, 16 );
+
+//test XMLHttpRequest
+var request = new XMLHttpRequest()
+request.open("GET","www.google.com");
+request.send()