#include "nodedef.h"
-#include "main.h" // For g_settings
#include "itemdef.h"
#ifndef SERVER
-#include "tile.h"
+#include "client/tile.h"
#include "mesh.h"
#include <IMeshManipulator.h>
#endif
liquid_alternative_source = "";
liquid_viscosity = 0;
liquid_renewable = true;
- freezemelt = "";
liquid_range = LIQUID_LEVEL_MAX+1;
drowning = 0;
light_source = 0;
sound_dug = SimpleSoundSpec();
}
-void ContentFeatures::serialize(std::ostream &os, u16 protocol_version)
+void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) const
{
if(protocol_version < 24){
serializeOld(os, protocol_version);
virtual content_t set(const std::string &name, const ContentFeatures &def);
virtual content_t allocateDummy(const std::string &name);
virtual void updateAliases(IItemDefManager *idef);
- virtual void updateTextures(IGameDef *gamedef);
- void serialize(std::ostream &os, u16 protocol_version);
+ virtual void updateTextures(IGameDef *gamedef,
+ void (*progress_cbk)(void *progress_args, u32 progress, u32 max_progress),
+ void *progress_cbk_args);
+ void serialize(std::ostream &os, u16 protocol_version) const;
void deSerialize(std::istream &is);
- virtual NodeResolver *getResolver();
+
+ inline virtual bool getNodeRegistrationStatus() const;
+ inline virtual void setNodeRegistrationStatus(bool completed);
+
+ virtual void pendNodeResolve(NodeResolver *nr);
+ virtual bool cancelNodeResolveCallback(NodeResolver *nr);
+ virtual void runNodeResolveCallbacks();
+ virtual void resetNodeResolveState();
private:
void addNameIdMapping(content_t i, std::string name);
// Next possibly free id
content_t m_next_id;
- // NodeResolver to queue pending node resolutions
- NodeResolver m_resolver;
+ // NodeResolvers to callback once node registration has ended
+ std::vector<NodeResolver *> m_pending_resolve_callbacks;
+
+ // True when all nodes have been registered
+ bool m_node_registration_complete;
};
-CNodeDefManager::CNodeDefManager() :
- m_resolver(this)
+CNodeDefManager::CNodeDefManager()
{
clear();
}
m_group_to_items.clear();
m_next_id = 0;
+ resetNodeResolveState();
+
u32 initial_length = 0;
initial_length = MYMAX(initial_length, CONTENT_UNKNOWN + 1);
initial_length = MYMAX(initial_length, CONTENT_AIR + 1);
// IWritableNodeDefManager
content_t CNodeDefManager::set(const std::string &name, const ContentFeatures &def)
{
+ // Pre-conditions
assert(name != "");
assert(name == def.name);
content_t CNodeDefManager::allocateDummy(const std::string &name)
{
- assert(name != "");
+ assert(name != ""); // Pre-condition
ContentFeatures f;
f.name = name;
return set(name, f);
}
-void CNodeDefManager::updateTextures(IGameDef *gamedef)
+void CNodeDefManager::updateTextures(IGameDef *gamedef,
+ void (*progress_callback)(void *progress_args, u32 progress, u32 max_progress),
+ void *progress_callback_args)
{
#ifndef SERVER
infostream << "CNodeDefManager::updateTextures(): Updating "
"textures in node definitions" << std::endl;
-
+
ITextureSource *tsrc = gamedef->tsrc();
IShaderSource *shdsrc = gamedef->getShaderSource();
scene::ISceneManager* smgr = gamedef->getSceneManager();
bool use_normal_texture = enable_shaders &&
(enable_bumpmapping || enable_parallax_occlusion);
- for (u32 i = 0; i < m_content_features.size(); i++) {
+ u32 size = m_content_features.size();
+
+ for (u32 i = 0; i < size; i++) {
ContentFeatures *f = &m_content_features[i];
// Figure out the actual tiles to use
v3f scale = v3f(1.0, 1.0, 1.0) * BS * f->visual_scale;
scaleMesh(f->mesh_ptr[0], scale);
recalculateBoundingBox(f->mesh_ptr[0]);
+ meshmanip->recalculateNormals(f->mesh_ptr[0], true, false);
}
- } else if ((f->drawtype == NDT_NODEBOX) &&
+ } else if ((f->drawtype == NDT_NODEBOX) &&
((f->node_box.type == NODEBOX_REGULAR) ||
(f->node_box.type == NODEBOX_FIXED)) &&
(!f->node_box.fixed.empty())) {
v3f scale = v3f(1.0, 1.0, 1.0) * f->visual_scale;
scaleMesh(f->mesh_ptr[0], scale);
recalculateBoundingBox(f->mesh_ptr[0]);
+ meshmanip->recalculateNormals(f->mesh_ptr[0], true, false);
}
//Cache 6dfacedir and wallmounted rotated clones of meshes
}
rotateMeshBy6dFacedir(f->mesh_ptr[0], wm_to_6d[0]);
recalculateBoundingBox(f->mesh_ptr[0]);
- meshmanip->recalculateNormals(f->mesh_ptr[0], true, false);
+ meshmanip->recalculateNormals(f->mesh_ptr[0], true, false);
}
+
+ progress_callback(progress_callback_args, i, size);
}
#endif
}
bool backface_culling, u8 alpha, u8 material_type)
{
tile->shader_id = shader_id;
- tile->texture = tsrc->getTexture(tiledef->name, &tile->texture_id);
+ tile->texture = tsrc->getTextureForMesh(tiledef->name, &tile->texture_id);
tile->alpha = alpha;
tile->material_type = material_type;
tile->material_flags &= ~MATERIAL_FLAG_ANIMATION_VERTICAL_FRAMES;
} else {
std::ostringstream os(std::ios::binary);
+ tile->frames.resize(frame_count);
+
for (int i = 0; i < frame_count; i++) {
+
FrameSpec frame;
os.str("");
os << tiledef->name << "^[verticalframe:"
<< frame_count << ":" << i;
- frame.texture = tsrc->getTexture(os.str(), &frame.texture_id);
+ frame.texture = tsrc->getTextureForMesh(os.str(), &frame.texture_id);
if (tile->normal_texture)
frame.normal_texture = tsrc->getNormalTexture(os.str());
tile->frames[i] = frame;
#endif
-void CNodeDefManager::serialize(std::ostream &os, u16 protocol_version)
+void CNodeDefManager::serialize(std::ostream &os, u16 protocol_version) const
{
writeU8(os, 1); // version
u16 count = 0;
if (i == CONTENT_IGNORE || i == CONTENT_AIR
|| i == CONTENT_UNKNOWN)
continue;
- ContentFeatures *f = &m_content_features[i];
+ const ContentFeatures *f = &m_content_features[i];
if (f->name == "")
continue;
writeU16(os2, i);
f->serialize(wrapper_os, protocol_version);
os2<<serializeString(wrapper_os.str());
- assert(count + 1 > count); // must not overflow
+ // must not overflow
+ u16 next = count + 1;
+ FATAL_ERROR_IF(next < count, "Overflow");
count++;
}
writeU16(os, count);
}
-NodeResolver *CNodeDefManager::getResolver()
-{
- return &m_resolver;
-}
-
-
IWritableNodeDefManager *createNodeDefManager()
{
return new CNodeDefManager();
//// Serialization of old ContentFeatures formats
-void ContentFeatures::serializeOld(std::ostream &os, u16 protocol_version)
+void ContentFeatures::serializeOld(std::ostream &os, u16 protocol_version) const
{
if (protocol_version == 13)
{
writeU8(os, drowning);
writeU8(os, leveled);
writeU8(os, liquid_range);
- } else
+ } else
throw SerializationError("ContentFeatures::serialize(): "
"Unsupported version requested");
}
}
}
-/*
- NodeResolver
-*/
-NodeResolver::NodeResolver(INodeDefManager *ndef)
+inline bool CNodeDefManager::getNodeRegistrationStatus() const
{
- m_ndef = ndef;
- m_is_node_registration_complete = false;
+ return m_node_registration_complete;
}
-NodeResolver::~NodeResolver()
+inline void CNodeDefManager::setNodeRegistrationStatus(bool completed)
{
- while (!m_pending_contents.empty()) {
- NodeResolveInfo *nri = m_pending_contents.front();
- m_pending_contents.pop_front();
- delete nri;
- }
+ m_node_registration_complete = completed;
}
-int NodeResolver::addNode(std::string n_wanted, std::string n_alt,
- content_t c_fallback, content_t *content)
+void CNodeDefManager::pendNodeResolve(NodeResolver *nr)
{
- if (m_is_node_registration_complete) {
- if (m_ndef->getId(n_wanted, *content))
- return NR_STATUS_SUCCESS;
+ nr->m_ndef = this;
+ if (m_node_registration_complete)
+ nr->nodeResolveInternal();
+ else
+ m_pending_resolve_callbacks.push_back(nr);
+}
- if (n_alt == "" || !m_ndef->getId(n_alt, *content)) {
- *content = c_fallback;
- return NR_STATUS_FAILURE;
- }
- return NR_STATUS_SUCCESS;
- } else {
- NodeResolveInfo *nfi = new NodeResolveInfo;
- nfi->n_wanted = n_wanted;
- nfi->n_alt = n_alt;
- nfi->c_fallback = c_fallback;
- nfi->output = content;
+bool CNodeDefManager::cancelNodeResolveCallback(NodeResolver *nr)
+{
+ size_t len = m_pending_resolve_callbacks.size();
+ for (size_t i = 0; i != len; i++) {
+ if (nr != m_pending_resolve_callbacks[i])
+ continue;
- m_pending_contents.push_back(nfi);
+ len--;
+ m_pending_resolve_callbacks[i] = m_pending_resolve_callbacks[len];
+ m_pending_resolve_callbacks.resize(len);
+ return true;
+ }
- return NR_STATUS_PENDING;
+ return false;
+}
+
+
+void CNodeDefManager::runNodeResolveCallbacks()
+{
+ for (size_t i = 0; i != m_pending_resolve_callbacks.size(); i++) {
+ NodeResolver *nr = m_pending_resolve_callbacks[i];
+ nr->nodeResolveInternal();
}
+
+ m_pending_resolve_callbacks.clear();
}
-int NodeResolver::addNodeList(const char *nodename,
- std::vector<content_t> *content_vec)
+void CNodeDefManager::resetNodeResolveState()
{
- if (m_is_node_registration_complete) {
- std::set<content_t> idset;
- std::set<content_t>::iterator it;
+ m_node_registration_complete = false;
+ m_pending_resolve_callbacks.clear();
+}
- m_ndef->getIds(nodename, idset);
- for (it = idset.begin(); it != idset.end(); ++it)
- content_vec->push_back(*it);
- return idset.size() ? NR_STATUS_SUCCESS : NR_STATUS_FAILURE;
- } else {
- m_pending_content_vecs.push_back(
- std::make_pair(std::string(nodename), content_vec));
- return NR_STATUS_PENDING;
- }
+////
+//// NodeResolver
+////
+
+NodeResolver::NodeResolver()
+{
+ m_ndef = NULL;
+ m_nodenames_idx = 0;
+ m_nnlistsizes_idx = 0;
+ m_resolve_done = false;
+
+ m_nodenames.reserve(16);
+ m_nnlistsizes.reserve(4);
}
-bool NodeResolver::cancelNode(content_t *content)
+NodeResolver::~NodeResolver()
{
- bool found = false;
-
- std::list<NodeResolveInfo *>::iterator it = m_pending_contents.begin();
- while (it != m_pending_contents.end()) {
- NodeResolveInfo *nfi = *it;
- if (nfi->output == content) {
- it = m_pending_contents.erase(it);
- delete nfi;
- found = true;
- }
- }
+ if (!m_resolve_done && m_ndef)
+ m_ndef->cancelNodeResolveCallback(this);
+}
+
+
+void NodeResolver::nodeResolveInternal()
+{
+ m_nodenames_idx = 0;
+ m_nnlistsizes_idx = 0;
+
+ resolveNodeNames();
+ m_resolve_done = true;
- return found;
+ m_nodenames.clear();
+ m_nnlistsizes.clear();
}
-int NodeResolver::cancelNodeList(std::vector<content_t> *content_vec)
+bool NodeResolver::getIdFromNrBacklog(content_t *result_out,
+ const std::string &node_alt, content_t c_fallback)
{
- int num_canceled = 0;
-
- std::list<std::pair<std::string, std::vector<content_t> *> >::iterator it;
- it = m_pending_content_vecs.begin();
- while (it != m_pending_content_vecs.end()) {
- if (it->second == content_vec) {
- it = m_pending_content_vecs.erase(it);
- num_canceled++;
- }
+ if (m_nodenames_idx == m_nodenames.size()) {
+ *result_out = c_fallback;
+ errorstream << "NodeResolver: no more nodes in list" << std::endl;
+ return false;
+ }
+
+ content_t c;
+ std::string name = m_nodenames[m_nodenames_idx++];
+
+ bool success = m_ndef->getId(name, c);
+ if (!success && node_alt != "") {
+ name = node_alt;
+ success = m_ndef->getId(name, c);
+ }
+
+ if (!success) {
+ errorstream << "NodeResolver: failed to resolve node name '" << name
+ << "'." << std::endl;
+ c = c_fallback;
}
- return num_canceled;
+ *result_out = c;
+ return success;
}
-int NodeResolver::resolveNodes()
+bool NodeResolver::getIdsFromNrBacklog(std::vector<content_t> *result_out,
+ bool all_required, content_t c_fallback)
{
- int num_failed = 0;
+ bool success = true;
- //// Resolve pending single node name -> content ID mappings
- while (!m_pending_contents.empty()) {
- NodeResolveInfo *nri = m_pending_contents.front();
- m_pending_contents.pop_front();
+ if (m_nnlistsizes_idx == m_nnlistsizes.size()) {
+ errorstream << "NodeResolver: no more node lists" << std::endl;
+ return false;
+ }
- bool success = true;
- if (!m_ndef->getId(nri->n_wanted, *nri->output)) {
- success = (nri->n_alt != "") ?
- m_ndef->getId(nri->n_alt, *nri->output) : false;
- }
+ size_t length = m_nnlistsizes[m_nnlistsizes_idx++];
- if (!success) {
- *nri->output = nri->c_fallback;
- num_failed++;
- errorstream << "NodeResolver::resolveNodes(): Failed to "
- "resolve '" << nri->n_wanted;
- if (nri->n_alt != "")
- errorstream << "' and '" << nri->n_alt;
- errorstream << "'" << std::endl;
+ while (length--) {
+ if (m_nodenames_idx == m_nodenames.size()) {
+ errorstream << "NodeResolver: no more nodes in list" << std::endl;
+ return false;
}
- delete nri;
- }
-
- //// Resolve pending node names and add to content_t vector
- while (!m_pending_content_vecs.empty()) {
- std::pair<std::string, std::vector<content_t> *> item =
- m_pending_content_vecs.front();
- m_pending_content_vecs.pop_front();
-
- std::string &name = item.first;
- std::vector<content_t> *output = item.second;
-
- std::set<content_t> idset;
- std::set<content_t>::iterator it;
-
- m_ndef->getIds(name, idset);
- for (it = idset.begin(); it != idset.end(); ++it)
- output->push_back(*it);
-
- if (idset.size() == 0) {
- num_failed++;
- errorstream << "NodeResolver::resolveNodes(): Failed to "
- "resolve '" << name << "'" << std::endl;
+ content_t c;
+ std::string &name = m_nodenames[m_nodenames_idx++];
+
+ if (name.substr(0,6) != "group:") {
+ if (m_ndef->getId(name, c)) {
+ result_out->push_back(c);
+ } else if (all_required) {
+ errorstream << "NodeResolver: failed to resolve node name '"
+ << name << "'." << std::endl;
+ result_out->push_back(c_fallback);
+ success = false;
+ }
+ } else {
+ std::set<content_t> cids;
+ std::set<content_t>::iterator it;
+ m_ndef->getIds(name, cids);
+ for (it = cids.begin(); it != cids.end(); ++it)
+ result_out->push_back(*it);
}
}
- //// Mark node registration as complete so future resolve
- //// requests are satisfied immediately
- m_is_node_registration_complete = true;
-
- return num_failed;
+ return success;
}
projects / dragonfireclient.git / blobdiff