Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge begin & end with one 'tap' command

This commit is contained in:
heliclei 2014-02-25 18:17:43 +08:00
parent 6848e6dde0
commit 1dc6d1ad21
1 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cocos/base/CCConsole.cpp
View File

@ -617,8 +617,7 @@ void Console::commandTouch(int fd, const std::string& args)
if(args =="help" || args == "-h") if(args =="help" || args == "-h")
{ {
const char help[] = "available touch directives:\n" const char help[] = "available touch directives:\n"
"\tbegin x y: simulate touch begin event\n" "\ttap x y: simulate touch tap at (x,y)\n"
"\tend x y: simulate touch end event\n"
"\tswipe x1 y1 x2 y2: simulate touch swipe from (x1,y1) to (x2,y2).\n"; "\tswipe x1 y1 x2 y2: simulate touch swipe from (x1,y1) to (x2,y2).\n";
send(fd, help, sizeof(help) - 1,0); send(fd, help, sizeof(help) - 1,0);
} }
@ -631,7 +630,7 @@ void Console::commandTouch(int fd, const std::string& args)
return; return;
} }
if(argv[0]=="begin") if(argv[0]=="tap")
{ {
if((argv.size() == 3) && (isFloat(argv[1]) && isFloat(argv[2]))) if((argv.size() == 3) && (isFloat(argv[1]) && isFloat(argv[2])))
{ {
@ -644,26 +643,6 @@ void Console::commandTouch(int fd, const std::string& args)
Scheduler *sched = Director::getInstance()->getScheduler(); Scheduler *sched = Director::getInstance()->getScheduler();
sched->performFunctionInCocosThread( [&](){ sched->performFunctionInCocosThread( [&](){
Director::getInstance()->getOpenGLView()->handleTouchesBegin(1, &_touchId, &x, &y); Director::getInstance()->getOpenGLView()->handleTouchesBegin(1, &_touchId, &x, &y);
});
}
else
{
const char msg[] = "touch: invalid arguments.\n";
send(fd, msg, sizeof(msg) - 1, 0);
}
return;
}
if(argv[0]=="end")
{
if((argv.size() == 3) && (isFloat(argv[1])) && (isFloat(argv[2])))
{
float x = std::atof(argv[1].c_str());
float y = std::atof(argv[2].c_str());
Scheduler *sched = Director::getInstance()->getScheduler();
sched->performFunctionInCocosThread( [&](){
Director::getInstance()->getOpenGLView()->handleTouchesEnd(1, &_touchId, &x, &y); Director::getInstance()->getOpenGLView()->handleTouchesEnd(1, &_touchId, &x, &y);
}); });
} }