Merge branch 'main' into volume-agents

simularium · Oct 28, 2024 · 4af3d98 · 4af3d98
2 parents ccfccf3 + 12d8ab7
commit 4af3d98
Show file tree

Hide file tree

Showing 20 changed files with 1,095 additions and 672 deletions.
diff --git a/examples/package-lock.json b/examples/package-lock.json
diff --git a/examples/package.json b/examples/package.json
@@ -21,7 +21,7 @@
     "css-loader": "^6.9.1",
     "html-webpack-plugin": "^5.6.0",
     "mini-css-extract-plugin": "^2.7.7",
-    "webpack": "^5.90.0",
+    "webpack": "^5.95.0",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^5.0.4"
   }

diff --git a/examples/src/Viewer.tsx b/examples/src/Viewer.tsx
@@ -1047,6 +1047,7 @@ class Viewer extends React.Component<InputParams, ViewerState> {
                         backgroundColor={[0, 0, 0]}
                         lockedCamera={false}
                         disableCache={false}
+                        maxCacheSize={Infinity} //  means no limit, provide limits in bytes, 1MB = 1000000, 1GB = 1000000000
                     />
                 </div>
             </div>

diff --git a/src/constants.ts b/src/constants.ts
@@ -49,3 +49,8 @@ export const nullAgent = (): AgentData => {
         subpoints: [],
     };
 };
+
+// the size of the header before the agent data in the binary file
+export const AGENT_HEADER_SIZE = 3; // frameNumber, time, agentCount
+
+export const BYTE_SIZE_64_BIT_NUM = 8;
diff --git a/src/controller/index.ts b/src/controller/index.ts
@@ -338,7 +338,6 @@ export default class SimulariumController {
 
         this.visData.WaitForFrame(0);
         this.visData.clearForNewTrajectory();
-        this.visData.cancelAllWorkers();
 
         this.stop();