Skip to content

Commit

Permalink
added gradle properties, removed unnecessary src
Browse files Browse the repository at this point in the history
  • Loading branch information
SpinyOwl committed Nov 23, 2018
1 parent 292a386 commit 6712390
Show file tree
Hide file tree
Showing 72 changed files with 79 additions and 2,484 deletions.
1 change: 0 additions & 1 deletion .gitignore
@@ -1,5 +1,4 @@
/.idea/
/gradle.properties
**/build/*
**/target/*
/.gradle/
Expand Down
@@ -1,27 +1,16 @@
package com.spinyowl.spinygui.backend.core.event;

import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.spinyowl.spinygui.core.api.Window;

/**
* Created by Shcherbin Alexander on 6/10/2016.
*/
public class SystemWindowCloseEvent implements SystemEvent {

public final long window;
public final Window window;

public SystemWindowCloseEvent(long window) {
public SystemWindowCloseEvent(Window window) {
this.window = window;
}

public long getWindow() {
return window;
}

@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
.append("window", window)
.toString();
}
}
@@ -1,27 +1,18 @@
package com.spinyowl.spinygui.backend.core.event;

import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.spinyowl.spinygui.core.api.Window;

/**
* Created by Shcherbin Alexander on 6/10/2016.
*/
public class SystemWindowFocusEvent implements SystemEvent {

public final long window;
public final Window window;
public final boolean focused;

public SystemWindowFocusEvent(long window, boolean focused) {
public SystemWindowFocusEvent(Window window, boolean focused) {
this.window = window;
this.focused = focused;
}

@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
.append("window", window)
.append("focused", focused)
.toString();
}

}
@@ -1,27 +1,18 @@
package com.spinyowl.spinygui.backend.core.event;

import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.spinyowl.spinygui.core.api.Window;

/**
* Created by Shcherbin Alexander on 6/10/2016.
*/
public class SystemWindowIconifyEvent implements SystemEvent {

public final long window;
public final Window window;
public final boolean iconified;

public SystemWindowIconifyEvent(long window, boolean iconified) {
public SystemWindowIconifyEvent(Window window, boolean iconified) {
this.window = window;
this.iconified = iconified;
}

@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
.append("iconified", iconified)
.append("window", window)
.toString();
}

}
@@ -1,30 +1,20 @@
package com.spinyowl.spinygui.backend.core.event;

import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.spinyowl.spinygui.core.api.Window;

/**
* Created by Shcherbin Alexander on 6/10/2016.
*/
public class SystemWindowPosEvent implements SystemEvent {

public final long window;
public final Window window;
public final int posX;
public final int posY;

public SystemWindowPosEvent(long window, int posX, int posY) {
public SystemWindowPosEvent(Window window, int posX, int posY) {
this.window = window;
this.posX = posX;
this.posY = posY;
}

@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
.append("window", window)
.append("posX", posX)
.append("posY", posY)
.toString();
}


}
@@ -1,23 +1,15 @@
package com.spinyowl.spinygui.backend.core.event;

import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.spinyowl.spinygui.core.api.Window;

/**
* Created by Shcherbin Alexander on 6/10/2016.
*/
public class SystemWindowRefreshEvent implements SystemEvent {

public final long window;
public final Window window;

public SystemWindowRefreshEvent(long window) {
public SystemWindowRefreshEvent(Window window) {
this.window = window;
}

@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
.append("window", window)
.toString();
}
}
@@ -1,30 +1,20 @@
package com.spinyowl.spinygui.backend.core.event;

import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.spinyowl.spinygui.core.api.Window;

/**
* Created by Shcherbin Alexander on 6/10/2016.
*/
public class SystemWindowSizeEvent implements SystemEvent {

public final long window;
public final Window window;
public final int width;
public final int height;

public SystemWindowSizeEvent(long window, int width, int height) {
public SystemWindowSizeEvent(Window window, int width, int height) {
this.window = window;
this.width = width;
this.height = height;
}

@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
.append("window", window)
.append("width", width)
.append("height", height)
.toString();
}

}
Expand Up @@ -2,17 +2,48 @@

import com.spinyowl.spinygui.backend.core.event.SystemEvent;

