fix rtpp

Author: KedamaOvO

Server/Api/RtppdApis.cs

@@ -83,15 +83,15 @@ public object GetHitCount()
             };
         }
 
-        [Route("/beatmap/{id}")]
+        [Route("/beatmapTuple/{id}")]
         public object GetBeatmap(int id)
         {
             RestfulDisplayer displayer = GetDisplayer(id);
 
             return (displayer?.HitCountTuple) == null ? null : MakeTupleResult(displayer?.BeatmapTuple);
         }
 
-        [Route("/beatmap")]
+        [Route("/beatmapTuple")]
         public object GetBeatmap()
         {
             List<RestfulDisplayer> displayers = EnumerateRestfulDisplayers();

html/js/rtppd/Formatter.js

@@ -31,33 +31,33 @@ class Formatter
 		for(let i=0;i<this.args.length;++i)
 		{
 			let expr=this.args[i].expr;
-			let value=expr(
-				tuple.rtpp,
-				tuple.rtppAccuracy,
-				tuple.rtppAim,
-				tuple.rtppSpeed,
-				tuple.maxpp,
-				tuple.maxAccuracy,
-				tuple.maxAim,
-				tuple.maxSpeed,
-				tuple.fcpp,
-				tuple.fcppAccuracy,
-				tuple.fcppAim,
-				tuple.fcppSpeed,
-				tuple.n300,
-				tuple.n300g,
-				tuple.n200,
-				tuple.n150,
-				tuple.n100,
-				tuple.n50,
-				tuple.n200,
-				tuple.n300g,
-				tuple.nmiss,
-				tuple.rtmaxcombo,
-				tuple.rtmaxcombo,
-				tuple.maxcombo,
-				tuple.maxcombo,
-				tuple.fullcombo,
+			let ret=expr(
+				tuple.realTimePP,
+				tuple.realTimeAccuracyPP,
+				tuple.realTimeAimPP,
+				tuple.realTimeSpeedPP,
+				tuple.maxPP,
+				tuple.maxAccuracyPP,
+				tuple.maxAimPP,
+				tuple.maxSpeedPP,
+				tuple.fullComboPP,
+				tuple.fullComboAccuracyPP,
+				tuple.fullComboAimPP,
+				tuple.fullComboSpeedPP,
+				tuple.count300,
+				tuple.countGeki,
+				tuple.countKatu,
+				tuple.count100,
+				tuple.count100,
+				tuple.count50,
+				tuple.countKatu,
+				tuple.countGeki,
+				tuple.countMiss,
+				tuple.currentMaxCombo,
+				tuple.currentMaxCombo,
+				tuple.playerMaxCombo,
+				tuple.playerMaxCombo,
+				tuple.fullCombo,
 				tuple.combo,
 				tuple.objectsCount,
 				tuple.time,
@@ -83,11 +83,13 @@ class Formatter
 				Math.ceil,
 				Math.round,
 				Math.sign,
+				Math.trunc,
 				(a,min,max)=>Math.max(Math.min(a,max),min),
 				(a,b,t)=>(1-t)*a+t*b,
 				(a,b)=>(a||0)+Math.random()*((b||1)-(a||0)),
 				()=>new Date().getTime()
-			).toFixed(digital);
+			);
+			let value = ret.toFixed(digital);
 			formatted=formatted.replace("${"+this.args[i].exprStr+"}",value);
 		}
 
@@ -145,15 +147,15 @@ class Formatter
 			"log",
 			"log10",
 			"floor",
-			"ceiling",
+			"ceil",
 			"round",
 			"sign",
 			"truncate",
 			"clamp",
 			"lerp",
 			"random",
-			"getTime"
-			`return ${expr}`
+			"getTime",
+			`return ${expr};`
 		);
 	}
 }

html/js/rtppd/RTPPD.js

@@ -36,4 +36,12 @@ class RTPPD {
     async getPlayingStatusList() {
         return await this._oddr.get(`api/rtppd/playingStatus`);
     }
+
+    async getBeatmapTupleAt(id = 0){
+        return await this._oddr.get(`api/rtppd/beatmapTuple/${id}`);
+    }
+
+    async getBeatmapTupleList(){
+        return await this._oddr.get(`api/rtppd/beatmapTuple`);
+    }
 }

html/rtpp.html

@@ -5,6 +5,7 @@
 		<title>Displayer</title>
 		<script src="js/ODDR.js"></script>
 		<script src="js/rtppd/RTPPD.js"></script>
+		<script src="js/ORTDP.js"></script>
 		<script src="js/Smoother.js"></script>
 		<script src="js/rtppd/Formatter.js"></script>
 		<style type="text/css">
@@ -59,6 +60,7 @@
 					let target_pp = null;
 
 					let hit_count = null;
+					let beatmapTuple = null;
 
 					let smoothers = {};
 					let pp_formatter = null;
@@ -69,6 +71,7 @@
 					//initialize ODDR and RTPPD
 					let oddr = new ODDR(host,port);
 					let rtppd = new RTPPD(oddr);
+					let ortdp = new ORTDP(host,port);
 
 					//get pp format and hit count format
 					rtppd.getPerformancePointFormatString().then(function (format_json) {
@@ -96,6 +99,8 @@
 							current_pp = target_pp;
 
 						hit_count = await rtppd.getHitCountAt(0);
+						beatmapTuple = await rtppd.getBeatmapTupleAt(0);
+						beatmapTuple.playtime = await ortdp.getPlayingTime();
 
 						playing = (await rtppd.getPlayingStatusAt(0)).playing;
 
@@ -106,6 +111,7 @@
 					function display_content() {
 						if (playing === true) {
 							let tuple = Object.assign(current_pp,hit_count);
+							tuple = Object.assign(tuple,beatmapTuple);
 
 							if (current_pp !== null) {
 								current_pp = SmoothObject(current_pp, target_pp);