From e93d227b626c674bf4b2a8821b92d6b1004480ea Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 10 Apr 2014 17:57:31 -0430 Subject: [PATCH] Updated the interfaces and renamed some methods. --- src/ve/ucv/ciens/ccg/nxtar/NxtARCore.java | 6 +++--- .../ccg/nxtar/interfaces/CVProcessor.java | 2 +- .../nxtar/interfaces/MulticastEnabler.java | 21 ------------------- ...ster.java => OSFunctionalityProvider.java} | 4 +++- .../ciens/ccg/nxtar/states/InGameState.java | 2 +- .../ccg/nxtar/utils/ProjectConstants.java | 2 ++ 6 files changed, 10 insertions(+), 27 deletions(-) delete mode 100644 src/ve/ucv/ciens/ccg/nxtar/interfaces/MulticastEnabler.java rename src/ve/ucv/ciens/ccg/nxtar/interfaces/{Toaster.java => OSFunctionalityProvider.java} (87%) diff --git a/src/ve/ucv/ciens/ccg/nxtar/NxtARCore.java b/src/ve/ucv/ciens/ccg/nxtar/NxtARCore.java index 429d5d1..015fd8c 100644 --- a/src/ve/ucv/ciens/ccg/nxtar/NxtARCore.java +++ b/src/ve/ucv/ciens/ccg/nxtar/NxtARCore.java @@ -18,7 +18,7 @@ package ve.ucv.ciens.ccg.nxtar; import ve.ucv.ciens.ccg.nxtar.interfaces.CVProcessor; import ve.ucv.ciens.ccg.nxtar.interfaces.MulticastEnabler; import ve.ucv.ciens.ccg.nxtar.interfaces.NetworkConnectionListener; -import ve.ucv.ciens.ccg.nxtar.interfaces.Toaster; +import ve.ucv.ciens.ccg.nxtar.interfaces.OSFunctionalityProvider; import ve.ucv.ciens.ccg.nxtar.network.RobotControlThread; import ve.ucv.ciens.ccg.nxtar.network.SensorReportThread; import ve.ucv.ciens.ccg.nxtar.network.ServiceDiscoveryThread; @@ -95,7 +95,7 @@ public class NxtARCore extends Game implements NetworkConnectionListener{ // Assorted fields. public SpriteBatch batch; public CVProcessor cvProc; - private Toaster toaster; + private OSFunctionalityProvider toaster; // Networking related fields. private int connections; @@ -124,7 +124,7 @@ public class NxtARCore extends Game implements NetworkConnectionListener{ super(); connections = 0; try{ - this.toaster = (Toaster)concreteApp; + this.toaster = (OSFunctionalityProvider)concreteApp; }catch(ClassCastException cc){ Gdx.app.debug(TAG, CLASS_NAME + ".Main() :: concreteApp does not implement the Toaster interface. Toasting disabled."); this.toaster = null; diff --git a/src/ve/ucv/ciens/ccg/nxtar/interfaces/CVProcessor.java b/src/ve/ucv/ciens/ccg/nxtar/interfaces/CVProcessor.java index d7d09f3..64b55c9 100644 --- a/src/ve/ucv/ciens/ccg/nxtar/interfaces/CVProcessor.java +++ b/src/ve/ucv/ciens/ccg/nxtar/interfaces/CVProcessor.java @@ -22,5 +22,5 @@ public interface CVProcessor { // TODO: Add marker location data. } - public CVData processFrame(byte[] frame, int w, int h); + public CVData findMarkersInFrame(byte[] frame, int w, int h); } diff --git a/src/ve/ucv/ciens/ccg/nxtar/interfaces/MulticastEnabler.java b/src/ve/ucv/ciens/ccg/nxtar/interfaces/MulticastEnabler.java deleted file mode 100644 index 80a1da2..0000000 --- a/src/ve/ucv/ciens/ccg/nxtar/interfaces/MulticastEnabler.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2013 Miguel Angel Astor Romero - * - * 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 - * - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package ve.ucv.ciens.ccg.nxtar.interfaces; - -public interface MulticastEnabler { - public void enableMulticast(); - public void disableMulticast(); -} diff --git a/src/ve/ucv/ciens/ccg/nxtar/interfaces/Toaster.java b/src/ve/ucv/ciens/ccg/nxtar/interfaces/OSFunctionalityProvider.java similarity index 87% rename from src/ve/ucv/ciens/ccg/nxtar/interfaces/Toaster.java rename to src/ve/ucv/ciens/ccg/nxtar/interfaces/OSFunctionalityProvider.java index bee8e60..76cd6aa 100644 --- a/src/ve/ucv/ciens/ccg/nxtar/interfaces/Toaster.java +++ b/src/ve/ucv/ciens/ccg/nxtar/interfaces/OSFunctionalityProvider.java @@ -15,7 +15,9 @@ */ package ve.ucv.ciens.ccg.nxtar.interfaces; -public interface Toaster { +public interface OSFunctionalityProvider{ public void showShortToast(String msg); public void showLongToast(String msg); + public void enableMulticast(); + public void disableMulticast(); } diff --git a/src/ve/ucv/ciens/ccg/nxtar/states/InGameState.java b/src/ve/ucv/ciens/ccg/nxtar/states/InGameState.java index 1474514..17143b2 100644 --- a/src/ve/ucv/ciens/ccg/nxtar/states/InGameState.java +++ b/src/ve/ucv/ciens/ccg/nxtar/states/InGameState.java @@ -179,7 +179,7 @@ public class InGameState extends BaseState{ fW = frameMonitor.getFrameDimensions().getWidth(); fH = frameMonitor.getFrameDimensions().getHeight(); - data = core.cvProc.processFrame(frame, fW, fH); + data = core.cvProc.findMarkersInFrame(frame, fW, fH); Gdx.app.log(TAG, CLASS_NAME + ".render(): Frame processed."); /*if(data != null){ diff --git a/src/ve/ucv/ciens/ccg/nxtar/utils/ProjectConstants.java b/src/ve/ucv/ciens/ccg/nxtar/utils/ProjectConstants.java index d53873a..03e69d8 100644 --- a/src/ve/ucv/ciens/ccg/nxtar/utils/ProjectConstants.java +++ b/src/ve/ucv/ciens/ccg/nxtar/utils/ProjectConstants.java @@ -37,6 +37,8 @@ public abstract class ProjectConstants{ public static final String FONT_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; + public static final int CALIBRATION_PATTERN_POINTS = 54; + static{ OVERSCAN = Ouya.runningOnOuya ? 0.9f : 1.0f; }