Moved everything into ru.windcorp.progressia package

This commit is contained in:
OLEGSHA 2020-08-10 12:22:45 +03:00
parent 45b0ad2888
commit 4cf0324f1a
133 changed files with 372 additions and 380 deletions

View File

@ -15,8 +15,8 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica; package ru.windcorp.progressia;
public class Optica { public class Progressia {
} }

View File

@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica; package ru.windcorp.progressia;
public class OpticaLauncher { public class ProgressiaLauncher {
public static void launch(String[] args, Proxy proxy) { public static void launch(String[] args, Proxy proxy) {
proxy.initialize(); proxy.initialize();

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica; package ru.windcorp.progressia;
public interface Proxy { public interface Proxy {

View File

@ -15,17 +15,17 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client; package ru.windcorp.progressia.client;
import ru.windcorp.optica.Proxy; import ru.windcorp.progressia.Proxy;
import ru.windcorp.optica.client.graphics.GUI; import ru.windcorp.progressia.client.graphics.GUI;
import ru.windcorp.optica.client.graphics.backend.GraphicsBackend; import ru.windcorp.progressia.client.graphics.backend.GraphicsBackend;
import ru.windcorp.optica.client.graphics.backend.RenderTaskQueue; import ru.windcorp.progressia.client.graphics.backend.RenderTaskQueue;
import ru.windcorp.optica.client.graphics.flat.FlatRenderProgram; import ru.windcorp.progressia.client.graphics.flat.FlatRenderProgram;
import ru.windcorp.optica.client.graphics.flat.LayerTestUI; import ru.windcorp.progressia.client.graphics.flat.LayerTestUI;
import ru.windcorp.optica.client.graphics.gui.LayerTestGUI; import ru.windcorp.progressia.client.graphics.gui.LayerTestGUI;
import ru.windcorp.optica.client.graphics.world.LayerWorld; import ru.windcorp.progressia.client.graphics.world.LayerWorld;
import ru.windcorp.optica.client.graphics.world.WorldRenderProgram; import ru.windcorp.progressia.client.graphics.world.WorldRenderProgram;
public class ClientProxy implements Proxy { public class ClientProxy implements Proxy {

View File

@ -15,14 +15,14 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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) { public static void main(String[] args) {
OpticaLauncher.launch(args, new ClientProxy()); ProgressiaLauncher.launch(args, new ClientProxy());
} }
} }

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics; package ru.windcorp.progressia.client.graphics;
public class Colors { public class Colors {

View File

@ -15,19 +15,19 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics; package ru.windcorp.progressia.client.graphics;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
import ru.windcorp.optica.client.graphics.input.CursorEvent; import ru.windcorp.progressia.client.graphics.input.CursorEvent;
import ru.windcorp.optica.client.graphics.input.FrameResizeEvent; import ru.windcorp.progressia.client.graphics.input.FrameResizeEvent;
import ru.windcorp.optica.client.graphics.input.InputEvent; import ru.windcorp.progressia.client.graphics.input.InputEvent;
import ru.windcorp.optica.client.graphics.input.KeyEvent; import ru.windcorp.progressia.client.graphics.input.KeyEvent;
import ru.windcorp.optica.client.graphics.input.WheelEvent; import ru.windcorp.progressia.client.graphics.input.WheelEvent;
import ru.windcorp.optica.client.graphics.input.bus.Input; import ru.windcorp.progressia.client.graphics.input.bus.Input;
public class GUI { public class GUI {

View File

@ -15,12 +15,12 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics; package ru.windcorp.progressia.client.graphics;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import ru.windcorp.optica.client.graphics.backend.GraphicsInterface; import ru.windcorp.progressia.client.graphics.backend.GraphicsInterface;
import ru.windcorp.optica.client.graphics.input.bus.Input; import ru.windcorp.progressia.client.graphics.input.bus.Input;
public abstract class Layer { public abstract class Layer {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.backend; package ru.windcorp.progressia.client.graphics.backend;
import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL11.*;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.backend; package ru.windcorp.progressia.client.graphics.backend;
import glm.vec._2.i.Vec2i; import glm.vec._2.i.Vec2i;

View File

@ -15,13 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.backend; package ru.windcorp.progressia.client.graphics.backend;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import com.google.common.eventbus.EventBus; import com.google.common.eventbus.EventBus;
import ru.windcorp.optica.client.graphics.input.*; import ru.windcorp.progressia.client.graphics.input.*;
public class InputHandler { public class InputHandler {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.backend; package ru.windcorp.progressia.client.graphics.backend;
import glm.vec._2.d.Vec2d; import glm.vec._2.d.Vec2d;
import gnu.trove.set.TIntSet; import gnu.trove.set.TIntSet;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.backend; package ru.windcorp.progressia.client.graphics.backend;
import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL11.*;
import static org.lwjgl.glfw.GLFW.*; import static org.lwjgl.glfw.GLFW.*;
@ -23,7 +23,7 @@ import static org.lwjgl.system.MemoryUtil.*;
import org.lwjgl.opengl.GL; import org.lwjgl.opengl.GL;
import ru.windcorp.optica.client.graphics.GUI; import ru.windcorp.progressia.client.graphics.GUI;
class LWJGLInitializer { class LWJGLInitializer {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.backend; package ru.windcorp.progressia.client.graphics.backend;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.backend; package ru.windcorp.progressia.client.graphics.backend;
import java.util.Iterator; import java.util.Iterator;
import java.util.Queue; import java.util.Queue;
@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import ru.windcorp.optica.common.util.ThrowingRunnable; import ru.windcorp.progressia.common.util.ThrowingRunnable;
public class RenderTaskQueue { public class RenderTaskQueue {

View File

@ -15,12 +15,12 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.backend; package ru.windcorp.progressia.client.graphics.backend;
import static org.lwjgl.glfw.GLFW.*; import static org.lwjgl.glfw.GLFW.*;
import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL11.*;
import ru.windcorp.optica.client.graphics.GUI; import ru.windcorp.progressia.client.graphics.GUI;
class RenderThread extends Thread { class RenderThread extends Thread {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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_DYNAMIC_DRAW;
import static org.lwjgl.opengl.GL15.GL_STATIC_DRAW; import static org.lwjgl.opengl.GL15.GL_STATIC_DRAW;

View File

@ -15,13 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.backend; package ru.windcorp.progressia.client.graphics.backend;
import static org.lwjgl.opengl.GL20.*; import static org.lwjgl.opengl.GL20.*;
import java.nio.*; 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 { public class VertexBufferObject implements OpenGLDeletable {

View File

@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 { public class CombinedShader extends Shader {

View File

@ -15,16 +15,16 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.backend.shaders; package ru.windcorp.progressia.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;
import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL11.*;
import static org.lwjgl.opengl.GL20.*; 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 { public class Program implements OpenGLDeletable {
private int handle; private int handle;

View File

@ -15,18 +15,18 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.backend.shaders; package ru.windcorp.progressia.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;
import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL11.*;
import static org.lwjgl.opengl.GL20.*; import static org.lwjgl.opengl.GL20.*;
import java.util.Locale; 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 class Shader implements OpenGLDeletable {
public static enum ShaderType { public static enum ShaderType {

View File

@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 { public class Attribute {

View File

@ -15,10 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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.VertexBufferObject;
import ru.windcorp.optica.client.graphics.backend.shaders.Program;
import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL11.*;
import static org.lwjgl.opengl.GL20.*; import static org.lwjgl.opengl.GL20.*;
@ -28,6 +25,9 @@ import java.nio.FloatBuffer;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import java.nio.ShortBuffer; 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 { public class AttributeVertexArray extends Attribute {
private boolean isEnabled = false; private boolean isEnabled = false;

View File

@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 { public class Uniform {

View File

@ -15,13 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 static org.lwjgl.opengl.GL20.*; import static org.lwjgl.opengl.GL20.*;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import ru.windcorp.progressia.client.graphics.backend.shaders.Program;
public class Uniform1Float extends Uniform { public class Uniform1Float extends Uniform {
public Uniform1Float(int handle, Program program) { public Uniform1Float(int handle, Program program) {

View File

@ -15,13 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 static org.lwjgl.opengl.GL20.*; import static org.lwjgl.opengl.GL20.*;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import ru.windcorp.progressia.client.graphics.backend.shaders.Program;
public class Uniform1Int extends Uniform { public class Uniform1Int extends Uniform {
public Uniform1Int(int handle, Program program) { public Uniform1Int(int handle, Program program) {

View File

@ -15,14 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 static org.lwjgl.opengl.GL20.*; import static org.lwjgl.opengl.GL20.*;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import glm.vec._2.Vec2; import glm.vec._2.Vec2;
import ru.windcorp.progressia.client.graphics.backend.shaders.Program;
public class Uniform2Float extends Uniform { public class Uniform2Float extends Uniform {

View File

@ -15,14 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 static org.lwjgl.opengl.GL20.*; import static org.lwjgl.opengl.GL20.*;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import glm.vec._2.i.Vec2i; import glm.vec._2.i.Vec2i;
import ru.windcorp.progressia.client.graphics.backend.shaders.Program;
public class Uniform2Int extends Uniform { public class Uniform2Int extends Uniform {

View File

@ -15,13 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 static org.lwjgl.opengl.GL20.*; import static org.lwjgl.opengl.GL20.*;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import ru.windcorp.progressia.client.graphics.backend.shaders.Program;
public class Uniform2Matrix extends Uniform { public class Uniform2Matrix extends Uniform {
public Uniform2Matrix(int handle, Program program) { public Uniform2Matrix(int handle, Program program) {

View File

@ -15,14 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 static org.lwjgl.opengl.GL20.*; import static org.lwjgl.opengl.GL20.*;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import glm.vec._3.Vec3; import glm.vec._3.Vec3;
import ru.windcorp.progressia.client.graphics.backend.shaders.Program;
public class Uniform3Float extends Uniform { public class Uniform3Float extends Uniform {

View File

@ -15,14 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 static org.lwjgl.opengl.GL20.*; import static org.lwjgl.opengl.GL20.*;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import glm.vec._3.i.Vec3i; import glm.vec._3.i.Vec3i;
import ru.windcorp.progressia.client.graphics.backend.shaders.Program;
public class Uniform3Int extends Uniform { public class Uniform3Int extends Uniform {

View File

@ -15,14 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 static org.lwjgl.opengl.GL20.*; import static org.lwjgl.opengl.GL20.*;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import glm.mat._3.Mat3; import glm.mat._3.Mat3;
import ru.windcorp.progressia.client.graphics.backend.shaders.Program;
public class Uniform3Matrix extends Uniform { public class Uniform3Matrix extends Uniform {

View File

@ -15,14 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 static org.lwjgl.opengl.GL20.*; import static org.lwjgl.opengl.GL20.*;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import glm.vec._4.Vec4; import glm.vec._4.Vec4;
import ru.windcorp.progressia.client.graphics.backend.shaders.Program;
public class Uniform4Float extends Uniform { public class Uniform4Float extends Uniform {

View File

@ -15,14 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 static org.lwjgl.opengl.GL20.*; import static org.lwjgl.opengl.GL20.*;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import glm.vec._4.i.Vec4i; import glm.vec._4.i.Vec4i;
import ru.windcorp.progressia.client.graphics.backend.shaders.Program;
public class Uniform4Int extends Uniform { public class Uniform4Int extends Uniform {

View File

@ -15,14 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 static org.lwjgl.opengl.GL20.*; import static org.lwjgl.opengl.GL20.*;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import glm.mat._4.Mat4; import glm.mat._4.Mat4;
import ru.windcorp.progressia.client.graphics.backend.shaders.Program;
public class Uniform4Matrix extends Uniform { public class Uniform4Matrix extends Uniform {

View File

@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 { public abstract class AssembledFlatLayer extends Layer {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.flat; package ru.windcorp.progressia.client.graphics.flat;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.flat; package ru.windcorp.progressia.client.graphics.flat;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.flat; package ru.windcorp.progressia.client.graphics.flat;
public class FlatGraphics { public class FlatGraphics {

View File

@ -15,13 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.flat; package ru.windcorp.progressia.client.graphics.flat;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import glm.mat._4.Mat4; import glm.mat._4.Mat4;
import ru.windcorp.optica.client.graphics.backend.GraphicsInterface; import ru.windcorp.progressia.client.graphics.backend.GraphicsInterface;
import ru.windcorp.optica.client.graphics.model.ShapeRenderHelper; import ru.windcorp.progressia.client.graphics.model.ShapeRenderHelper;
public abstract class FlatRenderHelper extends ShapeRenderHelper { public abstract class FlatRenderHelper extends ShapeRenderHelper {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.flat; package ru.windcorp.progressia.client.graphics.flat;
import static org.lwjgl.opengl.GL11.*; import static org.lwjgl.opengl.GL11.*;
@ -23,11 +23,11 @@ import java.nio.FloatBuffer;
import com.google.common.collect.ObjectArrays; import com.google.common.collect.ObjectArrays;
import ru.windcorp.optica.client.graphics.backend.shaders.uniforms.Uniform1Int; import ru.windcorp.progressia.client.graphics.backend.shaders.uniforms.Uniform1Int;
import ru.windcorp.optica.client.graphics.backend.shaders.uniforms.Uniform2Float; import ru.windcorp.progressia.client.graphics.backend.shaders.uniforms.Uniform2Float;
import ru.windcorp.optica.client.graphics.model.Shape; import ru.windcorp.progressia.client.graphics.model.Shape;
import ru.windcorp.optica.client.graphics.model.ShapeRenderHelper; import ru.windcorp.progressia.client.graphics.model.ShapeRenderHelper;
import ru.windcorp.optica.client.graphics.model.ShapeRenderProgram; import ru.windcorp.progressia.client.graphics.model.ShapeRenderProgram;
public class FlatRenderProgram extends ShapeRenderProgram { public class FlatRenderProgram extends ShapeRenderProgram {

View File

@ -15,24 +15,24 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.flat; package ru.windcorp.progressia.client.graphics.flat;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
import glm.mat._4.Mat4; import glm.mat._4.Mat4;
import ru.windcorp.optica.client.graphics.Colors; import ru.windcorp.progressia.client.graphics.Colors;
import ru.windcorp.optica.client.graphics.backend.GraphicsInterface; import ru.windcorp.progressia.client.graphics.backend.GraphicsInterface;
import ru.windcorp.optica.client.graphics.input.KeyEvent; import ru.windcorp.progressia.client.graphics.input.KeyEvent;
import ru.windcorp.optica.client.graphics.input.bus.Input; import ru.windcorp.progressia.client.graphics.input.bus.Input;
import ru.windcorp.optica.client.graphics.model.LambdaModel; import ru.windcorp.progressia.client.graphics.model.LambdaModel;
import ru.windcorp.optica.client.graphics.texture.SimpleTexture; import ru.windcorp.progressia.client.graphics.texture.SimpleTexture;
import ru.windcorp.optica.client.graphics.texture.Sprite; import ru.windcorp.progressia.client.graphics.texture.Sprite;
import ru.windcorp.optica.client.graphics.texture.Texture; import ru.windcorp.progressia.client.graphics.texture.Texture;
import ru.windcorp.optica.client.graphics.texture.TextureManager; import ru.windcorp.progressia.client.graphics.texture.TextureManager;
import ru.windcorp.optica.client.graphics.texture.TextureSettings; import ru.windcorp.progressia.client.graphics.texture.TextureSettings;
import ru.windcorp.optica.client.graphics.world.LayerWorld; import ru.windcorp.progressia.client.graphics.world.LayerWorld;
public class LayerTestUI extends AssembledFlatLayer { public class LayerTestUI extends AssembledFlatLayer {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.flat; package ru.windcorp.progressia.client.graphics.flat;
public class Mask { public class Mask {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.flat; package ru.windcorp.progressia.client.graphics.flat;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.flat; package ru.windcorp.progressia.client.graphics.flat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Deque; import java.util.Deque;
@ -25,13 +25,13 @@ import java.util.Objects;
import glm.mat._4.Mat4; import glm.mat._4.Mat4;
import glm.vec._3.Vec3; import glm.vec._3.Vec3;
import ru.windcorp.optica.client.graphics.Colors; import ru.windcorp.progressia.client.graphics.Colors;
import ru.windcorp.optica.client.graphics.backend.Usage; import ru.windcorp.progressia.client.graphics.backend.Usage;
import ru.windcorp.optica.client.graphics.model.Face; import ru.windcorp.progressia.client.graphics.model.Face;
import ru.windcorp.optica.client.graphics.model.Faces; import ru.windcorp.progressia.client.graphics.model.Faces;
import ru.windcorp.optica.client.graphics.model.Shape; import ru.windcorp.progressia.client.graphics.model.Shape;
import ru.windcorp.optica.client.graphics.model.WorldRenderable; import ru.windcorp.progressia.client.graphics.model.WorldRenderable;
import ru.windcorp.optica.client.graphics.texture.Texture; import ru.windcorp.progressia.client.graphics.texture.Texture;
public class RenderTarget { public class RenderTarget {

View File

@ -15,14 +15,14 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.flat; package ru.windcorp.progressia.client.graphics.flat;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import glm.mat._4.Mat4; import glm.mat._4.Mat4;
import glm.vec._2.Vec2; import glm.vec._2.Vec2;
import glm.vec._4.Vec4; import glm.vec._4.Vec4;
import ru.windcorp.optica.client.graphics.backend.GraphicsInterface; import ru.windcorp.progressia.client.graphics.backend.GraphicsInterface;
public class TransformedMask { public class TransformedMask {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.gui; package ru.windcorp.progressia.client.graphics.gui;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -26,19 +26,19 @@ import org.lwjgl.glfw.GLFW;
import com.google.common.eventbus.EventBus; import com.google.common.eventbus.EventBus;
import glm.vec._2.i.Vec2i; import glm.vec._2.i.Vec2i;
import ru.windcorp.optica.client.graphics.backend.InputTracker; import ru.windcorp.progressia.client.graphics.backend.InputTracker;
import ru.windcorp.optica.client.graphics.flat.RenderTarget; import ru.windcorp.progressia.client.graphics.flat.RenderTarget;
import ru.windcorp.optica.client.graphics.gui.event.ChildAddedEvent; import ru.windcorp.progressia.client.graphics.gui.event.ChildAddedEvent;
import ru.windcorp.optica.client.graphics.gui.event.ChildRemovedEvent; import ru.windcorp.progressia.client.graphics.gui.event.ChildRemovedEvent;
import ru.windcorp.optica.client.graphics.gui.event.FocusEvent; import ru.windcorp.progressia.client.graphics.gui.event.FocusEvent;
import ru.windcorp.optica.client.graphics.gui.event.HoverEvent; import ru.windcorp.progressia.client.graphics.gui.event.HoverEvent;
import ru.windcorp.optica.client.graphics.gui.event.ParentChangedEvent; import ru.windcorp.progressia.client.graphics.gui.event.ParentChangedEvent;
import ru.windcorp.optica.client.graphics.input.InputEvent; import ru.windcorp.progressia.client.graphics.input.InputEvent;
import ru.windcorp.optica.client.graphics.input.KeyEvent; import ru.windcorp.progressia.client.graphics.input.KeyEvent;
import ru.windcorp.optica.client.graphics.input.bus.Input; import ru.windcorp.progressia.client.graphics.input.bus.Input;
import ru.windcorp.optica.client.graphics.input.bus.InputBus; import ru.windcorp.progressia.client.graphics.input.bus.InputBus;
import ru.windcorp.optica.client.graphics.input.bus.InputListener; import ru.windcorp.progressia.client.graphics.input.bus.InputListener;
import ru.windcorp.optica.common.util.Named; import ru.windcorp.progressia.common.util.Named;
public class Component extends Named { public class Component extends Named {

View File

@ -15,11 +15,11 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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.progressia.client.graphics.flat.AssembledFlatLayer;
import ru.windcorp.optica.client.graphics.flat.RenderTarget; import ru.windcorp.progressia.client.graphics.flat.RenderTarget;
import ru.windcorp.optica.client.graphics.input.bus.Input; import ru.windcorp.progressia.client.graphics.input.bus.Input;
public abstract class GUILayer extends AssembledFlatLayer { public abstract class GUILayer extends AssembledFlatLayer {

View File

@ -15,16 +15,16 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.gui; package ru.windcorp.progressia.client.graphics.gui;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
import glm.vec._2.i.Vec2i; import glm.vec._2.i.Vec2i;
import ru.windcorp.optica.client.graphics.Colors; import ru.windcorp.progressia.client.graphics.Colors;
import ru.windcorp.optica.client.graphics.flat.RenderTarget; import ru.windcorp.progressia.client.graphics.flat.RenderTarget;
import ru.windcorp.optica.client.graphics.gui.event.HoverEvent; import ru.windcorp.progressia.client.graphics.gui.event.HoverEvent;
import ru.windcorp.optica.client.graphics.gui.layout.LayoutAlign; import ru.windcorp.progressia.client.graphics.gui.layout.LayoutAlign;
import ru.windcorp.optica.client.graphics.input.KeyEvent; import ru.windcorp.progressia.client.graphics.input.KeyEvent;
public class LayerTestGUI extends GUILayer { public class LayerTestGUI extends GUILayer {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.gui; package ru.windcorp.progressia.client.graphics.gui;
import glm.vec._2.i.Vec2i; import glm.vec._2.i.Vec2i;

View File

@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 { public class ChildAddedEvent extends ChildEvent {

View File

@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 { public abstract class ChildEvent extends HierarchyEvent {

View File

@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 { public class ChildRemovedEvent extends ChildEvent {

View File

@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 { public abstract class ComponentEvent {

View File

@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 { public class FocusEvent extends ComponentEvent {

View File

@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 { public abstract class HierarchyEvent extends ComponentEvent {

View File

@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 { public class HoverEvent extends ComponentEvent {

View File

@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 { public class ParentChangedEvent extends HierarchyEvent {

View File

@ -15,14 +15,14 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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.max;
import static java.lang.Math.min; import static java.lang.Math.min;
import glm.vec._2.i.Vec2i; import glm.vec._2.i.Vec2i;
import ru.windcorp.optica.client.graphics.gui.Component; import ru.windcorp.progressia.client.graphics.gui.Component;
import ru.windcorp.optica.client.graphics.gui.Layout; import ru.windcorp.progressia.client.graphics.gui.Layout;
public class LayoutAlign implements Layout { public class LayoutAlign implements Layout {

View File

@ -15,13 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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.max;
import glm.vec._2.i.Vec2i; import glm.vec._2.i.Vec2i;
import ru.windcorp.optica.client.graphics.gui.Component; import ru.windcorp.progressia.client.graphics.gui.Component;
import ru.windcorp.optica.client.graphics.gui.Layout; import ru.windcorp.progressia.client.graphics.gui.Layout;
public class LayoutBorderHorizontal implements Layout { public class LayoutBorderHorizontal implements Layout {

View File

@ -15,13 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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.max;
import glm.vec._2.i.Vec2i; import glm.vec._2.i.Vec2i;
import ru.windcorp.optica.client.graphics.gui.Component; import ru.windcorp.progressia.client.graphics.gui.Component;
import ru.windcorp.optica.client.graphics.gui.Layout; import ru.windcorp.progressia.client.graphics.gui.Layout;
public class LayoutBorderVertical implements Layout { public class LayoutBorderVertical implements Layout {

View File

@ -15,13 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.gui.layout; package ru.windcorp.progressia.client.graphics.gui.layout;
import java.util.Arrays; import java.util.Arrays;
import glm.vec._2.i.Vec2i; import glm.vec._2.i.Vec2i;
import ru.windcorp.optica.client.graphics.gui.Component; import ru.windcorp.progressia.client.graphics.gui.Component;
import ru.windcorp.optica.client.graphics.gui.Layout; import ru.windcorp.progressia.client.graphics.gui.Layout;
public class LayoutGrid implements Layout { public class LayoutGrid implements Layout {

View File

@ -15,13 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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.max;
import glm.vec._2.i.Vec2i; import glm.vec._2.i.Vec2i;
import ru.windcorp.optica.client.graphics.gui.Component; import ru.windcorp.progressia.client.graphics.gui.Component;
import ru.windcorp.optica.client.graphics.gui.Layout; import ru.windcorp.progressia.client.graphics.gui.Layout;
public class LayoutHorizontal implements Layout { public class LayoutHorizontal implements Layout {

View File

@ -15,13 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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.max;
import glm.vec._2.i.Vec2i; import glm.vec._2.i.Vec2i;
import ru.windcorp.optica.client.graphics.gui.Component; import ru.windcorp.progressia.client.graphics.gui.Component;
import ru.windcorp.optica.client.graphics.gui.Layout; import ru.windcorp.progressia.client.graphics.gui.Layout;
public class LayoutVertical implements Layout { public class LayoutVertical implements Layout {

View File

@ -15,10 +15,10 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.input; package ru.windcorp.progressia.client.graphics.input;
import glm.vec._2.d.Vec2d; 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 { public abstract class CursorEvent extends InputEvent {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.input; package ru.windcorp.progressia.client.graphics.input;
import glm.vec._2.Vec2; import glm.vec._2.Vec2;
import glm.vec._2.d.Vec2d; import glm.vec._2.d.Vec2d;

View File

@ -15,10 +15,10 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.input; package ru.windcorp.progressia.client.graphics.input;
import glm.vec._2.i.Vec2i; 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 { public class FrameResizeEvent extends InputEvent {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.input; package ru.windcorp.progressia.client.graphics.input;
public abstract class InputEvent { public abstract class InputEvent {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.input; package ru.windcorp.progressia.client.graphics.input;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;

View File

@ -15,10 +15,10 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.input; package ru.windcorp.progressia.client.graphics.input;
import gnu.trove.set.TIntSet; import gnu.trove.set.TIntSet;
import ru.windcorp.optica.client.graphics.backend.InputTracker; import ru.windcorp.progressia.client.graphics.backend.InputTracker;
public class KeyMatcher { public class KeyMatcher {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.input; package ru.windcorp.progressia.client.graphics.input;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.input; package ru.windcorp.progressia.client.graphics.input;
public abstract class WheelEvent extends InputEvent { public abstract class WheelEvent extends InputEvent {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.input; package ru.windcorp.progressia.client.graphics.input;
import glm.vec._2.d.Vec2d; import glm.vec._2.d.Vec2d;

View File

@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 { public class Input {

View File

@ -15,12 +15,12 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.input.bus; package ru.windcorp.progressia.client.graphics.input.bus;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import ru.windcorp.optica.client.graphics.input.InputEvent; import ru.windcorp.progressia.client.graphics.input.InputEvent;
public class InputBus { public class InputBus {

View File

@ -15,9 +15,9 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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 @FunctionalInterface
public interface InputListener<T extends InputEvent> { public interface InputListener<T extends InputEvent> {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.model; package ru.windcorp.progressia.client.graphics.model;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.model; package ru.windcorp.progressia.client.graphics.model;
import glm.mat._4.Mat4; import glm.mat._4.Mat4;

View File

@ -15,13 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.model; package ru.windcorp.progressia.client.graphics.model;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ShortBuffer; import java.nio.ShortBuffer;
import java.util.Objects; import java.util.Objects;
import ru.windcorp.optica.client.graphics.texture.Texture; import ru.windcorp.progressia.client.graphics.texture.Texture;
public class Face { public class Face {

View File

@ -15,15 +15,15 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.model; package ru.windcorp.progressia.client.graphics.model;
import java.nio.ShortBuffer; import java.nio.ShortBuffer;
import glm.vec._2.Vec2; import glm.vec._2.Vec2;
import glm.vec._3.Vec3; import glm.vec._3.Vec3;
import ru.windcorp.optica.client.graphics.model.ShapeRenderProgram.VertexBuilder; import ru.windcorp.progressia.client.graphics.model.ShapeRenderProgram.VertexBuilder;
import ru.windcorp.optica.client.graphics.texture.Texture; import ru.windcorp.progressia.client.graphics.texture.Texture;
import ru.windcorp.optica.common.block.BlockFace; import ru.windcorp.progressia.common.block.BlockFace;
public class Faces { public class Faces {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.model; package ru.windcorp.progressia.client.graphics.model;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.model; package ru.windcorp.progressia.client.graphics.model;
import glm.mat._4.Mat4; import glm.mat._4.Mat4;

View File

@ -15,15 +15,15 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.model; package ru.windcorp.progressia.client.graphics.model;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ShortBuffer; import java.nio.ShortBuffer;
import org.lwjgl.BufferUtils; import org.lwjgl.BufferUtils;
import ru.windcorp.optica.client.graphics.backend.Usage; import ru.windcorp.progressia.client.graphics.backend.Usage;
import ru.windcorp.optica.client.graphics.backend.VertexBufferObject; import ru.windcorp.progressia.client.graphics.backend.VertexBufferObject;
public class Shape implements WorldRenderable { public class Shape implements WorldRenderable {

View File

@ -15,10 +15,10 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.model; package ru.windcorp.progressia.client.graphics.model;
import glm.mat._4.Mat4; import glm.mat._4.Mat4;
import ru.windcorp.optica.common.util.StashingStack; import ru.windcorp.progressia.common.util.StashingStack;
public class ShapeRenderHelper { public class ShapeRenderHelper {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.model; package ru.windcorp.progressia.client.graphics.model;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.ArrayList; import java.util.ArrayList;
@ -28,14 +28,14 @@ import com.google.common.collect.ObjectArrays;
import glm.vec._2.Vec2; import glm.vec._2.Vec2;
import glm.vec._3.Vec3; import glm.vec._3.Vec3;
import ru.windcorp.optica.client.graphics.backend.VertexBufferObject; import ru.windcorp.progressia.client.graphics.backend.VertexBufferObject;
import ru.windcorp.optica.client.graphics.backend.VertexBufferObject.BindTarget; import ru.windcorp.progressia.client.graphics.backend.VertexBufferObject.BindTarget;
import ru.windcorp.optica.client.graphics.backend.shaders.CombinedShader; import ru.windcorp.progressia.client.graphics.backend.shaders.CombinedShader;
import ru.windcorp.optica.client.graphics.backend.shaders.Program; import ru.windcorp.progressia.client.graphics.backend.shaders.Program;
import ru.windcorp.optica.client.graphics.backend.shaders.attributes.*; import ru.windcorp.progressia.client.graphics.backend.shaders.attributes.*;
import ru.windcorp.optica.client.graphics.backend.shaders.uniforms.*; import ru.windcorp.progressia.client.graphics.backend.shaders.uniforms.*;
import ru.windcorp.optica.client.graphics.texture.Sprite; import ru.windcorp.progressia.client.graphics.texture.Sprite;
import ru.windcorp.optica.client.graphics.texture.Texture; import ru.windcorp.progressia.client.graphics.texture.Texture;
public class ShapeRenderProgram extends Program { public class ShapeRenderProgram extends Program {

View File

@ -15,11 +15,11 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.model; package ru.windcorp.progressia.client.graphics.model;
import glm.vec._3.Vec3; import glm.vec._3.Vec3;
import ru.windcorp.optica.client.graphics.backend.Usage; import ru.windcorp.progressia.client.graphics.backend.Usage;
import ru.windcorp.optica.client.graphics.texture.Texture; import ru.windcorp.progressia.client.graphics.texture.Texture;
public class Shapes { public class Shapes {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.model; package ru.windcorp.progressia.client.graphics.model;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.model; package ru.windcorp.progressia.client.graphics.model;
public interface WorldRenderable { public interface WorldRenderable {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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.GL11.*;
import static org.lwjgl.opengl.GL12.*; import static org.lwjgl.opengl.GL12.*;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.texture; package ru.windcorp.progressia.client.graphics.texture;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.color.ColorSpace; import java.awt.color.ColorSpace;
@ -33,7 +33,7 @@ import java.util.Hashtable;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import org.lwjgl.BufferUtils; import org.lwjgl.BufferUtils;
import ru.windcorp.optica.common.util.BinUtil; import ru.windcorp.progressia.common.util.BinUtil;
class PngLoader { class PngLoader {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.texture; package ru.windcorp.progressia.client.graphics.texture;
public class SimpleTexture extends Texture { public class SimpleTexture extends Texture {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.texture; package ru.windcorp.progressia.client.graphics.texture;
import java.util.Objects; import java.util.Objects;

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.texture; package ru.windcorp.progressia.client.graphics.texture;
public abstract class Texture { public abstract class Texture {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.texture; package ru.windcorp.progressia.client.graphics.texture;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -23,10 +23,10 @@ import java.nio.ByteBuffer;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import ru.windcorp.optica.client.graphics.backend.RenderTaskQueue; import ru.windcorp.progressia.client.graphics.backend.RenderTaskQueue;
import ru.windcorp.optica.common.resource.Resource; import ru.windcorp.progressia.common.resource.Resource;
import ru.windcorp.optica.common.resource.ResourceManager; import ru.windcorp.progressia.common.resource.ResourceManager;
import ru.windcorp.optica.common.util.ByteBufferInputStream; import ru.windcorp.progressia.common.util.ByteBufferInputStream;
public class TextureManager { public class TextureManager {

View File

@ -15,13 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
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.GL11.*;
import static org.lwjgl.opengl.GL20.*; import static org.lwjgl.opengl.GL20.*;
import ru.windcorp.optica.client.graphics.backend.OpenGLObjectTracker; import ru.windcorp.progressia.client.graphics.backend.OpenGLObjectTracker;
import ru.windcorp.optica.client.graphics.backend.OpenGLObjectTracker.OpenGLDeletable; import ru.windcorp.progressia.client.graphics.backend.OpenGLObjectTracker.OpenGLDeletable;
public class TexturePrimitive implements OpenGLDeletable { public class TexturePrimitive implements OpenGLDeletable {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.texture; package ru.windcorp.progressia.client.graphics.texture;
public class TextureSettings { public class TextureSettings {

View File

@ -15,14 +15,14 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.world; package ru.windcorp.progressia.client.graphics.world;
import static java.lang.Math.*; import static java.lang.Math.*;
import glm.Glm; import glm.Glm;
import glm.mat._4.Mat4; import glm.mat._4.Mat4;
import glm.vec._3.Vec3; import glm.vec._3.Vec3;
import ru.windcorp.optica.client.graphics.backend.GraphicsInterface; import ru.windcorp.progressia.client.graphics.backend.GraphicsInterface;
public class Camera { public class Camera {

View File

@ -15,23 +15,23 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.world; package ru.windcorp.progressia.client.graphics.world;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import glm.mat._3.Mat3; import glm.mat._3.Mat3;
import glm.vec._3.Vec3; import glm.vec._3.Vec3;
import ru.windcorp.optica.client.graphics.Layer; import ru.windcorp.progressia.client.graphics.Layer;
import ru.windcorp.optica.client.graphics.backend.GraphicsBackend; import ru.windcorp.progressia.client.graphics.backend.GraphicsBackend;
import ru.windcorp.optica.client.graphics.backend.GraphicsInterface; import ru.windcorp.progressia.client.graphics.backend.GraphicsInterface;
import ru.windcorp.optica.client.graphics.input.CursorMoveEvent; import ru.windcorp.progressia.client.graphics.input.CursorMoveEvent;
import ru.windcorp.optica.client.graphics.input.InputEvent; import ru.windcorp.progressia.client.graphics.input.InputEvent;
import ru.windcorp.optica.client.graphics.input.KeyEvent; import ru.windcorp.progressia.client.graphics.input.KeyEvent;
import ru.windcorp.optica.client.graphics.input.bus.Input; import ru.windcorp.progressia.client.graphics.input.bus.Input;
import ru.windcorp.optica.client.world.WorldRender; import ru.windcorp.progressia.client.world.WorldRender;
import ru.windcorp.optica.common.block.BlockData; import ru.windcorp.progressia.common.block.BlockData;
import ru.windcorp.optica.common.block.BlockDataRegistry; import ru.windcorp.progressia.common.block.BlockDataRegistry;
import ru.windcorp.optica.common.world.WorldData; import ru.windcorp.progressia.common.world.WorldData;
public class LayerWorld extends Layer { public class LayerWorld extends Layer {

View File

@ -15,11 +15,11 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.world; package ru.windcorp.progressia.client.graphics.world;
import glm.mat._4.Mat4; import glm.mat._4.Mat4;
import ru.windcorp.optica.client.graphics.model.ShapeRenderHelper; import ru.windcorp.progressia.client.graphics.model.ShapeRenderHelper;
import ru.windcorp.optica.common.util.StashingStack; import ru.windcorp.progressia.common.util.StashingStack;
public class WorldRenderHelper extends ShapeRenderHelper { public class WorldRenderHelper extends ShapeRenderHelper {

View File

@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*******************************************************************************/ *******************************************************************************/
package ru.windcorp.optica.client.graphics.world; package ru.windcorp.progressia.client.graphics.world;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.ArrayList; import java.util.ArrayList;
@ -28,13 +28,13 @@ import com.google.common.collect.ObjectArrays;
import glm.vec._2.Vec2; import glm.vec._2.Vec2;
import glm.vec._3.Vec3; import glm.vec._3.Vec3;
import ru.windcorp.optica.client.graphics.backend.VertexBufferObject; import ru.windcorp.progressia.client.graphics.backend.VertexBufferObject;
import ru.windcorp.optica.client.graphics.backend.shaders.attributes.*; import ru.windcorp.progressia.client.graphics.backend.shaders.attributes.*;
import ru.windcorp.optica.client.graphics.backend.shaders.uniforms.*; import ru.windcorp.progressia.client.graphics.backend.shaders.uniforms.*;
import ru.windcorp.optica.client.graphics.model.Face; import ru.windcorp.progressia.client.graphics.model.Face;
import ru.windcorp.optica.client.graphics.model.Shape; import ru.windcorp.progressia.client.graphics.model.Shape;
import ru.windcorp.optica.client.graphics.model.ShapeRenderHelper; import ru.windcorp.progressia.client.graphics.model.ShapeRenderHelper;
import ru.windcorp.optica.client.graphics.model.ShapeRenderProgram; import ru.windcorp.progressia.client.graphics.model.ShapeRenderProgram;
public class WorldRenderProgram extends ShapeRenderProgram { public class WorldRenderProgram extends ShapeRenderProgram {

Some files were not shown because too many files have changed in this diff Show More