Created
December 1, 2013 02:01
-
-
Save jonas/7727684 to your computer and use it in GitHub Desktop.
Scala.js Game 2 patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/main/resources/00boot.js b/src/main/resources/00boot.js | |
index 9f2a0bf..d8961f5 100644 | |
--- a/src/main/resources/00boot.js | |
+++ b/src/main/resources/00boot.js | |
@@ -1,3 +1,3 @@ | |
-function cp(){}; | |
-function ScalaJSBundle(){}; | |
-ScalaJS.modules.example_ScalaJSExample().main(); | |
+function xcp(){}; | |
+function xScalaJSBundle(){}; | |
+//ScalaJS.modules.example_ScalaJSExample().main(); | |
diff --git a/src/main/resources/index.html b/src/main/resources/index.html | |
index 63432d8..d98ee50 100644 | |
--- a/src/main/resources/index.html | |
+++ b/src/main/resources/index.html | |
@@ -9,9 +9,9 @@ | |
<script type="text/javascript" src="cp.js"></script> | |
<script type="text/javascript" src="hand-1.2.js"></script> | |
<script type="text/javascript" src="../workbench.js"></script> | |
- <script type="text/javascript" src="../bundled.js"></script> | |
<script type="text/javascript" src="../games-extdeps.js"></script> | |
<script type="text/javascript" src="../games-intdeps.js"></script> | |
+ <script type="text/javascript" src="../bundled.js"></script> | |
<script type="text/javascript" src="../games.js"></script> | |
<script>ScalaJS.modules.example_ScalaJSExample().main();</script> | |
</body> | |
diff --git a/src/main/scala/example/roll/Camera.scala b/src/main/scala/example/roll/Camera.scala | |
index f0978f2..e18bf2c 100644 | |
--- a/src/main/scala/example/roll/Camera.scala | |
+++ b/src/main/scala/example/roll/Camera.scala | |
@@ -26,7 +26,7 @@ trait Camera{ | |
object Camera{ | |
class Follow(targetPos: => cp.Vect, val canvasDims: () => cp.Vect, var scale: cp.Vect) extends Camera{ | |
- var pos = new cp.Vect(targetPos.x, targetPos.y) | |
+ var pos = targetPos | |
def update(dt: Double, keys: Set[Int]) = { | |
if (keys(KeyCode.pageUp)) scale *= 1.03 | |
if (keys(KeyCode.pageDown)) scale /= 1.03 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment