merge Commit

.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

.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

.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml

@@ -14,15 +14,21 @@
 	<section name="JavaElementSearchActions">
 	</section>
 	<section name="RefactoringWizard.preview">
+<<<<<<< HEAD
 		<item key="width" value="720"/>
 		<item key="height" value="500"/>
+=======
+		<item key="width" value="630"/>
+		<item key="height" value="400"/>
+>>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e
 	</section>
 	<section name="org.eclipse.ltk.ui.refactoring.settings">
 		<item key="updateSimilarElements" value="false"/>
 		<item key="updateSimilarElementsMatchStrategy" value="1"/>
 		<item key="updateTextualMatches" value="true"/>
 		<item key="updateQualifiedNames" value="true"/>
 		<item key="patterns" value="*"/>
+<<<<<<< HEAD
 		<item key="renameSubpackages" value="false"/>
 	</section>
 	<section name="NewPackageWizardPage">
@@ -47,5 +53,7 @@
 		<item key="create_unimplemented" value="true"/>
 	</section>
 	<section name="RenameInformationPopup">
+=======
+>>>>>>> aefdc99b447f4c2e53fc68e4066d71ca85feec2e
 	</section>
 </section>

.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

.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

.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

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();
+	}
+}

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
 	}
 }