mirror of
https://github.com/GTNewHorizons/NotEnoughItems.git
synced 2026-11-16 18:54:45 +00:00
Optimize GUI overlap scan for item panels (#1118)
This commit is contained in:
1 parent
fbbeafcd79
commit
0185cd64b1
10 files changed
+288
-85
No files matched your search
@@ -4,7 +4,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.times;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
@@ -16,7 +15,7 @@ import org.junit.jupiter.api.Test;
|
||||
public class ItemsGridTest {
|
||||
|
||||
@Test
|
||||
void synchronizesOverlapAndCaptureRefresh() {
|
||||
void refreshesCaptureOnlyWhenGridChanged() {
|
||||
TestGrid grid = new TestGrid();
|
||||
ItemsGrid.ScreenCapture capture = mock(ItemsGrid.ScreenCapture.class);
|
||||
grid.screenCapture = capture;
|
||||
@@ -24,22 +23,48 @@ public class ItemsGridTest {
|
||||
grid.setGridSize(1, 2, 18, 18);
|
||||
grid.setGridSize(1, 2, 18, 18);
|
||||
verify(capture, times(1)).refreshBuffer();
|
||||
}
|
||||
|
||||
when(capture.needRefresh(1)).thenReturn(false, true);
|
||||
grid.refresh(null);
|
||||
@Test
|
||||
void refreshesOverlapOnlyOnGridChangeOrScanFrame() {
|
||||
TestGrid grid = new TestGrid();
|
||||
|
||||
GridOverlapScanner.requestScan();
|
||||
GridOverlapScanner.beginFrame(null, true);
|
||||
grid.setGridSize(1, 2, 18, 18);
|
||||
grid.refresh(null);
|
||||
assertEquals(1, grid.overlapRefreshes);
|
||||
|
||||
GridOverlapScanner.beginFrame(null, true);
|
||||
grid.refresh(null);
|
||||
assertEquals(1, grid.overlapRefreshes);
|
||||
|
||||
grid.setGridSize(1, 2, 36, 18);
|
||||
grid.refresh(null);
|
||||
assertEquals(2, grid.overlapRefreshes);
|
||||
|
||||
GridOverlapScanner.requestScan();
|
||||
GridOverlapScanner.beginFrame(null, true);
|
||||
grid.refresh(null);
|
||||
assertEquals(3, grid.overlapRefreshes);
|
||||
|
||||
GridOverlapScanner.beginFrame(null, false);
|
||||
grid.refresh(null);
|
||||
assertEquals(4, grid.overlapRefreshes);
|
||||
|
||||
GridOverlapScanner.beginFrame(null, false);
|
||||
grid.refresh(null);
|
||||
assertEquals(4, grid.overlapRefreshes);
|
||||
|
||||
GridOverlapScanner.beginFrame(null, true);
|
||||
grid.refresh(null);
|
||||
assertEquals(5, grid.overlapRefreshes);
|
||||
}
|
||||
|
||||
private static final class TestGrid extends ItemsGrid<ItemsGrid.ItemsGridSlot, ItemsGrid.MouseContext> {
|
||||
|
||||
private int overlapRefreshes;
|
||||
|
||||
@Override
|
||||
protected int getGridRenderingCacheMode() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void updateGuiOverlapSlots(GuiContainer gui) {
|
||||
overlapRefreshes++;
|
||||
|
||||
Reference in new issue
Block a user