Preserve contact-owned roots and independent body modes
This commit is contained in:
1 parent
3845ea7114
commit
c9d0c5be59
25 files changed
+16388
-74
No files matched your search
@@ -0,0 +1,29 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Read-only479D20 flag contracts and separate copied-body fixture generator."""
|
||||
import argparse,hashlib,json
|
||||
from pathlib import Path
|
||||
from body_step_evidence import collect as body_collect
|
||||
from collision_response import header
|
||||
|
||||
REA_ID='ev_0d64cc58fa8f5573fc8e61e0f2c20e36288099212bd2257d3a3121361fd6c904'
|
||||
|
||||
def collect(original):
|
||||
result=body_collect(original)
|
||||
result['rea_evidence_id']=REA_ID
|
||||
result['flag_slots']={'support':'0x1c8','world_response':'0x1d0','integration':'0x210','supported':'0x218','collision':'0x220','alternate':'0x228'}
|
||||
result['scope']='Full copied479D20, original friction/support against synthetic body/triangle; synthetic world dispatcher and selected callback mutations; no game entrypoint or real actor.'
|
||||
return result
|
||||
|
||||
def generate(original,output):
|
||||
original=Path(original).resolve();output=Path(output).resolve()
|
||||
if output.is_relative_to(original) or original.is_relative_to(output):raise ValueError('Output must be separate from originals')
|
||||
if output.exists() and any(p.is_symlink() for p in output.rglob('*')):raise ValueError('Output contains symlinks')
|
||||
result=collect(original);output.mkdir(parents=True,exist_ok=True)
|
||||
base=Path(__file__).with_name('body_step_probe.c').read_text().split('static void run(')[0]
|
||||
(output/'body_modes_probe.c').write_text(base+Path(__file__).with_name('body_modes_probe.c').read_text())
|
||||
(output/'collision_response_relocations.h').write_text(header(result))
|
||||
(output/'source.json').write_text(json.dumps(result,indent=2)+'\n');return result
|
||||
|
||||
if __name__=='__main__':
|
||||
p=argparse.ArgumentParser();p.add_argument('original',type=Path);p.add_argument('--generate-probe',type=Path);a=p.parse_args()
|
||||
print(json.dumps(generate(a.original,a.generate_probe) if a.generate_probe else collect(a.original),indent=2))
|
||||
@@ -0,0 +1,91 @@
|
||||
/* Full copied479D20/friction/support, synthetic mode flags and world traversal.
|
||||
* World stub only publishes candidate/discrete callback flag mutations; original
|
||||
* support still queries the existing synthetic horizontal triangle. */
|
||||
static int integration_flag,alternate_flag,mutation;
|
||||
static unsigned world_calls,move_calls,previous_writes,position_writes,support_reads,friction_reads,factor_reads,rotates,clear_impulses,supported_writes;
|
||||
static char events[512];static unsigned event_count;
|
||||
static void event(char value){if(event_count<sizeof(events)-1){events[event_count++]=value;events[event_count]=0;}}
|
||||
static int TC mode_integration(Body*b){(void)b;event('I');return integration_flag;}
|
||||
static int TC mode_alternate(Body*b){(void)b;event('A');return alternate_flag;}
|
||||
static int TC mode_support(Body*b){support_reads++;event('S');return b->support;}
|
||||
static int TC mode_world(Body*b){event('W');return b->world;}
|
||||
static int TC mode_collision(Body*b){event('C');return b->pairs;}
|
||||
static int TC mode_supported(Body*b){event('G');return b->supported;}
|
||||
static void TC mode_set_supported(Body*b,int value){supported_writes++;event(value?'T':'F');set_supported(b,value);}
|
||||
static float TC mode_friction(Body*b){friction_reads++;event('D');return b->friction;}
|
||||
static float TC mode_factor(Body*b){factor_reads++;event('H');return b->factor;}
|
||||
static void TC mode_previous(Body*b,Vec value){previous_writes++;event('P');set_previous(b,value);}
|
||||
static void TC mode_position(Body*b,Vec value){position_writes++;event('V');set_position(b,value);}
|
||||
static void TC mode_move(Body*b,Vec value){move_calls++;event('M');move(b,value);}
|
||||
static void TC mode_rotate(Body*b,float x,float y,float z){rotates++;event('R');rotate(b,x,y,z);}
|
||||
static void TC mode_impulse_clear(Body*b,float x,float y,float z){clear_impulses++;event('Q');impulse_xyz(b,x,y,z);}
|
||||
static void TC mode_landing(Body*b){
|
||||
event('L');landing(b);
|
||||
if(mutation==10)b->support=0;
|
||||
if(mutation==11)b->pairs=0;
|
||||
if(mutation==12)b->speed=100;
|
||||
if(mutation==13)integration_flag=0;
|
||||
if(mutation==14)b->velocity=(Vec){7,123,9,0};
|
||||
if(mutation==15)b->acceleration=(Vec){7,123,9,0};
|
||||
if(mutation==16)b->position=(Vec){77,88,99,2};
|
||||
if(mutation==17)b->impulse=(Vec){7,123,9,0};
|
||||
if(mutation==18)b->anchor=(Vec){7,123,9,0};
|
||||
if(mutation==19)b->angular=(Vec){7,123,9,0};
|
||||
if(mutation==20)b->supported=0;
|
||||
}
|
||||
static void __cdecl mode_world_move(Body*b,Vec*out,Vec delta,int edges){
|
||||
(void)edges;world_calls++;event('X');*out=b->position;
|
||||
out->x+=delta.x;out->y+=delta.y;out->z+=delta.z;
|
||||
if(mutation==1)b->support=0;
|
||||
if(mutation==2)b->world=0;
|
||||
if(mutation==3)b->pairs=0;
|
||||
if(mutation==4)integration_flag=0;
|
||||
if(mutation==5)*AT(0x4f69e5)=0;
|
||||
if(mutation==6){b->support=0;b->world=0;b->pairs=0;integration_flag=0;}
|
||||
}
|
||||
static void mode_setup(void){
|
||||
setup();
|
||||
table[0x218/4]=(uintptr_t)mode_supported;table[0x21c/4]=(uintptr_t)mode_set_supported;
|
||||
table[0x210/4]=(uintptr_t)mode_integration;table[0x228/4]=(uintptr_t)mode_alternate;
|
||||
table[0x1c8/4]=(uintptr_t)mode_support;table[0x1d0/4]=(uintptr_t)mode_world;
|
||||
table[0x220/4]=(uintptr_t)mode_collision;table[0x248/4]=(uintptr_t)mode_friction;
|
||||
table[0x250/4]=(uintptr_t)mode_factor;table[0x2fc/4]=(uintptr_t)mode_previous;
|
||||
table[0x314/4]=(uintptr_t)mode_position;table[0x31c/4]=(uintptr_t)mode_move;
|
||||
table[0x334/4]=(uintptr_t)mode_rotate;table[0x28c/4]=(uintptr_t)mode_impulse_clear;
|
||||
table[0x37c/4]=(uintptr_t)mode_landing;
|
||||
unsigned char*at=AT(0x47b4b0);at[0]=0xe9;*(uint32_t*)(at+1)=(uint32_t)((uintptr_t)mode_world_move-(uintptr_t)(at+5));
|
||||
}
|
||||
static void mode_run(const char*name,Body b,int flags,int changed){
|
||||
integration_flag=(flags>>0)&1;b.support=(flags>>1)&1;b.world=(flags>>2)&1;
|
||||
b.pairs=(flags>>3)&1;alternate_flag=(flags>>4)&1;*AT(0x4f69e5)=(flags>>5)&1;mutation=changed;
|
||||
world_calls=move_calls=previous_writes=position_writes=support_reads=friction_reads=factor_reads=rotates=clear_impulses=supported_writes=event_count=0;events[0]=0;
|
||||
*(uint32_t*)AT(0x695d4c)=0x11111111;*(float*)AT(0x695d5c)=1234;
|
||||
*(float*)AT(0x5cfbe0)=5678;*(uint32_t*)AT(0x695d84)=0x22222222;
|
||||
((BodyStep)AT(0x479d20))(&b,1.f/60);
|
||||
printf("MODE {\"name\":\"%s\",\"flags\":%d,\"mutation\":%d,\"position\":[%.9g,%.9g,%.9g,%.9g],\"previous\":[%.9g,%.9g,%.9g,%.9g],\"velocity\":[%.9g,%.9g,%.9g],\"acceleration\":[%.9g,%.9g,%.9g],\"impulse\":[%.9g,%.9g,%.9g],\"angular\":[%.9g,%.9g,%.9g],\"rotation\":[%.9g,%.9g,%.9g],\"anchor\":[%.9g,%.9g,%.9g],\"supported\":%d,\"landings\":%u,\"final_flags\":[%d,%d,%d,%d,%d,%d],\"speed\":%.9g,\"calls\":[%u,%u,%u,%u,%u,%u,%u,%u,%u,%u],\"context\":[%lu,%.9g,%.9g,%lu],\"events\":\"%s\"}\n",
|
||||
name,flags,changed,b.position.x,b.position.y,b.position.z,b.position.w,b.previous.x,b.previous.y,b.previous.z,b.previous.w,
|
||||
b.velocity.x,b.velocity.y,b.velocity.z,b.acceleration.x,b.acceleration.y,b.acceleration.z,b.impulse.x,b.impulse.y,b.impulse.z,
|
||||
b.angular.x,b.angular.y,b.angular.z,b.rotation.x,b.rotation.y,b.rotation.z,b.anchor.x,b.anchor.y,b.anchor.z,b.supported,b.landings,
|
||||
integration_flag,b.support,b.world,b.pairs,alternate_flag,*AT(0x4f69e5),b.speed,
|
||||
world_calls,move_calls,previous_writes,position_writes,support_reads,friction_reads,factor_reads,rotates,clear_impulses,supported_writes,
|
||||
(unsigned long)*(uint32_t*)AT(0x695d4c),*(float*)AT(0x695d5c),*(float*)AT(0x5cfbe0),(unsigned long)*(uint32_t*)AT(0x695d84),events);
|
||||
require(isfinite(b.position.y)&&isfinite(b.velocity.y),"finite mode output");
|
||||
}
|
||||
static Body mode_initial(void){
|
||||
Body b=initial();b.supported=1;b.previous=(Vec){9,8,7,6};b.velocity=(Vec){100,200,50,0};
|
||||
b.acceleration.y=-264;b.impulse.y=20;b.angular.y=12;return b;
|
||||
}
|
||||
int main(void){
|
||||
setbuf(stdout,NULL);map_copy();mode_setup();
|
||||
for(int flags=0;flags<64;flags++){char name[24];snprintf(name,sizeof(name),"flags_%02d",flags);mode_run(name,mode_initial(),flags,0);}
|
||||
Body b;
|
||||
for(int change=1;change<=6;change++){char name[40];snprintf(name,sizeof(name),"world_mutation_%d",change);b=mode_initial();b.position.y=76;b.velocity.y=-200;b.impulse.y=0;b.acceleration.y=0;mode_run(name,b,47,change);}
|
||||
for(int change=10;change<=20;change++){char name[40];snprintf(name,sizeof(name),"landing_mutation_%d",change);b=mode_initial();b.supported=0;b.position.y=76;b.velocity.y=-200;b.impulse.y=0;b.acceleration.y=0;mode_run(name,b,47,change);}
|
||||
b=mode_initial();b.position.y=-30000;b.supported=0;mode_run("world_off_below_floor",b,43,0);
|
||||
b=mode_initial();b.position.y=-30000;b.supported=0;mode_run("collision_off_below_floor",b,33,0);
|
||||
b=mode_initial();b.supported=0;b.velocity=(Vec){.125f,0,0,0};b.angular.y=.1f;b.impulse.y=b.acceleration.y=0;mode_run("collision_off_suppression",b,33,0);
|
||||
b=mode_initial();b.supported=0;b.velocity=(Vec){.125f,0,0,0};b.angular.y=.1f;b.impulse.y=b.acceleration.y=0;mode_run("frozen_suppression",b,49,0);
|
||||
b=mode_initial();b.supported=0;b.velocity=(Vec){.125f,0,0,0};b.angular.y=.1f;b.impulse.y=b.acceleration.y=0;mode_run("collision_off_linear_suppression",b,1,0);
|
||||
b=mode_initial();b.supported=0;b.velocity=(Vec){.125f,0,0,0};b.angular.y=.1f;b.impulse.y=b.acceleration.y=0;mode_run("frozen_linear_suppression",b,17,0);
|
||||
puts("BODY_MODES_COMPLETE");return 0;
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Read-only original body/contact Vec4 publication probe generator."""
|
||||
import argparse,hashlib,json,struct
|
||||
from pathlib import Path
|
||||
from body_step_evidence import collect as body_collect
|
||||
from collision_response import header
|
||||
from checkpoint_script_state import find_case,read_va
|
||||
from pe_inspect import PE
|
||||
REA_ID='ev_0d64cc58fa8f5573fc8e61e0f2c20e36288099212bd2257d3a3121361fd6c904'
|
||||
ROOT_BINDINGS=((0x2f8,0x4721e0),(0x2fc,0x472240),(0x310,0x472300),(0x314,0x472360))
|
||||
ROOT_LEAVES=((0x4721e0,0x47220a),(0x472240,0x472264),(0x472300,0x47232a),(0x472360,0x472384))
|
||||
SITES=((0x47a084,'ff90fc020000'),(0x47a123,'8b168d44244c508bceff92f8020000'),
|
||||
(0x47a13d,'ff9210030000'),(0x47a147,'d819dfe0f6c440'),(0x47a157,'d85904dfe0f6c440'),
|
||||
(0x47a168,'d85908dfe0f6c440'),(0x47a179,'d8590cdfe0f6c440'),
|
||||
(0x47a198,'c74424200050c3c6'),(0x47a1c4,'ff9014030000'),(0x47a235,'e856160000'),
|
||||
(0x47b80f,'ff9774030000'),(0x47b82e,'ff9770030000'))
|
||||
def collect(original):
|
||||
r=body_collect(original);pe=PE(find_case(Path(original),'Neutron.exe'));sites=[]
|
||||
for va,want in SITES:
|
||||
actual=read_va(pe,va,len(bytes.fromhex(want))).hex()
|
||||
if actual!=want:raise ValueError(f'Changed original publication site {va:#x}')
|
||||
sites.append(dict(va=hex(va),file_offset=hex(pe.offset(va-pe.base)),bytes=actual))
|
||||
bindings=[]
|
||||
for slot,target in ROOT_BINDINGS:
|
||||
if struct.unpack('<I',read_va(pe,0x4a373c+slot,4))[0]!=target:raise ValueError('Changed Jimmy root binding')
|
||||
bindings.append(dict(table='0x4a373c',slot=hex(slot),target=hex(target)))
|
||||
leaves=[dict(va=hex(a),file_offset=hex(pe.offset(a-pe.base)),length=b-a,sha256=hashlib.sha256(read_va(pe,a,b-a)).hexdigest()) for a,b in ROOT_LEAVES]
|
||||
r.update(publication_sites=sites,root_bindings=bindings,root_leaf_ranges=leaves,rea_evidence_id=REA_ID,scope='Copied full479D20/47B4B0 with synthetic wall/body/contact callbacks and logging support wrapper; no original game entrypoint.')
|
||||
return r
|
||||
def generate(original,output):
|
||||
original=Path(original).resolve();output=Path(output).resolve()
|
||||
if output.is_relative_to(original) or original.is_relative_to(output):raise ValueError('Separate output required')
|
||||
if output.exists() and any(p.is_symlink() for p in output.rglob('*')):raise ValueError('Output symlinks rejected')
|
||||
r=collect(original);output.mkdir(parents=True,exist_ok=True)
|
||||
shared=Path(__file__).with_name('body_step_probe.c').read_text().split('int main(void)')[0]
|
||||
(output/'body_root_publication_probe.c').write_text(shared+Path(__file__).with_name('body_root_publication_probe.c').read_text())
|
||||
(output/'collision_response_relocations.h').write_text(header(r))
|
||||
(output/'source.json').write_text(json.dumps(r,indent=2)+'\n');return r
|
||||
if __name__=='__main__':
|
||||
p=argparse.ArgumentParser();p.add_argument('original',type=Path);p.add_argument('--generate-probe',type=Path);a=p.parse_args()
|
||||
print(json.dumps(generate(a.original,a.generate_probe) if a.generate_probe else collect(a.original),indent=2))
|
||||
@@ -0,0 +1,83 @@
|
||||
/* Full copied479D20 and47B4B0/kernel, synthetic wall/body/virtual contacts.
|
||||
* The support wrapper logs call order and either calls real47B890 or no-ops to
|
||||
* isolate publication. No game entrypoint, animation, scripts or audio. */
|
||||
static int mutation,real_support,after_contact;
|
||||
static unsigned callbacks,publications,support_calls,previous_reads,live_reads;
|
||||
static Vec callback_live,callback_previous,callback_velocity,support_live,support_previous,published;
|
||||
static char events[128];static unsigned event_count;
|
||||
static void event(char c){if(event_count+1<sizeof(events)){events[event_count++]=c;events[event_count]=0;}}
|
||||
static Vec *TC read_live(Body*b,Vec*out){if(after_contact){live_reads++;event('L');}*out=b->position;return out;}
|
||||
static Vec *TC read_previous(Body*b,Vec*out){if(after_contact){previous_reads++;event('R');}*out=b->previous;return out;}
|
||||
static void TC publish(Body*b,Vec value){publications++;published=value;event('P');b->position=value;}
|
||||
static void TC special(Body*b,Vec normal,void*poly){
|
||||
(void)normal;(void)poly;callbacks++;callback_live=b->position;callback_previous=b->previous;callback_velocity=b->velocity;
|
||||
event('C');after_contact=1;
|
||||
switch(mutation){
|
||||
case 1:b->position.x+=100;break;
|
||||
case 2:b->previous.x+=100;break;
|
||||
case 3:b->position.w=2;break;
|
||||
case 4:b->previous.w=2;break;
|
||||
case 5:b->position=(Vec){101,-30000,303,1};break;
|
||||
case 6:b->position=b->previous=(Vec){101,250,303,1};break;
|
||||
case 7:b->position.w=b->previous.w=2;break;
|
||||
case 8:b->velocity=(Vec){9,8,7,0};b->acceleration=(Vec){4,5,6,0};b->impulse=(Vec){0,77,0,0};break;
|
||||
case 9:b->position=(Vec){101,5,303,1};break;
|
||||
case 10:b->position.x+=100;b->previous.x+=100;b->velocity=(Vec){9,8,7,0};b->impulse.y=77;break;
|
||||
}
|
||||
}
|
||||
static void __cdecl observe_support(Body*b){
|
||||
support_calls++;support_live=b->position;support_previous=b->previous;event('S');
|
||||
if(real_support)((void(__cdecl*)(Body*))AT(0x47b890))(b);
|
||||
}
|
||||
static unsigned char wall_polygon[0x30],wall_shape[0x90],wall_corners[60];
|
||||
static Vec wall_points[3]={{-1000,-100000,0,1},{-1000,100000,0,1},{100000,0,0,1}};
|
||||
static void add_wall(void){
|
||||
*(void**)(wall_polygon+0x24)=wall_corners;*(Vec*)(wall_polygon+8)=(Vec){0,0,1,0};
|
||||
*(void**)(wall_shape+0x68)=wall_points;
|
||||
for(unsigned i=0;i<3;i++)*(unsigned*)(wall_corners+i*20)=i;
|
||||
for(int x=127;x<=132;x++)for(int z=127;z<=132;z++){
|
||||
Node*s=&sentinels[0][260*x+z],*n=calloc(1,sizeof(Node));void**r=calloc(1,0x1c);
|
||||
require(n&&r,"wall allocation");r[0]=wall_polygon;r[1]=wall_shape;n->value=r;
|
||||
n->next=s;n->previous=s->previous;s->previous->next=n;s->previous=n;
|
||||
}
|
||||
}
|
||||
static void call_hook(unsigned va,void*function,unsigned expected){
|
||||
require(*AT(va)==0xe8,"source relative CALL opcode");
|
||||
require((unsigned)(va+5+*(int32_t*)AT(va+1))==expected,"source relative CALL target");
|
||||
*(int32_t*)AT(va+1)=(int32_t)((unsigned char*)function-(AT(va)+5));
|
||||
}
|
||||
static void vec(Vec v){printf("%.9g,%.9g,%.9g,%.9g",v.x,v.y,v.z,v.w);}
|
||||
static void one(const char*name,int kind,float y,float vy,int original_support,int change_impulse){
|
||||
Body b=initial();b.radius=10;b.position=(Vec){0,y,20,1};b.previous=b.position;
|
||||
if(kind==11)b.previous=(Vec){999,999,999,3}; //World entry must replace stale previous before contact.
|
||||
b.velocity=(Vec){0,vy,-900,0};b.impulse.y=change_impulse?30:0;b.speed=100;
|
||||
mutation=kind;real_support=original_support;after_contact=0;
|
||||
callbacks=publications=support_calls=previous_reads=live_reads=event_count=0;events[0]=0;
|
||||
memset(&callback_live,0,sizeof(Vec));memset(&callback_previous,0,sizeof(Vec));memset(&callback_velocity,0,sizeof(Vec));
|
||||
memset(&support_live,0,sizeof(Vec));memset(&support_previous,0,sizeof(Vec));memset(&published,0,sizeof(Vec));
|
||||
*(unsigned char*)AT(0x4f69e5)=1;*(unsigned char*)AT(0x695d46)=0;
|
||||
((BodyStep)AT(0x479d20))(&b,1.f/60);
|
||||
printf("ROOT %s in=%d,%.9g,%.9g,%d,%d live=",name,kind,y,vy,original_support,change_impulse);vec(b.position);
|
||||
printf(" previous=");vec(b.previous);printf(" velocity=");vec(b.velocity);printf(" acceleration=");vec(b.acceleration);
|
||||
printf(" impulse=");vec(b.impulse);printf(" seen=");vec(callback_live);printf(" seenPrevious=");vec(callback_previous);
|
||||
printf(" seenVelocity=");vec(callback_velocity);printf(" supportLive=");vec(support_live);printf(" supportPrevious=");vec(support_previous);
|
||||
printf(" published=");vec(published);
|
||||
printf(" flags=%u,%u,%u,%u,%u,%d,%u events=%s\n",callbacks,publications,support_calls,previous_reads,live_reads,b.supported,b.landings,events);
|
||||
require(callbacks==1,"one actual wall contact");
|
||||
require(isfinite(b.position.x)&&isfinite(b.position.y)&&isfinite(b.position.w),"finite root");
|
||||
}
|
||||
int main(void){
|
||||
setbuf(stdout,NULL);map_copy();setup();add_wall();
|
||||
table[0x310/4]=(uintptr_t)read_live;table[0x2f8/4]=(uintptr_t)read_previous;table[0x314/4]=(uintptr_t)publish;
|
||||
table[0x374/4]=(uintptr_t)special;call_hook(0x47a235,observe_support,0x47b890);
|
||||
one("unchanged_down",0,20,-120,0,0);one("live_x_down",1,20,-120,0,0);
|
||||
one("stale_previous_reset",11,20,-120,0,0);
|
||||
one("previous_x_down",2,20,-120,0,0);one("live_w_down",3,20,-120,0,0);one("previous_w_down",4,20,-120,0,0);
|
||||
one("live_below_floor",5,20,-120,0,0);one("both_xyz_equal",6,20,-120,0,0);one("both_w_equal",7,20,-120,0,0);
|
||||
one("callback_motion",8,20,-120,0,1);one("both_equal_motion",10,20,-120,0,1);
|
||||
one("unchanged_up",0,20,200,0,0);one("live_x_up",1,20,200,0,0);one("previous_w_up",4,20,200,0,0);
|
||||
one("below_clamp_unchanged",0,-26000,-120,0,0);one("below_clamp_live_x",1,-26000,-120,0,0);
|
||||
one("below_clamp_equal",6,-26000,-120,0,0);
|
||||
one("support_after_live_change",9,20,-120,1,0);one("support_after_w_change",3,20,-120,1,0);
|
||||
puts("BODY_ROOT_PUBLICATION_COMPLETE");return 0;
|
||||
}
|
||||
Reference in new issue
Block a user