diff --git a/.metadata/.log b/.metadata/.log index 3e6f809..537b9a3 100644 --- a/.metadata/.log +++ b/.metadata/.log @@ -3252,6 +3252,7 @@ java.lang.Error: SWT Resource was not properly disposed at org.eclipse.equinox.launcher.Main.basicRun(Main.java:596) at org.eclipse.equinox.launcher.Main.run(Main.java:1467) at org.eclipse.equinox.launcher.Main.main(Main.java:1440) +<<<<<<< HEAD !SESSION 2022-03-23 07:05:34.491 ----------------------------------------------- eclipse.buildId=4.23.0.I20220308-0310 java.version=16.0.1 @@ -4285,3 +4286,5 @@ java.lang.ClassCastException: class org.eclipse.jdt.internal.corext.fix.LinkedPr at org.eclipse.equinox.launcher.Main.basicRun(Main.java:596) at org.eclipse.equinox.launcher.Main.run(Main.java:1467) at org.eclipse.equinox.launcher.Main.main(Main.java:1440) +======= +>>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e diff --git a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi index 455735f..84a58ee 100644 --- a/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi +++ b/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi @@ -1,6 +1,11 @@ +<<<<<<< HEAD +======= + + +>>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e activeSchemeId:org.eclipse.ui.defaultAcceleratorConfiguration @@ -74,11 +79,20 @@ persp.actionSet:org.eclipse.jdt.junit.JUnitActionSet persp.viewSC:org.eclipse.ant.ui.views.AntView persp.actionSet:org.eclipse.ui.edit.text.actionSet.presentation +<<<<<<< HEAD org.eclipse.e4.primaryNavigationStack +======= + + + + org.eclipse.e4.primaryNavigationStack + active + +>>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e View categoryTag:Java @@ -133,7 +147,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e org.eclipse.e4.secondaryDataStack Gradle General @@ -435,6 +453,7 @@ View categoryTag:Help +<<<<<<< HEAD org.eclipse.e4.primaryDataStack @@ -465,6 +484,12 @@ removeOnHide org.eclipse.jdt.ui.CompilationUnitEditor +======= + + + org.eclipse.e4.primaryDataStack + EditorStack +>>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e @@ -491,7 +516,13 @@ View categoryTag:General +<<<<<<< HEAD +======= + active + activeOnClose + +>>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e ViewMenu menuContribution:menu @@ -500,7 +531,11 @@ +<<<<<<< HEAD +======= + +>>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e View categoryTag:General @@ -780,7 +815,11 @@ Draggable +<<<<<<< HEAD +======= + +>>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e toolbarSeparator @@ -815,6 +854,13 @@ Draggable +<<<<<<< HEAD +======= + + + + Draggable +>>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e toolbarSeparator @@ -2611,6 +2657,7 @@ +<<<<<<< HEAD @@ -2759,4 +2806,154 @@ +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e diff --git a/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt b/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt index a55428c..ef9d294 100644 --- a/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt +++ b/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt @@ -3,12 +3,12 @@ INDEX VERSION 1.131+C:\Users\mario\Documents\GitHub\MarioGabIFP\Super_Paco_Bros\ 3995027108.index 1973561317.index 3885786831.index -3446081204.index 193490017.index -1865797976.index +3990670468.index +3446081204.index 3307210469.index 2584870405.index -3990670468.index +1865797976.index 2071674118.index 2881960682.index 1265598562.index @@ -21,11 +21,16 @@ INDEX VERSION 1.131+C:\Users\mario\Documents\GitHub\MarioGabIFP\Super_Paco_Bros\ 3552531414.index 240943240.index 2251499996.index +<<<<<<< HEAD 1642175237.index 2574099473.index 4153573058.index +======= +2574099473.index +>>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e 3103961500.index 3625172027.index +4153573058.index 2216734264.index 2048703835.index 3273598559.index diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml b/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml index c270d10..7c18c8b 100644 --- a/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml +++ b/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml @@ -14,8 +14,13 @@
+<<<<<<< HEAD +======= + + +>>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e
@@ -23,6 +28,7 @@ +<<<<<<< HEAD
@@ -47,5 +53,7 @@
+======= +>>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e
diff --git a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log index 0048763..eb075e5 100644 --- a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log +++ b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log @@ -6,5 +6,8 @@ 2022-03-22 11:54:49,371 [Worker-5: Loading available Gradle versions] INFO o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read. 2022-03-22 12:02:07,074 [Worker-6: Loading available Gradle versions] INFO o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read. 2022-03-23 06:36:51,812 [Worker-6: Loading available Gradle versions] INFO o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read. +<<<<<<< HEAD 2022-03-23 07:05:41,950 [Worker-0: Loading available Gradle versions] INFO o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is up-to-date. Trying to read. 2022-03-23 10:42:38,036 [Worker-8: Loading available Gradle versions] INFO o.e.b.c.i.u.g.PublishedGradleVersions - Gradle version information cache is out-of-date. Trying to update. +======= +>>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e diff --git a/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties b/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties index 9d73974..290e88d 100644 --- a/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties +++ b/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties @@ -1,2 +1,6 @@ #Cached timestamps +<<<<<<< HEAD #Wed Mar 23 10:27:35 CET 2022 +======= +#Wed Mar 23 06:42:39 CET 2022 +>>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e diff --git a/.metadata/version.ini b/.metadata/version.ini index 4a58804..e882722 100644 --- a/.metadata/version.ini +++ b/.metadata/version.ini @@ -1,3 +1,7 @@ +<<<<<<< HEAD #Wed Mar 23 10:42:33 CET 2022 +======= +#Wed Mar 23 06:36:45 CET 2022 +>>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e org.eclipse.core.runtime=2 org.eclipse.platform=4.23.0.v20220308-0310 diff --git a/Game/core/src/com/paco/game/Graphics.java b/Game/core/src/com/paco/game/Graphics.java new file mode 100644 index 0000000..d111d6d --- /dev/null +++ b/Game/core/src/com/paco/game/Graphics.java @@ -0,0 +1,44 @@ +package com.paco.game; + +import com.badlogic.gdx.ApplicationAdapter; +import com.badlogic.gdx.graphics.Texture; +import com.badlogic.gdx.graphics.g2d.SpriteBatch; +import com.badlogic.gdx.utils.ScreenUtils; + +public class Graphics extends ApplicationAdapter { + SpriteBatch batch; + Texture img; + + @Override + public void create () { + batch = new SpriteBatch(); + img = new Texture("cloud.png") { + @Override + public int getHeight() { + // TODO Auto-generated method stub + return 200; + } + + @Override + public int getWidth() { + // TODO Auto-generated method stub + return 400; + } + }; + } + + @Override + public void render () { + ScreenUtils.clear(0, 1, 1, 1); + batch.begin(); + batch.draw(img, 200, 800); + batch.draw(img, 800, 400); + batch.end(); + } + + @Override + public void dispose () { + batch.dispose(); + img.dispose(); + } +} diff --git a/Game/desktop/src/com/paco/game/DesktopLauncher.java b/Game/desktop/src/com/paco/game/DesktopLauncher.java index a48c014..c32fde1 100644 --- a/Game/desktop/src/com/paco/game/DesktopLauncher.java +++ b/Game/desktop/src/com/paco/game/DesktopLauncher.java @@ -12,6 +12,10 @@ public static void main (String[] arg) { Lwjgl3ApplicationConfiguration config = new Lwjgl3ApplicationConfiguration(); config.setFullscreenMode(Lwjgl3ApplicationConfiguration.getDisplayMode()); config.setForegroundFPS(60); +<<<<<<< HEAD new Lwjgl3Application(new Screen(), config); +======= + new Lwjgl3Application(new Graphics(), config); +>>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e } }