PHYS-1 #time 20m #comment Discovered further issues that must be resolved before I can get merging to happen correctly. I think the most important first step is to start passing a ShapeList into the calccollisions code, rather than a standard vector.
PHYS-1 #time 1h 15m #comment Merge is maybe, MAYBE working correctly with a ShapeList
PHYS-1 #time 35m #comment I think, at long last, I'm using the Octree for all the physical calculations!!