OSDN Git Service

fixed issue 1258, Intersector.intersectRayBounds was not public
authorMario Zechner <contact@badlogicgames.com>
Tue, 19 Feb 2013 13:56:14 +0000 (14:56 +0100)
committerMario Zechner <contact@badlogicgames.com>
Tue, 19 Feb 2013 13:56:14 +0000 (14:56 +0100)
gdx/src/com/badlogic/gdx/math/Intersector.java
tests/gdx-tests-lwjgl/src/com/badlogic/gdx/tests/lwjgl/LwjglDebugStarter.java
tests/gdx-tests/src/com/badlogic/gdx/tests/PixmapPackerTest.java

index 47b3fe2..ef81092 100644 (file)
@@ -364,7 +364,7 @@ public final class Intersector {
         * @param box The box
         * @param intersection The intersection point (optional)
         * @return Whether an intersection is present. */
-       boolean intersectRayBounds(Ray ray, BoundingBox box, Vector3 intersection)
+       public static boolean intersectRayBounds(Ray ray, BoundingBox box, Vector3 intersection)
        {
                Vector3.tmp.set(ray.origin);
                Vector3.tmp2.set(ray.origin);
index 3d0debe..1cb6062 100644 (file)
@@ -18,11 +18,7 @@ package com.badlogic.gdx.tests.lwjgl;
 \r
 import com.badlogic.gdx.backends.lwjgl.LwjglApplication;\r
 import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;\r
-import com.badlogic.gdx.tests.AssetManagerTest;\r
-import com.badlogic.gdx.tests.GamepadTest;\r
-import com.badlogic.gdx.tests.InverseKinematicsTest;\r
-import com.badlogic.gdx.tests.YDownTest;\r
-import com.badlogic.gdx.tests.extensions.FreeTypeTest;\r
+import com.badlogic.gdx.tests.PixmapPackerTest;\r
 import com.badlogic.gdx.tests.utils.GdxTest;\r
 import com.badlogic.gdx.utils.SharedLibraryLoader;\r
 \r
@@ -35,7 +31,7 @@ public class LwjglDebugStarter {
                new SharedLibraryLoader("../../extensions/gdx-controllers/gdx-controllers-desktop/libs/gdx-controllers-desktop-natives.jar").load("gdx-controllers-desktop");\r
                new SharedLibraryLoader("../../gdx/libs/gdx-natives.jar").load("gdx");\r
 \r
-               GdxTest test = new GamepadTest();\r
+               GdxTest test = new PixmapPackerTest();\r
                LwjglApplicationConfiguration config = new LwjglApplicationConfiguration();\r
                config.useGL20 = test.needsGL20();\r
                new LwjglApplication(test, config);\r
index 549ebf7..94c2daa 100644 (file)
@@ -32,7 +32,7 @@ public class PixmapPackerTest extends GdxTest {
                Pixmap pixmap2 = new Pixmap(Gdx.files.internal("data/wheel.png"));
                Pixmap pixmap3 = new Pixmap(Gdx.files.internal("data/egg.png"));
                
-               PixmapPacker packer =  new PixmapPacker(1024, 1024, Format.RGBA8888, 2, true);
+               PixmapPacker packer =  new PixmapPacker(256, 256, Format.RGBA8888, 2, true);
                packer.pack("badlogic", pixmap1);
                packer.pack("wheel", pixmap1);
                packer.pack("egg", pixmap1);