public interface SystemEventProcessor {
import java.util.ArrayList;
import java.util.List;
import java.util.Queue;
import java.util.concurrent.LinkedBlockingQueue;

public abstract class SystemEventProcessor {

private static SystemEventProcessor INSTANCE = new SystemEventProcessor() {
private Queue<SystemEvent> eventQueue = new LinkedBlockingQueue<>();

@Override
public void pushEvent(SystemEvent event) {
eventQueue.add(event);
}

@Override
public void processEvents() {
List<SystemEvent> events = new ArrayList<>(eventQueue);
for (SystemEvent event : events) {
this.processEvent(event);
}
eventQueue.removeAll(events);
}

private void processEvent(SystemEvent event) {

}
};

public static SystemEventProcessor getInstance() {
return INSTANCE;
}

/**
* Used to process system event.
*/
void processEvent();
public abstract void processEvents();

/**
* Used to push system event to processing queue.
*
* @param event event to push.
*/
void pushEvent(SystemEvent event);
public abstract void pushEvent(SystemEvent event);
}

This file was deleted.

@@ -0,0 +1,13 @@
package com.spinyowl.spinygui.backend.opengl32.event;

import com.spinyowl.spinygui.backend.core.event.SystemWindowCloseEvent;
import com.spinyowl.spinygui.backend.core.event.processor.SystemEventProcessor;
import com.spinyowl.spinygui.backend.opengl32.service.SpinyGuiOpenGL32WindowService;
import org.lwjgl.glfw.GLFWWindowCloseCallback;

public class WindowCloseEventListener extends GLFWWindowCloseCallback {
@Override
public void invoke(long window) {
SystemEventProcessor.getInstance().pushEvent(new SystemWindowCloseEvent(SpinyGuiOpenGL32WindowService.getInstance().getWindow(window)));
}
}
Expand Up @@ -71,6 +71,10 @@ public boolean closeWindow(Window window) {
public List<Long> getWindowPointers() {
return new ArrayList<>(WINDOW_CACHE.keySet());
}

public Window getWindow(long pointer) {
return WINDOW_CACHE.get(pointer);
}
//
// static Window _createWindow(int width, int height, String title, Monitor monitor) {
// long windowPointer = GLFW.glfwCreateWindow(width, height, title, monitor == null ? 0 : monitor.getPointer(), 0);
Expand Down
Expand Up @@ -127,7 +127,7 @@ private void processExecutions() {
private void processSystemEvents() {
SystemEventProcessor processor = null;
if (processor != null) {
processor.processEvent();
processor.processEvents();
}
}

Expand Down
2 changes: 2 additions & 0 deletions backend.opengl32/src/main/java/module-info.java
Expand Up @@ -16,7 +16,9 @@
requires org.slf4j;

exports com.spinyowl.spinygui.backend.opengl32.api;

exports com.spinyowl.spinygui.backend.opengl32.event;

exports com.spinyowl.spinygui.backend.opengl32.service;
exports com.spinyowl.spinygui.backend.opengl32.service.internal;
}
Expand Up @@ -4,7 +4,6 @@

public class Input extends EmptyComponent {


public String getValue() {
return getAttribute("value");
}
Expand Down
2 changes: 2 additions & 0 deletions core/src/main/java/module-info.java
Expand Up @@ -16,6 +16,8 @@
exports com.spinyowl.spinygui.core.converter;
exports com.spinyowl.spinygui.core.event;
exports com.spinyowl.spinygui.core.event.processor;
exports com.spinyowl.spinygui.core.event.listener;
exports com.spinyowl.spinygui.core.event.listener.impl;

exports com.spinyowl.spinygui.core.service;

Expand Down
Expand Up @@ -6,6 +6,7 @@
import com.spinyowl.spinygui.core.component.base.Component;
import com.spinyowl.spinygui.core.component.base.Text;
import com.spinyowl.spinygui.core.converter.ComponentMarshaller;
import com.spinyowl.spinygui.core.event.listener.impl.DefaultWindowCloseEventListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -25,6 +26,8 @@ public static void main(String[] args) throws Exception {

Window window = Window.createWindow(800, 600, "Example");
Window window2 = Window.createWindow(400, 300, "Example2", null);

window.addWindowCloseEventListener(new DefaultWindowCloseEventListener());
//
Input input = new Input();
input.setName("password");
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
@@ -0,0 +1 @@
lwjgl_version=3.2.1-SNAPSHOT

0 comments on commit 6712390

Please sign in to comment.