Improve code / xml formatting #54
This commit is contained in:
Emux
parent
308497ffa6
commit
3388e1401f
@ -1,12 +1,12 @@
|
||||
/*******************************************************************************
|
||||
* Copyright 2011 See AUTHORS file.
|
||||
*
|
||||
* <p>
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* <p>
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* <p>
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@ -55,10 +55,13 @@ import com.google.gwt.user.client.ui.TextArea;
|
||||
import com.google.gwt.user.client.ui.VerticalPanel;
|
||||
import com.google.gwt.user.client.ui.Widget;
|
||||
|
||||
/** Implementation of an {@link Application} based on GWT. Clients have to override {@link #getConfig()} and
|
||||
/**
|
||||
* Implementation of an {@link Application} based on GWT. Clients have to override {@link #getConfig()} and
|
||||
* {@link #createApplicationListener()}. Clients can override the default loading screen via
|
||||
* {@link #getPreloaderCallback()} and implement any loading screen drawing via GWT widgets.
|
||||
* @author mzechner */
|
||||
*
|
||||
* @author mzechner
|
||||
*/
|
||||
public abstract class GwtApplication implements EntryPoint, Application {
|
||||
private ApplicationListener listener;
|
||||
GwtApplicationConfiguration config;
|
||||
@ -79,12 +82,13 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
private Clipboard clipboard;
|
||||
LoadingListener loadingListener;
|
||||
|
||||
/** @return the configuration for the {@link GwtApplication}. */
|
||||
public abstract GwtApplicationConfiguration getConfig ();
|
||||
/**
|
||||
* @return the configuration for the {@link GwtApplication}.
|
||||
*/
|
||||
public abstract GwtApplicationConfiguration getConfig();
|
||||
|
||||
|
||||
public String getPreloaderBaseURL()
|
||||
{
|
||||
public String getPreloaderBaseURL() {
|
||||
return GWT.getHostPageBaseURL() + "assets/";
|
||||
}
|
||||
|
||||
@ -96,7 +100,7 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
public abstract ApplicationListener createApplicationListener();
|
||||
|
||||
@Override
|
||||
public void onModuleLoad () {
|
||||
public void onModuleLoad() {
|
||||
GwtApplication.agentInfo = computeAgentInfo();
|
||||
this.listener = createApplicationListener();
|
||||
this.config = getConfig();
|
||||
@ -133,19 +137,19 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
preloader = createPreloader();
|
||||
preloader.preload("assets.txt", new PreloaderCallback() {
|
||||
@Override
|
||||
public void error (String file) {
|
||||
public void error(String file) {
|
||||
callback.error(file);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void update (PreloaderState state) {
|
||||
public void update(PreloaderState state) {
|
||||
callback.update(state);
|
||||
if (state.hasEnded()) {
|
||||
getRootPanel().clear();
|
||||
if(loadingListener != null)
|
||||
if (loadingListener != null)
|
||||
loadingListener.beforeSetup();
|
||||
setupLoop();
|
||||
if(loadingListener != null)
|
||||
if (loadingListener != null)
|
||||
loadingListener.afterSetup();
|
||||
}
|
||||
}
|
||||
@ -161,7 +165,7 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
return new Label("Sorry, your browser doesn't seem to support WebGL");
|
||||
}
|
||||
|
||||
void setupLoop () {
|
||||
void setupLoop() {
|
||||
// setup modules
|
||||
try {
|
||||
graphics = new GwtGraphics(root, config);
|
||||
@ -197,7 +201,7 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
|
||||
AnimationScheduler.get().requestAnimationFrame(new AnimationCallback() {
|
||||
@Override
|
||||
public void execute (double timestamp) {
|
||||
public void execute(double timestamp) {
|
||||
try {
|
||||
mainLoop();
|
||||
} catch (Throwable t) {
|
||||
@ -228,7 +232,7 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
input.reset();
|
||||
}
|
||||
|
||||
public Panel getRootPanel () {
|
||||
public Panel getRootPanel() {
|
||||
return root;
|
||||
}
|
||||
|
||||
@ -238,7 +242,7 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
return new Preloader(getPreloaderBaseURL());
|
||||
}
|
||||
|
||||
public PreloaderCallback getPreloaderCallback () {
|
||||
public PreloaderCallback getPreloaderCallback() {
|
||||
final Panel preloaderPanel = new VerticalPanel();
|
||||
preloaderPanel.setStyleName("gdx-preloader");
|
||||
final Image logo = new Image(GWT.getModuleBaseURL() + "logo.png");
|
||||
@ -256,12 +260,12 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
return new PreloaderCallback() {
|
||||
|
||||
@Override
|
||||
public void error (String file) {
|
||||
public void error(String file) {
|
||||
System.out.println("error: " + file);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void update (PreloaderState state) {
|
||||
public void update(PreloaderState state) {
|
||||
meterStyle.setWidth(100f * state.getProgress(), Unit.PCT);
|
||||
}
|
||||
|
||||
@ -269,22 +273,22 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Graphics getGraphics () {
|
||||
public Graphics getGraphics() {
|
||||
return graphics;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Audio getAudio () {
|
||||
public Audio getAudio() {
|
||||
return Gdx.audio;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Input getInput () {
|
||||
public Input getInput() {
|
||||
return Gdx.input;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Files getFiles () {
|
||||
public Files getFiles() {
|
||||
return Gdx.files;
|
||||
}
|
||||
|
||||
@ -293,7 +297,7 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
return Gdx.net;
|
||||
}
|
||||
|
||||
private void updateLogLabelSize () {
|
||||
private void updateLogLabelSize() {
|
||||
if (log != null) {
|
||||
if (graphics != null) {
|
||||
log.setSize(graphics.getWidth() + "px", "200px");
|
||||
@ -303,7 +307,7 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
}
|
||||
}
|
||||
|
||||
private void checkLogLabel () {
|
||||
private void checkLogLabel() {
|
||||
if (log == null) {
|
||||
log = new TextArea();
|
||||
|
||||
@ -322,7 +326,7 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void log (String tag, String message) {
|
||||
public void log(String tag, String message) {
|
||||
if (logLevel >= LOG_INFO) {
|
||||
checkLogLabel();
|
||||
log.setText(log.getText() + "\n" + tag + ": " + message);
|
||||
@ -332,7 +336,7 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void log (String tag, String message, Throwable exception) {
|
||||
public void log(String tag, String message, Throwable exception) {
|
||||
if (logLevel >= LOG_INFO) {
|
||||
checkLogLabel();
|
||||
log.setText(log.getText() + "\n" + tag + ": " + message + "\n" + getMessages(exception) + "\n");
|
||||
@ -343,7 +347,7 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void error (String tag, String message) {
|
||||
public void error(String tag, String message) {
|
||||
if (logLevel >= LOG_ERROR) {
|
||||
checkLogLabel();
|
||||
log.setText(log.getText() + "\n" + tag + ": " + message + "\n");
|
||||
@ -353,7 +357,7 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void error (String tag, String message, Throwable exception) {
|
||||
public void error(String tag, String message, Throwable exception) {
|
||||
if (logLevel >= LOG_ERROR) {
|
||||
checkLogLabel();
|
||||
log.setText(log.getText() + "\n" + tag + ": " + message + "\n" + getMessages(exception) + "\n");
|
||||
@ -364,7 +368,7 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void debug (String tag, String message) {
|
||||
public void debug(String tag, String message) {
|
||||
if (logLevel >= LOG_DEBUG) {
|
||||
checkLogLabel();
|
||||
log.setText(log.getText() + "\n" + tag + ": " + message + "\n");
|
||||
@ -374,7 +378,7 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void debug (String tag, String message, Throwable exception) {
|
||||
public void debug(String tag, String message, Throwable exception) {
|
||||
if (logLevel >= LOG_DEBUG) {
|
||||
checkLogLabel();
|
||||
log.setText(log.getText() + "\n" + tag + ": " + message + "\n" + getMessages(exception) + "\n");
|
||||
@ -384,7 +388,7 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
}
|
||||
}
|
||||
|
||||
private String getMessages (Throwable e) {
|
||||
private String getMessages(Throwable e) {
|
||||
StringBuffer buffer = new StringBuffer();
|
||||
while (e != null) {
|
||||
buffer.append(e.getMessage() + "\n");
|
||||
@ -393,7 +397,7 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
return buffer.toString();
|
||||
}
|
||||
|
||||
private String getStackTrace (Throwable e) {
|
||||
private String getStackTrace(Throwable e) {
|
||||
StringBuffer buffer = new StringBuffer();
|
||||
for (StackTraceElement trace : e.getStackTrace()) {
|
||||
buffer.append(trace.toString() + "\n");
|
||||
@ -402,7 +406,7 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setLogLevel (int logLevel) {
|
||||
public void setLogLevel(int logLevel) {
|
||||
this.logLevel = logLevel;
|
||||
}
|
||||
|
||||
@ -412,27 +416,27 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
}
|
||||
|
||||
@Override
|
||||
public ApplicationType getType () {
|
||||
public ApplicationType getType() {
|
||||
return ApplicationType.WebGL;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getVersion () {
|
||||
public int getVersion() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getJavaHeap () {
|
||||
public long getJavaHeap() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getNativeHeap () {
|
||||
public long getNativeHeap() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Preferences getPreferences (String name) {
|
||||
public Preferences getPreferences(String name) {
|
||||
Preferences pref = prefs.get(name);
|
||||
if (pref == null) {
|
||||
pref = new GwtPreferences(name);
|
||||
@ -442,126 +446,132 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Clipboard getClipboard () {
|
||||
public Clipboard getClipboard() {
|
||||
return clipboard;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postRunnable (Runnable runnable) {
|
||||
public void postRunnable(Runnable runnable) {
|
||||
runnables.add(runnable);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void exit () {
|
||||
public void exit() {
|
||||
}
|
||||
|
||||
/** Contains precomputed information on the user-agent. Useful for dealing with browser and OS behavioral differences. Kindly
|
||||
* borrowed from PlayN */
|
||||
public static AgentInfo agentInfo () {
|
||||
/**
|
||||
* Contains precomputed information on the user-agent. Useful for dealing with browser and OS behavioral differences. Kindly
|
||||
* borrowed from PlayN
|
||||
*/
|
||||
public static AgentInfo agentInfo() {
|
||||
return agentInfo;
|
||||
}
|
||||
|
||||
/** kindly borrowed from PlayN **/
|
||||
private static native AgentInfo computeAgentInfo () /*-{
|
||||
var userAgent = navigator.userAgent.toLowerCase();
|
||||
return {
|
||||
// browser type flags
|
||||
isFirefox : userAgent.indexOf("firefox") != -1,
|
||||
isChrome : userAgent.indexOf("chrome") != -1,
|
||||
isSafari : userAgent.indexOf("safari") != -1,
|
||||
isOpera : userAgent.indexOf("opera") != -1,
|
||||
isIE : userAgent.indexOf("msie") != -1,
|
||||
// OS type flags
|
||||
isMacOS : userAgent.indexOf("mac") != -1,
|
||||
isLinux : userAgent.indexOf("linux") != -1,
|
||||
isWindows : userAgent.indexOf("win") != -1
|
||||
};
|
||||
}-*/;
|
||||
/**
|
||||
* kindly borrowed from PlayN
|
||||
**/
|
||||
private static native AgentInfo computeAgentInfo() /*-{
|
||||
var userAgent = navigator.userAgent.toLowerCase();
|
||||
return {
|
||||
// browser type flags
|
||||
isFirefox : userAgent.indexOf("firefox") != -1,
|
||||
isChrome : userAgent.indexOf("chrome") != -1,
|
||||
isSafari : userAgent.indexOf("safari") != -1,
|
||||
isOpera : userAgent.indexOf("opera") != -1,
|
||||
isIE : userAgent.indexOf("msie") != -1,
|
||||
// OS type flags
|
||||
isMacOS : userAgent.indexOf("mac") != -1,
|
||||
isLinux : userAgent.indexOf("linux") != -1,
|
||||
isWindows : userAgent.indexOf("win") != -1
|
||||
};
|
||||
}-*/;
|
||||
|
||||
/** Returned by {@link #agentInfo}. Kindly borrowed from PlayN. */
|
||||
/**
|
||||
* Returned by {@link #agentInfo}. Kindly borrowed from PlayN.
|
||||
*/
|
||||
public static class AgentInfo extends JavaScriptObject {
|
||||
public final native boolean isFirefox () /*-{
|
||||
return this.isFirefox;
|
||||
}-*/;
|
||||
public final native boolean isFirefox() /*-{
|
||||
return this.isFirefox;
|
||||
}-*/;
|
||||
|
||||
public final native boolean isChrome () /*-{
|
||||
return this.isChrome;
|
||||
}-*/;
|
||||
public final native boolean isChrome() /*-{
|
||||
return this.isChrome;
|
||||
}-*/;
|
||||
|
||||
public final native boolean isSafari () /*-{
|
||||
return this.isSafari;
|
||||
}-*/;
|
||||
public final native boolean isSafari() /*-{
|
||||
return this.isSafari;
|
||||
}-*/;
|
||||
|
||||
public final native boolean isOpera () /*-{
|
||||
return this.isOpera;
|
||||
}-*/;
|
||||
public final native boolean isOpera() /*-{
|
||||
return this.isOpera;
|
||||
}-*/;
|
||||
|
||||
public final native boolean isIE () /*-{
|
||||
return this.isIE;
|
||||
}-*/;
|
||||
public final native boolean isIE() /*-{
|
||||
return this.isIE;
|
||||
}-*/;
|
||||
|
||||
public final native boolean isMacOS () /*-{
|
||||
return this.isMacOS;
|
||||
}-*/;
|
||||
public final native boolean isMacOS() /*-{
|
||||
return this.isMacOS;
|
||||
}-*/;
|
||||
|
||||
public final native boolean isLinux () /*-{
|
||||
return this.isLinux;
|
||||
}-*/;
|
||||
public final native boolean isLinux() /*-{
|
||||
return this.isLinux;
|
||||
}-*/;
|
||||
|
||||
public final native boolean isWindows () /*-{
|
||||
return this.isWindows;
|
||||
}-*/;
|
||||
public final native boolean isWindows() /*-{
|
||||
return this.isWindows;
|
||||
}-*/;
|
||||
|
||||
protected AgentInfo () {
|
||||
protected AgentInfo() {
|
||||
}
|
||||
}
|
||||
|
||||
public String getBaseUrl () {
|
||||
public String getBaseUrl() {
|
||||
return preloader.baseUrl;
|
||||
}
|
||||
|
||||
public Preloader getPreloader () {
|
||||
public Preloader getPreloader() {
|
||||
return preloader;
|
||||
}
|
||||
|
||||
public CanvasElement getCanvasElement(){
|
||||
public CanvasElement getCanvasElement() {
|
||||
return graphics.canvas;
|
||||
}
|
||||
|
||||
public LoadingListener getLoadingListener () {
|
||||
public LoadingListener getLoadingListener() {
|
||||
return loadingListener;
|
||||
}
|
||||
|
||||
public void setLoadingListener (LoadingListener loadingListener) {
|
||||
public void setLoadingListener(LoadingListener loadingListener) {
|
||||
this.loadingListener = loadingListener;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addLifecycleListener (LifecycleListener listener) {
|
||||
synchronized(lifecycleListeners) {
|
||||
public void addLifecycleListener(LifecycleListener listener) {
|
||||
synchronized (lifecycleListeners) {
|
||||
lifecycleListeners.add(listener);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeLifecycleListener (LifecycleListener listener) {
|
||||
synchronized(lifecycleListeners) {
|
||||
public void removeLifecycleListener(LifecycleListener listener) {
|
||||
synchronized (lifecycleListeners) {
|
||||
lifecycleListeners.removeValue(listener, true);
|
||||
}
|
||||
}
|
||||
|
||||
native static public void consoleLog(String message) /*-{
|
||||
console.log( "GWT: " + message );
|
||||
}-*/;
|
||||
console.log( "GWT: " + message );
|
||||
}-*/;
|
||||
|
||||
private native void addEventListeners () /*-{
|
||||
var self = this;
|
||||
$doc.addEventListener('visibilitychange', function (e) {
|
||||
self.@com.badlogic.gdx.backends.gwt.GwtApplication::onVisibilityChange(Z)($doc['hidden'] !== true);
|
||||
});
|
||||
}-*/;
|
||||
private native void addEventListeners() /*-{
|
||||
var self = this;
|
||||
$doc.addEventListener('visibilitychange', function (e) {
|
||||
self.@com.badlogic.gdx.backends.gwt.GwtApplication::onVisibilityChange(Z)($doc['hidden'] !== true);
|
||||
});
|
||||
}-*/;
|
||||
|
||||
private void onVisibilityChange (boolean visible) {
|
||||
private void onVisibilityChange(boolean visible) {
|
||||
if (visible) {
|
||||
for (LifecycleListener listener : lifecycleListeners) {
|
||||
listener.resume();
|
||||
@ -578,7 +588,7 @@ public abstract class GwtApplication implements EntryPoint, Application {
|
||||
/**
|
||||
* LoadingListener interface main purpose is to do some things before or after {@link GwtApplication#setupLoop()}
|
||||
*/
|
||||
public interface LoadingListener{
|
||||
public interface LoadingListener {
|
||||
/**
|
||||
* Method called before the setup
|
||||
*/
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
/*******************************************************************************
|
||||
* Copyright 2011 See AUTHORS file.
|
||||
*
|
||||
* <p>
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* <p>
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* <p>
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
/*******************************************************************************
|
||||
* Copyright 2011 See AUTHORS file.
|
||||
*
|
||||
* <p>
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* <p>
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* <p>
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@ -52,12 +52,12 @@ public class GwtInput implements Input {
|
||||
final CanvasElement canvas;
|
||||
boolean hasFocus = true;
|
||||
|
||||
public GwtInput (CanvasElement canvas) {
|
||||
public GwtInput(CanvasElement canvas) {
|
||||
this.canvas = canvas;
|
||||
hookEvents();
|
||||
}
|
||||
|
||||
void reset () {
|
||||
void reset() {
|
||||
justTouched = false;
|
||||
if (keyJustPressed) {
|
||||
keyJustPressed = false;
|
||||
@ -68,80 +68,80 @@ public class GwtInput implements Input {
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getAccelerometerX () {
|
||||
public float getAccelerometerX() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getAccelerometerY () {
|
||||
public float getAccelerometerY() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getAccelerometerZ () {
|
||||
public float getAccelerometerZ() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getGyroscopeX () {
|
||||
public float getGyroscopeX() {
|
||||
// TODO Auto-generated method stub
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getGyroscopeY () {
|
||||
public float getGyroscopeY() {
|
||||
// TODO Auto-generated method stub
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getGyroscopeZ () {
|
||||
public float getGyroscopeZ() {
|
||||
// TODO Auto-generated method stub
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getX () {
|
||||
public int getX() {
|
||||
return touchX[0];
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getX (int pointer) {
|
||||
public int getX(int pointer) {
|
||||
return touchX[pointer];
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getDeltaX () {
|
||||
public int getDeltaX() {
|
||||
return deltaX[0];
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getDeltaX (int pointer) {
|
||||
public int getDeltaX(int pointer) {
|
||||
return deltaX[pointer];
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getY () {
|
||||
public int getY() {
|
||||
return touchY[0];
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getY (int pointer) {
|
||||
public int getY(int pointer) {
|
||||
return touchY[pointer];
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getDeltaY () {
|
||||
public int getDeltaY() {
|
||||
return deltaY[0];
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getDeltaY (int pointer) {
|
||||
public int getDeltaY(int pointer) {
|
||||
return deltaY[pointer];
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isTouched () {
|
||||
public boolean isTouched() {
|
||||
for (int pointer = 0; pointer < MAX_TOUCHES; pointer++) {
|
||||
if (touched[pointer]) {
|
||||
return true;
|
||||
@ -151,22 +151,22 @@ public class GwtInput implements Input {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean justTouched () {
|
||||
public boolean justTouched() {
|
||||
return justTouched;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isTouched (int pointer) {
|
||||
public boolean isTouched(int pointer) {
|
||||
return touched[pointer];
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isButtonPressed (int button) {
|
||||
public boolean isButtonPressed(int button) {
|
||||
return pressedButtons.contains(button) && touched[0];
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isKeyPressed (int key) {
|
||||
public boolean isKeyPressed(int key) {
|
||||
if (key == Keys.ANY_KEY) {
|
||||
return pressedKeyCount > 0;
|
||||
}
|
||||
@ -177,7 +177,7 @@ public class GwtInput implements Input {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isKeyJustPressed (int key) {
|
||||
public boolean isKeyJustPressed(int key) {
|
||||
if (key == Keys.ANY_KEY) {
|
||||
return keyJustPressed;
|
||||
}
|
||||
@ -187,19 +187,19 @@ public class GwtInput implements Input {
|
||||
return justPressedKeys[key];
|
||||
}
|
||||
|
||||
public void getTextInput (TextInputListener listener, String title, String text, String hint) {
|
||||
public void getTextInput(TextInputListener listener, String title, String text, String hint) {
|
||||
TextInputDialogBox dialog = new TextInputDialogBox(title, text, hint);
|
||||
final TextInputListener capturedListener = listener;
|
||||
dialog.setListener(new TextInputDialogListener() {
|
||||
@Override
|
||||
public void onPositive (String text) {
|
||||
public void onPositive(String text) {
|
||||
if (capturedListener != null) {
|
||||
capturedListener.input(text);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onNegative () {
|
||||
public void onNegative() {
|
||||
if (capturedListener != null) {
|
||||
capturedListener.canceled();
|
||||
}
|
||||
@ -208,75 +208,75 @@ public class GwtInput implements Input {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setOnscreenKeyboardVisible (boolean visible) {
|
||||
public void setOnscreenKeyboardVisible(boolean visible) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void vibrate (int milliseconds) {
|
||||
public void vibrate(int milliseconds) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void vibrate (long[] pattern, int repeat) {
|
||||
public void vibrate(long[] pattern, int repeat) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void cancelVibrate () {
|
||||
public void cancelVibrate() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getAzimuth () {
|
||||
public float getAzimuth() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getPitch () {
|
||||
public float getPitch() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getRoll () {
|
||||
public float getRoll() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getRotationMatrix (float[] matrix) {
|
||||
public void getRotationMatrix(float[] matrix) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getCurrentEventTime () {
|
||||
public long getCurrentEventTime() {
|
||||
return currentEventTimeStamp;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setCatchBackKey (boolean catchBack) {
|
||||
public void setCatchBackKey(boolean catchBack) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isCatchBackKey () {
|
||||
public boolean isCatchBackKey() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setCatchMenuKey (boolean catchMenu) {
|
||||
public void setCatchMenuKey(boolean catchMenu) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isCatchMenuKey () {
|
||||
public boolean isCatchMenuKey() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setInputProcessor (InputProcessor processor) {
|
||||
public void setInputProcessor(InputProcessor processor) {
|
||||
this.processor = processor;
|
||||
}
|
||||
|
||||
@Override
|
||||
public InputProcessor getInputProcessor () {
|
||||
public InputProcessor getInputProcessor() {
|
||||
return processor;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isPeripheralAvailable (Peripheral peripheral) {
|
||||
public boolean isPeripheralAvailable(Peripheral peripheral) {
|
||||
if (peripheral == Peripheral.Accelerometer) return false;
|
||||
if (peripheral == Peripheral.Compass) return false;
|
||||
if (peripheral == Peripheral.HardwareKeyboard) return true;
|
||||
@ -287,95 +287,111 @@ public class GwtInput implements Input {
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRotation () {
|
||||
public int getRotation() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Orientation getNativeOrientation () {
|
||||
public Orientation getNativeOrientation() {
|
||||
return Orientation.Landscape;
|
||||
}
|
||||
|
||||
/** from https://github.com/toji/game-shim/blob/master/game-shim.js
|
||||
* @return is Cursor catched */
|
||||
private native boolean isCursorCatchedJSNI () /*-{
|
||||
if (!navigator.pointer) {
|
||||
navigator.pointer = navigator.webkitPointer || navigator.mozPointer;
|
||||
}
|
||||
if (navigator.pointer) {
|
||||
if (typeof (navigator.pointer.isLocked) === "boolean") {
|
||||
// Chrome initially launched with this interface
|
||||
return navigator.pointer.isLocked;
|
||||
} else if (typeof (navigator.pointer.isLocked) === "function") {
|
||||
// Some older builds might provide isLocked as a function
|
||||
return navigator.pointer.isLocked();
|
||||
} else if (typeof (navigator.pointer.islocked) === "function") {
|
||||
// For compatibility with early Firefox build
|
||||
return navigator.pointer.islocked();
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}-*/;
|
||||
/**
|
||||
* from https://github.com/toji/game-shim/blob/master/game-shim.js
|
||||
*
|
||||
* @return is Cursor catched
|
||||
*/
|
||||
private native boolean isCursorCatchedJSNI() /*-{
|
||||
if (!navigator.pointer) {
|
||||
navigator.pointer = navigator.webkitPointer || navigator.mozPointer;
|
||||
}
|
||||
if (navigator.pointer) {
|
||||
if (typeof (navigator.pointer.isLocked) === "boolean") {
|
||||
// Chrome initially launched with this interface
|
||||
return navigator.pointer.isLocked;
|
||||
} else if (typeof (navigator.pointer.isLocked) === "function") {
|
||||
// Some older builds might provide isLocked as a function
|
||||
return navigator.pointer.isLocked();
|
||||
} else if (typeof (navigator.pointer.islocked) === "function") {
|
||||
// For compatibility with early Firefox build
|
||||
return navigator.pointer.islocked();
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}-*/;
|
||||
|
||||
/** from https://github.com/toji/game-shim/blob/master/game-shim.js
|
||||
* @param element Canvas */
|
||||
private native void setCursorCatchedJSNI (CanvasElement element) /*-{
|
||||
// Navigator pointer is not the right interface according to spec.
|
||||
// Here for backwards compatibility only
|
||||
if (!navigator.pointer) {
|
||||
navigator.pointer = navigator.webkitPointer || navigator.mozPointer;
|
||||
}
|
||||
// element.requestPointerLock
|
||||
if (!element.requestPointerLock) {
|
||||
element.requestPointerLock = (function() {
|
||||
return element.webkitRequestPointerLock
|
||||
|| element.mozRequestPointerLock || function() {
|
||||
if (navigator.pointer) {
|
||||
navigator.pointer.lock(element);
|
||||
}
|
||||
};
|
||||
})();
|
||||
}
|
||||
element.requestPointerLock();
|
||||
}-*/;
|
||||
/**
|
||||
* from https://github.com/toji/game-shim/blob/master/game-shim.js
|
||||
*
|
||||
* @param element Canvas
|
||||
*/
|
||||
private native void setCursorCatchedJSNI(CanvasElement element) /*-{
|
||||
// Navigator pointer is not the right interface according to spec.
|
||||
// Here for backwards compatibility only
|
||||
if (!navigator.pointer) {
|
||||
navigator.pointer = navigator.webkitPointer || navigator.mozPointer;
|
||||
}
|
||||
// element.requestPointerLock
|
||||
if (!element.requestPointerLock) {
|
||||
element.requestPointerLock = (function() {
|
||||
return element.webkitRequestPointerLock
|
||||
|| element.mozRequestPointerLock || function() {
|
||||
if (navigator.pointer) {
|
||||
navigator.pointer.lock(element);
|
||||
}
|
||||
};
|
||||
})();
|
||||
}
|
||||
element.requestPointerLock();
|
||||
}-*/;
|
||||
|
||||
/** from https://github.com/toji/game-shim/blob/master/game-shim.js */
|
||||
private native void exitCursorCatchedJSNI () /*-{
|
||||
if (!$doc.exitPointerLock) {
|
||||
$doc.exitPointerLock = (function() {
|
||||
return $doc.webkitExitPointerLock || $doc.mozExitPointerLock
|
||||
|| function() {
|
||||
if (navigator.pointer) {
|
||||
var elem = this;
|
||||
navigator.pointer.unlock();
|
||||
}
|
||||
};
|
||||
})();
|
||||
}
|
||||
}-*/;
|
||||
/**
|
||||
* from https://github.com/toji/game-shim/blob/master/game-shim.js
|
||||
*/
|
||||
private native void exitCursorCatchedJSNI() /*-{
|
||||
if (!$doc.exitPointerLock) {
|
||||
$doc.exitPointerLock = (function() {
|
||||
return $doc.webkitExitPointerLock || $doc.mozExitPointerLock
|
||||
|| function() {
|
||||
if (navigator.pointer) {
|
||||
var elem = this;
|
||||
navigator.pointer.unlock();
|
||||
}
|
||||
};
|
||||
})();
|
||||
}
|
||||
}-*/;
|
||||
|
||||
/** from https://github.com/toji/game-shim/blob/master/game-shim.js
|
||||
/**
|
||||
* from https://github.com/toji/game-shim/blob/master/game-shim.js
|
||||
*
|
||||
* @param event JavaScript Mouse Event
|
||||
* @return movement in x direction */
|
||||
private native float getMovementXJSNI (NativeEvent event) /*-{
|
||||
return event.movementX || event.webkitMovementX || 0;
|
||||
}-*/;
|
||||
* @return movement in x direction
|
||||
*/
|
||||
private native float getMovementXJSNI(NativeEvent event) /*-{
|
||||
return event.movementX || event.webkitMovementX || 0;
|
||||
}-*/;
|
||||
|
||||
/** from https://github.com/toji/game-shim/blob/master/game-shim.js
|
||||
/**
|
||||
* from https://github.com/toji/game-shim/blob/master/game-shim.js
|
||||
*
|
||||
* @param event JavaScript Mouse Event
|
||||
* @return movement in y direction */
|
||||
private native float getMovementYJSNI (NativeEvent event) /*-{
|
||||
return event.movementY || event.webkitMovementY || 0;
|
||||
}-*/;
|
||||
* @return movement in y direction
|
||||
*/
|
||||
private native float getMovementYJSNI(NativeEvent event) /*-{
|
||||
return event.movementY || event.webkitMovementY || 0;
|
||||
}-*/;
|
||||
|
||||
private static native boolean isTouchScreen () /*-{
|
||||
return (('ontouchstart' in window) || (navigator.msMaxTouchPoints > 0));
|
||||
}-*/;
|
||||
private static native boolean isTouchScreen() /*-{
|
||||
return (('ontouchstart' in window) || (navigator.msMaxTouchPoints > 0));
|
||||
}-*/;
|
||||
|
||||
/** works only for Chrome > Version 18 with enabled Mouse Lock enable in about:flags or start Chrome with the
|
||||
* --enable-pointer-lock flag */
|
||||
/**
|
||||
* works only for Chrome > Version 18 with enabled Mouse Lock enable in about:flags or start Chrome with the
|
||||
* --enable-pointer-lock flag
|
||||
*/
|
||||
@Override
|
||||
public void setCursorCatched (boolean catched) {
|
||||
public void setCursorCatched(boolean catched) {
|
||||
if (catched)
|
||||
setCursorCatchedJSNI(canvas);
|
||||
else
|
||||
@ -383,90 +399,96 @@ public class GwtInput implements Input {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isCursorCatched () {
|
||||
public boolean isCursorCatched() {
|
||||
return isCursorCatchedJSNI();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setCursorPosition (int x, int y) {
|
||||
public void setCursorPosition(int x, int y) {
|
||||
// FIXME??
|
||||
}
|
||||
|
||||
// kindly borrowed from our dear playn friends...
|
||||
static native void addEventListener (JavaScriptObject target, String name, GwtInput handler, boolean capture) /*-{
|
||||
target
|
||||
.addEventListener(
|
||||
name,
|
||||
function(e) {
|
||||
handler.@com.badlogic.gdx.backends.gwt.GwtInput::handleEvent(Lcom/google/gwt/dom/client/NativeEvent;)(e);
|
||||
}, capture);
|
||||
}-*/;
|
||||
static native void addEventListener(JavaScriptObject target, String name, GwtInput handler, boolean capture) /*-{
|
||||
target
|
||||
.addEventListener(
|
||||
name,
|
||||
function(e) {
|
||||
handler.@com.badlogic.gdx.backends.gwt.GwtInput::handleEvent(Lcom/google/gwt/dom/client/NativeEvent;)(e);
|
||||
}, capture);
|
||||
}-*/;
|
||||
|
||||
private static native float getMouseWheelVelocity (NativeEvent evt) /*-{
|
||||
var delta = 0.0;
|
||||
var agentInfo = @com.badlogic.gdx.backends.gwt.GwtApplication::agentInfo()();
|
||||
private static native float getMouseWheelVelocity(NativeEvent evt) /*-{
|
||||
var delta = 0.0;
|
||||
var agentInfo = @com.badlogic.gdx.backends.gwt.GwtApplication::agentInfo()();
|
||||
|
||||
if (agentInfo.isFirefox) {
|
||||
if (agentInfo.isMacOS) {
|
||||
delta = 1.0 * evt.detail;
|
||||
} else {
|
||||
delta = 1.0 * evt.detail / 3;
|
||||
}
|
||||
} else if (agentInfo.isOpera) {
|
||||
if (agentInfo.isLinux) {
|
||||
delta = -1.0 * evt.wheelDelta / 80;
|
||||
} else {
|
||||
// on mac
|
||||
delta = -1.0 * evt.wheelDelta / 40;
|
||||
}
|
||||
} else if (agentInfo.isChrome || agentInfo.isSafari) {
|
||||
delta = -1.0 * evt.wheelDelta / 120;
|
||||
// handle touchpad for chrome
|
||||
if (Math.abs(delta) < 1) {
|
||||
if (agentInfo.isWindows) {
|
||||
delta = -1.0 * evt.wheelDelta;
|
||||
} else if (agentInfo.isMacOS) {
|
||||
delta = -1.0 * evt.wheelDelta / 3;
|
||||
}
|
||||
}
|
||||
}
|
||||
return delta;
|
||||
}-*/;
|
||||
if (agentInfo.isFirefox) {
|
||||
if (agentInfo.isMacOS) {
|
||||
delta = 1.0 * evt.detail;
|
||||
} else {
|
||||
delta = 1.0 * evt.detail / 3;
|
||||
}
|
||||
} else if (agentInfo.isOpera) {
|
||||
if (agentInfo.isLinux) {
|
||||
delta = -1.0 * evt.wheelDelta / 80;
|
||||
} else {
|
||||
// on mac
|
||||
delta = -1.0 * evt.wheelDelta / 40;
|
||||
}
|
||||
} else if (agentInfo.isChrome || agentInfo.isSafari) {
|
||||
delta = -1.0 * evt.wheelDelta / 120;
|
||||
// handle touchpad for chrome
|
||||
if (Math.abs(delta) < 1) {
|
||||
if (agentInfo.isWindows) {
|
||||
delta = -1.0 * evt.wheelDelta;
|
||||
} else if (agentInfo.isMacOS) {
|
||||
delta = -1.0 * evt.wheelDelta / 3;
|
||||
}
|
||||
}
|
||||
}
|
||||
return delta;
|
||||
}-*/;
|
||||
|
||||
/** Kindly borrowed from PlayN. **/
|
||||
protected static native String getMouseWheelEvent () /*-{
|
||||
if (navigator.userAgent.toLowerCase().indexOf('firefox') != -1) {
|
||||
return "DOMMouseScroll";
|
||||
} else {
|
||||
return "mousewheel";
|
||||
}
|
||||
}-*/;
|
||||
/**
|
||||
* Kindly borrowed from PlayN.
|
||||
**/
|
||||
protected static native String getMouseWheelEvent() /*-{
|
||||
if (navigator.userAgent.toLowerCase().indexOf('firefox') != -1) {
|
||||
return "DOMMouseScroll";
|
||||
} else {
|
||||
return "mousewheel";
|
||||
}
|
||||
}-*/;
|
||||
|
||||
/** Kindly borrowed from PlayN. **/
|
||||
protected int getRelativeX (NativeEvent e, CanvasElement target) {
|
||||
/**
|
||||
* Kindly borrowed from PlayN.
|
||||
**/
|
||||
protected int getRelativeX(NativeEvent e, CanvasElement target) {
|
||||
float xScaleRatio = target.getWidth() * 1f / target.getClientWidth(); // Correct for canvas CSS scaling
|
||||
return Math.round(xScaleRatio
|
||||
* (e.getClientX() - target.getAbsoluteLeft() + target.getScrollLeft() + target.getOwnerDocument().getScrollLeft()));
|
||||
}
|
||||
|
||||
/** Kindly borrowed from PlayN. **/
|
||||
protected int getRelativeY (NativeEvent e, CanvasElement target) {
|
||||
/**
|
||||
* Kindly borrowed from PlayN.
|
||||
**/
|
||||
protected int getRelativeY(NativeEvent e, CanvasElement target) {
|
||||
float yScaleRatio = target.getHeight() * 1f / target.getClientHeight(); // Correct for canvas CSS scaling
|
||||
return Math.round(yScaleRatio
|
||||
* (e.getClientY() - target.getAbsoluteTop() + target.getScrollTop() + target.getOwnerDocument().getScrollTop()));
|
||||
}
|
||||
|
||||
protected int getRelativeX (Touch touch, CanvasElement target) {
|
||||
protected int getRelativeX(Touch touch, CanvasElement target) {
|
||||
float xScaleRatio = target.getWidth() * 1f / target.getClientWidth(); // Correct for canvas CSS scaling
|
||||
return Math.round(xScaleRatio * touch.getRelativeX(target));
|
||||
}
|
||||
|
||||
protected int getRelativeY (Touch touch, CanvasElement target) {
|
||||
protected int getRelativeY(Touch touch, CanvasElement target) {
|
||||
float yScaleRatio = target.getHeight() * 1f / target.getClientHeight(); // Correct for canvas CSS scaling
|
||||
return Math.round(yScaleRatio * touch.getRelativeY(target));
|
||||
}
|
||||
|
||||
private void hookEvents () {
|
||||
private void hookEvents() {
|
||||
addEventListener(canvas, "mousedown", this, true);
|
||||
// addEventListener(Document.get(), "mousedown", this, true);
|
||||
addEventListener(canvas, "mouseup", this, true);
|
||||
@ -488,14 +510,14 @@ public class GwtInput implements Input {
|
||||
|
||||
}
|
||||
|
||||
private int getButton (int button) {
|
||||
private int getButton(int button) {
|
||||
if (button == NativeEvent.BUTTON_LEFT) return Buttons.LEFT;
|
||||
if (button == NativeEvent.BUTTON_RIGHT) return Buttons.RIGHT;
|
||||
if (button == NativeEvent.BUTTON_MIDDLE) return Buttons.MIDDLE;
|
||||
return Buttons.LEFT;
|
||||
}
|
||||
|
||||
private void handleEvent (NativeEvent e) {
|
||||
private void handleEvent(NativeEvent e) {
|
||||
if (e.getType().equals("mousedown")) {
|
||||
if (!e.getEventTarget().equals(canvas) || touched[0]) {
|
||||
float mouseX = getRelativeX(e, canvas);
|
||||
@ -519,13 +541,14 @@ public class GwtInput implements Input {
|
||||
this.touchY[0] = getRelativeY(e, canvas);
|
||||
}
|
||||
this.currentEventTimeStamp = TimeUtils.nanoTime();
|
||||
if (processor != null) processor.touchDown(touchX[0], touchY[0], 0, getButton(e.getButton()));
|
||||
if (processor != null)
|
||||
processor.touchDown(touchX[0], touchY[0], 0, getButton(e.getButton()));
|
||||
}
|
||||
|
||||
if (e.getType().equals("mousemove")) {
|
||||
if (isCursorCatched()) {
|
||||
this.deltaX[0] = (int)getMovementXJSNI(e);
|
||||
this.deltaY[0] = (int)getMovementYJSNI(e);
|
||||
this.deltaX[0] = (int) getMovementXJSNI(e);
|
||||
this.deltaY[0] = (int) getMovementYJSNI(e);
|
||||
this.touchX[0] += getMovementXJSNI(e);
|
||||
this.touchY[0] += getMovementYJSNI(e);
|
||||
} else {
|
||||
@ -548,8 +571,8 @@ public class GwtInput implements Input {
|
||||
this.pressedButtons.remove(getButton(e.getButton()));
|
||||
this.touched[0] = pressedButtons.size > 0;
|
||||
if (isCursorCatched()) {
|
||||
this.deltaX[0] = (int)getMovementXJSNI(e);
|
||||
this.deltaY[0] = (int)getMovementYJSNI(e);
|
||||
this.deltaX[0] = (int) getMovementXJSNI(e);
|
||||
this.deltaY[0] = (int) getMovementYJSNI(e);
|
||||
this.touchX[0] += getMovementXJSNI(e);
|
||||
this.touchY[0] += getMovementYJSNI(e);
|
||||
} else {
|
||||
@ -560,11 +583,12 @@ public class GwtInput implements Input {
|
||||
}
|
||||
this.currentEventTimeStamp = TimeUtils.nanoTime();
|
||||
this.touched[0] = false;
|
||||
if (processor != null) processor.touchUp(touchX[0], touchY[0], 0, getButton(e.getButton()));
|
||||
if (processor != null)
|
||||
processor.touchUp(touchX[0], touchY[0], 0, getButton(e.getButton()));
|
||||
}
|
||||
if (e.getType().equals(getMouseWheelEvent())) {
|
||||
if (processor != null) {
|
||||
processor.scrolled((int)getMouseWheelVelocity(e));
|
||||
processor.scrolled((int) getMouseWheelVelocity(e));
|
||||
}
|
||||
this.currentEventTimeStamp = TimeUtils.nanoTime();
|
||||
e.preventDefault();
|
||||
@ -593,7 +617,7 @@ public class GwtInput implements Input {
|
||||
|
||||
if (e.getType().equals("keypress") && hasFocus) {
|
||||
// System.out.println("keypress");
|
||||
char c = (char)e.getCharCode();
|
||||
char c = (char) e.getCharCode();
|
||||
if (processor != null) processor.keyTyped(c);
|
||||
}
|
||||
|
||||
@ -687,15 +711,17 @@ public class GwtInput implements Input {
|
||||
// if(hasFocus) e.preventDefault();
|
||||
}
|
||||
|
||||
private int getAvailablePointer () {
|
||||
private int getAvailablePointer() {
|
||||
for (int i = 0; i < MAX_TOUCHES; i++) {
|
||||
if (!touchMap.containsValue(i, false)) return i;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
/** borrowed from PlayN, thanks guys **/
|
||||
private static int keyForCode (int keyCode) {
|
||||
/**
|
||||
* borrowed from PlayN, thanks guys
|
||||
**/
|
||||
private static int keyForCode(int keyCode) {
|
||||
switch (keyCode) {
|
||||
case KeyCodes.KEY_ALT:
|
||||
return Keys.ALT_LEFT;
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
/*******************************************************************************
|
||||
* Copyright 2011 See AUTHORS file.
|
||||
*
|
||||
* <p>
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* <p>
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* <p>
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@ -16,11 +16,6 @@
|
||||
|
||||
package com.badlogic.gdx.graphics;
|
||||
|
||||
import java.nio.Buffer;
|
||||
import java.nio.IntBuffer;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import com.badlogic.gdx.backends.gwt.GwtFileHandle;
|
||||
import com.badlogic.gdx.files.FileHandle;
|
||||
import com.badlogic.gdx.utils.BufferUtils;
|
||||
@ -33,17 +28,24 @@ import com.google.gwt.canvas.dom.client.Context2d.Composite;
|
||||
import com.google.gwt.dom.client.CanvasElement;
|
||||
import com.google.gwt.dom.client.ImageElement;
|
||||
|
||||
import java.nio.Buffer;
|
||||
import java.nio.IntBuffer;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class Pixmap implements Disposable {
|
||||
public static Map<Integer, Pixmap> pixmaps = new HashMap<Integer, Pixmap>();
|
||||
static int nextId = 0;
|
||||
|
||||
/** Different pixel formats.
|
||||
/**
|
||||
* Different pixel formats.
|
||||
*
|
||||
* @author mzechner */
|
||||
* @author mzechner
|
||||
*/
|
||||
public enum Format {
|
||||
Alpha, Intensity, LuminanceAlpha, RGB565, RGBA4444, RGB888, RGBA8888;
|
||||
|
||||
public static int toGlFormat (Format format) {
|
||||
public static int toGlFormat(Format format) {
|
||||
if (format == Alpha) return GL20.GL_ALPHA;
|
||||
if (format == Intensity) return GL20.GL_ALPHA;
|
||||
if (format == LuminanceAlpha) return GL20.GL_LUMINANCE_ALPHA;
|
||||
@ -54,7 +56,7 @@ public class Pixmap implements Disposable {
|
||||
throw new GdxRuntimeException("unknown format: " + format);
|
||||
}
|
||||
|
||||
public static int toGlType (Format format) {
|
||||
public static int toGlType(Format format) {
|
||||
if (format == Alpha) return GL20.GL_UNSIGNED_BYTE;
|
||||
if (format == Intensity) return GL20.GL_UNSIGNED_BYTE;
|
||||
if (format == LuminanceAlpha) return GL20.GL_UNSIGNED_BYTE;
|
||||
@ -66,15 +68,20 @@ public class Pixmap implements Disposable {
|
||||
}
|
||||
}
|
||||
|
||||
/** Blending functions to be set with {@link Pixmap#setBlending}.
|
||||
* @author mzechner */
|
||||
/**
|
||||
* Blending functions to be set with {@link Pixmap#setBlending}.
|
||||
*
|
||||
* @author mzechner
|
||||
*/
|
||||
public enum Blending {
|
||||
None, SourceOver
|
||||
}
|
||||
|
||||
/** Filters to be used with {@link Pixmap#drawPixmap(Pixmap, int, int, int, int, int, int, int, int)}.
|
||||
/**
|
||||
* Filters to be used with {@link Pixmap#drawPixmap(Pixmap, int, int, int, int, int, int, int, int)}.
|
||||
*
|
||||
* @author mzechner */
|
||||
* @author mzechner
|
||||
*/
|
||||
public enum Filter {
|
||||
NearestNeighbour, BiLinear
|
||||
}
|
||||
@ -94,9 +101,10 @@ public class Pixmap implements Disposable {
|
||||
CanvasPixelArray pixels;
|
||||
private ImageElement imageElement;
|
||||
|
||||
public Pixmap (FileHandle file) {
|
||||
this(((GwtFileHandle)file).preloader.images.get(file.path()));
|
||||
if (imageElement == null) throw new GdxRuntimeException("Couldn't load image '" + file.path() + "', file does not exist");
|
||||
public Pixmap(FileHandle file) {
|
||||
this(((GwtFileHandle) file).preloader.images.get(file.path()));
|
||||
if (imageElement == null)
|
||||
throw new GdxRuntimeException("Couldn't load image '" + file.path() + "', file does not exist");
|
||||
}
|
||||
|
||||
public Context2d getContext() {
|
||||
@ -104,16 +112,16 @@ public class Pixmap implements Disposable {
|
||||
return context;
|
||||
}
|
||||
|
||||
private static Composite getComposite () {
|
||||
private static Composite getComposite() {
|
||||
return Composite.SOURCE_OVER;
|
||||
}
|
||||
|
||||
public Pixmap (ImageElement img) {
|
||||
public Pixmap(ImageElement img) {
|
||||
this(-1, -1, img);
|
||||
}
|
||||
|
||||
public Pixmap (int width, int height, Format format) {
|
||||
this(width, height, (ImageElement)null);
|
||||
public Pixmap(int width, int height, Format format) {
|
||||
this(width, height, (ImageElement) null);
|
||||
}
|
||||
|
||||
private Pixmap(int width, int height, ImageElement imageElement) {
|
||||
@ -127,7 +135,7 @@ public class Pixmap implements Disposable {
|
||||
pixmaps.put(id, this);
|
||||
}
|
||||
|
||||
private void create () {
|
||||
private void create() {
|
||||
canvas = Canvas.createIfSupported();
|
||||
canvas.getCanvasElement().setWidth(width);
|
||||
canvas.getCanvasElement().setHeight(height);
|
||||
@ -135,13 +143,16 @@ public class Pixmap implements Disposable {
|
||||
context.setGlobalCompositeOperation(getComposite());
|
||||
}
|
||||
|
||||
public static String make (int r2, int g2, int b2, float a2) {
|
||||
public static String make(int r2, int g2, int b2, float a2) {
|
||||
return "rgba(" + r2 + "," + g2 + "," + b2 + "," + a2 + ")";
|
||||
}
|
||||
|
||||
/** Sets the type of {@link Blending} to be used for all operations. Default is {@link Blending#SourceOver}.
|
||||
* @param blending the blending type */
|
||||
public static void setBlending (Blending blending) {
|
||||
/**
|
||||
* Sets the type of {@link Blending} to be used for all operations. Default is {@link Blending#SourceOver}.
|
||||
*
|
||||
* @param blending the blending type
|
||||
*/
|
||||
public static void setBlending(Blending blending) {
|
||||
Pixmap.blending = blending;
|
||||
Composite composite = getComposite();
|
||||
for (Pixmap pixmap : pixmaps.values()) {
|
||||
@ -150,56 +161,61 @@ public class Pixmap implements Disposable {
|
||||
}
|
||||
}
|
||||
|
||||
/** @return the currently set {@link Blending} */
|
||||
public static Blending getBlending () {
|
||||
/**
|
||||
* @return the currently set {@link Blending}
|
||||
*/
|
||||
public static Blending getBlending() {
|
||||
return blending;
|
||||
}
|
||||
|
||||
/** Sets the type of interpolation {@link Filter} to be used in conjunction with
|
||||
/**
|
||||
* Sets the type of interpolation {@link Filter} to be used in conjunction with
|
||||
* {@link Pixmap#drawPixmap(Pixmap, int, int, int, int, int, int, int, int)}.
|
||||
* @param filter the filter. */
|
||||
public static void setFilter (Filter filter) {
|
||||
*
|
||||
* @param filter the filter.
|
||||
*/
|
||||
public static void setFilter(Filter filter) {
|
||||
}
|
||||
|
||||
public Format getFormat () {
|
||||
public Format getFormat() {
|
||||
return format;
|
||||
}
|
||||
|
||||
public int getGLInternalFormat () {
|
||||
public int getGLInternalFormat() {
|
||||
return GL20.GL_RGBA;
|
||||
}
|
||||
|
||||
public int getGLFormat () {
|
||||
public int getGLFormat() {
|
||||
return GL20.GL_RGBA;
|
||||
}
|
||||
|
||||
public int getGLType () {
|
||||
public int getGLType() {
|
||||
return GL20.GL_UNSIGNED_BYTE;
|
||||
}
|
||||
|
||||
public int getWidth () {
|
||||
public int getWidth() {
|
||||
return width;
|
||||
}
|
||||
|
||||
public int getHeight () {
|
||||
public int getHeight() {
|
||||
return height;
|
||||
}
|
||||
|
||||
public Buffer getPixels () {
|
||||
public Buffer getPixels() {
|
||||
return buffer;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void dispose () {
|
||||
public void dispose() {
|
||||
pixmaps.remove(id);
|
||||
}
|
||||
|
||||
public CanvasElement getCanvasElement () {
|
||||
public CanvasElement getCanvasElement() {
|
||||
ensureCanvasExists();
|
||||
return canvas.getCanvasElement();
|
||||
}
|
||||
|
||||
private void ensureCanvasExists () {
|
||||
private void ensureCanvasExists() {
|
||||
if (canvas == null) {
|
||||
create();
|
||||
if (imageElement != null) {
|
||||
@ -210,17 +226,20 @@ public class Pixmap implements Disposable {
|
||||
}
|
||||
}
|
||||
|
||||
public boolean canUseImageElement () {
|
||||
public boolean canUseImageElement() {
|
||||
return canvas == null && imageElement != null;
|
||||
}
|
||||
|
||||
public ImageElement getImageElement () {
|
||||
public ImageElement getImageElement() {
|
||||
return imageElement;
|
||||
}
|
||||
|
||||
/** Sets the color for the following drawing operations
|
||||
* @param color the color, encoded as RGBA8888 */
|
||||
public void setColor (int color) {
|
||||
/**
|
||||
* Sets the color for the following drawing operations
|
||||
*
|
||||
* @param color the color, encoded as RGBA8888
|
||||
*/
|
||||
public void setColor(int color) {
|
||||
ensureCanvasExists();
|
||||
r = (color >>> 24) & 0xff;
|
||||
g = (color >>> 16) & 0xff;
|
||||
@ -231,31 +250,38 @@ public class Pixmap implements Disposable {
|
||||
context.setStrokeStyle(this.color);
|
||||
}
|
||||
|
||||
/** Sets the color for the following drawing operations.
|
||||
/**
|
||||
* Sets the color for the following drawing operations.
|
||||
*
|
||||
* @param r The red component.
|
||||
* @param g The green component.
|
||||
* @param b The blue component.
|
||||
* @param a The alpha component. */
|
||||
public void setColor (float r, float g, float b, float a) {
|
||||
* @param a The alpha component.
|
||||
*/
|
||||
public void setColor(float r, float g, float b, float a) {
|
||||
ensureCanvasExists();
|
||||
this.r = (int)(r * 255);
|
||||
this.g = (int)(g * 255);
|
||||
this.b = (int)(b * 255);
|
||||
this.r = (int) (r * 255);
|
||||
this.g = (int) (g * 255);
|
||||
this.b = (int) (b * 255);
|
||||
this.a = a;
|
||||
color = make(this.r, this.g, this.b, this.a);
|
||||
context.setFillStyle(color);
|
||||
context.setStrokeStyle(this.color);
|
||||
}
|
||||
|
||||
/** Sets the color for the following drawing operations.
|
||||
* @param color The color. */
|
||||
public void setColor (Color color) {
|
||||
/**
|
||||
* Sets the color for the following drawing operations.
|
||||
*
|
||||
* @param color The color.
|
||||
*/
|
||||
public void setColor(Color color) {
|
||||
setColor(color.r, color.g, color.b, color.a);
|
||||
}
|
||||
|
||||
/** Fills the complete bitmap with the currently set color. */
|
||||
public void fill () {
|
||||
/**
|
||||
* Fills the complete bitmap with the currently set color.
|
||||
*/
|
||||
public void fill() {
|
||||
ensureCanvasExists();
|
||||
context.clearRect(0, 0, getWidth(), getHeight());
|
||||
rectangle(0, 0, getWidth(), getHeight(), DrawType.FILL);
|
||||
@ -268,116 +294,136 @@ public class Pixmap implements Disposable {
|
||||
// */
|
||||
// public void setStrokeWidth (int width);
|
||||
|
||||
/** Draws a line between the given coordinates using the currently set color.
|
||||
/**
|
||||
* Draws a line between the given coordinates using the currently set color.
|
||||
*
|
||||
* @param x The x-coodinate of the first point
|
||||
* @param y The y-coordinate of the first point
|
||||
* @param x The x-coodinate of the first point
|
||||
* @param y The y-coordinate of the first point
|
||||
* @param x2 The x-coordinate of the first point
|
||||
* @param y2 The y-coordinate of the first point */
|
||||
public void drawLine (int x, int y, int x2, int y2) {
|
||||
* @param y2 The y-coordinate of the first point
|
||||
*/
|
||||
public void drawLine(int x, int y, int x2, int y2) {
|
||||
line(x, y, x2, y2, DrawType.STROKE);
|
||||
}
|
||||
|
||||
/** Draws a rectangle outline starting at x, y extending by width to the right and by height downwards (y-axis points downwards)
|
||||
/**
|
||||
* Draws a rectangle outline starting at x, y extending by width to the right and by height downwards (y-axis points downwards)
|
||||
* using the current color.
|
||||
*
|
||||
* @param x The x coordinate
|
||||
* @param y The y coordinate
|
||||
* @param width The width in pixels
|
||||
* @param height The height in pixels */
|
||||
public void drawRectangle (int x, int y, int width, int height) {
|
||||
* @param x The x coordinate
|
||||
* @param y The y coordinate
|
||||
* @param width The width in pixels
|
||||
* @param height The height in pixels
|
||||
*/
|
||||
public void drawRectangle(int x, int y, int width, int height) {
|
||||
rectangle(x, y, width, height, DrawType.STROKE);
|
||||
}
|
||||
|
||||
/** Draws an area form another Pixmap to this Pixmap.
|
||||
/**
|
||||
* Draws an area form another Pixmap to this Pixmap.
|
||||
*
|
||||
* @param pixmap The other Pixmap
|
||||
* @param x The target x-coordinate (top left corner)
|
||||
* @param y The target y-coordinate (top left corner) */
|
||||
public void drawPixmap (Pixmap pixmap, int x, int y) {
|
||||
* @param x The target x-coordinate (top left corner)
|
||||
* @param y The target y-coordinate (top left corner)
|
||||
*/
|
||||
public void drawPixmap(Pixmap pixmap, int x, int y) {
|
||||
CanvasElement image = pixmap.getCanvasElement();
|
||||
image(image, 0, 0, image.getWidth(), image.getHeight(), x, y, image.getWidth(), image.getHeight());
|
||||
}
|
||||
|
||||
/** Draws an area form another Pixmap to this Pixmap.
|
||||
/**
|
||||
* Draws an area form another Pixmap to this Pixmap.
|
||||
*
|
||||
* @param pixmap The other Pixmap
|
||||
* @param x The target x-coordinate (top left corner)
|
||||
* @param y The target y-coordinate (top left corner)
|
||||
* @param srcx The source x-coordinate (top left corner)
|
||||
* @param srcy The source y-coordinate (top left corner);
|
||||
* @param srcWidth The width of the area form the other Pixmap in pixels
|
||||
* @param srcHeight The height of the area form the other Pixmap in pixles */
|
||||
public void drawPixmap (Pixmap pixmap, int x, int y, int srcx, int srcy, int srcWidth, int srcHeight) {
|
||||
* @param pixmap The other Pixmap
|
||||
* @param x The target x-coordinate (top left corner)
|
||||
* @param y The target y-coordinate (top left corner)
|
||||
* @param srcx The source x-coordinate (top left corner)
|
||||
* @param srcy The source y-coordinate (top left corner);
|
||||
* @param srcWidth The width of the area form the other Pixmap in pixels
|
||||
* @param srcHeight The height of the area form the other Pixmap in pixles
|
||||
*/
|
||||
public void drawPixmap(Pixmap pixmap, int x, int y, int srcx, int srcy, int srcWidth, int srcHeight) {
|
||||
CanvasElement image = pixmap.getCanvasElement();
|
||||
image(image, srcx, srcy, srcWidth, srcHeight, x, y, srcWidth, srcHeight);
|
||||
}
|
||||
|
||||
/** Draws an area form another Pixmap to this Pixmap. This will automatically scale and stretch the source image to the
|
||||
/**
|
||||
* Draws an area form another Pixmap to this Pixmap. This will automatically scale and stretch the source image to the
|
||||
* specified target rectangle. Use {@link Pixmap#setFilter(Filter)} to specify the type of filtering to be used (nearest
|
||||
* neighbour or bilinear).
|
||||
*
|
||||
* @param pixmap The other Pixmap
|
||||
* @param srcx The source x-coordinate (top left corner)
|
||||
* @param srcy The source y-coordinate (top left corner);
|
||||
* @param srcWidth The width of the area form the other Pixmap in pixels
|
||||
* @param pixmap The other Pixmap
|
||||
* @param srcx The source x-coordinate (top left corner)
|
||||
* @param srcy The source y-coordinate (top left corner);
|
||||
* @param srcWidth The width of the area form the other Pixmap in pixels
|
||||
* @param srcHeight The height of the area form the other Pixmap in pixles
|
||||
* @param dstx The target x-coordinate (top left corner)
|
||||
* @param dsty The target y-coordinate (top left corner)
|
||||
* @param dstWidth The target width
|
||||
* @param dstHeight the target height */
|
||||
public void drawPixmap (Pixmap pixmap, int srcx, int srcy, int srcWidth, int srcHeight, int dstx, int dsty, int dstWidth,
|
||||
int dstHeight) {
|
||||
* @param dstx The target x-coordinate (top left corner)
|
||||
* @param dsty The target y-coordinate (top left corner)
|
||||
* @param dstWidth The target width
|
||||
* @param dstHeight the target height
|
||||
*/
|
||||
public void drawPixmap(Pixmap pixmap, int srcx, int srcy, int srcWidth, int srcHeight, int dstx, int dsty, int dstWidth,
|
||||
int dstHeight) {
|
||||
image(pixmap.getCanvasElement(), srcx, srcy, srcWidth, srcHeight, dstx, dsty, dstWidth, dstHeight);
|
||||
}
|
||||
|
||||
/** Fills a rectangle starting at x, y extending by width to the right and by height downwards (y-axis points downwards) using
|
||||
/**
|
||||
* Fills a rectangle starting at x, y extending by width to the right and by height downwards (y-axis points downwards) using
|
||||
* the current color.
|
||||
*
|
||||
* @param x The x coordinate
|
||||
* @param y The y coordinate
|
||||
* @param width The width in pixels
|
||||
* @param height The height in pixels */
|
||||
public void fillRectangle (int x, int y, int width, int height) {
|
||||
* @param x The x coordinate
|
||||
* @param y The y coordinate
|
||||
* @param width The width in pixels
|
||||
* @param height The height in pixels
|
||||
*/
|
||||
public void fillRectangle(int x, int y, int width, int height) {
|
||||
rectangle(x, y, width, height, DrawType.FILL);
|
||||
}
|
||||
|
||||
/** Draws a circle outline with the center at x,y and a radius using the current color and stroke width.
|
||||
/**
|
||||
* Draws a circle outline with the center at x,y and a radius using the current color and stroke width.
|
||||
*
|
||||
* @param x The x-coordinate of the center
|
||||
* @param y The y-coordinate of the center
|
||||
* @param radius The radius in pixels */
|
||||
public void drawCircle (int x, int y, int radius) {
|
||||
* @param x The x-coordinate of the center
|
||||
* @param y The y-coordinate of the center
|
||||
* @param radius The radius in pixels
|
||||
*/
|
||||
public void drawCircle(int x, int y, int radius) {
|
||||
circle(x, y, radius, DrawType.STROKE);
|
||||
}
|
||||
|
||||
/** Fills a circle with the center at x,y and a radius using the current color.
|
||||
/**
|
||||
* Fills a circle with the center at x,y and a radius using the current color.
|
||||
*
|
||||
* @param x The x-coordinate of the center
|
||||
* @param y The y-coordinate of the center
|
||||
* @param radius The radius in pixels */
|
||||
public void fillCircle (int x, int y, int radius) {
|
||||
* @param x The x-coordinate of the center
|
||||
* @param y The y-coordinate of the center
|
||||
* @param radius The radius in pixels
|
||||
*/
|
||||
public void fillCircle(int x, int y, int radius) {
|
||||
circle(x, y, radius, DrawType.FILL);
|
||||
}
|
||||
|
||||
/** Fills a triangle with vertices at x1,y1 and x2,y2 and x3,y3 using the current color.
|
||||
/**
|
||||
* Fills a triangle with vertices at x1,y1 and x2,y2 and x3,y3 using the current color.
|
||||
*
|
||||
* @param x1 The x-coordinate of vertex 1
|
||||
* @param y1 The y-coordinate of vertex 1
|
||||
* @param x2 The x-coordinate of vertex 2
|
||||
* @param y2 The y-coordinate of vertex 2
|
||||
* @param x3 The x-coordinate of vertex 3
|
||||
* @param y3 The y-coordinate of vertex 3 */
|
||||
public void fillTriangle (int x1, int y1, int x2, int y2, int x3, int y3) {
|
||||
* @param y3 The y-coordinate of vertex 3
|
||||
*/
|
||||
public void fillTriangle(int x1, int y1, int x2, int y2, int x3, int y3) {
|
||||
triangle(x1, y1, x2, y2, x3, y3, DrawType.FILL);
|
||||
}
|
||||
|
||||
/** Returns the 32-bit RGBA8888 value of the pixel at x, y. For Alpha formats the RGB components will be one.
|
||||
/**
|
||||
* Returns the 32-bit RGBA8888 value of the pixel at x, y. For Alpha formats the RGB components will be one.
|
||||
*
|
||||
* @param x The x-coordinate
|
||||
* @param y The y-coordinate
|
||||
* @return The pixel color in RGBA8888 format. */
|
||||
public int getPixel (int x, int y) {
|
||||
* @return The pixel color in RGBA8888 format.
|
||||
*/
|
||||
public int getPixel(int x, int y) {
|
||||
ensureCanvasExists();
|
||||
if (pixels == null) pixels = context.getImageData(0, 0, width, height).getData();
|
||||
int i = x * 4 + y * width * 4;
|
||||
@ -388,25 +434,29 @@ public class Pixmap implements Disposable {
|
||||
return (r << 24) | (g << 16) | (b << 8) | (a);
|
||||
}
|
||||
|
||||
/** Draws a pixel at the given location with the current color.
|
||||
*
|
||||
* @param x the x-coordinate
|
||||
* @param y the y-coordinate */
|
||||
public void drawPixel (int x, int y) {
|
||||
rectangle(x, y, 1, 1, DrawType.FILL);
|
||||
}
|
||||
|
||||
/** Draws a pixel at the given location with the given color.
|
||||
/**
|
||||
* Draws a pixel at the given location with the current color.
|
||||
*
|
||||
* @param x the x-coordinate
|
||||
* @param y the y-coordinate
|
||||
* @param color the color in RGBA8888 format. */
|
||||
public void drawPixel (int x, int y, int color) {
|
||||
*/
|
||||
public void drawPixel(int x, int y) {
|
||||
rectangle(x, y, 1, 1, DrawType.FILL);
|
||||
}
|
||||
|
||||
/**
|
||||
* Draws a pixel at the given location with the given color.
|
||||
*
|
||||
* @param x the x-coordinate
|
||||
* @param y the y-coordinate
|
||||
* @param color the color in RGBA8888 format.
|
||||
*/
|
||||
public void drawPixel(int x, int y, int color) {
|
||||
setColor(color);
|
||||
drawPixel(x, y);
|
||||
}
|
||||
|
||||
private void circle (int x, int y, int radius, DrawType drawType) {
|
||||
private void circle(int x, int y, int radius, DrawType drawType) {
|
||||
ensureCanvasExists();
|
||||
if (blending == Blending.None) {
|
||||
context.setFillStyle(clearColor);
|
||||
@ -478,10 +528,10 @@ public class Pixmap implements Disposable {
|
||||
context.setStrokeStyle(clearColor);
|
||||
context.setGlobalCompositeOperation("destination-out");
|
||||
context.beginPath();
|
||||
context.moveTo(x1,y1);
|
||||
context.lineTo(x2,y2);
|
||||
context.lineTo(x3,y3);
|
||||
context.lineTo(x1,y1);
|
||||
context.moveTo(x1, y1);
|
||||
context.lineTo(x2, y2);
|
||||
context.lineTo(x3, y3);
|
||||
context.lineTo(x1, y1);
|
||||
fillOrStrokePath(drawType);
|
||||
context.closePath();
|
||||
context.setFillStyle(color);
|
||||
@ -489,16 +539,16 @@ public class Pixmap implements Disposable {
|
||||
context.setGlobalCompositeOperation(Composite.SOURCE_OVER);
|
||||
}
|
||||
context.beginPath();
|
||||
context.moveTo(x1,y1);
|
||||
context.lineTo(x2,y2);
|
||||
context.lineTo(x3,y3);
|
||||
context.lineTo(x1,y1);
|
||||
context.moveTo(x1, y1);
|
||||
context.lineTo(x2, y2);
|
||||
context.lineTo(x3, y3);
|
||||
context.lineTo(x1, y1);
|
||||
fillOrStrokePath(drawType);
|
||||
context.closePath();
|
||||
pixels = null;
|
||||
}
|
||||
|
||||
private void image (CanvasElement image, int srcX, int srcY, int srcWidth, int srcHeight, int dstX, int dstY, int dstWidth, int dstHeight) {
|
||||
private void image(CanvasElement image, int srcX, int srcY, int srcWidth, int srcHeight, int dstX, int dstY, int dstWidth, int dstHeight) {
|
||||
ensureCanvasExists();
|
||||
if (blending == Blending.None) {
|
||||
context.setFillStyle(clearColor);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user