Pārlūkot izejas kodu

float check fix

ganahrhr 4 gadi atpakaļ
vecāks
revīzija
96203c8876

+ 2 - 4
.gitignore

@@ -9,6 +9,8 @@
 /[Bb]uilds/
 /[Ll]ogs/
 /[Uu]ser[Ss]ettings/
+/PositionViewer/
+/PositionViewer2/
 
 # MemoryCaptures can get excessive in size.
 # They also could contain extremely sensitive data
@@ -70,7 +72,3 @@ crashlytics-build.properties
 # Temporary auto-generated Android Assets
 /[Aa]ssets/[Ss]treamingAssets/aa.meta
 /[Aa]ssets/[Ss]treamingAssets/aa/*
-
-# BeatPulse healthcheck temp database
-/PositionViewer
-/PositionViewer2

+ 10 - 8
Assets/Scripts/Controllers/PlayerController.cs

@@ -58,9 +58,9 @@ public class PlayerController : MonoBehaviour
     static bool starting = false; // флаг остановки
     public Dictionary<uint, bool> end_send = new Dictionary<uint, bool>(); // флаги завершения загрузки
     Dictionary<uint, MarkerMoving> moving = new Dictionary<uint, MarkerMoving>(); // флаги начала движения
-    
-   
-    float interpolationPeriod = 0.1f;
+
+
+    const float INTERPOLATION_PERIOD = 0.1f;
     //float time_realtime = 0;
     float time_draw = 0;
     public List<User> users = new List<User>();
@@ -115,10 +115,10 @@ public class PlayerController : MonoBehaviour
 
 
         time_draw += Time.deltaTime;
-        if (time_draw >= interpolationPeriod)
+        if (time_draw >= INTERPOLATION_PERIOD)
         {
             MarkerMove();
-            time_draw -= interpolationPeriod;
+            time_draw -= INTERPOLATION_PERIOD;
         }
 
         //if (active_mode == Mode.RealTime && !starting)
@@ -376,17 +376,19 @@ public class PlayerController : MonoBehaviour
 
         }
 
-        step += interpolationPeriod; // 0.1f;        
+        step += INTERPOLATION_PERIOD; // 0.1f;        
         moving[m.acc_id].step = step;
-        if (step > 1)
+        if (Math.Round(step, 1) > 1)
         {
+            Debug.Log($"step:{step}");
             i++;
             moving[m.acc_id].index = i;
         }
 
         if (active_mode == Mode.RealTime)
-            if (step > 1)
+            if (Math.Round(step, 1) > 1)
             {
+                Debug.Log($"Mode.RealTime step:{step}");
                 Workers.Remove(m.acc_id);
                 Debug.LogWarning($"clear coord user {m.acc_id}");
             }

BIN
PositionViewer/Build/PositionViewer.data.unityweb


+ 0 - 16
PositionViewer/Build/PositionViewer.json

@@ -1,16 +0,0 @@
-{
-"companyName": "DefaultCompany",
-"productName": "PositionViewer",
-"productVersion": "0.1",
-"dataUrl": "PositionViewer.data.unityweb",
-"wasmCodeUrl": "PositionViewer.wasm.code.unityweb",
-"wasmFrameworkUrl": "PositionViewer.wasm.framework.unityweb",
-"graphicsAPI": ["WebGL 2.0","WebGL 1.0"],
-"webglContextAttributes": {"preserveDrawingBuffer": false},
-"splashScreenStyle": "Dark",
-"backgroundColor": "#231F20",
-"cacheControl": {"default": "must-revalidate"},
-"developmentBuild": false,
-"multithreading": false,
-"unityVersion": "2019.3.9f1"
-}

BIN
PositionViewer/Build/PositionViewer.wasm.code.unityweb


BIN
PositionViewer/Build/PositionViewer.wasm.framework.unityweb


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 4
PositionViewer/Build/UnityLoader.js


+ 0 - 24
PositionViewer/TemplateData/UnityProgress.js

@@ -1,24 +0,0 @@
-function UnityProgress(unityInstance, progress) {
-  if (!unityInstance.Module)
-    return;
-  if (!unityInstance.logo) {
-    unityInstance.logo = document.createElement("div");
-    unityInstance.logo.className = "logo " + unityInstance.Module.splashScreenStyle;
-    unityInstance.container.appendChild(unityInstance.logo);
-  }
-  if (!unityInstance.progress) {    
-    unityInstance.progress = document.createElement("div");
-    unityInstance.progress.className = "progress " + unityInstance.Module.splashScreenStyle;
-    unityInstance.progress.empty = document.createElement("div");
-    unityInstance.progress.empty.className = "empty";
-    unityInstance.progress.appendChild(unityInstance.progress.empty);
-    unityInstance.progress.full = document.createElement("div");
-    unityInstance.progress.full.className = "full";
-    unityInstance.progress.appendChild(unityInstance.progress.full);
-    unityInstance.container.appendChild(unityInstance.progress);
-  }
-  unityInstance.progress.full.style.width = (100 * progress) + "%";
-  unityInstance.progress.empty.style.width = (100 * (1 - progress)) + "%";
-  if (progress == 1)
-    unityInstance.logo.style.display = unityInstance.progress.style.display = "none";
-}

BIN
PositionViewer/TemplateData/favicon.ico


BIN
PositionViewer/TemplateData/fullscreen.png


BIN
PositionViewer/TemplateData/progressEmpty.Dark.png


BIN
PositionViewer/TemplateData/progressEmpty.Light.png


BIN
PositionViewer/TemplateData/progressFull.Dark.png


BIN
PositionViewer/TemplateData/progressFull.Light.png


BIN
PositionViewer/TemplateData/progressLogo.Dark.png


BIN
PositionViewer/TemplateData/progressLogo.Light.png


+ 0 - 18
PositionViewer/TemplateData/style.css

@@ -1,18 +0,0 @@
-.webgl-content * {border: 0; margin: 0; padding: 0}
-.webgl-content {position: absolute; top: 50%; left: 50%; -webkit-transform: translate(-50%, -50%); transform: translate(-50%, -50%);}
-
-.webgl-content .logo, .progress {position: absolute; left: 50%; top: 50%; -webkit-transform: translate(-50%, -50%); transform: translate(-50%, -50%);}
-.webgl-content .logo {background: url('progressLogo.Light.png') no-repeat center / contain; width: 154px; height: 130px;}
-.webgl-content .progress {height: 18px; width: 141px; margin-top: 90px;}
-.webgl-content .progress .empty {background: url('progressEmpty.Light.png') no-repeat right / cover; float: right; width: 100%; height: 100%; display: inline-block;}
-.webgl-content .progress .full {background: url('progressFull.Light.png') no-repeat left / cover; float: left; width: 0%; height: 100%; display: inline-block;}
-
-.webgl-content .logo.Dark {background-image: url('progressLogo.Dark.png');}
-.webgl-content .progress.Dark .empty {background-image: url('progressEmpty.Dark.png');}
-.webgl-content .progress.Dark .full {background-image: url('progressFull.Dark.png');}
-
-.webgl-content .footer {margin-top: 5px; height: 38px; line-height: 38px; font-family: Helvetica, Verdana, Arial, sans-serif; font-size: 18px;}
-.webgl-content .footer .webgl-logo, .title, .fullscreen {height: 100%; display: inline-block; background: transparent center no-repeat;}
-.webgl-content .footer .webgl-logo {background-image: url('webgl-logo.png'); width: 204px; float: left;}
-.webgl-content .footer .title {margin-right: 10px; float: right;}
-.webgl-content .footer .fullscreen {background-image: url('fullscreen.png'); width: 38px; float: right;}

BIN
PositionViewer/TemplateData/webgl-logo.png


+ 0 - 25
PositionViewer/index.html

@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html lang="en-us">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title>Unity WebGL Player | PositionViewer</title>
-    <link rel="shortcut icon" href="TemplateData/favicon.ico">
-    <link rel="stylesheet" href="TemplateData/style.css">
-    <script src="TemplateData/UnityProgress.js"></script>
-    <script src="Build/UnityLoader.js"></script>
-    <script>
-      var unityInstance = UnityLoader.instantiate("unityContainer", "Build/PositionViewer.json", {onProgress: UnityProgress});
-    </script>
-  </head>
-  <body>
-    <div class="webgl-content">
-      <div id="unityContainer" style="width: 960px; height: 600px"></div>
-      <div class="footer">
-        <div class="webgl-logo"></div>
-        <div class="fullscreen" onclick="unityInstance.SetFullscreen(1)"></div>
-        <div class="title">PositionViewer</div>
-      </div>
-    </div>
-  </body>
-</html>

BIN
Positioning.7z