Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 21:57:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Added multiple cache per entity

Browse source
This commit is contained in:
smallmodel 2024-02-20 20:44:55 +01:00
parent 6b6e2c947c
commit cbe6d85bcd
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
2 changed files with 37 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

45
code/tiki/tiki_cache.cpp
View file

@ -42,7 +42,7 @@ struct pchar {
con_map<pchar, dtikianim_t *> *tikianimcache;
con_map<pchar, dtiki_t *> *tikicache;
static skeletor_c *skel_entity_cache[1024];
static skeletor_c *skel_entity_cache[TIKI_MAX_ENTITY_CACHE];
template<>
int HashCode<pchar>(const pchar& key)
@ -300,6 +300,8 @@ static qboolean tiki_started;
void *TIKI_GetSkeletor(dtiki_t *tiki, int entnum)
{
skeletor_c *skel;
int i;
int index;
if (entnum == ENTITYNUM_NONE) {
if (!tiki->skeletor) {
@ -307,17 +309,34 @@ void *TIKI_GetSkeletor(dtiki_t *tiki, int entnum)
}
skel = (skeletor_c *)tiki->skeletor;
} else {
skel = skel_entity_cache[entnum];
if (skel) {
if (skel->m_Tiki == tiki) {
return skel_entity_cache[entnum];
// Added in 2.30
// Multiple caches per entity
for (i = 0; i < TIKI_MAX_ENTITY_CACHE_PER_ENT; i++) {
index = ((entnum % TIKI_MAX_ENTITIES) * TIKI_MAX_ENTITY_CACHE_PER_ENT) + i;
skel = skel_entity_cache[index];
if (!skel) {
break;
}
if (skel->m_Tiki == tiki) {
return skel;
}
}
if (i == TIKI_MAX_ENTITY_CACHE_PER_ENT) {
i = 0;
}
index = ((entnum % TIKI_MAX_ENTITIES) * TIKI_MAX_ENTITY_CACHE_PER_ENT) + i;
skel = skel_entity_cache[index];
if (skel) {
delete skel;
}
skel = new skeletor_c(tiki);
skel_entity_cache[entnum] = skel;
skel_entity_cache[index] = skel;
}
return skel;
@ -331,15 +350,17 @@ TIKI_DeleteSkeletor
static void TIKI_DeleteSkeletor(int entnum)
{
skeletor_c *skel;
int i;
if (entnum == ENTITYNUM_NONE) {
return;
}
skel = skel_entity_cache[entnum];
if (skel) {
delete skel;
skel_entity_cache[entnum] = 0;
for (i = 0; i < TIKI_MAX_ENTITY_CACHE_PER_ENT; i++) {
skel = skel_entity_cache[entnum * TIKI_MAX_ENTITY_CACHE_PER_ENT + i];
if (skel) {
delete skel;
}
}
}
@ -352,7 +373,7 @@ void TIKI_Begin(void)
{
int i;
for (i = 0; i < TIKI_MAX_SKELCACHE; i++) {
for (i = 0; i < MAX_GENTITIES; i++) {
skel_entity_cache[i] = 0;
}
@ -368,7 +389,7 @@ void TIKI_End(void)
{
int i;
for (i = 0; i < TIKI_MAX_SKELCACHE; i++) {
for (i = 0; i < MAX_GENTITIES; i++) {
TIKI_DeleteSkeletor(i);
}

4
code/tiki/tiki_shared.h
View file

@ -77,6 +77,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define TIKI_MAX_SKELCACHE 1024
#define TIKI_MAX_COMMANDS 128
#define TIKI_MAX_ENTITIES 2048
#define TIKI_MAX_ENTITY_CACHE_PER_ENT 2
#define TIKI_MAX_ENTITY_CACHE (TIKI_MAX_ENTITIES*TIKI_MAX_ENTITY_CACHE_PER_ENT)
// tiki surface flags
#define TIKI_SURF_SKIN1 (1 << 0)
#define TIKI_SURF_SKIN2 (1 << 1)