ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'runelite/master' into HEAD

Browse Source
This commit is contained in:
Owain van Brakel
2021-09-24 01:22:12 +02:00
parent c08c6d80e8 4cab29cf2f
commit 62b58f5e5a
5 changed files with 52 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
http-service/src/main/java/net/runelite/http/service/SpringSchedulingConfigurer.java Normal file
View File

@@ -0,0 +1,52 @@
/*
* Copyright (c) 2021, Adam <Adam@sigterm.info>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.http.service;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.scheduling.annotation.SchedulingConfigurer;
import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler;
import org.springframework.scheduling.config.ScheduledTaskRegistrar;
@Configuration
public class SpringSchedulingConfigurer implements SchedulingConfigurer
{
@Override
public void configureTasks(ScheduledTaskRegistrar taskRegistrar)
{
// this is from ScheduledTaskRegistrar.scheduleTasks() but modified to give the scheduler thread a
// recognizable name
ScheduledExecutorService scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(
new ThreadFactoryBuilder()
.setNameFormat("scheduler-%d")
.build()
);
TaskScheduler scheduler = new ConcurrentTaskScheduler(scheduledExecutorService);
taskRegistrar.setTaskScheduler(scheduler);
}
}

2
runelite-api/src/main/java/net/runelite/api/Client.java
View File

@@ -1917,8 +1917,6 @@ public interface Client extends GameEngine
TextureProvider getTextureProvider(); TextureProvider getTextureProvider();
NodeCache getCachedModels2();
void setRenderArea(boolean[][] renderArea); void setRenderArea(boolean[][] renderArea);
int getRasterizer3D_clipMidX2(); int getRasterizer3D_clipMidX2();

4
runelite-api/src/main/java/net/runelite/api/NodeCache.java
View File

@@ -33,8 +33,4 @@ public interface NodeCache
* Resets cache. * Resets cache.
*/ */
void reset(); void reset();
void setCapacity(int capacity);
void setRemainingCapacity(int remainingCapacity);
} }

7
runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java
View File

@@ -66,7 +66,6 @@ import net.runelite.api.BufferProvider;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState; import net.runelite.api.GameState;
import net.runelite.api.Model; import net.runelite.api.Model;
import net.runelite.api.NodeCache;
import net.runelite.api.Perspective; import net.runelite.api.Perspective;
import net.runelite.api.Renderable; import net.runelite.api.Renderable;
import net.runelite.api.Scene; import net.runelite.api.Scene;
@@ -407,12 +406,6 @@ public class GpuPlugin extends Plugin implements DrawCallbacks
textureArrayId = -1; textureArrayId = -1;
// increase size of model cache for dynamic objects since we are extending scene size
NodeCache cachedModels2 = client.getCachedModels2();
cachedModels2.setCapacity(256);
cachedModels2.setRemainingCapacity(256);
cachedModels2.reset();
if (client.getGameState() == GameState.LOGGED_IN) if (client.getGameState() == GameState.LOGGED_IN)
{ {
invokeOnMainThread(this::uploadScene); invokeOnMainThread(this::uploadScene);

2
runescape-api/src/main/java/net/runelite/rs/api/RSEvictingDualNodeHashTable.java
View File

@@ -13,10 +13,8 @@ public interface RSEvictingDualNodeHashTable extends NodeCache
void reset(); void reset();
@Import("capacity") @Import("capacity")
@Override
void setCapacity(int capacity); void setCapacity(int capacity);
@Import("remainingCapacity") @Import("remainingCapacity")
@Override
void setRemainingCapacity(int remainingCapacity); void setRemainingCapacity(int remainingCapacity);
} }