mirror of https://github.com/axmolengine/axmol.git
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
This commit is contained in:
boyu0
commit
270bd997cc
|
|
@ -1,83 +0,0 @@
|
|||
/****************************************************************************
|
||||
Copyright (c) 2010 cocos2d-x.org
|
||||
|
||||
http://www.cocos2d-x.org
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef __CCKEYBOARD_DISPATCHER_H__
|
||||
#define __CCKEYBOARD_DISPATCHER_H__
|
||||
|
||||
#include <vector>
|
||||
#include <functional>
|
||||
#include "cocoa/CCArray.h"
|
||||
|
||||
NS_CC_BEGIN
|
||||
|
||||
/**
|
||||
* @addtogroup input
|
||||
* @{
|
||||
*/
|
||||
|
||||
typedef std::function<void(int)> KeyboardDelegate;
|
||||
|
||||
/**
|
||||
@class KeyboardDispatcher
|
||||
@brief Dispatch the keypad message from the phone
|
||||
*/
|
||||
class CC_DLL KeyboardDispatcher : public Object
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* @js ctor
|
||||
*/
|
||||
KeyboardDispatcher();
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
~KeyboardDispatcher();
|
||||
|
||||
/**
|
||||
@brief set delagate to key press event
|
||||
*/
|
||||
void setKeyPressDelegate(KeyboardDelegate delegate);
|
||||
/**
|
||||
@brief set delagate to key release event
|
||||
*/
|
||||
void setKeyReleaseDelegate(KeyboardDelegate delegate);
|
||||
|
||||
/**
|
||||
@brief dispatch the key stroke event
|
||||
*/
|
||||
bool dispatchKeyboardEvent(int keyCode, bool pressed);
|
||||
|
||||
protected:
|
||||
|
||||
KeyboardDelegate _keyPressDelegate;
|
||||
KeyboardDelegate _keyReleaseDelegate;
|
||||
};
|
||||
|
||||
// end of input group
|
||||
/// @}
|
||||
|
||||
NS_CC_END
|
||||
|
||||
#endif //__CCKEYBOARD_DISPATCHER_H__
|
||||
|
|
@ -1,102 +0,0 @@
|
|||
/****************************************************************************
|
||||
Copyright (c) 2010 cocos2d-x.org
|
||||
|
||||
http://www.cocos2d-x.org
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef __CCKEYPAD_DELEGATE_H__
|
||||
#define __CCKEYPAD_DELEGATE_H__
|
||||
|
||||
|
||||
#include "cocoa/CCObject.h"
|
||||
|
||||
NS_CC_BEGIN
|
||||
|
||||
/**
|
||||
* @addtogroup input
|
||||
* @{
|
||||
*/
|
||||
|
||||
class CC_DLL KeypadDelegate
|
||||
{
|
||||
public:
|
||||
/** The back key clicked
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
|
||||
virtual void keyBackClicked() {}
|
||||
|
||||
/** The menu key clicked. only available on wophone & android
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void keyMenuClicked() {};
|
||||
};
|
||||
|
||||
/**
|
||||
@brief
|
||||
KeypadHandler
|
||||
Object than contains the KeypadDelegate.
|
||||
*/
|
||||
class CC_DLL KeypadHandler : public Object
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual ~KeypadHandler(void);
|
||||
|
||||
/** delegate
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
KeypadDelegate* getDelegate();
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
void setDelegate(KeypadDelegate *pDelegate);
|
||||
|
||||
/** initializes a KeypadHandler with a delegate
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual bool initWithDelegate(KeypadDelegate *pDelegate);
|
||||
|
||||
public:
|
||||
/** allocates a KeypadHandler with a delegate
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
static KeypadHandler* handlerWithDelegate(KeypadDelegate *pDelegate);
|
||||
|
||||
protected:
|
||||
KeypadDelegate* _delegate;
|
||||
};
|
||||
|
||||
// end of input group
|
||||
/// @}
|
||||
|
||||
NS_CC_END
|
||||
|
||||
#endif // __CCKEYPAD_DELEGATE_H__
|
||||
|
|
@ -1,103 +0,0 @@
|
|||
/****************************************************************************
|
||||
Copyright (c) 2010 cocos2d-x.org
|
||||
|
||||
http://www.cocos2d-x.org
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef __CCKEYPAD_DISPATCHER_H__
|
||||
#define __CCKEYPAD_DISPATCHER_H__
|
||||
|
||||
#include "CCKeypadDelegate.h"
|
||||
#include "cocoa/CCArray.h"
|
||||
|
||||
NS_CC_BEGIN
|
||||
|
||||
/**
|
||||
* @addtogroup input
|
||||
* @{
|
||||
*/
|
||||
|
||||
typedef enum {
|
||||
// the back key clicked msg
|
||||
kTypeBackClicked = 1,
|
||||
kTypeMenuClicked,
|
||||
} ccKeypadMSGType;
|
||||
|
||||
struct _ccCArray;
|
||||
/**
|
||||
@class KeypadDispatcher
|
||||
@brief Dispatch the keypad message from the phone
|
||||
*/
|
||||
class CC_DLL KeypadDispatcher : public Object
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* @js ctor
|
||||
*/
|
||||
KeypadDispatcher();
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
~KeypadDispatcher();
|
||||
|
||||
/**
|
||||
@brief add delegate to concern keypad msg
|
||||
*/
|
||||
void addDelegate(KeypadDelegate* pDelegate);
|
||||
|
||||
/**
|
||||
@brief remove the delegate from the delegates who concern keypad msg
|
||||
*/
|
||||
void removeDelegate(KeypadDelegate* pDelegate);
|
||||
|
||||
/**
|
||||
@brief force add the delegate
|
||||
*/
|
||||
void forceAddDelegate(KeypadDelegate* pDelegate);
|
||||
|
||||
/**
|
||||
@brief force remove the delegate
|
||||
*/
|
||||
void forceRemoveDelegate(KeypadDelegate* pDelegate);
|
||||
|
||||
/**
|
||||
@brief dispatch the key pad msg
|
||||
*/
|
||||
bool dispatchKeypadMSG(ccKeypadMSGType nMsgType);
|
||||
|
||||
protected:
|
||||
|
||||
Array* _delegates;
|
||||
bool _locked;
|
||||
bool _toAdd;
|
||||
bool _toRemove;
|
||||
|
||||
struct _ccCArray *_handlersToAdd;
|
||||
struct _ccCArray *_handlersToRemove;
|
||||
};
|
||||
|
||||
// end of input group
|
||||
/// @}
|
||||
|
||||
NS_CC_END
|
||||
|
||||
#endif //__CCKEYPAD_DISPATCHER_H__
|
||||
|
|
@ -27,7 +27,8 @@ import java.io.UnsupportedEncodingException;
|
|||
import java.util.Locale;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.app.AlertDialog;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.SharedPreferences;
|
||||
import android.content.pm.ActivityInfo;
|
||||
import android.content.pm.ApplicationInfo;
|
||||
|
|
@ -72,7 +73,7 @@ public class Cocos2dxHelper {
|
|||
public static void init(final Activity activity) {
|
||||
final ApplicationInfo applicationInfo = activity.getApplicationInfo();
|
||||
|
||||
Cocos2dxHelper.sActivity = activity;
|
||||
initListener();
|
||||
|
||||
try {
|
||||
// Get the lib_name from AndroidManifest.xml metadata
|
||||
|
|
@ -102,6 +103,51 @@ public class Cocos2dxHelper {
|
|||
Cocos2dxBitmap.setContext(activity);
|
||||
}
|
||||
|
||||
public static void initListener() {
|
||||
Cocos2dxHelper.sCocos2dxHelperListener = new Cocos2dxHelperListener() {
|
||||
|
||||
@Override
|
||||
public void showEditTextDialog(final String title, final String message,
|
||||
final int inputMode, final int inputFlag, final int returnType, final int maxLength) {
|
||||
|
||||
sActivity.runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
new Cocos2dxEditBoxDialog(sActivity,
|
||||
title,
|
||||
message,
|
||||
inputMode,
|
||||
inputFlag,
|
||||
returnType,
|
||||
maxLength).show();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void showDialog(final String title, final String message) {
|
||||
|
||||
sActivity.runOnUiThread(new Runnable() {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
new AlertDialog.Builder(sActivity)
|
||||
.setTitle(title)
|
||||
.setMessage(message)
|
||||
.setPositiveButton("Ok",
|
||||
new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
// TODO Auto-generated method stub
|
||||
}
|
||||
}).create().show();
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public static Activity getActivity() {
|
||||
return sActivity;
|
||||
}
|
||||
|
|
@ -241,12 +287,7 @@ public class Cocos2dxHelper {
|
|||
try {
|
||||
final byte[] bytesUTF8 = pResult.getBytes("UTF8");
|
||||
|
||||
Cocos2dxHelper.sCocos2dxHelperListener.runOnGLThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
Cocos2dxHelper.nativeSetEditTextDialogResult(bytesUTF8);
|
||||
}
|
||||
});
|
||||
Cocos2dxHelper.nativeSetEditTextDialogResult(bytesUTF8);
|
||||
} catch (UnsupportedEncodingException pUnsupportedEncodingException) {
|
||||
/* Nothing. */
|
||||
}
|
||||
|
|
@ -342,9 +383,7 @@ public class Cocos2dxHelper {
|
|||
// ===========================================================
|
||||
|
||||
public static interface Cocos2dxHelperListener {
|
||||
public void showDialog(final String pTitle, final String pMessage);
|
||||
public void showEditTextDialog(final String pTitle, final String pMessage, final int pInputMode, final int pInputFlag, final int pReturnType, final int pMaxLength);
|
||||
|
||||
public void runOnGLThread(final Runnable pRunnable);
|
||||
public void showDialog(final String title, final String message);
|
||||
public void showEditTextDialog(final String title, final String message, final int inputMode, final int inputFlag, final int returnType, final int maxLength);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,8 +11,7 @@
|
|||
#include "platform/CCCommon.h"
|
||||
#include "cocoa/CCGeometry.h"
|
||||
#include "platform/CCEGLViewProtocol.h"
|
||||
#include "platform/third_party/linux/glfw/glfw3.h"
|
||||
#include <SDL2/SDL.h>
|
||||
#include "platform/third_party/linux/glfw/glfw3.h"
|
||||
#include <set>
|
||||
|
||||
bool initExtensions();
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ SHAREDLIBS += -lfmodex
|
|||
endif
|
||||
endif
|
||||
|
||||
SHAREDLIBS += -lSDL2 -lGLEW -lfontconfig -lpthread -lGL -lpng `pkg-config --libs glfw3`
|
||||
SHAREDLIBS += -lGLEW -lfontconfig -lpthread -lGL -lpng `pkg-config --libs glfw3`
|
||||
SHAREDLIBS += -L$(FMOD_LIBDIR) -Wl,-rpath,$(abspath $(FMOD_LIBDIR))
|
||||
SHAREDLIBS += -L$(LIB_DIR) -Wl,-rpath,$(abspath $(LIB_DIR))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,179 +0,0 @@
|
|||
/****************************************************************************
|
||||
Copyright (c) 2010-2012 cocos2d-x.org
|
||||
Copyright (c) 2009 Valentin Milea
|
||||
|
||||
http://www.cocos2d-x.org
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef __TOUCH_DISPATHCHER_CCTOUCH_DELEGATE_PROTOCOL_H__
|
||||
#define __TOUCH_DISPATHCHER_CCTOUCH_DELEGATE_PROTOCOL_H__
|
||||
|
||||
#include "cocoa/CCObject.h"
|
||||
#include "ccConfig.h"
|
||||
|
||||
NS_CC_BEGIN
|
||||
|
||||
class Touch;
|
||||
class Event;
|
||||
class Set;
|
||||
class TouchDispatcher;
|
||||
|
||||
/**
|
||||
* @addtogroup input
|
||||
* @{
|
||||
*/
|
||||
|
||||
class CC_DLL TouchDelegate
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
TouchDelegate() {}
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual ~TouchDelegate()
|
||||
{
|
||||
}
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual bool ccTouchBegan(Touch *pTouch, Event *pEvent) {CC_UNUSED_PARAM(pTouch); CC_UNUSED_PARAM(pEvent); return false;};
|
||||
// optional
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void ccTouchMoved(Touch *pTouch, Event *pEvent) {CC_UNUSED_PARAM(pTouch); CC_UNUSED_PARAM(pEvent);}
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void ccTouchEnded(Touch *pTouch, Event *pEvent) {CC_UNUSED_PARAM(pTouch); CC_UNUSED_PARAM(pEvent);}
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void ccTouchCancelled(Touch *pTouch, Event *pEvent) {CC_UNUSED_PARAM(pTouch); CC_UNUSED_PARAM(pEvent);}
|
||||
|
||||
// optional
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void ccTouchesBegan(Set *pTouches, Event *pEvent) {CC_UNUSED_PARAM(pTouches); CC_UNUSED_PARAM(pEvent);}
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void ccTouchesMoved(Set *pTouches, Event *pEvent) {CC_UNUSED_PARAM(pTouches); CC_UNUSED_PARAM(pEvent);}
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void ccTouchesEnded(Set *pTouches, Event *pEvent) {CC_UNUSED_PARAM(pTouches); CC_UNUSED_PARAM(pEvent);}
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void ccTouchesCancelled(Set *pTouches, Event *pEvent) {CC_UNUSED_PARAM(pTouches); CC_UNUSED_PARAM(pEvent);}
|
||||
|
||||
};
|
||||
/**
|
||||
@brief
|
||||
Using this type of delegate results in two benefits:
|
||||
- 1. You don't need to deal with Sets, the dispatcher does the job of splitting
|
||||
them. You get exactly one UITouch per call.
|
||||
- 2. You can *claim* a UITouch by returning true in ccTouchBegan. Updates of claimed
|
||||
touches are sent only to the delegate(s) that claimed them. So if you get a move/
|
||||
ended/canceled update you're sure it's your touch. This frees you from doing a
|
||||
lot of checks when doing multi-touch.
|
||||
|
||||
(The name TargetedTouchDelegate relates to updates "targeting" their specific
|
||||
handler, without bothering the other handlers.)
|
||||
@since v0.8
|
||||
*/
|
||||
class CC_DLL TargetedTouchDelegate : public TouchDelegate
|
||||
{
|
||||
public:
|
||||
/** Return true to claim the touch.
|
||||
@since v0
|
||||
*/
|
||||
virtual bool ccTouchBegan(Touch *pTouch, Event *pEvent) { CC_UNUSED_PARAM(pTouch); CC_UNUSED_PARAM(pEvent);return false;};
|
||||
|
||||
// optional
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void ccTouchMoved(Touch *pTouch, Event *pEvent) {CC_UNUSED_PARAM(pTouch); CC_UNUSED_PARAM(pEvent);}
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void ccTouchEnded(Touch *pTouch, Event *pEvent) {CC_UNUSED_PARAM(pTouch); CC_UNUSED_PARAM(pEvent);}
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void ccTouchCancelled(Touch *pTouch, Event *pEvent) {CC_UNUSED_PARAM(pTouch); CC_UNUSED_PARAM(pEvent);}
|
||||
};
|
||||
|
||||
/** @brief
|
||||
This type of delegate is the same one used by CocoaTouch. You will receive all the events (Began,Moved,Ended,Canceled).
|
||||
@since v0.8
|
||||
*/
|
||||
class CC_DLL StandardTouchDelegate : public TouchDelegate
|
||||
{
|
||||
public:
|
||||
// optional
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void ccTouchesBegan(Set *pTouches, Event *pEvent) {CC_UNUSED_PARAM(pTouches); CC_UNUSED_PARAM(pEvent);}
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void ccTouchesMoved(Set *pTouches, Event *pEvent) {CC_UNUSED_PARAM(pTouches); CC_UNUSED_PARAM(pEvent);}
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void ccTouchesEnded(Set *pTouches, Event *pEvent) {CC_UNUSED_PARAM(pTouches); CC_UNUSED_PARAM(pEvent);}
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void ccTouchesCancelled(Set *pTouches, Event *pEvent) {CC_UNUSED_PARAM(pTouches); CC_UNUSED_PARAM(pEvent);}
|
||||
};
|
||||
|
||||
// end of input group
|
||||
/// @}
|
||||
|
||||
NS_CC_END
|
||||
|
||||
#endif // __TOUCH_DISPATHCHER_CCTOUCH_DELEGATE_PROTOCOL_H__
|
||||
|
|
@ -1,237 +0,0 @@
|
|||
/****************************************************************************
|
||||
Copyright (c) 2010-2012 cocos2d-x.org
|
||||
Copyright (c) 2009 Valentin Milea
|
||||
|
||||
http://www.cocos2d-x.org
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef __TOUCH_DISPATCHER_CCTOUCH_DISPATCHER_H__
|
||||
#define __TOUCH_DISPATCHER_CCTOUCH_DISPATCHER_H__
|
||||
|
||||
#include "CCTouchDelegateProtocol.h"
|
||||
#include "cocoa/CCObject.h"
|
||||
#include "cocoa/CCArray.h"
|
||||
|
||||
NS_CC_BEGIN
|
||||
|
||||
/**
|
||||
* @addtogroup input
|
||||
* @{
|
||||
*/
|
||||
|
||||
|
||||
enum {
|
||||
CCTOUCHBEGAN,
|
||||
CCTOUCHMOVED,
|
||||
CCTOUCHENDED,
|
||||
CCTOUCHCANCELLED,
|
||||
|
||||
ccTouchMax,
|
||||
};
|
||||
|
||||
class Set;
|
||||
class Event;
|
||||
|
||||
struct ccTouchHandlerHelperData {
|
||||
// we only use the type
|
||||
// void (StandardTouchDelegate::*touchesSel)(Set*, Event*);
|
||||
// void (TargetedTouchDelegate::*touchSel)(NSTouch*, Event*);
|
||||
int _type;
|
||||
};
|
||||
|
||||
|
||||
class CC_DLL EGLTouchDelegate
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void touchesBegan(Set* touches, Event* pEvent) = 0;
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void touchesMoved(Set* touches, Event* pEvent) = 0;
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void touchesEnded(Set* touches, Event* pEvent) = 0;
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void touchesCancelled(Set* touches, Event* pEvent) = 0;
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual ~EGLTouchDelegate() {}
|
||||
};
|
||||
|
||||
class TouchHandler;
|
||||
struct _ccCArray;
|
||||
/** @brief TouchDispatcher.
|
||||
Singleton that handles all the touch events.
|
||||
The dispatcher dispatches events to the registered TouchHandlers.
|
||||
There are 2 different type of touch handlers:
|
||||
- Standard Touch Handlers
|
||||
- Targeted Touch Handlers
|
||||
|
||||
The Standard Touch Handlers work like the CocoaTouch touch handler: a set of touches is passed to the delegate.
|
||||
On the other hand, the Targeted Touch Handlers only receive 1 touch at the time, and they can "swallow" touches (avoid the propagation of the event).
|
||||
|
||||
Firstly, the dispatcher sends the received touches to the targeted touches.
|
||||
These touches can be swallowed by the Targeted Touch Handlers. If there are still remaining touches, then the remaining touches will be sent
|
||||
to the Standard Touch Handlers.
|
||||
|
||||
@since v0.8.0
|
||||
*/
|
||||
class CC_DLL TouchDispatcher : public Object, public EGLTouchDelegate
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
~TouchDispatcher();
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
bool init(void);
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
TouchDispatcher()
|
||||
: _targetedHandlers(NULL)
|
||||
, _standardHandlers(NULL)
|
||||
, _handlersToAdd(NULL)
|
||||
, _handlersToRemove(NULL)
|
||||
|
||||
{}
|
||||
|
||||
public:
|
||||
/** Whether or not the events are going to be dispatched. Default: true
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
bool isDispatchEvents(void);
|
||||
void setDispatchEvents(bool bDispatchEvents);
|
||||
|
||||
/** Adds a standard touch delegate to the dispatcher's list.
|
||||
See StandardTouchDelegate description.
|
||||
IMPORTANT: The delegate will be retained.
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
void addStandardDelegate(TouchDelegate *pDelegate, int nPriority);
|
||||
|
||||
/** Adds a targeted touch delegate to the dispatcher's list.
|
||||
See TargetedTouchDelegate description.
|
||||
IMPORTANT: The delegate will be retained.
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
void addTargetedDelegate(TouchDelegate *pDelegate, int nPriority, bool bSwallowsTouches);
|
||||
|
||||
/** Removes a touch delegate.
|
||||
The delegate will be released
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
void removeDelegate(TouchDelegate *pDelegate);
|
||||
|
||||
/** Removes all touch delegates, releasing all the delegates
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
void removeAllDelegates(void);
|
||||
|
||||
/** Changes the priority of a previously added delegate. The lower the number,
|
||||
the higher the priority
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
void setPriority(int nPriority, TouchDelegate *pDelegate);
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
void touches(Set *pTouches, Event *pEvent, unsigned int uIndex);
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void touchesBegan(Set* touches, Event* pEvent);
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void touchesMoved(Set* touches, Event* pEvent);
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void touchesEnded(Set* touches, Event* pEvent);
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual void touchesCancelled(Set* touches, Event* pEvent);
|
||||
|
||||
public:
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
TouchHandler* findHandler(TouchDelegate *pDelegate);
|
||||
protected:
|
||||
void forceRemoveDelegate(TouchDelegate *pDelegate);
|
||||
void forceAddHandler(TouchHandler *pHandler, Array* pArray);
|
||||
void forceRemoveAllDelegates(void);
|
||||
void rearrangeHandlers(Array* pArray);
|
||||
TouchHandler* findHandler(Array* pArray, TouchDelegate *pDelegate);
|
||||
|
||||
protected:
|
||||
Array* _targetedHandlers;
|
||||
Array* _standardHandlers;
|
||||
|
||||
bool _locked;
|
||||
bool _toAdd;
|
||||
bool _toRemove;
|
||||
Array* _handlersToAdd;
|
||||
struct _ccCArray *_handlersToRemove;
|
||||
bool _toQuit;
|
||||
bool _dispatchEvents;
|
||||
|
||||
// 4, 1 for each type of event
|
||||
struct ccTouchHandlerHelperData _handlerHelperData[ccTouchMax];
|
||||
};
|
||||
|
||||
// end of input group
|
||||
/// @}
|
||||
|
||||
NS_CC_END
|
||||
|
||||
#endif // __TOUCH_DISPATCHER_CCTOUCH_DISPATCHER_H__
|
||||
|
|
@ -1,138 +0,0 @@
|
|||
/****************************************************************************
|
||||
Copyright (c) 2010-2012 cocos2d-x.org
|
||||
Copyright (c) 2009 Valentin Milea
|
||||
|
||||
http://www.cocos2d-x.org
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef __TOUCH_DISPATCHER_CCTOUCH_HANDLER_H__
|
||||
#define __TOUCH_DISPATCHER_CCTOUCH_HANDLER_H__
|
||||
|
||||
#include "CCTouchDelegateProtocol.h"
|
||||
#include "CCTouchDispatcher.h"
|
||||
#include "cocoa/CCObject.h"
|
||||
#include "cocoa/CCSet.h"
|
||||
|
||||
NS_CC_BEGIN
|
||||
|
||||
/**
|
||||
* @addtogroup input
|
||||
* @{
|
||||
*/
|
||||
|
||||
/**
|
||||
TouchHandler
|
||||
Object than contains the delegate and priority of the event handler.
|
||||
*/
|
||||
class CC_DLL TouchHandler : public Object
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual ~TouchHandler(void);
|
||||
|
||||
/** delegate
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
TouchDelegate* getDelegate();
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
void setDelegate(TouchDelegate *pDelegate);
|
||||
|
||||
/** priority */
|
||||
int getPriority(void);
|
||||
void setPriority(int nPriority);
|
||||
|
||||
/** enabled selectors */
|
||||
int getEnabledSelectors(void);
|
||||
void setEnalbedSelectors(int nValue);
|
||||
|
||||
/** initializes a TouchHandler with a delegate and a priority */
|
||||
bool initWithDelegate(TouchDelegate *pDelegate, int nPriority);
|
||||
|
||||
public:
|
||||
/** allocates a TouchHandler with a delegate and a priority */
|
||||
static TouchHandler* handlerWithDelegate(TouchDelegate *pDelegate, int nPriority);
|
||||
|
||||
protected:
|
||||
TouchDelegate *_delegate;
|
||||
int _priority;
|
||||
int _enabledSelectors;
|
||||
};
|
||||
|
||||
/** StandardTouchHandler
|
||||
It forwards each event to the delegate.
|
||||
*/
|
||||
class CC_DLL StandardTouchHandler : public TouchHandler
|
||||
{
|
||||
public:
|
||||
/** initializes a TouchHandler with a delegate and a priority */
|
||||
bool initWithDelegate(TouchDelegate *pDelegate, int nPriority);
|
||||
|
||||
public:
|
||||
/** allocates a TouchHandler with a delegate and a priority */
|
||||
static StandardTouchHandler* handlerWithDelegate(TouchDelegate *pDelegate, int nPriority);
|
||||
};
|
||||
|
||||
/**
|
||||
TargetedTouchHandler
|
||||
Object than contains the claimed touches and if it swallows touches.
|
||||
Used internally by TouchDispatcher
|
||||
*/
|
||||
class CC_DLL TargetedTouchHandler : public TouchHandler
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
~TargetedTouchHandler(void);
|
||||
|
||||
/** whether or not the touches are swallowed */
|
||||
bool isSwallowsTouches(void);
|
||||
void setSwallowsTouches(bool bSwallowsTouches);
|
||||
|
||||
/** MutableSet that contains the claimed touches */
|
||||
Set* getClaimedTouches(void);
|
||||
|
||||
/** initializes a TargetedTouchHandler with a delegate, a priority and whether or not it swallows touches or not */
|
||||
bool initWithDelegate(TouchDelegate *pDelegate, int nPriority, bool bSwallow);
|
||||
|
||||
public:
|
||||
/** allocates a TargetedTouchHandler with a delegate, a priority and whether or not it swallows touches or not */
|
||||
static TargetedTouchHandler* handlerWithDelegate(TouchDelegate *pDelegate, int nPriority, bool bSwallow);
|
||||
|
||||
protected:
|
||||
bool _swallowsTouches;
|
||||
Set *_claimedTouches;
|
||||
};
|
||||
|
||||
// end of input group
|
||||
/// @}
|
||||
|
||||
NS_CC_END
|
||||
|
||||
#endif // __TOUCH_DISPATCHER_CCTOUCH_HANDLER_H__
|
||||
|
|
@ -462,7 +462,7 @@ bool RectClippingNode::init()
|
|||
rect[2] = Point(_clippingSize.width, _clippingSize.height);
|
||||
rect[3] = Point(0, _clippingSize.height);
|
||||
|
||||
Color4F green = {0, 1, 0, 1};
|
||||
Color4F green(0, 1, 0, 1);
|
||||
m_pInnerStencil->drawPolygon(rect, 4, green, 0, green);
|
||||
if (CCClippingNode::init(m_pInnerStencil))
|
||||
{
|
||||
|
|
@ -480,7 +480,7 @@ void RectClippingNode::setClippingSize(const Size &size)
|
|||
rect[1] = Point(_clippingSize.width, 0);
|
||||
rect[2] = Point(_clippingSize.width, _clippingSize.height);
|
||||
rect[3] = Point(0, _clippingSize.height);
|
||||
Color4F green = {0, 1, 0, 1};
|
||||
Color4F green(0, 1, 0, 1);
|
||||
m_pInnerStencil->clear();
|
||||
m_pInnerStencil->drawPolygon(rect, 4, green, 0, green);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ DEPENDS+=' libxmu-dev'
|
|||
DEPENDS+=' libglu1-mesa-dev'
|
||||
DEPENDS+=' libgl2ps-dev'
|
||||
DEPENDS+=' libxi-dev'
|
||||
DEPENDS+=' libsdl2-dev'
|
||||
DEPENDS+=' g++'
|
||||
DEPENDS+=' libzip-dev'
|
||||
DEPENDS+=' libpng12-dev'
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
5fe89fb5bd58cedf13b0363f97b20e3ea7ff255d
|
||||
|
|
@ -0,0 +1 @@
|
|||
500d95937f3fd81659da66d2099b6c80d988a6b5
|
||||
|
|
@ -0,0 +1 @@
|
|||
39179659c7b94b213b6ab7b24372c96378f61062
|
||||
|
|
@ -0,0 +1 @@
|
|||
9975e4961272d5bda6d5f3bbd61ea0fc02222199
|
||||
|
|
@ -0,0 +1 @@
|
|||
0a4ce85782909e964aa0e95e89bab8272d0c3d4e
|
||||
|
|
@ -0,0 +1 @@
|
|||
0a77108d377ceb5f084f1aab1877159df9499428
|
||||
|
|
@ -0,0 +1 @@
|
|||
39d29cbeb700598c3e4ad6d3ee0ac273a3385fcd
|
||||
|
|
@ -0,0 +1 @@
|
|||
500d95937f3fd81659da66d2099b6c80d988a6b5
|
||||
|
|
@ -0,0 +1 @@
|
|||
a6e5d948d0c85ecc42b7a2ebf5751e3990002bac
|
||||
|
|
@ -0,0 +1 @@
|
|||
eff519b0334eaeb486f302ec2581771950b7cca2
|
||||
|
|
@ -0,0 +1 @@
|
|||
021493cabd2489bf2c20c657e5523e24608df86c
|
||||
|
|
@ -0,0 +1 @@
|
|||
9975e4961272d5bda6d5f3bbd61ea0fc02222199
|
||||
|
|
@ -0,0 +1 @@
|
|||
0a4ce85782909e964aa0e95e89bab8272d0c3d4e
|
||||
|
|
@ -0,0 +1 @@
|
|||
0a77108d377ceb5f084f1aab1877159df9499428
|
||||
|
|
@ -0,0 +1 @@
|
|||
1a6a5a2f571c692a962e9159fca8ea5d6879a748
|
||||
|
|
@ -0,0 +1 @@
|
|||
eff519b0334eaeb486f302ec2581771950b7cca2
|
||||
|
|
@ -60,6 +60,25 @@ SOURCES = ../Classes/AccelerometerTest/AccelerometerTest.cpp \
|
|||
../Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp \
|
||||
../Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp \
|
||||
../Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp \
|
||||
../Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp \
|
||||
../Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp \
|
||||
../Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp \
|
||||
../Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp \
|
||||
../Classes/ExtensionsTest/CocoStudioGUITest/UIDragPanelTest/UIDragPanelTest.cpp \
|
||||
../Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp \
|
||||
../Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp \
|
||||
../Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp \
|
||||
../Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp \
|
||||
../Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp \
|
||||
../Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp \
|
||||
../Classes/ExtensionsTest/CocoStudioGUITest/UINodeContainerTest/UINodeContainerTest.cpp \
|
||||
../Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp \
|
||||
../Classes/ExtensionsTest/CocoStudioGUITest/UIPanelTest/UIPanelTest.cpp \
|
||||
../Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp \
|
||||
../Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp \
|
||||
../Classes/ExtensionsTest/CocoStudioGUITest/UITextAreaTest/UITextAreaTest.cpp \
|
||||
../Classes/ExtensionsTest/CocoStudioGUITest/UITextButtonTest/UITextButtonTest.cpp \
|
||||
../Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp \
|
||||
../Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp \
|
||||
../Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp \
|
||||
../Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp \
|
||||
|
|
|
|||
|
|
@ -146,6 +146,26 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\libwebsockets\win32\lib\*.*" "$(O
|
|||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioComponentsTest\PlayerController.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioComponentsTest\ProjectileController.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioComponentsTest\SceneController.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\CocosGUIScene.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIButtonTest\UIButtonTest.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UICheckBoxTest\UICheckBoxTest.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIDragPanelTest\UIDragPanelTest.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIImageViewTest\UIImageViewTest.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UILabelAtlasTest\UILabelAtlasTest.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UILabelBMFontTest\UILabelBMFontTest.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UILabelTest\UILabelTest.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIListViewTest\UIListViewTest.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UILoadingBarTest\UILoadingBarTest.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UINodeContainerTest\UINodeContainerTest.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIPageViewTest\UIPageViewTest.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIPanelTest\UIPanelTest.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIScene.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UISceneManager.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIScrollViewTest\UIScrollViewTest.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UISliderTest\UISliderTest.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UITextAreaTest\UITextAreaTest.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UITextButtonTest\UITextButtonTest.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UITextFieldTest\UITextFieldTest.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioSceneTest\SceneEditorTest.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\ControlExtensionTest\CCControlPotentiometerTest\CCControlPotentiometerTest.cpp" />
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\ControlExtensionTest\CCControlStepperTest\CCControlStepperTest.cpp" />
|
||||
|
|
@ -261,6 +281,26 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\libwebsockets\win32\lib\*.*" "$(O
|
|||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioComponentsTest\PlayerController.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioComponentsTest\ProjectileController.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioComponentsTest\SceneController.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\CocosGUIScene.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIButtonTest\UIButtonTest.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UICheckBoxTest\UICheckBoxTest.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIDragPanelTest\UIDragPanelTest.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIImageViewTest\UIImageViewTest.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UILabelAtlasTest\UILabelAtlasTest.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UILabelBMFontTest\UILabelBMFontTest.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UILabelTest\UILabelTest.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIListViewTest\UIListViewTest.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UILoadingBarTest\UILoadingBarTest.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UINodeContainerTest\UINodeContainerTest.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIPageViewTest\UIPageViewTest.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIPanelTest\UIPanelTest.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIScene.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UISceneManager.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIScrollViewTest\UIScrollViewTest.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UISliderTest\UISliderTest.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UITextAreaTest\UITextAreaTest.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UITextButtonTest\UITextButtonTest.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UITextFieldTest\UITextFieldTest.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioSceneTest\SceneEditorTest.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\ControlExtensionTest\CCControlPotentiometerTest\CCControlPotentiometerTest.h" />
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\ControlExtensionTest\CCControlStepperTest\CCControlStepperTest.h" />
|
||||
|
|
|
|||
|
|
@ -243,6 +243,59 @@
|
|||
</Filter>
|
||||
<Filter Include="Classes\PhysicsTest">
|
||||
<UniqueIdentifier>{a83cb042-e3d6-4d3b-a4f6-30a4b3fcb3e9}</UniqueIdentifier>
|
||||
<Filter Include="Classes\ExtensionsTest\CocoStudioGUITest">
|
||||
<UniqueIdentifier>{9daecd38-37c6-4216-a999-86077af83beb}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Classes\ExtensionsTest\CocoStudioGUITest\UITextFieldTest">
|
||||
<UniqueIdentifier>{493fcd85-c749-482d-9404-905e99aa0103}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Classes\ExtensionsTest\CocoStudioGUITest\UITextButtonTest">
|
||||
<UniqueIdentifier>{5c1960de-24ba-4b72-be18-cc160dd2a50d}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Classes\ExtensionsTest\CocoStudioGUITest\UITextAreaTest">
|
||||
<UniqueIdentifier>{175b363b-a41a-4b1d-bde1-970e77e64cff}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Classes\ExtensionsTest\CocoStudioGUITest\UISliderTest">
|
||||
<UniqueIdentifier>{2e08949f-bf73-4fdc-85e8-34b8c69aa978}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Classes\ExtensionsTest\CocoStudioGUITest\UIScrollViewTest">
|
||||
<UniqueIdentifier>{c57c0453-a096-44d7-830b-1cf24c712cfd}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Classes\ExtensionsTest\CocoStudioGUITest\UIPanelTest">
|
||||
<UniqueIdentifier>{c4dbbfb3-0e91-492f-bbbf-f03fb26f3f54}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Classes\ExtensionsTest\CocoStudioGUITest\UIPageViewTest">
|
||||
<UniqueIdentifier>{01097388-e538-4081-8e16-d1ff3a86292a}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Classes\ExtensionsTest\CocoStudioGUITest\UINodeContainerTest">
|
||||
<UniqueIdentifier>{160da6f0-a0f1-4a53-8e5e-cf0a63ee82a3}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Classes\ExtensionsTest\CocoStudioGUITest\UILoadingBarTest">
|
||||
<UniqueIdentifier>{fadff96e-c19a-41f5-a755-547cf1f8a5fb}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Classes\ExtensionsTest\CocoStudioGUITest\UIListViewTest">
|
||||
<UniqueIdentifier>{73c268e8-3872-49d6-9204-1e679ff72a42}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Classes\ExtensionsTest\CocoStudioGUITest\UILabelTest">
|
||||
<UniqueIdentifier>{6e7f1d2a-c8c1-4f48-826f-930bc8a0556e}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Classes\ExtensionsTest\CocoStudioGUITest\UILabelBMFontTest">
|
||||
<UniqueIdentifier>{305e1c54-9321-49f7-8672-46d1286dbe83}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Classes\ExtensionsTest\CocoStudioGUITest\UILabelAtlasTest">
|
||||
<UniqueIdentifier>{df6e9468-93f7-472d-be1d-d274d7de677e}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Classes\ExtensionsTest\CocoStudioGUITest\UIImageViewTest">
|
||||
<UniqueIdentifier>{dedcabba-959c-40e3-9959-7ccf4e31c792}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Classes\ExtensionsTest\CocoStudioGUITest\UIDragPanelTest">
|
||||
<UniqueIdentifier>{cfc87c30-a7b4-4b6f-bc5d-da45360466b6}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Classes\ExtensionsTest\CocoStudioGUITest\UICheckBoxTest">
|
||||
<UniqueIdentifier>{5caf2179-ae22-4040-8bac-17e9f22efbf7}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="Classes\ExtensionsTest\CocoStudioGUITest\UIButtonTest">
|
||||
<UniqueIdentifier>{24f044ee-09a6-406b-98d7-8d5d759e5bb1}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
@ -576,6 +629,65 @@
|
|||
</ClCompile>
|
||||
<ClCompile Include="..\Classes\PhysicsTest\PhysicsTest.cpp">
|
||||
<Filter>Classes\PhysicsTest</Filter>
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIButtonTest\UIButtonTest.cpp">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UIButtonTest</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UICheckBoxTest\UICheckBoxTest.cpp">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UICheckBoxTest</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIDragPanelTest\UIDragPanelTest.cpp">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UIDragPanelTest</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIImageViewTest\UIImageViewTest.cpp">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UIImageViewTest</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UILabelAtlasTest\UILabelAtlasTest.cpp">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UILabelAtlasTest</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UILabelBMFontTest\UILabelBMFontTest.cpp">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UILabelBMFontTest</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UILabelTest\UILabelTest.cpp">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UILabelTest</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIListViewTest\UIListViewTest.cpp">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UIListViewTest</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UILoadingBarTest\UILoadingBarTest.cpp">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UILoadingBarTest</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UINodeContainerTest\UINodeContainerTest.cpp">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UINodeContainerTest</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIPageViewTest\UIPageViewTest.cpp">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UIPageViewTest</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIPanelTest\UIPanelTest.cpp">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UIPanelTest</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIScrollViewTest\UIScrollViewTest.cpp">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UIScrollViewTest</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UISliderTest\UISliderTest.cpp">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UISliderTest</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UITextAreaTest\UITextAreaTest.cpp">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UITextAreaTest</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UITextButtonTest\UITextButtonTest.cpp">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UITextButtonTest</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UITextFieldTest\UITextFieldTest.cpp">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UITextFieldTest</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\CocosGUIScene.cpp">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIScene.cpp">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UISceneManager.cpp">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
@ -1086,6 +1198,65 @@
|
|||
</ClInclude>
|
||||
<ClInclude Include="..\Classes\PhysicsTest\PhysicsTest.h">
|
||||
<Filter>Classes\PhysicsTest</Filter>
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIButtonTest\UIButtonTest.h">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UIButtonTest</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UICheckBoxTest\UICheckBoxTest.h">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UICheckBoxTest</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIDragPanelTest\UIDragPanelTest.h">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UIDragPanelTest</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIImageViewTest\UIImageViewTest.h">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UIImageViewTest</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UILabelAtlasTest\UILabelAtlasTest.h">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UILabelAtlasTest</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UILabelBMFontTest\UILabelBMFontTest.h">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UILabelBMFontTest</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UILabelTest\UILabelTest.h">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UILabelTest</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIListViewTest\UIListViewTest.h">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UIListViewTest</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UILoadingBarTest\UILoadingBarTest.h">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UILoadingBarTest</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UINodeContainerTest\UINodeContainerTest.h">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UINodeContainerTest</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIPageViewTest\UIPageViewTest.h">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UIPageViewTest</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIPanelTest\UIPanelTest.h">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UIPanelTest</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIScrollViewTest\UIScrollViewTest.h">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UIScrollViewTest</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UISliderTest\UISliderTest.h">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UISliderTest</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UITextAreaTest\UITextAreaTest.h">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UITextAreaTest</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UITextButtonTest\UITextButtonTest.h">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UITextButtonTest</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UITextFieldTest\UITextFieldTest.h">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest\UITextFieldTest</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\CocosGUIScene.h">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UIScene.h">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\Classes\ExtensionsTest\CocoStudioGUITest\UISceneManager.h">
|
||||
<Filter>Classes\ExtensionsTest\CocoStudioGUITest</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1 +1 @@
|
|||
60d103435762fea41e137a0d126bc9a94ec71dc3
|
||||
cd24df86bd74572c1ef45ee4af05633066a9d966
|
||||
Loading…
Reference in New Issue