cybafelo
/
r3-custom-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge conflicts

beta.r3js.org
Theunis Johannes Botha 2018-05-21 15:04:07 +02:00
parent d5509d9d7f f23218eae9
commit 5345ae998f
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
7l8ar325qf.js Normal file
View File

@ -0,0 +1,8 @@
if (!this.entityLoaded) {
return;
}
this.entityLoaded.render(data.delta);
//@ sourceURL=beforeRender.js

2
bmllkpyql3.js
View File

@ -11,4 +11,4 @@ this.entityLoaded.move(
}
);
//@ sourceURL=mouseMoveARFootball2.js
//@ sourceURL=mouseMoveARFootball3.js

7
ff0fsum4zx.js
View File

@ -222,9 +222,8 @@ R3.CustomCode.prototype.render = function(delta) {
R3.CustomCode.prototype.move = function(data) {
var x = data.x;
var y = data.y;
var x = data.x || 0;
var y = data.y || 0;
x *= 0.0025;
y *= 0.0075;
@ -398,4 +397,4 @@ R3.Event.Emit(
}
);
//@ sourceURL=entityLoaded.js
//@ sourceURL=entityLoaded.js

2
madnahfvrc.js
View File

@ -1,5 +1,5 @@
if (data.entity === this.parentEntity) {
console.log('AR Football 2 Entity Loaded');
console.log('AR Football 3 Entity Loaded');
} else {
return;
}