Include a check for eye tracking toggle key shortcut.
This commit is contained in:
parent
20912064e4
commit
d4424b0f31
1
DivaBot/.gitignore
vendored
1
DivaBot/.gitignore
vendored
@ -14,3 +14,4 @@
|
|||||||
!/*.png
|
!/*.png
|
||||||
/scoreimage.png
|
/scoreimage.png
|
||||||
/authToken.txt
|
/authToken.txt
|
||||||
|
/ps4startstream.png
|
||||||
|
Binary file not shown.
@ -334,6 +334,7 @@ public class MyRobot{
|
|||||||
prevSongTitle=selectedSong.title;
|
prevSongTitle=selectedSong.title;
|
||||||
prevDifficulty=difficulty;
|
prevDifficulty=difficulty;
|
||||||
MyRobot.p.repaint();
|
MyRobot.p.repaint();
|
||||||
|
if (DrawCanvas.configData.containsKey("EYE_TRACKING_TOGGLE")) {
|
||||||
if (NEWSONGS.length==0) {
|
if (NEWSONGS.length==0) {
|
||||||
MYROBOT.keyPress(KeyEvent.VK_CONTROL);
|
MYROBOT.keyPress(KeyEvent.VK_CONTROL);
|
||||||
MYROBOT.keyPress(KeyEvent.VK_SHIFT);
|
MYROBOT.keyPress(KeyEvent.VK_SHIFT);
|
||||||
@ -344,6 +345,7 @@ public class MyRobot{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
lastSongSelectTime = System.currentTimeMillis();
|
lastSongSelectTime = System.currentTimeMillis();
|
||||||
} else {
|
} else {
|
||||||
if (overlayHidden) {
|
if (overlayHidden) {
|
||||||
@ -354,16 +356,8 @@ public class MyRobot{
|
|||||||
if (OnResultsScreen() && !recordedResults && !recordingResults && results.size()==0) {
|
if (OnResultsScreen() && !recordedResults && !recordingResults && results.size()==0) {
|
||||||
lastSongSelectTime=System.currentTimeMillis();
|
lastSongSelectTime=System.currentTimeMillis();
|
||||||
MYROBOT.setAutoDelay(0);
|
MYROBOT.setAutoDelay(0);
|
||||||
if (NEWSONGS.length==0) {
|
|
||||||
MYROBOT.keyPress(KeyEvent.VK_CONTROL);
|
|
||||||
MYROBOT.keyPress(KeyEvent.VK_SHIFT);
|
|
||||||
MYROBOT.keyPress(KeyEvent.VK_F12);
|
|
||||||
MYROBOT.keyRelease(KeyEvent.VK_F12);
|
|
||||||
MYROBOT.keyRelease(KeyEvent.VK_SHIFT);
|
|
||||||
MYROBOT.keyRelease(KeyEvent.VK_CONTROL);
|
|
||||||
}
|
|
||||||
MYROBOT.refreshScoreScreen();
|
MYROBOT.refreshScoreScreen();
|
||||||
ImageIO.write(MYROBOT.createScoreScreenCapture(),"png",new File("scoreimage.png"));
|
//ImageIO.write(MYROBOT.createScoreScreenCapture(),"png",new File("scoreimage.png"));
|
||||||
File tmp = new File("tmp");
|
File tmp = new File("tmp");
|
||||||
if (tmp.exists()) {
|
if (tmp.exists()) {
|
||||||
FileUtils.deleteFile(tmp);
|
FileUtils.deleteFile(tmp);
|
||||||
@ -371,16 +365,8 @@ public class MyRobot{
|
|||||||
tmp.mkdir();
|
tmp.mkdir();
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
final Result data = typeface1.getAllData(MYROBOT.createScoreScreenCapture());
|
Result data = typeface1.getAllData(MYROBOT.createScoreScreenCapture());
|
||||||
MYROBOT.setAutoDelay(0);
|
MYROBOT.setAutoDelay(0);
|
||||||
if (NEWSONGS.length==0) {
|
|
||||||
MYROBOT.keyPress(KeyEvent.VK_CONTROL);
|
|
||||||
MYROBOT.keyPress(KeyEvent.VK_SHIFT);
|
|
||||||
MYROBOT.keyPress(KeyEvent.VK_F11);
|
|
||||||
MYROBOT.keyRelease(KeyEvent.VK_F11);
|
|
||||||
MYROBOT.keyRelease(KeyEvent.VK_SHIFT);
|
|
||||||
MYROBOT.keyRelease(KeyEvent.VK_CONTROL);
|
|
||||||
}
|
|
||||||
if (data.cool==-1 || data.fine==-1 || data.safe==-1 || data.sad==-1 || data.worst==-1 || data.percent<0f || data.percent>110f || data.combo==-1 || data.score==-1) {
|
if (data.cool==-1 || data.fine==-1 || data.safe==-1 || data.sad==-1 || data.worst==-1 || data.percent<0f || data.percent>110f || data.combo==-1 || data.score==-1) {
|
||||||
if (lastData==null || (lastData.cool!=data.cool || data.fine!=lastData.fine || data.safe!=lastData.safe || data.sad!=lastData.sad || data.worst!=lastData.worst || data.percent!=lastData.percent || data.combo!=lastData.combo || data.score!=lastData.score)) {
|
if (lastData==null || (lastData.cool!=data.cool || data.fine!=lastData.fine || data.safe!=lastData.safe || data.sad!=lastData.sad || data.worst!=lastData.worst || data.percent!=lastData.percent || data.combo!=lastData.combo || data.score!=lastData.score)) {
|
||||||
System.out.println("Waiting for results to populate...");
|
System.out.println("Waiting for results to populate...");
|
||||||
@ -400,6 +386,20 @@ public class MyRobot{
|
|||||||
} else
|
} else
|
||||||
if ((data.combo!=lastcombo || data.fail!=lastfail || data.cool!=lastcool || lastfine!=data.fine || lastsafe!=data.safe || lastsad!=data.sad || lastworst!=data.worst)
|
if ((data.combo!=lastcombo || data.fail!=lastfail || data.cool!=lastcool || lastfine!=data.fine || lastsafe!=data.safe || lastsad!=data.sad || lastworst!=data.worst)
|
||||||
&& data.score!=lastscore /*|| lastpercent!=percent*/){
|
&& data.score!=lastscore /*|| lastpercent!=percent*/){
|
||||||
|
if (DrawCanvas.configData.containsKey("EYE_TRACKING_TOGGLE")) {
|
||||||
|
if (NEWSONGS.length==0) {
|
||||||
|
MYROBOT.keyPress(KeyEvent.VK_CONTROL);
|
||||||
|
MYROBOT.keyPress(KeyEvent.VK_SHIFT);
|
||||||
|
MYROBOT.keyPress(KeyEvent.VK_F12);
|
||||||
|
MYROBOT.keyRelease(KeyEvent.VK_F12);
|
||||||
|
MYROBOT.keyRelease(KeyEvent.VK_SHIFT);
|
||||||
|
MYROBOT.keyRelease(KeyEvent.VK_CONTROL);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Thread.sleep(100);
|
||||||
|
MYROBOT.refreshScoreScreen();
|
||||||
|
ImageIO.write(MYROBOT.createScoreScreenCapture(),"png",new File("scoreimage.png"));
|
||||||
|
data = typeface1.getAllData(MYROBOT.createScoreScreenCapture());
|
||||||
System.out.println("Results for "+selectedSong.title+" "+data.difficulty+": "+data.display());
|
System.out.println("Results for "+selectedSong.title+" "+data.difficulty+": "+data.display());
|
||||||
TypeFace2.deepCopyOfficialYPointersFromPointers();
|
TypeFace2.deepCopyOfficialYPointersFromPointers();
|
||||||
File songFolder = new File(selectedSong.title.replace(":","")+"/"+data.difficulty);
|
File songFolder = new File(selectedSong.title.replace(":","")+"/"+data.difficulty);
|
||||||
@ -426,6 +426,16 @@ public class MyRobot{
|
|||||||
results.add(new Result(selectedSong.title,data.difficulty,data.cool,data.fine,data.safe,data.sad,data.worst,data.percent,data.mod,data.combo,data.score,data.fail,resultImage));
|
results.add(new Result(selectedSong.title,data.difficulty,data.cool,data.fine,data.safe,data.sad,data.worst,data.percent,data.mod,data.combo,data.score,data.fail,resultImage));
|
||||||
SoundUtils.playSound("collect_item.wav");
|
SoundUtils.playSound("collect_item.wav");
|
||||||
|
|
||||||
|
if (DrawCanvas.configData.containsKey("EYE_TRACKING_TOGGLE")) {
|
||||||
|
if (NEWSONGS.length==0) {
|
||||||
|
MYROBOT.keyPress(KeyEvent.VK_CONTROL);
|
||||||
|
MYROBOT.keyPress(KeyEvent.VK_SHIFT);
|
||||||
|
MYROBOT.keyPress(KeyEvent.VK_F11);
|
||||||
|
MYROBOT.keyRelease(KeyEvent.VK_F11);
|
||||||
|
MYROBOT.keyRelease(KeyEvent.VK_SHIFT);
|
||||||
|
MYROBOT.keyRelease(KeyEvent.VK_CONTROL);
|
||||||
|
}
|
||||||
|
}
|
||||||
//gotoxy(800,64);
|
//gotoxy(800,64);
|
||||||
//click();
|
//click();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user