Small changes

This commit is contained in:
Ruben 2016-10-05 14:55:23 +02:00
parent 958780b57e
commit c45a0d2e7f
3 changed files with 3 additions and 3 deletions

View file

@ -30,7 +30,7 @@ public class AchievementCollection {
if(hit.target.value == 100) { if(hit.target.value == 100) {
// if target was 100, but player only showed less // if target was 100, but player only showed less
// then 13..s/he's playing with microexpressions ;-) // then 13..s/he's playing with microexpressions ;-)
if(hit.emotions.get(hit.target.emotion) < 13) { if(hit.emotions.get(hit.target.emotion) < 20) {
return true; return true;
} }
} }

View file

@ -211,7 +211,6 @@ public class GamingActivity extends AppCompatActivity implements Detector.ImageL
// SurfaceView surfaceView = (SurfaceView) findViewById(R.id.surfaceView); // SurfaceView surfaceView = (SurfaceView) findViewById(R.id.surfaceView);
detector = new CameraDetector(this, CameraDetector.CameraType.CAMERA_FRONT, cameraPreview, 1, Detector.FaceDetectorMode.LARGE_FACES); detector = new CameraDetector(this, CameraDetector.CameraType.CAMERA_FRONT, cameraPreview, 1, Detector.FaceDetectorMode.LARGE_FACES);
detector.setLicensePath("emotionhero_dev.license");
detector.setDetectAllEmotions(true); detector.setDetectAllEmotions(true);
detector.setDetectAllAppearances(true); detector.setDetectAllAppearances(true);

View file

@ -43,7 +43,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:id="@+id/achievementsLayout" android:id="@+id/achievementsLayout"
android:layout_margin="@dimen/fab_margin"> android:layout_margin="@dimen/fab_margin"
android:layout_marginBottom="32dp">
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>