Overview
Comment: | Convert md2 and mapmodelinfo to ObjC |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
cfbd2ec1e63de153d5113d4f69ba8556 |
User & Date: | js on 2025-03-04 00:51:34 |
Other Links: | manifest | tags |
Context
2025-03-04
| ||
01:00 | weapon.mm: Some cleanups check-in: 3d4489fdbb user: js tags: trunk | |
00:51 | Convert md2 and mapmodelinfo to ObjC check-in: cfbd2ec1e6 user: js tags: trunk | |
00:14 | Migrate vec to OFVector3D check-in: 2e931ae3e1 user: js tags: trunk | |
Changes
Modified src/cube.h from [b2a4ca42d9] to [e88df65bda].
︙ | ︙ | |||
101 102 103 104 105 106 107 | #define OUTBORD(x, y) \ ((x) < MINBORD || (y) < MINBORD || (x) >= ssize - MINBORD || \ (y) >= ssize - MINBORD) struct block { int x, y, xs, ys; }; | | > | | | > > > > > > | 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 | #define OUTBORD(x, y) \ ((x) < MINBORD || (y) < MINBORD || (x) >= ssize - MINBORD || \ (y) >= ssize - MINBORD) struct block { int x, y, xs, ys; }; @interface MapModelInfo : OFObject @property (nonatomic) int rad, h, zoff, snap; @property (copy, nonatomic) OFString *name; - (instancetype)initWithRad:(int)rad h:(int)h zoff:(int)zoff snap:(int)snap name:(OFString *)name; @end enum { GUN_FIST = 0, GUN_SG, GUN_CG, GUN_RL, GUN_RIFLE, |
︙ | ︙ |
Modified src/entities.mm from [feb802b67f] to [1ac9739b65].
︙ | ︙ | |||
32 33 34 35 36 37 38 | { if (lastmillis > triggertime + 1000) triggertime = 0; loopv(ents) { entity &e = ents[i]; if (e.type == MAPMODEL) { | | | | | | | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 | { if (lastmillis > triggertime + 1000) triggertime = 0; loopv(ents) { entity &e = ents[i]; if (e.type == MAPMODEL) { MapModelInfo *mmi = getmminfo(e.attr2); if (mmi == nil) continue; @autoreleasepool { rendermodel(mmi.name, 0, 1, e.attr4, (float)mmi.rad, e.x, (float)S(e.x, e.y)->floor + mmi.zoff + e.attr3, e.y, (float)((e.attr1 + 7) - (e.attr1 + 7) % 15), 0, false, 1.0f, 10.0f, mmi.snap); } } else { if (OUTBORD(e.x, e.y)) continue; if (e.type != CARROT) { if (!e.spawned && e.type != TELEPORT) continue; |
︙ | ︙ |
Modified src/physics.mm from [023335c214] to [186af48f2c].
︙ | ︙ | |||
55 56 57 58 59 60 61 | mmcollide(dynent *d, float &hi, float &lo) // collide with a mapmodel { loopv(ents) { entity &e = ents[i]; if (e.type != MAPMODEL) continue; | | | | | | | < < < > > > | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 | mmcollide(dynent *d, float &hi, float &lo) // collide with a mapmodel { loopv(ents) { entity &e = ents[i]; if (e.type != MAPMODEL) continue; MapModelInfo *mmi = getmminfo(e.attr2); if (mmi == nil || !mmi.h) continue; const float r = mmi.rad + d->radius; if (fabs(e.x - d->o.x) < r && fabs(e.y - d->o.y) < r) { float mmz = (float)(S(e.x, e.y)->floor + mmi.zoff + e.attr3); if (d->o.z - d->eyeheight < mmz) { if (mmz < hi) hi = mmz; } else if (mmz + mmi.h > lo) lo = mmz + mmi.h; } } } // all collision happens here // spawn is a dirty side effect used in spawning // drop & rise are supplied by the physics below to indicate gravity/push for // current mini-timestep bool |
︙ | ︙ |
Modified src/protos.h from [4c05d76f8a] to [c14b92cf05].
︙ | ︙ | |||
208 209 210 211 212 213 214 | extern void initsound(); extern void cleansound(); // rendermd2 extern void rendermodel(OFString *mdl, int frame, int range, int tex, float rad, float x, float y, float z, float yaw, float pitch, bool teammate, float scale, float speed, int snap = 0, int basetime = 0); | | | 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 | extern void initsound(); extern void cleansound(); // rendermd2 extern void rendermodel(OFString *mdl, int frame, int range, int tex, float rad, float x, float y, float z, float yaw, float pitch, bool teammate, float scale, float speed, int snap = 0, int basetime = 0); extern MapModelInfo *getmminfo(int i); // server extern void initserver(bool dedicated, int uprate, const char *sdesc, const char *ip, const char *master, OFString *passwd, int maxcl); extern void cleanupserver(); extern void localconnect(); extern void localdisconnect(); |
︙ | ︙ |
Modified src/rendermd2.mm from [a893c08a25] to [dec49d88ac].
︙ | ︙ | |||
20 21 22 23 24 25 26 | struct md2_frame { float scale[3]; float translate[3]; char name[16]; md2_vertex vertices[1]; }; | | | | | | | | | | | | | | > | | | > > > > > > > > > > > > > > > > > > | < < | | | > > | < < > > | | > | | | | | | < < | | | | | | | < | | | | | | | | | | | < > < | | < > | | | | < < | > | | > > > > > > > > > > | | > > | | | | | < > | | | < > < > < | > | | < < > > < < | | > | > | | | > | | | > | | < < | | | | | > > > > | | | | > > | | > > | | | | | | | < > < | | > > > > > > > > > > > | > > | > > > > > > > > > > > > > > > > > > | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 | struct md2_frame { float scale[3]; float translate[3]; char name[16]; md2_vertex vertices[1]; }; @interface MD2 : OFObject { int _numGlCommands; int *_glCommands; int _numTriangles; int _frameSize; int _numFrames; int _numVerts; char *_frames; OFVector3D **_mverts; int _displaylist; int _displaylistverts; } @property (nonatomic) MapModelInfo *mmi; @property (copy, nonatomic) OFString *loadname; @property (nonatomic) int mdlnum; @property (nonatomic) bool loaded; - (bool)loadWithPath:(char *)filename; - (void)renderWithLight:(OFVector3D &)light frame:(int)frame range:(int)range x:(float)x y:(float)y z:(float)z yaw:(float)yaw pitch:(float)pitch scale:(float)scale speed:(float)speed snap:(int)snap basetime:(int)basetime; - (void)scaleWithFrame:(int)frame scale:(float)scale snap:(int)snap; @end static OFMutableDictionary<OFString *, MD2 *> *mdllookup = nil; static OFMutableArray<MD2 *> *mapmodels = nil; @implementation MD2 + (void)initialize { if (self != [MD2 class]) return; mdllookup = [[OFMutableDictionary alloc] init]; mapmodels = [[OFMutableArray alloc] init]; } - (void)dealloc { if (_glCommands) delete[] _glCommands; if (_frames) delete[] _frames; } - (bool)loadWithPath:(char *)filename { FILE *file; md2_header header; if ((file = fopen(filename, "rb")) == NULL) return false; fread(&header, sizeof(md2_header), 1, file); endianswap(&header, sizeof(int), sizeof(md2_header) / sizeof(int)); if (header.magic != 844121161 || header.version != 8) return false; _frames = new char[header.frameSize * header.numFrames]; if (_frames == NULL) return false; fseek(file, header.offsetFrames, SEEK_SET); fread(_frames, header.frameSize * header.numFrames, 1, file); for (int i = 0; i < header.numFrames; ++i) endianswap(_frames + i * header.frameSize, sizeof(float), 6); _glCommands = new int[header.numGlCommands]; if (_glCommands == NULL) return false; fseek(file, header.offsetGlCommands, SEEK_SET); fread(_glCommands, header.numGlCommands * sizeof(int), 1, file); endianswap(_glCommands, sizeof(int), header.numGlCommands); _numFrames = header.numFrames; _numGlCommands = header.numGlCommands; _frameSize = header.frameSize; _numTriangles = header.numTriangles; _numVerts = header.numVertices; fclose(file); _mverts = new OFVector3D *[_numFrames]; loopj(_numFrames) _mverts[j] = NULL; return true; } float snap(int sn, float f) { return sn ? (float)(((int)(f + sn * 0.5f)) & (~(sn - 1))) : f; } - (void)scaleWithFrame:(int)frame scale:(float)scale snap:(int)sn { _mverts[frame] = new OFVector3D[_numVerts]; md2_frame *cf = (md2_frame *)((char *)_frames + _frameSize * frame); float sc = 16.0f / scale; loop(vi, _numVerts) { uchar *cv = (uchar *)&cf->vertices[vi].vertex; OFVector3D *v = &(_mverts[frame])[vi]; v->x = (snap(sn, cv[0] * cf->scale[0]) + cf->translate[0]) / sc; v->y = -(snap(sn, cv[1] * cf->scale[1]) + cf->translate[1]) / sc; v->z = (snap(sn, cv[2] * cf->scale[2]) + cf->translate[2]) / sc; } } - (void)renderWithLight:(OFVector3D &)light frame:(int)frame range:(int)range x:(float)x y:(float)y z:(float)z yaw:(float)yaw pitch:(float)pitch scale:(float)sc speed:(float)speed snap:(int)sn basetime:(int)basetime { loopi(range) if (!_mverts[frame + i])[self scaleWithFrame:frame + i scale:sc snap:sn]; glPushMatrix(); glTranslatef(x, y, z); glRotatef(yaw + 180, 0, -1, 0); glRotatef(pitch, 0, 0, 1); glColor3fv((float *)&light); if (_displaylist && frame == 0 && range == 1) { glCallList(_displaylist); xtraverts += _displaylistverts; } else { if (frame == 0 && range == 1) { static int displaylistn = 10; glNewList(_displaylist = displaylistn++, GL_COMPILE); _displaylistverts = xtraverts; } int time = lastmillis - basetime; int fr1 = (int)(time / speed); float frac1 = (time - fr1 * speed) / speed; float frac2 = 1 - frac1; fr1 = fr1 % range + frame; int fr2 = fr1 + 1; if (fr2 >= frame + range) fr2 = frame; OFVector3D *verts1 = _mverts[fr1]; OFVector3D *verts2 = _mverts[fr2]; for (int *command = _glCommands; (*command) != 0;) { int numVertex = *command++; if (numVertex > 0) { glBegin(GL_TRIANGLE_STRIP); } else { glBegin(GL_TRIANGLE_FAN); numVertex = -numVertex; } loopi(numVertex) { float tu = *((float *)command++); float tv = *((float *)command++); glTexCoord2f(tu, tv); int vn = *command++; OFVector3D &v1 = verts1[vn]; OFVector3D &v2 = verts2[vn]; #define ip(c) v1.c *frac2 + v2.c *frac1 glVertex3f(ip(x), ip(z), ip(y)); } xtraverts += numVertex; glEnd(); } if (_displaylist) { glEndList(); _displaylistverts = xtraverts - _displaylistverts; } } glPopMatrix(); } const int FIRSTMDL = 20; void delayedload(MD2 *m) { if (!m.loaded) { @autoreleasepool { sprintf_sd(name1)("packages/models/%s/tris.md2", m.loadname.UTF8String); if (![m loadWithPath:path(name1)]) fatal("loadmodel: ", name1); sprintf_sd(name2)("packages/models/%s/skin.jpg", m.loadname.UTF8String); int xs, ys; installtex(FIRSTMDL + m.mdlnum, path(name2), xs, ys); m.loaded = true; } } } int modelnum = 0; MD2 * loadmodel(OFString *name) { @autoreleasepool { MD2 *m = mdllookup[name]; if (m != nil) return m; m = [[MD2 alloc] init]; m.mdlnum = modelnum++; MapModelInfo *mmi = [[MapModelInfo alloc] initWithRad:2 h:2 zoff:0 snap:0 name:@""]; m.mmi = mmi; m.loadname = name; mdllookup[name] = m; return m; } } void mapmodel( OFString *rad, OFString *h, OFString *zoff, OFString *snap, OFString *name) { MD2 *m = loadmodel(name); MapModelInfo *mmi = [[MapModelInfo alloc] initWithRad:(int)rad.longLongValue h:(int)h.longLongValue zoff:(int)zoff.longLongValue snap:(int)snap.longLongValue name:m.loadname]; m.mmi = mmi; [mapmodels addObject:m]; } COMMAND(mapmodel, ARG_5STR) void mapmodelreset() { [mapmodels removeAllObjects]; } COMMAND(mapmodelreset, ARG_NONE) MapModelInfo * getmminfo(int i) { return i < mapmodels.count ? mapmodels[i].mmi : nil; } void rendermodel(OFString *mdl, int frame, int range, int tex, float rad, float x, float y, float z, float yaw, float pitch, bool teammate, float scale, float speed, int snap, int basetime) { MD2 *m = loadmodel(mdl); if (isoccluded(player1->o.x, player1->o.y, x - rad, z - rad, rad * 2)) return; delayedload(m); int xs, ys; glBindTexture(GL_TEXTURE_2D, tex ? lookuptexture(tex, xs, ys) : FIRSTMDL + m.mdlnum); int ix = (int)x; int iy = (int)z; OFVector3D light = OFMakeVector3D(1, 1, 1); if (!OUTBORD(ix, iy)) { sqr *s = S(ix, iy); float ll = 256.0f; // 0.96f; float of = 0.0f; // 0.1f; light.x = s->r / ll + of; light.y = s->g / ll + of; light.z = s->b / ll + of; } if (teammate) { light.x *= 0.6f; light.y *= 0.7f; light.z *= 1.2f; } [m renderWithLight:light frame:frame range:range x:x y:y z:z yaw:yaw pitch:pitch scale:scale speed:speed snap:snap basetime:basetime]; } @end @implementation MapModelInfo - (instancetype)initWithRad:(int)rad h:(int)h zoff:(int)zoff snap:(int)snap name:(OFString *)name { self = [super init]; _rad = rad; _h = h; _zoff = zoff; _snap = snap; _name = [name copy]; return self; } @end |