ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/face.h
(Generate patch)

Comparing deliantra/server/include/face.h (file contents):
Revision 1.42 by root, Sun Nov 11 04:29:11 2012 UTC vs.
Revision 1.48 by root, Wed Dec 5 19:03:26 2018 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 6 *
6 * Deliantra is free software: you can redistribute it and/or modify it under 7 * Deliantra is free software: you can redistribute it and/or modify it under
7 * the terms of the Affero GNU General Public License as published by the 8 * the terms of the Affero GNU General Public License as published by the
8 * Free Software Foundation, either version 3 of the License, or (at your 9 * Free Software Foundation, either version 3 of the License, or (at your
9 * option) any later version. 10 * option) any later version.
22 23
23#ifndef FACE_H__ 24#ifndef FACE_H__
24#define FACE_H__ 25#define FACE_H__
25 26
26#include <util.h> 27#include <util.h>
27#include <tr1/unordered_map> 28
29#include "flat_hash_map.hpp"
28 30
29#define CHKSUM_MAXLEN 15 31#define CHKSUM_MAXLEN 15
30#define MAX_FACES 65535 // we reserve face #65535 32#define MAX_FACES 65535 // we reserve face #65535
31 33
32extern faceidx blank_face, empty_face, magicmouth_face; 34extern faceidx blank_face, empty_face, magicmouth_face;
33 35
34struct facedata 36struct facedata
35{ 37{
36 uint32_t size;
37 uint32_t fofs; // file offste in facedatax
38 uint8 chksum[CHKSUM_MAXLEN]; 38 uint8 chksum[CHKSUM_MAXLEN];
39 uint8 chksum_len; 39 uint8 chksum_len;
40 40
41 facedata () 41 facedata ()
42 : size (0), fofs (0), chksum_len (0) 42 : chksum_len (0)
43 { } 43 { }
44}; 44};
45 45
46/* New face structure - this enforces the notion that data is face by 46/* New face structure - this enforces the notion that data is face by
47 * face only - you can not change the color of an item - you need to instead 47 * face only - you can not change the color of an item - you need to instead
48 * create a new face with that color. 48 * create a new face with that color.
49 */ 49 */
50struct faceinfo 50struct faceinfo
51{ 51{
52 faceinfo () 52 faceinfo ()
53 : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0), refcnt (1), meta_hv (0) 53 : number (0), smooth (0), type (0), smoothlevel (0), visibility (0), magicmap (0), refcnt (1)
54 { 54 {
55 } 55 }
56 56
57 shstr name; 57 shstr name;
58 HV *meta_hv; /* note, no destructor of copy constructor, must never be freed, but can be moved aorund */
59 facedata face[3]; // indexed by faceset, 0 == 32 bit or generic, 1 == 64, 2 == text 58 facedata face[3]; // indexed by faceset, 0 == 32 bit or generic, 1 == 64, 2 == text
60 faceidx number; /* This is the image id. It should be the */ 59 faceidx number; /* This is the image id. It should be the */
61 /* same value as its position in the array */ 60 /* same value as its position in the array */
62 faceidx smooth; /* the smooth face for this face, or 0 */ 61 faceidx smooth; /* the smooth face for this face, or 0 */
63 uint8 type; // 0 normal face, otherwise other resource 62 uint8 type; // 0 normal face, otherwise other resource
73}; 72};
74 73
75inline void 74inline void
76object_freezer::put (const keyword_string k, faceinfo *v) 75object_freezer::put (const keyword_string k, faceinfo *v)
77{ 76{
78 if (expect_true (v)) 77 if (ecb_expect_true (v))
79 put (k, v->name); 78 put (k, v->name);
80 else 79 else
81 put (k); 80 put (k);
82} 81}
83 82
84typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > facehash_t; 83typedef ska::flat_hash_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int>>> facehash_t;
85 84
86extern facehash_t facehash; 85extern facehash_t facehash;
87extern std::vector<faceinfo> faces; 86extern std::vector<faceinfo> faces;
88 87
89/* This returns an the face number of face 'name'. Number is constant 88/* This returns an the face number of face 'name'. Number is constant
121 static animation &find (const char *name); 120 static animation &find (const char *name);
122 121
123 void resize (int new_size); 122 void resize (int new_size);
124}; 123};
125 124
126typedef std::tr1::unordered_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int> > > animhash_t; 125typedef ska::flat_hash_map<const char *, int, str_hash, str_equal, slice_allocator< std::pair<const char *const, int>>> animhash_t;
127 126
128extern std::vector<animation> animations; 127extern std::vector<animation> animations;
129 128
130#endif 129#endif
131 130

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines