diff --git a/src/main/java/ru/windcorp/optica/Optica.java b/src/main/java/ru/windcorp/progressia/Progressia.java similarity index 91% rename from src/main/java/ru/windcorp/optica/Optica.java rename to src/main/java/ru/windcorp/progressia/Progressia.java index 9ebf2b4..caaa346 100644 --- a/src/main/java/ru/windcorp/optica/Optica.java +++ b/src/main/java/ru/windcorp/progressia/Progressia.java @@ -15,8 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica; +package ru.windcorp.progressia; -public class Optica { +public class Progressia { } diff --git a/src/main/java/ru/windcorp/optica/OpticaLauncher.java b/src/main/java/ru/windcorp/progressia/ProgressiaLauncher.java similarity index 91% rename from src/main/java/ru/windcorp/optica/OpticaLauncher.java rename to src/main/java/ru/windcorp/progressia/ProgressiaLauncher.java index 4f89519..dfa0aa9 100644 --- a/src/main/java/ru/windcorp/optica/OpticaLauncher.java +++ b/src/main/java/ru/windcorp/progressia/ProgressiaLauncher.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica; +package ru.windcorp.progressia; -public class OpticaLauncher { +public class ProgressiaLauncher { public static void launch(String[] args, Proxy proxy) { proxy.initialize(); diff --git a/src/main/java/ru/windcorp/optica/Proxy.java b/src/main/java/ru/windcorp/progressia/Proxy.java similarity index 94% rename from src/main/java/ru/windcorp/optica/Proxy.java rename to src/main/java/ru/windcorp/progressia/Proxy.java index 4720695..5e0db01 100644 --- a/src/main/java/ru/windcorp/optica/Proxy.java +++ b/src/main/java/ru/windcorp/progressia/Proxy.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica; +package ru.windcorp.progressia; public interface Proxy { diff --git a/src/main/java/ru/windcorp/optica/client/ClientProxy.java b/src/main/java/ru/windcorp/progressia/client/ClientProxy.java similarity index 67% rename from src/main/java/ru/windcorp/optica/client/ClientProxy.java rename to src/main/java/ru/windcorp/progressia/client/ClientProxy.java index 0a1d3cc..d810d50 100644 --- a/src/main/java/ru/windcorp/optica/client/ClientProxy.java +++ b/src/main/java/ru/windcorp/progressia/client/ClientProxy.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client; +package ru.windcorp.progressia.client; -import ru.windcorp.optica.Proxy; -import ru.windcorp.optica.client.graphics.GUI; -import ru.windcorp.optica.client.graphics.backend.GraphicsBackend; -import ru.windcorp.optica.client.graphics.backend.RenderTaskQueue; -import ru.windcorp.optica.client.graphics.flat.FlatRenderProgram; -import ru.windcorp.optica.client.graphics.flat.LayerTestUI; -import ru.windcorp.optica.client.graphics.gui.LayerTestGUI; -import ru.windcorp.optica.client.graphics.world.LayerWorld; -import ru.windcorp.optica.client.graphics.world.WorldRenderProgram; +import ru.windcorp.progressia.Proxy; +import ru.windcorp.progressia.client.graphics.GUI; +import ru.windcorp.progressia.client.graphics.backend.GraphicsBackend; +import ru.windcorp.progressia.client.graphics.backend.RenderTaskQueue; +import ru.windcorp.progressia.client.graphics.flat.FlatRenderProgram; +import ru.windcorp.progressia.client.graphics.flat.LayerTestUI; +import ru.windcorp.progressia.client.graphics.gui.LayerTestGUI; +import ru.windcorp.progressia.client.graphics.world.LayerWorld; +import ru.windcorp.progressia.client.graphics.world.WorldRenderProgram; public class ClientProxy implements Proxy { diff --git a/src/main/java/ru/windcorp/optica/client/OpticaClientMain.java b/src/main/java/ru/windcorp/progressia/client/ProgressiaClientMain.java similarity index 81% rename from src/main/java/ru/windcorp/optica/client/OpticaClientMain.java rename to src/main/java/ru/windcorp/progressia/client/ProgressiaClientMain.java index c086634..bb84b1f 100644 --- a/src/main/java/ru/windcorp/optica/client/OpticaClientMain.java +++ b/src/main/java/ru/windcorp/progressia/client/ProgressiaClientMain.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client; +package ru.windcorp.progressia.client; -import ru.windcorp.optica.OpticaLauncher; +import ru.windcorp.progressia.ProgressiaLauncher; -public class OpticaClientMain { +public class ProgressiaClientMain { public static void main(String[] args) { - OpticaLauncher.launch(args, new ClientProxy()); + ProgressiaLauncher.launch(args, new ClientProxy()); } } diff --git a/src/main/java/ru/windcorp/optica/client/graphics/Colors.java b/src/main/java/ru/windcorp/progressia/client/graphics/Colors.java similarity index 93% rename from src/main/java/ru/windcorp/optica/client/graphics/Colors.java rename to src/main/java/ru/windcorp/progressia/client/graphics/Colors.java index 369c7a3..eb950dd 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/Colors.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/Colors.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics; +package ru.windcorp.progressia.client.graphics; public class Colors { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/GUI.java b/src/main/java/ru/windcorp/progressia/client/graphics/GUI.java similarity index 83% rename from src/main/java/ru/windcorp/optica/client/graphics/GUI.java rename to src/main/java/ru/windcorp/progressia/client/graphics/GUI.java index 73b1507..eb1ad60 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/GUI.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/GUI.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics; +package ru.windcorp.progressia.client.graphics; import java.util.ArrayList; import java.util.List; import com.google.common.eventbus.Subscribe; -import ru.windcorp.optica.client.graphics.input.CursorEvent; -import ru.windcorp.optica.client.graphics.input.FrameResizeEvent; -import ru.windcorp.optica.client.graphics.input.InputEvent; -import ru.windcorp.optica.client.graphics.input.KeyEvent; -import ru.windcorp.optica.client.graphics.input.WheelEvent; -import ru.windcorp.optica.client.graphics.input.bus.Input; +import ru.windcorp.progressia.client.graphics.input.CursorEvent; +import ru.windcorp.progressia.client.graphics.input.FrameResizeEvent; +import ru.windcorp.progressia.client.graphics.input.InputEvent; +import ru.windcorp.progressia.client.graphics.input.KeyEvent; +import ru.windcorp.progressia.client.graphics.input.WheelEvent; +import ru.windcorp.progressia.client.graphics.input.bus.Input; public class GUI { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/Layer.java b/src/main/java/ru/windcorp/progressia/client/graphics/Layer.java similarity index 87% rename from src/main/java/ru/windcorp/optica/client/graphics/Layer.java rename to src/main/java/ru/windcorp/progressia/client/graphics/Layer.java index 000fa37..7bb9264 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/Layer.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/Layer.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics; +package ru.windcorp.progressia.client.graphics; import java.util.concurrent.atomic.AtomicBoolean; -import ru.windcorp.optica.client.graphics.backend.GraphicsInterface; -import ru.windcorp.optica.client.graphics.input.bus.Input; +import ru.windcorp.progressia.client.graphics.backend.GraphicsInterface; +import ru.windcorp.progressia.client.graphics.input.bus.Input; public abstract class Layer { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/GraphicsBackend.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/GraphicsBackend.java similarity index 94% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/GraphicsBackend.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/GraphicsBackend.java index 14868f5..489f3d3 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/GraphicsBackend.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/GraphicsBackend.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend; +package ru.windcorp.progressia.client.graphics.backend; import static org.lwjgl.opengl.GL11.*; diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/GraphicsInterface.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/GraphicsInterface.java similarity index 93% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/GraphicsInterface.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/GraphicsInterface.java index d578a9c..395524e 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/GraphicsInterface.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/GraphicsInterface.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend; +package ru.windcorp.progressia.client.graphics.backend; import glm.vec._2.i.Vec2i; diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/InputHandler.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/InputHandler.java similarity index 93% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/InputHandler.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/InputHandler.java index 7850bba..3a35c93 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/InputHandler.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/InputHandler.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend; +package ru.windcorp.progressia.client.graphics.backend; import org.lwjgl.glfw.GLFW; import com.google.common.eventbus.EventBus; -import ru.windcorp.optica.client.graphics.input.*; +import ru.windcorp.progressia.client.graphics.input.*; public class InputHandler { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/InputTracker.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/InputTracker.java similarity index 93% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/InputTracker.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/InputTracker.java index 060a526..91a91df 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/InputTracker.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/InputTracker.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend; +package ru.windcorp.progressia.client.graphics.backend; import glm.vec._2.d.Vec2d; import gnu.trove.set.TIntSet; diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/LWJGLInitializer.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/LWJGLInitializer.java similarity index 93% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/LWJGLInitializer.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/LWJGLInitializer.java index fdbd9c6..66f2efe 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/LWJGLInitializer.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/LWJGLInitializer.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend; +package ru.windcorp.progressia.client.graphics.backend; import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.glfw.GLFW.*; @@ -23,7 +23,7 @@ import static org.lwjgl.system.MemoryUtil.*; import org.lwjgl.opengl.GL; -import ru.windcorp.optica.client.graphics.GUI; +import ru.windcorp.progressia.client.graphics.GUI; class LWJGLInitializer { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/OpenGLObjectTracker.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/OpenGLObjectTracker.java similarity index 93% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/OpenGLObjectTracker.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/OpenGLObjectTracker.java index b2fa223..56b7e2f 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/OpenGLObjectTracker.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/OpenGLObjectTracker.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend; +package ru.windcorp.progressia.client.graphics.backend; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/RenderTaskQueue.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/RenderTaskQueue.java similarity index 92% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/RenderTaskQueue.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/RenderTaskQueue.java index 8a8d927..d62143d 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/RenderTaskQueue.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/RenderTaskQueue.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend; +package ru.windcorp.progressia.client.graphics.backend; import java.util.Iterator; import java.util.Queue; @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import ru.windcorp.optica.common.util.ThrowingRunnable; +import ru.windcorp.progressia.common.util.ThrowingRunnable; public class RenderTaskQueue { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/RenderThread.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/RenderThread.java similarity index 90% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/RenderThread.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/RenderThread.java index 239f71c..82a2f1b 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/RenderThread.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/RenderThread.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend; +package ru.windcorp.progressia.client.graphics.backend; import static org.lwjgl.glfw.GLFW.*; import static org.lwjgl.opengl.GL11.*; -import ru.windcorp.optica.client.graphics.GUI; +import ru.windcorp.progressia.client.graphics.GUI; class RenderThread extends Thread { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/Usage.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/Usage.java similarity index 93% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/Usage.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/Usage.java index 1a356c1..05cd00f 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/Usage.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/Usage.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend; +package ru.windcorp.progressia.client.graphics.backend; import static org.lwjgl.opengl.GL15.GL_DYNAMIC_DRAW; import static org.lwjgl.opengl.GL15.GL_STATIC_DRAW; diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/VertexBufferObject.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/VertexBufferObject.java similarity index 94% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/VertexBufferObject.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/VertexBufferObject.java index abf4cb8..1864946 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/VertexBufferObject.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/VertexBufferObject.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend; +package ru.windcorp.progressia.client.graphics.backend; import static org.lwjgl.opengl.GL20.*; import java.nio.*; -import ru.windcorp.optica.client.graphics.backend.OpenGLObjectTracker.OpenGLDeletable; +import ru.windcorp.progressia.client.graphics.backend.OpenGLObjectTracker.OpenGLDeletable; public class VertexBufferObject implements OpenGLDeletable { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/CombinedShader.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/CombinedShader.java similarity index 92% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/CombinedShader.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/CombinedShader.java index dcd9571..06b1dd1 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/CombinedShader.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/CombinedShader.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend.shaders; +package ru.windcorp.progressia.client.graphics.backend.shaders; -import ru.windcorp.optica.common.resource.Resource; +import ru.windcorp.progressia.common.resource.Resource; public class CombinedShader extends Shader { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/Program.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/Program.java similarity index 79% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/Program.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/Program.java index e2ed2ac..b94386f 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/Program.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/Program.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend.shaders; - -import ru.windcorp.optica.client.graphics.backend.OpenGLObjectTracker; -import ru.windcorp.optica.client.graphics.backend.OpenGLObjectTracker.OpenGLDeletable; -import ru.windcorp.optica.client.graphics.backend.shaders.attributes.Attribute; -import ru.windcorp.optica.client.graphics.backend.shaders.uniforms.Uniform; +package ru.windcorp.progressia.client.graphics.backend.shaders; import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL20.*; +import ru.windcorp.progressia.client.graphics.backend.OpenGLObjectTracker; +import ru.windcorp.progressia.client.graphics.backend.OpenGLObjectTracker.OpenGLDeletable; +import ru.windcorp.progressia.client.graphics.backend.shaders.attributes.Attribute; +import ru.windcorp.progressia.client.graphics.backend.shaders.uniforms.Uniform; + public class Program implements OpenGLDeletable { private int handle; diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/Shader.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/Shader.java similarity index 85% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/Shader.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/Shader.java index a2c4081..ba9e6bf 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/Shader.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/Shader.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend.shaders; - -import ru.windcorp.optica.client.graphics.backend.OpenGLObjectTracker; -import ru.windcorp.optica.client.graphics.backend.OpenGLObjectTracker.OpenGLDeletable; -import ru.windcorp.optica.common.resource.Resource; -import ru.windcorp.optica.common.resource.ResourceManager; +package ru.windcorp.progressia.client.graphics.backend.shaders; import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL20.*; import java.util.Locale; +import ru.windcorp.progressia.client.graphics.backend.OpenGLObjectTracker; +import ru.windcorp.progressia.client.graphics.backend.OpenGLObjectTracker.OpenGLDeletable; +import ru.windcorp.progressia.common.resource.Resource; +import ru.windcorp.progressia.common.resource.ResourceManager; + public class Shader implements OpenGLDeletable { public static enum ShaderType { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/attributes/Attribute.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/attributes/Attribute.java similarity index 87% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/attributes/Attribute.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/attributes/Attribute.java index fcbbe9b..43b3e4a 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/attributes/Attribute.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/attributes/Attribute.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend.shaders.attributes; +package ru.windcorp.progressia.client.graphics.backend.shaders.attributes; -import ru.windcorp.optica.client.graphics.backend.shaders.Program; +import ru.windcorp.progressia.client.graphics.backend.shaders.Program; public class Attribute { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/attributes/AttributeVertexArray.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/attributes/AttributeVertexArray.java similarity index 88% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/attributes/AttributeVertexArray.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/attributes/AttributeVertexArray.java index f382f9d..7680a07 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/attributes/AttributeVertexArray.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/attributes/AttributeVertexArray.java @@ -15,10 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend.shaders.attributes; - -import ru.windcorp.optica.client.graphics.backend.VertexBufferObject; -import ru.windcorp.optica.client.graphics.backend.shaders.Program; +package ru.windcorp.progressia.client.graphics.backend.shaders.attributes; import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL20.*; @@ -28,6 +25,9 @@ import java.nio.FloatBuffer; import java.nio.IntBuffer; import java.nio.ShortBuffer; +import ru.windcorp.progressia.client.graphics.backend.VertexBufferObject; +import ru.windcorp.progressia.client.graphics.backend.shaders.Program; + public class AttributeVertexArray extends Attribute { private boolean isEnabled = false; diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform.java similarity index 90% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform.java index fadcbc7..e17af28 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend.shaders.uniforms; +package ru.windcorp.progressia.client.graphics.backend.shaders.uniforms; -import ru.windcorp.optica.client.graphics.backend.shaders.Program; +import ru.windcorp.progressia.client.graphics.backend.shaders.Program; public class Uniform { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform1Float.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform1Float.java similarity index 87% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform1Float.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform1Float.java index 7a64168..b156c96 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform1Float.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform1Float.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend.shaders.uniforms; - -import ru.windcorp.optica.client.graphics.backend.shaders.Program; +package ru.windcorp.progressia.client.graphics.backend.shaders.uniforms; import static org.lwjgl.opengl.GL20.*; import java.nio.FloatBuffer; +import ru.windcorp.progressia.client.graphics.backend.shaders.Program; + public class Uniform1Float extends Uniform { public Uniform1Float(int handle, Program program) { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform1Int.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform1Int.java similarity index 87% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform1Int.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform1Int.java index 2fa81a2..691b32e 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform1Int.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform1Int.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend.shaders.uniforms; - -import ru.windcorp.optica.client.graphics.backend.shaders.Program; +package ru.windcorp.progressia.client.graphics.backend.shaders.uniforms; import static org.lwjgl.opengl.GL20.*; import java.nio.IntBuffer; +import ru.windcorp.progressia.client.graphics.backend.shaders.Program; + public class Uniform1Int extends Uniform { public Uniform1Int(int handle, Program program) { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform2Float.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform2Float.java similarity index 87% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform2Float.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform2Float.java index 9a4130a..86a2eaf 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform2Float.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform2Float.java @@ -15,14 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend.shaders.uniforms; - -import ru.windcorp.optica.client.graphics.backend.shaders.Program; +package ru.windcorp.progressia.client.graphics.backend.shaders.uniforms; import static org.lwjgl.opengl.GL20.*; import java.nio.FloatBuffer; import glm.vec._2.Vec2; +import ru.windcorp.progressia.client.graphics.backend.shaders.Program; public class Uniform2Float extends Uniform { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform2Int.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform2Int.java similarity index 87% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform2Int.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform2Int.java index 4df68f7..cee7d48 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform2Int.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform2Int.java @@ -15,14 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend.shaders.uniforms; - -import ru.windcorp.optica.client.graphics.backend.shaders.Program; +package ru.windcorp.progressia.client.graphics.backend.shaders.uniforms; import static org.lwjgl.opengl.GL20.*; import java.nio.IntBuffer; import glm.vec._2.i.Vec2i; +import ru.windcorp.progressia.client.graphics.backend.shaders.Program; public class Uniform2Int extends Uniform { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform2Matrix.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform2Matrix.java similarity index 87% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform2Matrix.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform2Matrix.java index 348cb40..f786e8d 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform2Matrix.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform2Matrix.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend.shaders.uniforms; - -import ru.windcorp.optica.client.graphics.backend.shaders.Program; +package ru.windcorp.progressia.client.graphics.backend.shaders.uniforms; import static org.lwjgl.opengl.GL20.*; import java.nio.FloatBuffer; +import ru.windcorp.progressia.client.graphics.backend.shaders.Program; + public class Uniform2Matrix extends Uniform { public Uniform2Matrix(int handle, Program program) { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform3Float.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform3Float.java similarity index 87% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform3Float.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform3Float.java index 1f54360..d0bafc5 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform3Float.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform3Float.java @@ -15,14 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend.shaders.uniforms; - -import ru.windcorp.optica.client.graphics.backend.shaders.Program; +package ru.windcorp.progressia.client.graphics.backend.shaders.uniforms; import static org.lwjgl.opengl.GL20.*; import java.nio.FloatBuffer; import glm.vec._3.Vec3; +import ru.windcorp.progressia.client.graphics.backend.shaders.Program; public class Uniform3Float extends Uniform { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform3Int.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform3Int.java similarity index 87% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform3Int.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform3Int.java index 8936406..d3a9852 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform3Int.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform3Int.java @@ -15,14 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend.shaders.uniforms; - -import ru.windcorp.optica.client.graphics.backend.shaders.Program; +package ru.windcorp.progressia.client.graphics.backend.shaders.uniforms; import static org.lwjgl.opengl.GL20.*; import java.nio.IntBuffer; import glm.vec._3.i.Vec3i; +import ru.windcorp.progressia.client.graphics.backend.shaders.Program; public class Uniform3Int extends Uniform { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform3Matrix.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform3Matrix.java similarity index 88% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform3Matrix.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform3Matrix.java index 62ddb77..7e72538 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform3Matrix.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform3Matrix.java @@ -15,14 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend.shaders.uniforms; - -import ru.windcorp.optica.client.graphics.backend.shaders.Program; +package ru.windcorp.progressia.client.graphics.backend.shaders.uniforms; import static org.lwjgl.opengl.GL20.*; import java.nio.FloatBuffer; import glm.mat._3.Mat3; +import ru.windcorp.progressia.client.graphics.backend.shaders.Program; public class Uniform3Matrix extends Uniform { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform4Float.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform4Float.java similarity index 88% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform4Float.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform4Float.java index 6b22f76..6d61edd 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform4Float.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform4Float.java @@ -15,14 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend.shaders.uniforms; - -import ru.windcorp.optica.client.graphics.backend.shaders.Program; +package ru.windcorp.progressia.client.graphics.backend.shaders.uniforms; import static org.lwjgl.opengl.GL20.*; import java.nio.FloatBuffer; import glm.vec._4.Vec4; +import ru.windcorp.progressia.client.graphics.backend.shaders.Program; public class Uniform4Float extends Uniform { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform4Int.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform4Int.java similarity index 88% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform4Int.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform4Int.java index e21bf27..cb17841 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform4Int.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform4Int.java @@ -15,14 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend.shaders.uniforms; - -import ru.windcorp.optica.client.graphics.backend.shaders.Program; +package ru.windcorp.progressia.client.graphics.backend.shaders.uniforms; import static org.lwjgl.opengl.GL20.*; import java.nio.IntBuffer; import glm.vec._4.i.Vec4i; +import ru.windcorp.progressia.client.graphics.backend.shaders.Program; public class Uniform4Int extends Uniform { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform4Matrix.java b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform4Matrix.java similarity index 88% rename from src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform4Matrix.java rename to src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform4Matrix.java index 03e9d62..d5f0860 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/backend/shaders/uniforms/Uniform4Matrix.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/uniforms/Uniform4Matrix.java @@ -15,14 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.backend.shaders.uniforms; - -import ru.windcorp.optica.client.graphics.backend.shaders.Program; +package ru.windcorp.progressia.client.graphics.backend.shaders.uniforms; import static org.lwjgl.opengl.GL20.*; import java.nio.FloatBuffer; import glm.mat._4.Mat4; +import ru.windcorp.progressia.client.graphics.backend.shaders.Program; public class Uniform4Matrix extends Uniform { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/flat/AssembledFlatLayer.java b/src/main/java/ru/windcorp/progressia/client/graphics/flat/AssembledFlatLayer.java similarity index 90% rename from src/main/java/ru/windcorp/optica/client/graphics/flat/AssembledFlatLayer.java rename to src/main/java/ru/windcorp/progressia/client/graphics/flat/AssembledFlatLayer.java index ad0a27f..233832e 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/flat/AssembledFlatLayer.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/flat/AssembledFlatLayer.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.flat; +package ru.windcorp.progressia.client.graphics.flat; -import ru.windcorp.optica.client.graphics.Layer; +import ru.windcorp.progressia.client.graphics.Layer; public abstract class AssembledFlatLayer extends Layer { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/flat/AssembledFlatRenderHelper.java b/src/main/java/ru/windcorp/progressia/client/graphics/flat/AssembledFlatRenderHelper.java similarity index 92% rename from src/main/java/ru/windcorp/optica/client/graphics/flat/AssembledFlatRenderHelper.java rename to src/main/java/ru/windcorp/progressia/client/graphics/flat/AssembledFlatRenderHelper.java index 9763644..b87febc 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/flat/AssembledFlatRenderHelper.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/flat/AssembledFlatRenderHelper.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.flat; +package ru.windcorp.progressia.client.graphics.flat; import java.nio.FloatBuffer; diff --git a/src/main/java/ru/windcorp/optica/client/graphics/flat/DefaultFlatRenderHelper.java b/src/main/java/ru/windcorp/progressia/client/graphics/flat/DefaultFlatRenderHelper.java similarity index 94% rename from src/main/java/ru/windcorp/optica/client/graphics/flat/DefaultFlatRenderHelper.java rename to src/main/java/ru/windcorp/progressia/client/graphics/flat/DefaultFlatRenderHelper.java index 4749b77..b513c75 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/flat/DefaultFlatRenderHelper.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/flat/DefaultFlatRenderHelper.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.flat; +package ru.windcorp.progressia.client.graphics.flat; import java.nio.FloatBuffer; diff --git a/src/main/java/ru/windcorp/optica/client/graphics/flat/FlatGraphics.java b/src/main/java/ru/windcorp/progressia/client/graphics/flat/FlatGraphics.java similarity index 92% rename from src/main/java/ru/windcorp/optica/client/graphics/flat/FlatGraphics.java rename to src/main/java/ru/windcorp/progressia/client/graphics/flat/FlatGraphics.java index da94b2a..8a83686 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/flat/FlatGraphics.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/flat/FlatGraphics.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.flat; +package ru.windcorp.progressia.client.graphics.flat; public class FlatGraphics { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/flat/FlatRenderHelper.java b/src/main/java/ru/windcorp/progressia/client/graphics/flat/FlatRenderHelper.java similarity index 85% rename from src/main/java/ru/windcorp/optica/client/graphics/flat/FlatRenderHelper.java rename to src/main/java/ru/windcorp/progressia/client/graphics/flat/FlatRenderHelper.java index ec39961..550295c 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/flat/FlatRenderHelper.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/flat/FlatRenderHelper.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.flat; +package ru.windcorp.progressia.client.graphics.flat; import java.nio.FloatBuffer; import glm.mat._4.Mat4; -import ru.windcorp.optica.client.graphics.backend.GraphicsInterface; -import ru.windcorp.optica.client.graphics.model.ShapeRenderHelper; +import ru.windcorp.progressia.client.graphics.backend.GraphicsInterface; +import ru.windcorp.progressia.client.graphics.model.ShapeRenderHelper; public abstract class FlatRenderHelper extends ShapeRenderHelper { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/flat/FlatRenderProgram.java b/src/main/java/ru/windcorp/progressia/client/graphics/flat/FlatRenderProgram.java similarity index 85% rename from src/main/java/ru/windcorp/optica/client/graphics/flat/FlatRenderProgram.java rename to src/main/java/ru/windcorp/progressia/client/graphics/flat/FlatRenderProgram.java index 4a41b67..8de657a 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/flat/FlatRenderProgram.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/flat/FlatRenderProgram.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.flat; +package ru.windcorp.progressia.client.graphics.flat; import static org.lwjgl.opengl.GL11.*; @@ -23,11 +23,11 @@ import java.nio.FloatBuffer; import com.google.common.collect.ObjectArrays; -import ru.windcorp.optica.client.graphics.backend.shaders.uniforms.Uniform1Int; -import ru.windcorp.optica.client.graphics.backend.shaders.uniforms.Uniform2Float; -import ru.windcorp.optica.client.graphics.model.Shape; -import ru.windcorp.optica.client.graphics.model.ShapeRenderHelper; -import ru.windcorp.optica.client.graphics.model.ShapeRenderProgram; +import ru.windcorp.progressia.client.graphics.backend.shaders.uniforms.Uniform1Int; +import ru.windcorp.progressia.client.graphics.backend.shaders.uniforms.Uniform2Float; +import ru.windcorp.progressia.client.graphics.model.Shape; +import ru.windcorp.progressia.client.graphics.model.ShapeRenderHelper; +import ru.windcorp.progressia.client.graphics.model.ShapeRenderProgram; public class FlatRenderProgram extends ShapeRenderProgram { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/flat/LayerTestUI.java b/src/main/java/ru/windcorp/progressia/client/graphics/flat/LayerTestUI.java similarity index 81% rename from src/main/java/ru/windcorp/optica/client/graphics/flat/LayerTestUI.java rename to src/main/java/ru/windcorp/progressia/client/graphics/flat/LayerTestUI.java index bd9541e..9c72901 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/flat/LayerTestUI.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/flat/LayerTestUI.java @@ -15,24 +15,24 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.flat; +package ru.windcorp.progressia.client.graphics.flat; import org.lwjgl.glfw.GLFW; import com.google.common.eventbus.Subscribe; import glm.mat._4.Mat4; -import ru.windcorp.optica.client.graphics.Colors; -import ru.windcorp.optica.client.graphics.backend.GraphicsInterface; -import ru.windcorp.optica.client.graphics.input.KeyEvent; -import ru.windcorp.optica.client.graphics.input.bus.Input; -import ru.windcorp.optica.client.graphics.model.LambdaModel; -import ru.windcorp.optica.client.graphics.texture.SimpleTexture; -import ru.windcorp.optica.client.graphics.texture.Sprite; -import ru.windcorp.optica.client.graphics.texture.Texture; -import ru.windcorp.optica.client.graphics.texture.TextureManager; -import ru.windcorp.optica.client.graphics.texture.TextureSettings; -import ru.windcorp.optica.client.graphics.world.LayerWorld; +import ru.windcorp.progressia.client.graphics.Colors; +import ru.windcorp.progressia.client.graphics.backend.GraphicsInterface; +import ru.windcorp.progressia.client.graphics.input.KeyEvent; +import ru.windcorp.progressia.client.graphics.input.bus.Input; +import ru.windcorp.progressia.client.graphics.model.LambdaModel; +import ru.windcorp.progressia.client.graphics.texture.SimpleTexture; +import ru.windcorp.progressia.client.graphics.texture.Sprite; +import ru.windcorp.progressia.client.graphics.texture.Texture; +import ru.windcorp.progressia.client.graphics.texture.TextureManager; +import ru.windcorp.progressia.client.graphics.texture.TextureSettings; +import ru.windcorp.progressia.client.graphics.world.LayerWorld; public class LayerTestUI extends AssembledFlatLayer { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/flat/Mask.java b/src/main/java/ru/windcorp/progressia/client/graphics/flat/Mask.java similarity index 93% rename from src/main/java/ru/windcorp/optica/client/graphics/flat/Mask.java rename to src/main/java/ru/windcorp/progressia/client/graphics/flat/Mask.java index 1295a4d..87bd4d1 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/flat/Mask.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/flat/Mask.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.flat; +package ru.windcorp.progressia.client.graphics.flat; public class Mask { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/flat/MaskStack.java b/src/main/java/ru/windcorp/progressia/client/graphics/flat/MaskStack.java similarity index 93% rename from src/main/java/ru/windcorp/optica/client/graphics/flat/MaskStack.java rename to src/main/java/ru/windcorp/progressia/client/graphics/flat/MaskStack.java index e0c9dcf..49770ad 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/flat/MaskStack.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/flat/MaskStack.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.flat; +package ru.windcorp.progressia.client.graphics.flat; import java.nio.FloatBuffer; diff --git a/src/main/java/ru/windcorp/optica/client/graphics/flat/RenderTarget.java b/src/main/java/ru/windcorp/progressia/client/graphics/flat/RenderTarget.java similarity index 88% rename from src/main/java/ru/windcorp/optica/client/graphics/flat/RenderTarget.java rename to src/main/java/ru/windcorp/progressia/client/graphics/flat/RenderTarget.java index e087a18..92f7e27 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/flat/RenderTarget.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/flat/RenderTarget.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.flat; +package ru.windcorp.progressia.client.graphics.flat; import java.util.ArrayList; import java.util.Deque; @@ -25,13 +25,13 @@ import java.util.Objects; import glm.mat._4.Mat4; import glm.vec._3.Vec3; -import ru.windcorp.optica.client.graphics.Colors; -import ru.windcorp.optica.client.graphics.backend.Usage; -import ru.windcorp.optica.client.graphics.model.Face; -import ru.windcorp.optica.client.graphics.model.Faces; -import ru.windcorp.optica.client.graphics.model.Shape; -import ru.windcorp.optica.client.graphics.model.WorldRenderable; -import ru.windcorp.optica.client.graphics.texture.Texture; +import ru.windcorp.progressia.client.graphics.Colors; +import ru.windcorp.progressia.client.graphics.backend.Usage; +import ru.windcorp.progressia.client.graphics.model.Face; +import ru.windcorp.progressia.client.graphics.model.Faces; +import ru.windcorp.progressia.client.graphics.model.Shape; +import ru.windcorp.progressia.client.graphics.model.WorldRenderable; +import ru.windcorp.progressia.client.graphics.texture.Texture; public class RenderTarget { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/flat/TransformedMask.java b/src/main/java/ru/windcorp/progressia/client/graphics/flat/TransformedMask.java similarity index 93% rename from src/main/java/ru/windcorp/optica/client/graphics/flat/TransformedMask.java rename to src/main/java/ru/windcorp/progressia/client/graphics/flat/TransformedMask.java index eb5f492..5d6592f 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/flat/TransformedMask.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/flat/TransformedMask.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.flat; +package ru.windcorp.progressia.client.graphics.flat; import java.nio.FloatBuffer; import glm.mat._4.Mat4; import glm.vec._2.Vec2; import glm.vec._4.Vec4; -import ru.windcorp.optica.client.graphics.backend.GraphicsInterface; +import ru.windcorp.progressia.client.graphics.backend.GraphicsInterface; public class TransformedMask { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/gui/Component.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/Component.java similarity index 89% rename from src/main/java/ru/windcorp/optica/client/graphics/gui/Component.java rename to src/main/java/ru/windcorp/progressia/client/graphics/gui/Component.java index 6376b0c..36ede82 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/gui/Component.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/Component.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.gui; +package ru.windcorp.progressia.client.graphics.gui; import java.util.Collections; import java.util.List; @@ -26,19 +26,19 @@ import org.lwjgl.glfw.GLFW; import com.google.common.eventbus.EventBus; import glm.vec._2.i.Vec2i; -import ru.windcorp.optica.client.graphics.backend.InputTracker; -import ru.windcorp.optica.client.graphics.flat.RenderTarget; -import ru.windcorp.optica.client.graphics.gui.event.ChildAddedEvent; -import ru.windcorp.optica.client.graphics.gui.event.ChildRemovedEvent; -import ru.windcorp.optica.client.graphics.gui.event.FocusEvent; -import ru.windcorp.optica.client.graphics.gui.event.HoverEvent; -import ru.windcorp.optica.client.graphics.gui.event.ParentChangedEvent; -import ru.windcorp.optica.client.graphics.input.InputEvent; -import ru.windcorp.optica.client.graphics.input.KeyEvent; -import ru.windcorp.optica.client.graphics.input.bus.Input; -import ru.windcorp.optica.client.graphics.input.bus.InputBus; -import ru.windcorp.optica.client.graphics.input.bus.InputListener; -import ru.windcorp.optica.common.util.Named; +import ru.windcorp.progressia.client.graphics.backend.InputTracker; +import ru.windcorp.progressia.client.graphics.flat.RenderTarget; +import ru.windcorp.progressia.client.graphics.gui.event.ChildAddedEvent; +import ru.windcorp.progressia.client.graphics.gui.event.ChildRemovedEvent; +import ru.windcorp.progressia.client.graphics.gui.event.FocusEvent; +import ru.windcorp.progressia.client.graphics.gui.event.HoverEvent; +import ru.windcorp.progressia.client.graphics.gui.event.ParentChangedEvent; +import ru.windcorp.progressia.client.graphics.input.InputEvent; +import ru.windcorp.progressia.client.graphics.input.KeyEvent; +import ru.windcorp.progressia.client.graphics.input.bus.Input; +import ru.windcorp.progressia.client.graphics.input.bus.InputBus; +import ru.windcorp.progressia.client.graphics.input.bus.InputListener; +import ru.windcorp.progressia.common.util.Named; public class Component extends Named { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/gui/GUILayer.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/GUILayer.java similarity index 82% rename from src/main/java/ru/windcorp/optica/client/graphics/gui/GUILayer.java rename to src/main/java/ru/windcorp/progressia/client/graphics/gui/GUILayer.java index 60b3504..6c8365c 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/gui/GUILayer.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/GUILayer.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.gui; +package ru.windcorp.progressia.client.graphics.gui; -import ru.windcorp.optica.client.graphics.flat.AssembledFlatLayer; -import ru.windcorp.optica.client.graphics.flat.RenderTarget; -import ru.windcorp.optica.client.graphics.input.bus.Input; +import ru.windcorp.progressia.client.graphics.flat.AssembledFlatLayer; +import ru.windcorp.progressia.client.graphics.flat.RenderTarget; +import ru.windcorp.progressia.client.graphics.input.bus.Input; public abstract class GUILayer extends AssembledFlatLayer { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/gui/LayerTestGUI.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/LayerTestGUI.java similarity index 82% rename from src/main/java/ru/windcorp/optica/client/graphics/gui/LayerTestGUI.java rename to src/main/java/ru/windcorp/progressia/client/graphics/gui/LayerTestGUI.java index e194bf1..3ce4b7e 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/gui/LayerTestGUI.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/LayerTestGUI.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.gui; +package ru.windcorp.progressia.client.graphics.gui; import com.google.common.eventbus.Subscribe; import glm.vec._2.i.Vec2i; -import ru.windcorp.optica.client.graphics.Colors; -import ru.windcorp.optica.client.graphics.flat.RenderTarget; -import ru.windcorp.optica.client.graphics.gui.event.HoverEvent; -import ru.windcorp.optica.client.graphics.gui.layout.LayoutAlign; -import ru.windcorp.optica.client.graphics.input.KeyEvent; +import ru.windcorp.progressia.client.graphics.Colors; +import ru.windcorp.progressia.client.graphics.flat.RenderTarget; +import ru.windcorp.progressia.client.graphics.gui.event.HoverEvent; +import ru.windcorp.progressia.client.graphics.gui.layout.LayoutAlign; +import ru.windcorp.progressia.client.graphics.input.KeyEvent; public class LayerTestGUI extends GUILayer { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/gui/Layout.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/Layout.java similarity index 92% rename from src/main/java/ru/windcorp/optica/client/graphics/gui/Layout.java rename to src/main/java/ru/windcorp/progressia/client/graphics/gui/Layout.java index 9858314..25a4cb6 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/gui/Layout.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/Layout.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.gui; +package ru.windcorp.progressia.client.graphics.gui; import glm.vec._2.i.Vec2i; diff --git a/src/main/java/ru/windcorp/optica/client/graphics/gui/event/ChildAddedEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ChildAddedEvent.java similarity index 87% rename from src/main/java/ru/windcorp/optica/client/graphics/gui/event/ChildAddedEvent.java rename to src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ChildAddedEvent.java index 185cb7e..9496daf 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/gui/event/ChildAddedEvent.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ChildAddedEvent.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.gui.event; +package ru.windcorp.progressia.client.graphics.gui.event; -import ru.windcorp.optica.client.graphics.gui.Component; +import ru.windcorp.progressia.client.graphics.gui.Component; public class ChildAddedEvent extends ChildEvent { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/gui/event/ChildEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ChildEvent.java similarity index 87% rename from src/main/java/ru/windcorp/optica/client/graphics/gui/event/ChildEvent.java rename to src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ChildEvent.java index 44ed509..50c9476 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/gui/event/ChildEvent.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ChildEvent.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.gui.event; +package ru.windcorp.progressia.client.graphics.gui.event; -import ru.windcorp.optica.client.graphics.gui.Component; +import ru.windcorp.progressia.client.graphics.gui.Component; public abstract class ChildEvent extends HierarchyEvent { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/gui/event/ChildRemovedEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ChildRemovedEvent.java similarity index 87% rename from src/main/java/ru/windcorp/optica/client/graphics/gui/event/ChildRemovedEvent.java rename to src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ChildRemovedEvent.java index 90dc073..8b56851 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/gui/event/ChildRemovedEvent.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ChildRemovedEvent.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.gui.event; +package ru.windcorp.progressia.client.graphics.gui.event; -import ru.windcorp.optica.client.graphics.gui.Component; +import ru.windcorp.progressia.client.graphics.gui.Component; public class ChildRemovedEvent extends ChildEvent { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/gui/event/ComponentEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ComponentEvent.java similarity index 87% rename from src/main/java/ru/windcorp/optica/client/graphics/gui/event/ComponentEvent.java rename to src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ComponentEvent.java index ce479a1..584b386 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/gui/event/ComponentEvent.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ComponentEvent.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.gui.event; +package ru.windcorp.progressia.client.graphics.gui.event; -import ru.windcorp.optica.client.graphics.gui.Component; +import ru.windcorp.progressia.client.graphics.gui.Component; public abstract class ComponentEvent { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/gui/event/FocusEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/FocusEvent.java similarity index 87% rename from src/main/java/ru/windcorp/optica/client/graphics/gui/event/FocusEvent.java rename to src/main/java/ru/windcorp/progressia/client/graphics/gui/event/FocusEvent.java index c8cae1c..2f316f2 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/gui/event/FocusEvent.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/FocusEvent.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.gui.event; +package ru.windcorp.progressia.client.graphics.gui.event; -import ru.windcorp.optica.client.graphics.gui.Component; +import ru.windcorp.progressia.client.graphics.gui.Component; public class FocusEvent extends ComponentEvent { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/gui/event/HierarchyEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/HierarchyEvent.java similarity index 87% rename from src/main/java/ru/windcorp/optica/client/graphics/gui/event/HierarchyEvent.java rename to src/main/java/ru/windcorp/progressia/client/graphics/gui/event/HierarchyEvent.java index 53d6247..f9135aa 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/gui/event/HierarchyEvent.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/HierarchyEvent.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.gui.event; +package ru.windcorp.progressia.client.graphics.gui.event; -import ru.windcorp.optica.client.graphics.gui.Component; +import ru.windcorp.progressia.client.graphics.gui.Component; public abstract class HierarchyEvent extends ComponentEvent { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/gui/event/HoverEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/HoverEvent.java similarity index 88% rename from src/main/java/ru/windcorp/optica/client/graphics/gui/event/HoverEvent.java rename to src/main/java/ru/windcorp/progressia/client/graphics/gui/event/HoverEvent.java index 0ad6d50..02779be 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/gui/event/HoverEvent.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/HoverEvent.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.gui.event; +package ru.windcorp.progressia.client.graphics.gui.event; -import ru.windcorp.optica.client.graphics.gui.Component; +import ru.windcorp.progressia.client.graphics.gui.Component; public class HoverEvent extends ComponentEvent { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/gui/event/ParentChangedEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ParentChangedEvent.java similarity index 89% rename from src/main/java/ru/windcorp/optica/client/graphics/gui/event/ParentChangedEvent.java rename to src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ParentChangedEvent.java index 8c91fa0..5a186df 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/gui/event/ParentChangedEvent.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/event/ParentChangedEvent.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.gui.event; +package ru.windcorp.progressia.client.graphics.gui.event; -import ru.windcorp.optica.client.graphics.gui.Component; +import ru.windcorp.progressia.client.graphics.gui.Component; public class ParentChangedEvent extends HierarchyEvent { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/gui/layout/LayoutAlign.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutAlign.java similarity index 92% rename from src/main/java/ru/windcorp/optica/client/graphics/gui/layout/LayoutAlign.java rename to src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutAlign.java index 1dbe5fd..5ae0cf0 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/gui/layout/LayoutAlign.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutAlign.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.gui.layout; +package ru.windcorp.progressia.client.graphics.gui.layout; import static java.lang.Math.max; import static java.lang.Math.min; import glm.vec._2.i.Vec2i; -import ru.windcorp.optica.client.graphics.gui.Component; -import ru.windcorp.optica.client.graphics.gui.Layout; +import ru.windcorp.progressia.client.graphics.gui.Component; +import ru.windcorp.progressia.client.graphics.gui.Layout; public class LayoutAlign implements Layout { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/gui/layout/LayoutBorderHorizontal.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutBorderHorizontal.java similarity index 94% rename from src/main/java/ru/windcorp/optica/client/graphics/gui/layout/LayoutBorderHorizontal.java rename to src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutBorderHorizontal.java index 3ae970c..ddb015d 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/gui/layout/LayoutBorderHorizontal.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutBorderHorizontal.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.gui.layout; +package ru.windcorp.progressia.client.graphics.gui.layout; import static java.lang.Math.max; import glm.vec._2.i.Vec2i; -import ru.windcorp.optica.client.graphics.gui.Component; -import ru.windcorp.optica.client.graphics.gui.Layout; +import ru.windcorp.progressia.client.graphics.gui.Component; +import ru.windcorp.progressia.client.graphics.gui.Layout; public class LayoutBorderHorizontal implements Layout { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/gui/layout/LayoutBorderVertical.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutBorderVertical.java similarity index 94% rename from src/main/java/ru/windcorp/optica/client/graphics/gui/layout/LayoutBorderVertical.java rename to src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutBorderVertical.java index 2374493..5ef0340 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/gui/layout/LayoutBorderVertical.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutBorderVertical.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.gui.layout; +package ru.windcorp.progressia.client.graphics.gui.layout; import static java.lang.Math.max; import glm.vec._2.i.Vec2i; -import ru.windcorp.optica.client.graphics.gui.Component; -import ru.windcorp.optica.client.graphics.gui.Layout; +import ru.windcorp.progressia.client.graphics.gui.Component; +import ru.windcorp.progressia.client.graphics.gui.Layout; public class LayoutBorderVertical implements Layout { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/gui/layout/LayoutGrid.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutGrid.java similarity index 95% rename from src/main/java/ru/windcorp/optica/client/graphics/gui/layout/LayoutGrid.java rename to src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutGrid.java index 8823e92..67c235d 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/gui/layout/LayoutGrid.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutGrid.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.gui.layout; +package ru.windcorp.progressia.client.graphics.gui.layout; import java.util.Arrays; import glm.vec._2.i.Vec2i; -import ru.windcorp.optica.client.graphics.gui.Component; -import ru.windcorp.optica.client.graphics.gui.Layout; +import ru.windcorp.progressia.client.graphics.gui.Component; +import ru.windcorp.progressia.client.graphics.gui.Layout; public class LayoutGrid implements Layout { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/gui/layout/LayoutHorizontal.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutHorizontal.java similarity index 92% rename from src/main/java/ru/windcorp/optica/client/graphics/gui/layout/LayoutHorizontal.java rename to src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutHorizontal.java index 51b5b20..17c9898 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/gui/layout/LayoutHorizontal.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutHorizontal.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.gui.layout; +package ru.windcorp.progressia.client.graphics.gui.layout; import static java.lang.Math.max; import glm.vec._2.i.Vec2i; -import ru.windcorp.optica.client.graphics.gui.Component; -import ru.windcorp.optica.client.graphics.gui.Layout; +import ru.windcorp.progressia.client.graphics.gui.Component; +import ru.windcorp.progressia.client.graphics.gui.Layout; public class LayoutHorizontal implements Layout { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/gui/layout/LayoutVertical.java b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutVertical.java similarity index 92% rename from src/main/java/ru/windcorp/optica/client/graphics/gui/layout/LayoutVertical.java rename to src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutVertical.java index a50c706..4bcf678 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/gui/layout/LayoutVertical.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/gui/layout/LayoutVertical.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.gui.layout; +package ru.windcorp.progressia.client.graphics.gui.layout; import static java.lang.Math.max; import glm.vec._2.i.Vec2i; -import ru.windcorp.optica.client.graphics.gui.Component; -import ru.windcorp.optica.client.graphics.gui.Layout; +import ru.windcorp.progressia.client.graphics.gui.Component; +import ru.windcorp.progressia.client.graphics.gui.Layout; public class LayoutVertical implements Layout { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/input/CursorEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/CursorEvent.java similarity index 88% rename from src/main/java/ru/windcorp/optica/client/graphics/input/CursorEvent.java rename to src/main/java/ru/windcorp/progressia/client/graphics/input/CursorEvent.java index 85db36f..2996e80 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/input/CursorEvent.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/CursorEvent.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.input; +package ru.windcorp.progressia.client.graphics.input; import glm.vec._2.d.Vec2d; -import ru.windcorp.optica.client.graphics.backend.InputTracker; +import ru.windcorp.progressia.client.graphics.backend.InputTracker; public abstract class CursorEvent extends InputEvent { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/input/CursorMoveEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/CursorMoveEvent.java similarity index 94% rename from src/main/java/ru/windcorp/optica/client/graphics/input/CursorMoveEvent.java rename to src/main/java/ru/windcorp/progressia/client/graphics/input/CursorMoveEvent.java index 7f3a6b3..55ab690 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/input/CursorMoveEvent.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/CursorMoveEvent.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.input; +package ru.windcorp.progressia.client.graphics.input; import glm.vec._2.Vec2; import glm.vec._2.d.Vec2d; diff --git a/src/main/java/ru/windcorp/optica/client/graphics/input/FrameResizeEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/FrameResizeEvent.java similarity index 90% rename from src/main/java/ru/windcorp/optica/client/graphics/input/FrameResizeEvent.java rename to src/main/java/ru/windcorp/progressia/client/graphics/input/FrameResizeEvent.java index 549c2e9..d80a00f 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/input/FrameResizeEvent.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/FrameResizeEvent.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.input; +package ru.windcorp.progressia.client.graphics.input; import glm.vec._2.i.Vec2i; -import ru.windcorp.optica.client.graphics.backend.GraphicsInterface; +import ru.windcorp.progressia.client.graphics.backend.GraphicsInterface; public class FrameResizeEvent extends InputEvent { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/input/InputEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/InputEvent.java similarity index 92% rename from src/main/java/ru/windcorp/optica/client/graphics/input/InputEvent.java rename to src/main/java/ru/windcorp/progressia/client/graphics/input/InputEvent.java index cbf5fb4..8399a7d 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/input/InputEvent.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/InputEvent.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.input; +package ru.windcorp.progressia.client.graphics.input; public abstract class InputEvent { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/input/KeyEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/KeyEvent.java similarity index 93% rename from src/main/java/ru/windcorp/optica/client/graphics/input/KeyEvent.java rename to src/main/java/ru/windcorp/progressia/client/graphics/input/KeyEvent.java index bce6a30..c04bdea 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/input/KeyEvent.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/KeyEvent.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.input; +package ru.windcorp.progressia.client.graphics.input; import org.lwjgl.glfw.GLFW; diff --git a/src/main/java/ru/windcorp/optica/client/graphics/input/KeyMatcher.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/KeyMatcher.java similarity index 91% rename from src/main/java/ru/windcorp/optica/client/graphics/input/KeyMatcher.java rename to src/main/java/ru/windcorp/progressia/client/graphics/input/KeyMatcher.java index 2a387cb..2527560 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/input/KeyMatcher.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/KeyMatcher.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.input; +package ru.windcorp.progressia.client.graphics.input; import gnu.trove.set.TIntSet; -import ru.windcorp.optica.client.graphics.backend.InputTracker; +import ru.windcorp.progressia.client.graphics.backend.InputTracker; public class KeyMatcher { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/input/Keys.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/Keys.java similarity index 95% rename from src/main/java/ru/windcorp/optica/client/graphics/input/Keys.java rename to src/main/java/ru/windcorp/progressia/client/graphics/input/Keys.java index 26ea944..db5d482 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/input/Keys.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/Keys.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.input; +package ru.windcorp.progressia.client.graphics.input; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/src/main/java/ru/windcorp/optica/client/graphics/input/WheelEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/WheelEvent.java similarity index 92% rename from src/main/java/ru/windcorp/optica/client/graphics/input/WheelEvent.java rename to src/main/java/ru/windcorp/progressia/client/graphics/input/WheelEvent.java index 0e8f5af..2420bca 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/input/WheelEvent.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/WheelEvent.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.input; +package ru.windcorp.progressia.client.graphics.input; public abstract class WheelEvent extends InputEvent { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/input/WheelScrollEvent.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/WheelScrollEvent.java similarity index 93% rename from src/main/java/ru/windcorp/optica/client/graphics/input/WheelScrollEvent.java rename to src/main/java/ru/windcorp/progressia/client/graphics/input/WheelScrollEvent.java index 01706cf..d7efa8f 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/input/WheelScrollEvent.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/WheelScrollEvent.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.input; +package ru.windcorp.progressia.client.graphics.input; import glm.vec._2.d.Vec2d; diff --git a/src/main/java/ru/windcorp/optica/client/graphics/input/bus/Input.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/bus/Input.java similarity index 88% rename from src/main/java/ru/windcorp/optica/client/graphics/input/bus/Input.java rename to src/main/java/ru/windcorp/progressia/client/graphics/input/bus/Input.java index 55c7118..43abb84 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/input/bus/Input.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/bus/Input.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.input.bus; +package ru.windcorp.progressia.client.graphics.input.bus; -import ru.windcorp.optica.client.graphics.input.InputEvent; +import ru.windcorp.progressia.client.graphics.input.InputEvent; public class Input { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/input/bus/InputBus.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/bus/InputBus.java similarity index 91% rename from src/main/java/ru/windcorp/optica/client/graphics/input/bus/InputBus.java rename to src/main/java/ru/windcorp/progressia/client/graphics/input/bus/InputBus.java index b3446e1..9ea9c70 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/input/bus/InputBus.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/bus/InputBus.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.input.bus; +package ru.windcorp.progressia.client.graphics.input.bus; import java.util.ArrayList; import java.util.Collection; -import ru.windcorp.optica.client.graphics.input.InputEvent; +import ru.windcorp.progressia.client.graphics.input.InputEvent; public class InputBus { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/input/bus/InputListener.java b/src/main/java/ru/windcorp/progressia/client/graphics/input/bus/InputListener.java similarity index 86% rename from src/main/java/ru/windcorp/optica/client/graphics/input/bus/InputListener.java rename to src/main/java/ru/windcorp/progressia/client/graphics/input/bus/InputListener.java index c14c2cd..44677f2 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/input/bus/InputListener.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/input/bus/InputListener.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.input.bus; +package ru.windcorp.progressia.client.graphics.input.bus; -import ru.windcorp.optica.client.graphics.input.InputEvent; +import ru.windcorp.progressia.client.graphics.input.InputEvent; @FunctionalInterface public interface InputListener { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/model/DynamicModel.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/DynamicModel.java similarity index 94% rename from src/main/java/ru/windcorp/optica/client/graphics/model/DynamicModel.java rename to src/main/java/ru/windcorp/progressia/client/graphics/model/DynamicModel.java index a0f7575..a2bd678 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/model/DynamicModel.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/DynamicModel.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.model; +package ru.windcorp.progressia.client.graphics.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ru/windcorp/optica/client/graphics/model/EmptyModel.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/EmptyModel.java similarity index 93% rename from src/main/java/ru/windcorp/optica/client/graphics/model/EmptyModel.java rename to src/main/java/ru/windcorp/progressia/client/graphics/model/EmptyModel.java index 8e22707..1e54d1b 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/model/EmptyModel.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/EmptyModel.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.model; +package ru.windcorp.progressia.client.graphics.model; import glm.mat._4.Mat4; diff --git a/src/main/java/ru/windcorp/optica/client/graphics/model/Face.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/Face.java similarity index 93% rename from src/main/java/ru/windcorp/optica/client/graphics/model/Face.java rename to src/main/java/ru/windcorp/progressia/client/graphics/model/Face.java index f0ae15f..3fb4c7d 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/model/Face.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/Face.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.model; +package ru.windcorp.progressia.client.graphics.model; import java.nio.ByteBuffer; import java.nio.ShortBuffer; import java.util.Objects; -import ru.windcorp.optica.client.graphics.texture.Texture; +import ru.windcorp.progressia.client.graphics.texture.Texture; public class Face { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/model/Faces.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/Faces.java similarity index 88% rename from src/main/java/ru/windcorp/optica/client/graphics/model/Faces.java rename to src/main/java/ru/windcorp/progressia/client/graphics/model/Faces.java index 1d32beb..d690707 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/model/Faces.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/Faces.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.model; +package ru.windcorp.progressia.client.graphics.model; import java.nio.ShortBuffer; import glm.vec._2.Vec2; import glm.vec._3.Vec3; -import ru.windcorp.optica.client.graphics.model.ShapeRenderProgram.VertexBuilder; -import ru.windcorp.optica.client.graphics.texture.Texture; -import ru.windcorp.optica.common.block.BlockFace; +import ru.windcorp.progressia.client.graphics.model.ShapeRenderProgram.VertexBuilder; +import ru.windcorp.progressia.client.graphics.texture.Texture; +import ru.windcorp.progressia.common.block.BlockFace; public class Faces { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/model/LambdaModel.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/LambdaModel.java similarity index 94% rename from src/main/java/ru/windcorp/optica/client/graphics/model/LambdaModel.java rename to src/main/java/ru/windcorp/progressia/client/graphics/model/LambdaModel.java index 4c946dd..1b74720 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/model/LambdaModel.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/LambdaModel.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.model; +package ru.windcorp.progressia.client.graphics.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ru/windcorp/optica/client/graphics/model/Model.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/Model.java similarity index 93% rename from src/main/java/ru/windcorp/optica/client/graphics/model/Model.java rename to src/main/java/ru/windcorp/progressia/client/graphics/model/Model.java index 8055b45..83a616d 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/model/Model.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/Model.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.model; +package ru.windcorp.progressia.client.graphics.model; import glm.mat._4.Mat4; diff --git a/src/main/java/ru/windcorp/optica/client/graphics/model/Shape.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/Shape.java similarity index 92% rename from src/main/java/ru/windcorp/optica/client/graphics/model/Shape.java rename to src/main/java/ru/windcorp/progressia/client/graphics/model/Shape.java index c733ba7..f005086 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/model/Shape.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/Shape.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.model; +package ru.windcorp.progressia.client.graphics.model; import java.nio.ByteBuffer; import java.nio.ShortBuffer; import org.lwjgl.BufferUtils; -import ru.windcorp.optica.client.graphics.backend.Usage; -import ru.windcorp.optica.client.graphics.backend.VertexBufferObject; +import ru.windcorp.progressia.client.graphics.backend.Usage; +import ru.windcorp.progressia.client.graphics.backend.VertexBufferObject; public class Shape implements WorldRenderable { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/model/ShapeRenderHelper.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/ShapeRenderHelper.java similarity index 90% rename from src/main/java/ru/windcorp/optica/client/graphics/model/ShapeRenderHelper.java rename to src/main/java/ru/windcorp/progressia/client/graphics/model/ShapeRenderHelper.java index 8c691f3..f68f367 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/model/ShapeRenderHelper.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/ShapeRenderHelper.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.model; +package ru.windcorp.progressia.client.graphics.model; import glm.mat._4.Mat4; -import ru.windcorp.optica.common.util.StashingStack; +import ru.windcorp.progressia.common.util.StashingStack; public class ShapeRenderHelper { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/model/ShapeRenderProgram.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/ShapeRenderProgram.java similarity index 88% rename from src/main/java/ru/windcorp/optica/client/graphics/model/ShapeRenderProgram.java rename to src/main/java/ru/windcorp/progressia/client/graphics/model/ShapeRenderProgram.java index 2c35f64..bcd5662 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/model/ShapeRenderProgram.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/ShapeRenderProgram.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.model; +package ru.windcorp.progressia.client.graphics.model; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -28,14 +28,14 @@ import com.google.common.collect.ObjectArrays; import glm.vec._2.Vec2; import glm.vec._3.Vec3; -import ru.windcorp.optica.client.graphics.backend.VertexBufferObject; -import ru.windcorp.optica.client.graphics.backend.VertexBufferObject.BindTarget; -import ru.windcorp.optica.client.graphics.backend.shaders.CombinedShader; -import ru.windcorp.optica.client.graphics.backend.shaders.Program; -import ru.windcorp.optica.client.graphics.backend.shaders.attributes.*; -import ru.windcorp.optica.client.graphics.backend.shaders.uniforms.*; -import ru.windcorp.optica.client.graphics.texture.Sprite; -import ru.windcorp.optica.client.graphics.texture.Texture; +import ru.windcorp.progressia.client.graphics.backend.VertexBufferObject; +import ru.windcorp.progressia.client.graphics.backend.VertexBufferObject.BindTarget; +import ru.windcorp.progressia.client.graphics.backend.shaders.CombinedShader; +import ru.windcorp.progressia.client.graphics.backend.shaders.Program; +import ru.windcorp.progressia.client.graphics.backend.shaders.attributes.*; +import ru.windcorp.progressia.client.graphics.backend.shaders.uniforms.*; +import ru.windcorp.progressia.client.graphics.texture.Sprite; +import ru.windcorp.progressia.client.graphics.texture.Texture; public class ShapeRenderProgram extends Program { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/model/Shapes.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/Shapes.java similarity index 92% rename from src/main/java/ru/windcorp/optica/client/graphics/model/Shapes.java rename to src/main/java/ru/windcorp/progressia/client/graphics/model/Shapes.java index 9da8fbe..d5d6d19 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/model/Shapes.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/Shapes.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.model; +package ru.windcorp.progressia.client.graphics.model; import glm.vec._3.Vec3; -import ru.windcorp.optica.client.graphics.backend.Usage; -import ru.windcorp.optica.client.graphics.texture.Texture; +import ru.windcorp.progressia.client.graphics.backend.Usage; +import ru.windcorp.progressia.client.graphics.texture.Texture; public class Shapes { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/model/StaticModel.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/StaticModel.java similarity index 94% rename from src/main/java/ru/windcorp/optica/client/graphics/model/StaticModel.java rename to src/main/java/ru/windcorp/progressia/client/graphics/model/StaticModel.java index 84c755c..d74436a 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/model/StaticModel.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/StaticModel.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.model; +package ru.windcorp.progressia.client.graphics.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ru/windcorp/optica/client/graphics/model/WorldRenderable.java b/src/main/java/ru/windcorp/progressia/client/graphics/model/WorldRenderable.java similarity index 92% rename from src/main/java/ru/windcorp/optica/client/graphics/model/WorldRenderable.java rename to src/main/java/ru/windcorp/progressia/client/graphics/model/WorldRenderable.java index d4333a0..78981b3 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/model/WorldRenderable.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/model/WorldRenderable.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.model; +package ru.windcorp.progressia.client.graphics.model; public interface WorldRenderable { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/texture/Pixels.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/Pixels.java similarity index 94% rename from src/main/java/ru/windcorp/optica/client/graphics/texture/Pixels.java rename to src/main/java/ru/windcorp/progressia/client/graphics/texture/Pixels.java index 8f28c38..5516f0b 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/texture/Pixels.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/Pixels.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.texture; +package ru.windcorp.progressia.client.graphics.texture; import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL12.*; diff --git a/src/main/java/ru/windcorp/optica/client/graphics/texture/PngLoader.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/PngLoader.java similarity index 94% rename from src/main/java/ru/windcorp/optica/client/graphics/texture/PngLoader.java rename to src/main/java/ru/windcorp/progressia/client/graphics/texture/PngLoader.java index 62f1d94..fafafd2 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/texture/PngLoader.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/PngLoader.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.texture; +package ru.windcorp.progressia.client.graphics.texture; import java.awt.Graphics2D; import java.awt.color.ColorSpace; @@ -33,7 +33,7 @@ import java.util.Hashtable; import javax.imageio.ImageIO; import org.lwjgl.BufferUtils; -import ru.windcorp.optica.common.util.BinUtil; +import ru.windcorp.progressia.common.util.BinUtil; class PngLoader { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/texture/SimpleTexture.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/SimpleTexture.java similarity index 92% rename from src/main/java/ru/windcorp/optica/client/graphics/texture/SimpleTexture.java rename to src/main/java/ru/windcorp/progressia/client/graphics/texture/SimpleTexture.java index 0af8360..b2fd148 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/texture/SimpleTexture.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/SimpleTexture.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.texture; +package ru.windcorp.progressia.client.graphics.texture; public class SimpleTexture extends Texture { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/texture/Sprite.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/Sprite.java similarity index 93% rename from src/main/java/ru/windcorp/optica/client/graphics/texture/Sprite.java rename to src/main/java/ru/windcorp/progressia/client/graphics/texture/Sprite.java index fd39285..eb808e5 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/texture/Sprite.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/Sprite.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.texture; +package ru.windcorp.progressia.client.graphics.texture; import java.util.Objects; diff --git a/src/main/java/ru/windcorp/optica/client/graphics/texture/Texture.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/Texture.java similarity index 92% rename from src/main/java/ru/windcorp/optica/client/graphics/texture/Texture.java rename to src/main/java/ru/windcorp/progressia/client/graphics/texture/Texture.java index be36348..131f1b4 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/texture/Texture.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/Texture.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.texture; +package ru.windcorp.progressia.client.graphics.texture; public abstract class Texture { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/texture/TextureManager.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureManager.java similarity index 91% rename from src/main/java/ru/windcorp/optica/client/graphics/texture/TextureManager.java rename to src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureManager.java index e5f7145..e05743b 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/texture/TextureManager.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureManager.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.texture; +package ru.windcorp.progressia.client.graphics.texture; import java.io.IOException; import java.io.InputStream; @@ -23,10 +23,10 @@ import java.nio.ByteBuffer; import java.util.HashMap; import java.util.Map; -import ru.windcorp.optica.client.graphics.backend.RenderTaskQueue; -import ru.windcorp.optica.common.resource.Resource; -import ru.windcorp.optica.common.resource.ResourceManager; -import ru.windcorp.optica.common.util.ByteBufferInputStream; +import ru.windcorp.progressia.client.graphics.backend.RenderTaskQueue; +import ru.windcorp.progressia.common.resource.Resource; +import ru.windcorp.progressia.common.resource.ResourceManager; +import ru.windcorp.progressia.common.util.ByteBufferInputStream; public class TextureManager { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/texture/TexturePrimitive.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TexturePrimitive.java similarity index 86% rename from src/main/java/ru/windcorp/optica/client/graphics/texture/TexturePrimitive.java rename to src/main/java/ru/windcorp/progressia/client/graphics/texture/TexturePrimitive.java index 40c8916..62c7db4 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/texture/TexturePrimitive.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TexturePrimitive.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.texture; +package ru.windcorp.progressia.client.graphics.texture; import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL20.*; -import ru.windcorp.optica.client.graphics.backend.OpenGLObjectTracker; -import ru.windcorp.optica.client.graphics.backend.OpenGLObjectTracker.OpenGLDeletable; +import ru.windcorp.progressia.client.graphics.backend.OpenGLObjectTracker; +import ru.windcorp.progressia.client.graphics.backend.OpenGLObjectTracker.OpenGLDeletable; public class TexturePrimitive implements OpenGLDeletable { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/texture/TextureSettings.java b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureSettings.java similarity index 92% rename from src/main/java/ru/windcorp/optica/client/graphics/texture/TextureSettings.java rename to src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureSettings.java index af422d1..7ab8517 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/texture/TextureSettings.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/texture/TextureSettings.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.texture; +package ru.windcorp.progressia.client.graphics.texture; public class TextureSettings { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/world/Camera.java b/src/main/java/ru/windcorp/progressia/client/graphics/world/Camera.java similarity index 91% rename from src/main/java/ru/windcorp/optica/client/graphics/world/Camera.java rename to src/main/java/ru/windcorp/progressia/client/graphics/world/Camera.java index 5ce57f1..0e93644 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/world/Camera.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/world/Camera.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.world; +package ru.windcorp.progressia.client.graphics.world; import static java.lang.Math.*; import glm.Glm; import glm.mat._4.Mat4; import glm.vec._3.Vec3; -import ru.windcorp.optica.client.graphics.backend.GraphicsInterface; +import ru.windcorp.progressia.client.graphics.backend.GraphicsInterface; public class Camera { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/world/LayerWorld.java b/src/main/java/ru/windcorp/progressia/client/graphics/world/LayerWorld.java similarity index 83% rename from src/main/java/ru/windcorp/optica/client/graphics/world/LayerWorld.java rename to src/main/java/ru/windcorp/progressia/client/graphics/world/LayerWorld.java index fecbe81..fbda751 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/world/LayerWorld.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/world/LayerWorld.java @@ -15,23 +15,23 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.world; +package ru.windcorp.progressia.client.graphics.world; import org.lwjgl.glfw.GLFW; import glm.mat._3.Mat3; import glm.vec._3.Vec3; -import ru.windcorp.optica.client.graphics.Layer; -import ru.windcorp.optica.client.graphics.backend.GraphicsBackend; -import ru.windcorp.optica.client.graphics.backend.GraphicsInterface; -import ru.windcorp.optica.client.graphics.input.CursorMoveEvent; -import ru.windcorp.optica.client.graphics.input.InputEvent; -import ru.windcorp.optica.client.graphics.input.KeyEvent; -import ru.windcorp.optica.client.graphics.input.bus.Input; -import ru.windcorp.optica.client.world.WorldRender; -import ru.windcorp.optica.common.block.BlockData; -import ru.windcorp.optica.common.block.BlockDataRegistry; -import ru.windcorp.optica.common.world.WorldData; +import ru.windcorp.progressia.client.graphics.Layer; +import ru.windcorp.progressia.client.graphics.backend.GraphicsBackend; +import ru.windcorp.progressia.client.graphics.backend.GraphicsInterface; +import ru.windcorp.progressia.client.graphics.input.CursorMoveEvent; +import ru.windcorp.progressia.client.graphics.input.InputEvent; +import ru.windcorp.progressia.client.graphics.input.KeyEvent; +import ru.windcorp.progressia.client.graphics.input.bus.Input; +import ru.windcorp.progressia.client.world.WorldRender; +import ru.windcorp.progressia.common.block.BlockData; +import ru.windcorp.progressia.common.block.BlockDataRegistry; +import ru.windcorp.progressia.common.world.WorldData; public class LayerWorld extends Layer { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/world/WorldRenderHelper.java b/src/main/java/ru/windcorp/progressia/client/graphics/world/WorldRenderHelper.java similarity index 87% rename from src/main/java/ru/windcorp/optica/client/graphics/world/WorldRenderHelper.java rename to src/main/java/ru/windcorp/progressia/client/graphics/world/WorldRenderHelper.java index 6bc6657..0668252 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/world/WorldRenderHelper.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/world/WorldRenderHelper.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.world; +package ru.windcorp.progressia.client.graphics.world; import glm.mat._4.Mat4; -import ru.windcorp.optica.client.graphics.model.ShapeRenderHelper; -import ru.windcorp.optica.common.util.StashingStack; +import ru.windcorp.progressia.client.graphics.model.ShapeRenderHelper; +import ru.windcorp.progressia.common.util.StashingStack; public class WorldRenderHelper extends ShapeRenderHelper { diff --git a/src/main/java/ru/windcorp/optica/client/graphics/world/WorldRenderProgram.java b/src/main/java/ru/windcorp/progressia/client/graphics/world/WorldRenderProgram.java similarity index 89% rename from src/main/java/ru/windcorp/optica/client/graphics/world/WorldRenderProgram.java rename to src/main/java/ru/windcorp/progressia/client/graphics/world/WorldRenderProgram.java index a865437..d8dfac8 100644 --- a/src/main/java/ru/windcorp/optica/client/graphics/world/WorldRenderProgram.java +++ b/src/main/java/ru/windcorp/progressia/client/graphics/world/WorldRenderProgram.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.graphics.world; +package ru.windcorp.progressia.client.graphics.world; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -28,13 +28,13 @@ import com.google.common.collect.ObjectArrays; import glm.vec._2.Vec2; import glm.vec._3.Vec3; -import ru.windcorp.optica.client.graphics.backend.VertexBufferObject; -import ru.windcorp.optica.client.graphics.backend.shaders.attributes.*; -import ru.windcorp.optica.client.graphics.backend.shaders.uniforms.*; -import ru.windcorp.optica.client.graphics.model.Face; -import ru.windcorp.optica.client.graphics.model.Shape; -import ru.windcorp.optica.client.graphics.model.ShapeRenderHelper; -import ru.windcorp.optica.client.graphics.model.ShapeRenderProgram; +import ru.windcorp.progressia.client.graphics.backend.VertexBufferObject; +import ru.windcorp.progressia.client.graphics.backend.shaders.attributes.*; +import ru.windcorp.progressia.client.graphics.backend.shaders.uniforms.*; +import ru.windcorp.progressia.client.graphics.model.Face; +import ru.windcorp.progressia.client.graphics.model.Shape; +import ru.windcorp.progressia.client.graphics.model.ShapeRenderHelper; +import ru.windcorp.progressia.client.graphics.model.ShapeRenderProgram; public class WorldRenderProgram extends ShapeRenderProgram { diff --git a/src/main/java/ru/windcorp/optica/client/world/ChunkRender.java b/src/main/java/ru/windcorp/progressia/client/world/ChunkRender.java similarity index 78% rename from src/main/java/ru/windcorp/optica/client/world/ChunkRender.java rename to src/main/java/ru/windcorp/progressia/client/world/ChunkRender.java index 753b6c2..37f88e4 100644 --- a/src/main/java/ru/windcorp/optica/client/world/ChunkRender.java +++ b/src/main/java/ru/windcorp/progressia/client/world/ChunkRender.java @@ -15,25 +15,25 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.world; +package ru.windcorp.progressia.client.world; import java.util.HashMap; import java.util.Map; import glm.mat._4.Mat4; -import ru.windcorp.optica.client.graphics.model.Model; -import ru.windcorp.optica.client.graphics.model.Shape; -import ru.windcorp.optica.client.graphics.model.StaticModel; -import ru.windcorp.optica.client.graphics.model.StaticModel.Builder; -import ru.windcorp.optica.client.graphics.model.WorldRenderable; -import ru.windcorp.optica.client.graphics.model.ShapeRenderHelper; -import ru.windcorp.optica.client.world.renders.BlockRender; -import ru.windcorp.optica.client.world.renders.BlockRenderNone; -import ru.windcorp.optica.client.world.renders.BlockRenders; -import ru.windcorp.optica.client.world.renders.bro.BlockRenderOptimizer; -import ru.windcorp.optica.client.world.renders.bro.BlockRenderOptimizerGenerator; -import ru.windcorp.optica.client.world.renders.bro.BlockRenderOptimizerGenerators; -import ru.windcorp.optica.common.world.ChunkData; +import ru.windcorp.progressia.client.graphics.model.Model; +import ru.windcorp.progressia.client.graphics.model.Shape; +import ru.windcorp.progressia.client.graphics.model.ShapeRenderHelper; +import ru.windcorp.progressia.client.graphics.model.StaticModel; +import ru.windcorp.progressia.client.graphics.model.WorldRenderable; +import ru.windcorp.progressia.client.graphics.model.StaticModel.Builder; +import ru.windcorp.progressia.client.world.renders.BlockRender; +import ru.windcorp.progressia.client.world.renders.BlockRenderNone; +import ru.windcorp.progressia.client.world.renders.BlockRenders; +import ru.windcorp.progressia.client.world.renders.bro.BlockRenderOptimizer; +import ru.windcorp.progressia.client.world.renders.bro.BlockRenderOptimizerGenerator; +import ru.windcorp.progressia.client.world.renders.bro.BlockRenderOptimizerGenerators; +import ru.windcorp.progressia.common.world.ChunkData; public class ChunkRender { diff --git a/src/main/java/ru/windcorp/optica/client/world/WorldRender.java b/src/main/java/ru/windcorp/progressia/client/world/WorldRender.java similarity index 85% rename from src/main/java/ru/windcorp/optica/client/world/WorldRender.java rename to src/main/java/ru/windcorp/progressia/client/world/WorldRender.java index b037e7b..6ffb15d 100644 --- a/src/main/java/ru/windcorp/optica/client/world/WorldRender.java +++ b/src/main/java/ru/windcorp/progressia/client/world/WorldRender.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.world; +package ru.windcorp.progressia.client.world; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import ru.windcorp.optica.client.graphics.model.ShapeRenderHelper; -import ru.windcorp.optica.common.world.ChunkData; -import ru.windcorp.optica.common.world.WorldData; +import ru.windcorp.progressia.client.graphics.model.ShapeRenderHelper; +import ru.windcorp.progressia.common.world.ChunkData; +import ru.windcorp.progressia.common.world.WorldData; public class WorldRender { diff --git a/src/main/java/ru/windcorp/optica/client/world/renders/BlockRender.java b/src/main/java/ru/windcorp/progressia/client/world/renders/BlockRender.java similarity index 82% rename from src/main/java/ru/windcorp/optica/client/world/renders/BlockRender.java rename to src/main/java/ru/windcorp/progressia/client/world/renders/BlockRender.java index faadf63..9d6854d 100644 --- a/src/main/java/ru/windcorp/optica/client/world/renders/BlockRender.java +++ b/src/main/java/ru/windcorp/progressia/client/world/renders/BlockRender.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.world.renders; +package ru.windcorp.progressia.client.world.renders; -import ru.windcorp.optica.client.graphics.model.WorldRenderable; -import ru.windcorp.optica.client.graphics.model.ShapeRenderHelper; -import ru.windcorp.optica.common.util.Namespaced; +import ru.windcorp.progressia.client.graphics.model.ShapeRenderHelper; +import ru.windcorp.progressia.client.graphics.model.WorldRenderable; +import ru.windcorp.progressia.common.util.Namespaced; public abstract class BlockRender extends Namespaced { diff --git a/src/main/java/ru/windcorp/optica/client/world/renders/BlockRenderNone.java b/src/main/java/ru/windcorp/progressia/client/world/renders/BlockRenderNone.java similarity index 83% rename from src/main/java/ru/windcorp/optica/client/world/renders/BlockRenderNone.java rename to src/main/java/ru/windcorp/progressia/client/world/renders/BlockRenderNone.java index 2111d4c..717ae88 100644 --- a/src/main/java/ru/windcorp/optica/client/world/renders/BlockRenderNone.java +++ b/src/main/java/ru/windcorp/progressia/client/world/renders/BlockRenderNone.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.world.renders; +package ru.windcorp.progressia.client.world.renders; -import ru.windcorp.optica.client.graphics.model.EmptyModel; -import ru.windcorp.optica.client.graphics.model.WorldRenderable; +import ru.windcorp.progressia.client.graphics.model.EmptyModel; +import ru.windcorp.progressia.client.graphics.model.WorldRenderable; public class BlockRenderNone extends BlockRender { diff --git a/src/main/java/ru/windcorp/optica/client/world/renders/BlockRenderTexturedCube.java b/src/main/java/ru/windcorp/progressia/client/world/renders/BlockRenderTexturedCube.java similarity index 78% rename from src/main/java/ru/windcorp/optica/client/world/renders/BlockRenderTexturedCube.java rename to src/main/java/ru/windcorp/progressia/client/world/renders/BlockRenderTexturedCube.java index 4359882..9614c77 100644 --- a/src/main/java/ru/windcorp/optica/client/world/renders/BlockRenderTexturedCube.java +++ b/src/main/java/ru/windcorp/progressia/client/world/renders/BlockRenderTexturedCube.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.world.renders; +package ru.windcorp.progressia.client.world.renders; -import static ru.windcorp.optica.common.block.BlockFace.*; +import static ru.windcorp.progressia.common.block.BlockFace.*; import java.util.EnumMap; -import ru.windcorp.optica.client.graphics.model.Shapes; -import ru.windcorp.optica.client.graphics.model.WorldRenderable; -import ru.windcorp.optica.client.graphics.texture.Texture; -import ru.windcorp.optica.client.graphics.world.WorldRenderProgram; -import ru.windcorp.optica.common.block.BlockFace; +import ru.windcorp.progressia.client.graphics.model.Shapes; +import ru.windcorp.progressia.client.graphics.model.WorldRenderable; +import ru.windcorp.progressia.client.graphics.texture.Texture; +import ru.windcorp.progressia.client.graphics.world.WorldRenderProgram; +import ru.windcorp.progressia.common.block.BlockFace; public abstract class BlockRenderTexturedCube extends BlockRender { diff --git a/src/main/java/ru/windcorp/optica/client/world/renders/BlockRenderTransparentCube.java b/src/main/java/ru/windcorp/progressia/client/world/renders/BlockRenderTransparentCube.java similarity index 89% rename from src/main/java/ru/windcorp/optica/client/world/renders/BlockRenderTransparentCube.java rename to src/main/java/ru/windcorp/progressia/client/world/renders/BlockRenderTransparentCube.java index efca0ec..b616013 100644 --- a/src/main/java/ru/windcorp/optica/client/world/renders/BlockRenderTransparentCube.java +++ b/src/main/java/ru/windcorp/progressia/client/world/renders/BlockRenderTransparentCube.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.world.renders; +package ru.windcorp.progressia.client.world.renders; -import ru.windcorp.optica.client.graphics.texture.Texture; +import ru.windcorp.progressia.client.graphics.texture.Texture; public class BlockRenderTransparentCube extends BlockRenderTexturedCube { diff --git a/src/main/java/ru/windcorp/optica/client/world/renders/BlockRenders.java b/src/main/java/ru/windcorp/progressia/client/world/renders/BlockRenders.java similarity index 81% rename from src/main/java/ru/windcorp/optica/client/world/renders/BlockRenders.java rename to src/main/java/ru/windcorp/progressia/client/world/renders/BlockRenders.java index 7c1bbca..e1c9eac 100644 --- a/src/main/java/ru/windcorp/optica/client/world/renders/BlockRenders.java +++ b/src/main/java/ru/windcorp/progressia/client/world/renders/BlockRenders.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.world.renders; +package ru.windcorp.progressia.client.world.renders; import java.util.HashMap; import java.util.Map; -import ru.windcorp.optica.client.graphics.texture.SimpleTexture; -import ru.windcorp.optica.client.graphics.texture.Sprite; -import ru.windcorp.optica.client.graphics.texture.Texture; -import ru.windcorp.optica.client.graphics.texture.TextureManager; -import ru.windcorp.optica.client.graphics.texture.TextureSettings; -import ru.windcorp.optica.client.world.renders.bro.BlockRenderOpaqueCube; +import ru.windcorp.progressia.client.graphics.texture.SimpleTexture; +import ru.windcorp.progressia.client.graphics.texture.Sprite; +import ru.windcorp.progressia.client.graphics.texture.Texture; +import ru.windcorp.progressia.client.graphics.texture.TextureManager; +import ru.windcorp.progressia.client.graphics.texture.TextureSettings; +import ru.windcorp.progressia.client.world.renders.bro.BlockRenderOpaqueCube; public class BlockRenders { diff --git a/src/main/java/ru/windcorp/optica/client/world/renders/bro/BlockRenderOpaqueCube.java b/src/main/java/ru/windcorp/progressia/client/world/renders/bro/BlockRenderOpaqueCube.java similarity index 84% rename from src/main/java/ru/windcorp/optica/client/world/renders/bro/BlockRenderOpaqueCube.java rename to src/main/java/ru/windcorp/progressia/client/world/renders/bro/BlockRenderOpaqueCube.java index 2342a9c..c14ed75 100644 --- a/src/main/java/ru/windcorp/optica/client/world/renders/bro/BlockRenderOpaqueCube.java +++ b/src/main/java/ru/windcorp/progressia/client/world/renders/bro/BlockRenderOpaqueCube.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.world.renders.bro; +package ru.windcorp.progressia.client.world.renders.bro; -import ru.windcorp.optica.client.graphics.texture.Texture; -import ru.windcorp.optica.client.world.renders.BlockRenderTexturedCube; +import ru.windcorp.progressia.client.graphics.texture.Texture; +import ru.windcorp.progressia.client.world.renders.BlockRenderTexturedCube; public class BlockRenderOpaqueCube extends BlockRenderTexturedCube { diff --git a/src/main/java/ru/windcorp/optica/client/world/renders/bro/BlockRenderOpaqueCubeOptimizer.java b/src/main/java/ru/windcorp/progressia/client/world/renders/bro/BlockRenderOpaqueCubeOptimizer.java similarity index 82% rename from src/main/java/ru/windcorp/optica/client/world/renders/bro/BlockRenderOpaqueCubeOptimizer.java rename to src/main/java/ru/windcorp/progressia/client/world/renders/bro/BlockRenderOpaqueCubeOptimizer.java index 002e160..1c28468 100644 --- a/src/main/java/ru/windcorp/optica/client/world/renders/bro/BlockRenderOpaqueCubeOptimizer.java +++ b/src/main/java/ru/windcorp/progressia/client/world/renders/bro/BlockRenderOpaqueCubeOptimizer.java @@ -15,24 +15,24 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.world.renders.bro; +package ru.windcorp.progressia.client.world.renders.bro; -import static ru.windcorp.optica.common.world.ChunkData.BLOCKS_PER_CHUNK; +import static ru.windcorp.progressia.common.world.ChunkData.BLOCKS_PER_CHUNK; import java.util.ArrayList; import java.util.Collection; import glm.vec._3.Vec3; -import ru.windcorp.optica.client.graphics.backend.Usage; -import ru.windcorp.optica.client.graphics.model.Face; -import ru.windcorp.optica.client.graphics.model.Faces; -import ru.windcorp.optica.client.graphics.model.Shape; -import ru.windcorp.optica.client.graphics.texture.Texture; -import ru.windcorp.optica.client.graphics.world.WorldRenderProgram; -import ru.windcorp.optica.client.world.ChunkRender; -import ru.windcorp.optica.client.world.renders.BlockRender; -import ru.windcorp.optica.common.block.BlockFace; -import ru.windcorp.optica.common.world.ChunkData; +import ru.windcorp.progressia.client.graphics.backend.Usage; +import ru.windcorp.progressia.client.graphics.model.Face; +import ru.windcorp.progressia.client.graphics.model.Faces; +import ru.windcorp.progressia.client.graphics.model.Shape; +import ru.windcorp.progressia.client.graphics.texture.Texture; +import ru.windcorp.progressia.client.graphics.world.WorldRenderProgram; +import ru.windcorp.progressia.client.world.ChunkRender; +import ru.windcorp.progressia.client.world.renders.BlockRender; +import ru.windcorp.progressia.common.block.BlockFace; +import ru.windcorp.progressia.common.world.ChunkData; public class BlockRenderOpaqueCubeOptimizer extends BlockRenderOptimizer { diff --git a/src/main/java/ru/windcorp/optica/client/world/renders/bro/BlockRenderOptimizer.java b/src/main/java/ru/windcorp/progressia/client/world/renders/bro/BlockRenderOptimizer.java similarity index 80% rename from src/main/java/ru/windcorp/optica/client/world/renders/bro/BlockRenderOptimizer.java rename to src/main/java/ru/windcorp/progressia/client/world/renders/bro/BlockRenderOptimizer.java index 33a6f8f..f604ef7 100644 --- a/src/main/java/ru/windcorp/optica/client/world/renders/bro/BlockRenderOptimizer.java +++ b/src/main/java/ru/windcorp/progressia/client/world/renders/bro/BlockRenderOptimizer.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.world.renders.bro; +package ru.windcorp.progressia.client.world.renders.bro; -import ru.windcorp.optica.client.graphics.model.Shape; -import ru.windcorp.optica.client.world.ChunkRender; -import ru.windcorp.optica.client.world.renders.BlockRender; +import ru.windcorp.progressia.client.graphics.model.Shape; +import ru.windcorp.progressia.client.world.ChunkRender; +import ru.windcorp.progressia.client.world.renders.BlockRender; public abstract class BlockRenderOptimizer { diff --git a/src/main/java/ru/windcorp/optica/client/world/renders/bro/BlockRenderOptimizerGenerator.java b/src/main/java/ru/windcorp/progressia/client/world/renders/bro/BlockRenderOptimizerGenerator.java similarity index 88% rename from src/main/java/ru/windcorp/optica/client/world/renders/bro/BlockRenderOptimizerGenerator.java rename to src/main/java/ru/windcorp/progressia/client/world/renders/bro/BlockRenderOptimizerGenerator.java index 04cd326..7506513 100644 --- a/src/main/java/ru/windcorp/optica/client/world/renders/bro/BlockRenderOptimizerGenerator.java +++ b/src/main/java/ru/windcorp/progressia/client/world/renders/bro/BlockRenderOptimizerGenerator.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.world.renders.bro; +package ru.windcorp.progressia.client.world.renders.bro; -import ru.windcorp.optica.common.util.Namespaced; +import ru.windcorp.progressia.common.util.Namespaced; public abstract class BlockRenderOptimizerGenerator extends Namespaced { diff --git a/src/main/java/ru/windcorp/optica/client/world/renders/bro/BlockRenderOptimizerGenerators.java b/src/main/java/ru/windcorp/progressia/client/world/renders/bro/BlockRenderOptimizerGenerators.java similarity index 93% rename from src/main/java/ru/windcorp/optica/client/world/renders/bro/BlockRenderOptimizerGenerators.java rename to src/main/java/ru/windcorp/progressia/client/world/renders/bro/BlockRenderOptimizerGenerators.java index a72db7f..bc634dd 100644 --- a/src/main/java/ru/windcorp/optica/client/world/renders/bro/BlockRenderOptimizerGenerators.java +++ b/src/main/java/ru/windcorp/progressia/client/world/renders/bro/BlockRenderOptimizerGenerators.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.client.world.renders.bro; +package ru.windcorp.progressia.client.world.renders.bro; import java.util.Collection; import java.util.HashMap; diff --git a/src/main/java/ru/windcorp/optica/common/block/BlockData.java b/src/main/java/ru/windcorp/progressia/common/block/BlockData.java similarity index 88% rename from src/main/java/ru/windcorp/optica/common/block/BlockData.java rename to src/main/java/ru/windcorp/progressia/common/block/BlockData.java index 84b56a0..f06be40 100644 --- a/src/main/java/ru/windcorp/optica/common/block/BlockData.java +++ b/src/main/java/ru/windcorp/progressia/common/block/BlockData.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.common.block; +package ru.windcorp.progressia.common.block; -import ru.windcorp.optica.common.util.Namespaced; +import ru.windcorp.progressia.common.util.Namespaced; public class BlockData extends Namespaced { diff --git a/src/main/java/ru/windcorp/optica/common/block/BlockDataRegistry.java b/src/main/java/ru/windcorp/progressia/common/block/BlockDataRegistry.java similarity index 94% rename from src/main/java/ru/windcorp/optica/common/block/BlockDataRegistry.java rename to src/main/java/ru/windcorp/progressia/common/block/BlockDataRegistry.java index cb6691c..0a98a2b 100644 --- a/src/main/java/ru/windcorp/optica/common/block/BlockDataRegistry.java +++ b/src/main/java/ru/windcorp/progressia/common/block/BlockDataRegistry.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.common.block; +package ru.windcorp.progressia.common.block; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/ru/windcorp/optica/common/block/BlockFace.java b/src/main/java/ru/windcorp/progressia/common/block/BlockFace.java similarity index 93% rename from src/main/java/ru/windcorp/optica/common/block/BlockFace.java rename to src/main/java/ru/windcorp/progressia/common/block/BlockFace.java index 93873f5..df4763f 100644 --- a/src/main/java/ru/windcorp/optica/common/block/BlockFace.java +++ b/src/main/java/ru/windcorp/progressia/common/block/BlockFace.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.common.block; +package ru.windcorp.progressia.common.block; public enum BlockFace { diff --git a/src/main/java/ru/windcorp/optica/common/resource/Resource.java b/src/main/java/ru/windcorp/progressia/common/resource/Resource.java similarity index 87% rename from src/main/java/ru/windcorp/optica/common/resource/Resource.java rename to src/main/java/ru/windcorp/progressia/common/resource/Resource.java index 83168d3..0a3251b 100644 --- a/src/main/java/ru/windcorp/optica/common/resource/Resource.java +++ b/src/main/java/ru/windcorp/progressia/common/resource/Resource.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.common.resource; +package ru.windcorp.progressia.common.resource; import java.io.IOException; import java.io.InputStream; @@ -24,7 +24,7 @@ import java.io.Reader; import com.google.common.io.CharStreams; -import ru.windcorp.optica.Optica; +import ru.windcorp.progressia.Progressia; public class Resource { @@ -40,7 +40,7 @@ public class Resource { public InputStream getInputStream() { // TODO Do proper resource lookup - return Optica.class.getClassLoader().getResourceAsStream(name); + return Progressia.class.getClassLoader().getResourceAsStream(name); } public Reader getReader() { diff --git a/src/main/java/ru/windcorp/optica/common/resource/ResourceManager.java b/src/main/java/ru/windcorp/progressia/common/resource/ResourceManager.java similarity index 92% rename from src/main/java/ru/windcorp/optica/common/resource/ResourceManager.java rename to src/main/java/ru/windcorp/progressia/common/resource/ResourceManager.java index 1751549..ed42faf 100644 --- a/src/main/java/ru/windcorp/optica/common/resource/ResourceManager.java +++ b/src/main/java/ru/windcorp/progressia/common/resource/ResourceManager.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.common.resource; +package ru.windcorp.progressia.common.resource; public class ResourceManager { diff --git a/src/main/java/ru/windcorp/optica/common/util/BinUtil.java b/src/main/java/ru/windcorp/progressia/common/util/BinUtil.java similarity index 93% rename from src/main/java/ru/windcorp/optica/common/util/BinUtil.java rename to src/main/java/ru/windcorp/progressia/common/util/BinUtil.java index 10193fd..115a036 100644 --- a/src/main/java/ru/windcorp/optica/common/util/BinUtil.java +++ b/src/main/java/ru/windcorp/progressia/common/util/BinUtil.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.common.util; +package ru.windcorp.progressia.common.util; public class BinUtil { diff --git a/src/main/java/ru/windcorp/optica/common/util/ByteBufferInputStream.java b/src/main/java/ru/windcorp/progressia/common/util/ByteBufferInputStream.java similarity index 94% rename from src/main/java/ru/windcorp/optica/common/util/ByteBufferInputStream.java rename to src/main/java/ru/windcorp/progressia/common/util/ByteBufferInputStream.java index 4705a65..84b3419 100644 --- a/src/main/java/ru/windcorp/optica/common/util/ByteBufferInputStream.java +++ b/src/main/java/ru/windcorp/progressia/common/util/ByteBufferInputStream.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.common.util; +package ru.windcorp.progressia.common.util; import java.io.InputStream; import java.nio.ByteBuffer; diff --git a/src/main/java/ru/windcorp/optica/common/util/ByteBufferOutputStream.java b/src/main/java/ru/windcorp/progressia/common/util/ByteBufferOutputStream.java similarity index 94% rename from src/main/java/ru/windcorp/optica/common/util/ByteBufferOutputStream.java rename to src/main/java/ru/windcorp/progressia/common/util/ByteBufferOutputStream.java index 9ccd754..8149f9f 100644 --- a/src/main/java/ru/windcorp/optica/common/util/ByteBufferOutputStream.java +++ b/src/main/java/ru/windcorp/progressia/common/util/ByteBufferOutputStream.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.common.util; +package ru.windcorp.progressia.common.util; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/ru/windcorp/optica/common/util/CoordinatePacker.java b/src/main/java/ru/windcorp/progressia/common/util/CoordinatePacker.java similarity index 95% rename from src/main/java/ru/windcorp/optica/common/util/CoordinatePacker.java rename to src/main/java/ru/windcorp/progressia/common/util/CoordinatePacker.java index d54e6e2..dff5039 100644 --- a/src/main/java/ru/windcorp/optica/common/util/CoordinatePacker.java +++ b/src/main/java/ru/windcorp/progressia/common/util/CoordinatePacker.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.common.util; +package ru.windcorp.progressia.common.util; public class CoordinatePacker { diff --git a/src/main/java/ru/windcorp/optica/common/util/Named.java b/src/main/java/ru/windcorp/progressia/common/util/Named.java similarity index 93% rename from src/main/java/ru/windcorp/optica/common/util/Named.java rename to src/main/java/ru/windcorp/progressia/common/util/Named.java index c008838..9cbd6da 100644 --- a/src/main/java/ru/windcorp/optica/common/util/Named.java +++ b/src/main/java/ru/windcorp/progressia/common/util/Named.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.common.util; +package ru.windcorp.progressia.common.util; import java.util.Objects; diff --git a/src/main/java/ru/windcorp/optica/common/util/Namespaced.java b/src/main/java/ru/windcorp/progressia/common/util/Namespaced.java similarity index 94% rename from src/main/java/ru/windcorp/optica/common/util/Namespaced.java rename to src/main/java/ru/windcorp/progressia/common/util/Namespaced.java index c54a2a6..8d7f838 100644 --- a/src/main/java/ru/windcorp/optica/common/util/Namespaced.java +++ b/src/main/java/ru/windcorp/progressia/common/util/Namespaced.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.common.util; +package ru.windcorp.progressia.common.util; import java.util.Objects; import java.util.function.Predicate; diff --git a/src/main/java/ru/windcorp/optica/common/util/StashingStack.java b/src/main/java/ru/windcorp/progressia/common/util/StashingStack.java similarity index 95% rename from src/main/java/ru/windcorp/optica/common/util/StashingStack.java rename to src/main/java/ru/windcorp/progressia/common/util/StashingStack.java index e7d520e..5d27171 100644 --- a/src/main/java/ru/windcorp/optica/common/util/StashingStack.java +++ b/src/main/java/ru/windcorp/progressia/common/util/StashingStack.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.common.util; +package ru.windcorp.progressia.common.util; import java.util.Arrays; import java.util.Iterator; diff --git a/src/main/java/ru/windcorp/optica/common/util/ThrowingRunnable.java b/src/main/java/ru/windcorp/progressia/common/util/ThrowingRunnable.java similarity index 93% rename from src/main/java/ru/windcorp/optica/common/util/ThrowingRunnable.java rename to src/main/java/ru/windcorp/progressia/common/util/ThrowingRunnable.java index 5602d0d..562840d 100644 --- a/src/main/java/ru/windcorp/optica/common/util/ThrowingRunnable.java +++ b/src/main/java/ru/windcorp/progressia/common/util/ThrowingRunnable.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.common.util; +package ru.windcorp.progressia.common.util; import java.util.function.Consumer; diff --git a/src/main/java/ru/windcorp/optica/common/world/ChunkData.java b/src/main/java/ru/windcorp/progressia/common/world/ChunkData.java similarity index 91% rename from src/main/java/ru/windcorp/optica/common/world/ChunkData.java rename to src/main/java/ru/windcorp/progressia/common/world/ChunkData.java index a03efae..4396c72 100644 --- a/src/main/java/ru/windcorp/optica/common/world/ChunkData.java +++ b/src/main/java/ru/windcorp/progressia/common/world/ChunkData.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.common.world; +package ru.windcorp.progressia.common.world; import glm.vec._3.i.Vec3i; -import ru.windcorp.optica.common.block.BlockData; -import ru.windcorp.optica.common.block.BlockDataRegistry; +import ru.windcorp.progressia.common.block.BlockData; +import ru.windcorp.progressia.common.block.BlockDataRegistry; public class ChunkData { diff --git a/src/main/java/ru/windcorp/optica/common/world/WorldData.java b/src/main/java/ru/windcorp/progressia/common/world/WorldData.java similarity index 91% rename from src/main/java/ru/windcorp/optica/common/world/WorldData.java rename to src/main/java/ru/windcorp/progressia/common/world/WorldData.java index 3db4455..2d421ba 100644 --- a/src/main/java/ru/windcorp/optica/common/world/WorldData.java +++ b/src/main/java/ru/windcorp/progressia/common/world/WorldData.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.common.world; +package ru.windcorp.progressia.common.world; import java.util.Collection; import java.util.Collections; import gnu.trove.map.TLongObjectMap; import gnu.trove.map.hash.TLongObjectHashMap; -import ru.windcorp.optica.common.util.CoordinatePacker; +import ru.windcorp.progressia.common.util.CoordinatePacker; public class WorldData { diff --git a/src/test/java/ru/windcorp/optica/util/BinUtilIsPowerOf2Test.java b/src/test/java/ru/windcorp/progressia/util/BinUtilIsPowerOf2Test.java similarity index 91% rename from src/test/java/ru/windcorp/optica/util/BinUtilIsPowerOf2Test.java rename to src/test/java/ru/windcorp/progressia/util/BinUtilIsPowerOf2Test.java index 8db1b18..eca5b9e 100644 --- a/src/test/java/ru/windcorp/optica/util/BinUtilIsPowerOf2Test.java +++ b/src/test/java/ru/windcorp/progressia/util/BinUtilIsPowerOf2Test.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.util; +package ru.windcorp.progressia.util; import static org.junit.Assert.assertEquals; @@ -23,7 +23,7 @@ import java.util.Random; import org.junit.Test; -import ru.windcorp.optica.common.util.BinUtil; +import ru.windcorp.progressia.common.util.BinUtil; public class BinUtilIsPowerOf2Test { diff --git a/src/test/java/ru/windcorp/optica/util/BinUtilRoundTest.java b/src/test/java/ru/windcorp/progressia/util/BinUtilRoundTest.java similarity index 91% rename from src/test/java/ru/windcorp/optica/util/BinUtilRoundTest.java rename to src/test/java/ru/windcorp/progressia/util/BinUtilRoundTest.java index b959a81..d696f9a 100644 --- a/src/test/java/ru/windcorp/optica/util/BinUtilRoundTest.java +++ b/src/test/java/ru/windcorp/progressia/util/BinUtilRoundTest.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.util; +package ru.windcorp.progressia.util; import static org.junit.Assert.assertEquals; @@ -23,7 +23,7 @@ import java.util.Random; import org.junit.Test; -import ru.windcorp.optica.common.util.BinUtil; +import ru.windcorp.progressia.common.util.BinUtil; public class BinUtilRoundTest { diff --git a/src/test/java/ru/windcorp/optica/util/CoordinatePacker2Test.java b/src/test/java/ru/windcorp/progressia/util/CoordinatePacker2Test.java similarity index 91% rename from src/test/java/ru/windcorp/optica/util/CoordinatePacker2Test.java rename to src/test/java/ru/windcorp/progressia/util/CoordinatePacker2Test.java index b7b667f..1e466a4 100644 --- a/src/test/java/ru/windcorp/optica/util/CoordinatePacker2Test.java +++ b/src/test/java/ru/windcorp/progressia/util/CoordinatePacker2Test.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.util; +package ru.windcorp.progressia.util; import static org.junit.Assert.assertEquals; @@ -23,7 +23,7 @@ import java.util.Random; import org.junit.Test; -import ru.windcorp.optica.common.util.CoordinatePacker; +import ru.windcorp.progressia.common.util.CoordinatePacker; public class CoordinatePacker2Test { diff --git a/src/test/java/ru/windcorp/optica/util/CoordinatePacker3Test.java b/src/test/java/ru/windcorp/progressia/util/CoordinatePacker3Test.java similarity index 92% rename from src/test/java/ru/windcorp/optica/util/CoordinatePacker3Test.java rename to src/test/java/ru/windcorp/progressia/util/CoordinatePacker3Test.java index 06fcb46..a8e69c5 100644 --- a/src/test/java/ru/windcorp/optica/util/CoordinatePacker3Test.java +++ b/src/test/java/ru/windcorp/progressia/util/CoordinatePacker3Test.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.util; +package ru.windcorp.progressia.util; import static org.junit.Assert.assertEquals; @@ -23,7 +23,7 @@ import java.util.Random; import org.junit.Test; -import ru.windcorp.optica.common.util.CoordinatePacker; +import ru.windcorp.progressia.common.util.CoordinatePacker; public class CoordinatePacker3Test { diff --git a/src/test/java/ru/windcorp/optica/util/NamespacedTest.java b/src/test/java/ru/windcorp/progressia/util/NamespacedTest.java similarity index 94% rename from src/test/java/ru/windcorp/optica/util/NamespacedTest.java rename to src/test/java/ru/windcorp/progressia/util/NamespacedTest.java index 5a5a678..b98b524 100644 --- a/src/test/java/ru/windcorp/optica/util/NamespacedTest.java +++ b/src/test/java/ru/windcorp/progressia/util/NamespacedTest.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.util; +package ru.windcorp.progressia.util; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -29,7 +29,7 @@ import java.util.Random; import org.junit.Test; import junit.framework.AssertionFailedError; -import ru.windcorp.optica.common.util.Namespaced; +import ru.windcorp.progressia.common.util.Namespaced; public class NamespacedTest { diff --git a/src/test/java/ru/windcorp/optica/util/StashingStackTest.java b/src/test/java/ru/windcorp/progressia/util/StashingStackTest.java similarity index 93% rename from src/test/java/ru/windcorp/optica/util/StashingStackTest.java rename to src/test/java/ru/windcorp/progressia/util/StashingStackTest.java index 7aecb27..f00cace 100644 --- a/src/test/java/ru/windcorp/optica/util/StashingStackTest.java +++ b/src/test/java/ru/windcorp/progressia/util/StashingStackTest.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . *******************************************************************************/ -package ru.windcorp.optica.util; +package ru.windcorp.progressia.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -30,7 +30,7 @@ import org.junit.Test; import com.google.common.collect.Iterators; -import ru.windcorp.optica.common.util.StashingStack; +import ru.windcorp.progressia.common.util.StashingStack; public class StashingStackTest {