Skip to content

Large performance increase from spatial indexes #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
micycle1 wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Large performance increase from spatial indexes #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fec65c5
faster isparallel
micycle1 Feb 11, 2025
f7c1079
introduce grid-based spatial index
micycle1 Feb 11, 2025
c4df8c6
add spatial index file
micycle1 Feb 15, 2025
0f08945
rtree index
micycle1 Feb 15, 2025
cc03998
fix regression
micycle1 Feb 15, 2025
bb97289
faster Edge .collide()
micycle1 Feb 15, 2025
4e2724f
use kd-tree to find coincident height collisions
micycle1 Feb 15, 2025
9e1b144
add javadoc for the constructor
micycle1 Feb 16, 2025
845e720
java 11
micycle1 May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.twak.campskeleton</groupId>
<artifactId>campskeleton</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.2-SNAPSHOT</version>

<packaging>jar</packaging>

<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
</properties>

<build>
Expand Down Expand Up @@ -122,12 +122,10 @@
<artifactId>vecmath</artifactId>
<version>1.5.2</version>
</dependency>

<!-- https://mvnrepository.com/artifact/gov.nist.math/jama -->
<dependency>
<groupId>gov.nist.math</groupId>
<artifactId>jama</artifactId>
<version>1.0.3</version>
<groupId>org.tinspin</groupId>
<artifactId>tinspin-indexes</artifactId>
<version>2.1.3</version>
</dependency>

</dependencies>
Expand Down
12 changes: 7 additions & 5 deletions src/org/twak/camp/CoSitedCollision.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
package org.twak.camp;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
Expand All @@ -27,7 +29,7 @@
*/
public class CoSitedCollision
{
public Set<EdgeCollision> edges = new LinkedHashSet();
public Collection<EdgeCollision> edges = new ArrayList<>(10);
public Point3d loc;

public boolean debugHoriz = false;
Expand All @@ -45,7 +47,7 @@ public CoSitedCollision( Point3d loc, EdgeCollision ec, HeightCollision parent )

public void add(EdgeCollision ec)
{
edges.add( ec );
edges.add(ec);
}

/**
Expand All @@ -54,10 +56,10 @@ public void add(EdgeCollision ec)
*/
public boolean findChains ( Skeleton skel )
{
chains = new ArrayList();
chains = new ArrayList<>();

// remove duplicate edges
Set<Edge> allEdges = new LinkedHashSet();
Set<Edge> allEdges = new HashSet<>();
for (EdgeCollision ec : edges)
{
allEdges.add( ec.a );
Expand Down Expand Up @@ -124,7 +126,7 @@ public boolean findChains ( Skeleton skel )
}

/**
* If another collision has been evaluated at teh same height, this method
* If another collision has been evaluated at the same height, this method
* checks for any changes in the Corners involved in a skeleton. This is a problem
* when several collisions at the same height occur against one smash edge.
*
Expand Down
Loading