rpms/sear/F-8 cal3d-paths.patch,NONE,1.1 sear.spec,1.5,1.6
Michael Thomas (wart)
fedora-extras-commits at redhat.com
Tue Jan 1 19:13:39 UTC 2008
- Previous message (by thread): rpms/sear/devel cal3d-paths.patch,NONE,1.1 sear.spec,1.6,1.7
- Next message (by thread): rpms/e2fsprogs/devel e2fsprogs.spec, 1.88, 1.89 e2fsprogs-1.38-no_pottcdate.patch, 1.2, NONE e2fsprogs-1.38-resize-inode.patch, 1.1, NONE e2fsprogs-1.39-multilib.patch, 1.3, NONE e2fsprogs-1.40.2-protect-open-ops.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: wart
Update of /cvs/extras/rpms/sear/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv740
Modified Files:
sear.spec
Added Files:
cal3d-paths.patch
Log Message:
Add patch to support locally installed media files from sear-media (BZ #425774)
cal3d-paths.patch:
--- NEW FILE cal3d-paths.patch ---
diff --git a/loaders/cal3d/Cal3dCoreModel.cpp b/loaders/cal3d/Cal3dCoreModel.cpp
index 007a896..eb9f7a6 100644
--- a/loaders/cal3d/Cal3dCoreModel.cpp
+++ b/loaders/cal3d/Cal3dCoreModel.cpp
@@ -125,7 +129,7 @@ int Cal3dCoreModel::readConfig(const std::string &filename) {
if (config.findItem(SECTION_model, KEY_path)) {
path = (std::string)config.getItem(SECTION_model, KEY_path);
- System::instance()->getFileHandler()->getFilePath(path);
+// System::instance()->getFileHandler()->getFilePath(path);
}
if (config.findItem(SECTION_model, KEY_appearance)) {
@@ -137,7 +141,9 @@ int Cal3dCoreModel::readConfig(const std::string &filename) {
// Load skeleton
- if (m_core_model->loadCoreSkeleton(path + "/" + (std::string)config.getItem(SECTION_model, KEY_skeleton)) == 0) {
+ std::string skeleton_path = path + "/" + (std::string)config.getItem(SECTION_model, KEY_skeleton);
+ System::instance()->getFileHandler()->getFilePath(skeleton_path);
+ if (m_core_model->loadCoreSkeleton(skeleton_path) == 0) {
CalError::printLastError();
return 1;
}
@@ -149,18 +155,18 @@ int Cal3dCoreModel::readConfig(const std::string &filename) {
m_scale = 1.0f;
}
-
if (config.findItem(SECTION_model, KEY_rotate)) {
m_rotate = (double)config.getItem(SECTION_model, KEY_rotate);
-// if (debug) printf("Rotate %f\n", m_rotate);
}
// Load all meshes
for (MeshMap::const_iterator I = m_meshes.begin(); I != m_meshes.end(); ++I) {
- std::string mesh_name = I->first;
- int mesh = m_core_model->loadCoreMesh(path + (std::string)config.getItem(SECTION_model, KEY_mesh + "_" + mesh_name));
+ const std::string &mesh_name = I->first;
+ std::string mesh_path = path + (std::string)config.getItem(SECTION_model, KEY_mesh + "_" + mesh_name);
+ System::instance()->getFileHandler()->getFilePath(mesh_path);
+ int mesh = m_core_model->loadCoreMesh(mesh_path);
if (mesh == -1) {
- std::cerr << "Error loading mesh - " << path + (std::string)config.getItem(SECTION_model, KEY_mesh + "_" + mesh_name) << std::endl;
+ fprintf(stderr, "[Cal3dCoreModel] Error loading mesh - %s\n", mesh_path.c_str());
CalError::printLastError();
} else {
m_meshes[mesh_name] = mesh;
@@ -169,10 +175,12 @@ int Cal3dCoreModel::readConfig(const std::string &filename) {
// Load all animations
for (AnimationMap::const_iterator I = m_animations.begin(); I != m_animations.end(); ++I) {
- std::string animation_name = I->first;
- int animation = m_core_model->loadCoreAnimation(path + (std::string)config.getItem(SECTION_model, KEY_animation + "_" + animation_name));
+ const std::string &animation_name = I->first;
+ std::string anim_path = path + (std::string)config.getItem(SECTION_model, KEY_animation + "_" + animation_name);
+ System::instance()->getFileHandler()->getFilePath(anim_path);
+ int animation = m_core_model->loadCoreAnimation(anim_path);
if (animation == -1) {
- std::cerr << "Error loading animation - " << path + (std::string)config.getItem(SECTION_model, KEY_animation + "_" + animation_name) << std::endl;
+ fprintf(stderr, "[Cal3dCoreModel] Error loading animation - %s\n", anim_path.c_str());
CalError::printLastError();
} else {
m_animations[animation_name] = animation;
@@ -182,14 +190,16 @@ int Cal3dCoreModel::readConfig(const std::string &filename) {
// Load all materials
for (MaterialList::const_iterator I = m_material_list.begin();
I != m_material_list.end(); ++I) {
- std::string material_name = *I;
+ const std::string &material_name = *I;
int length = material_name.find_first_of("_");
- std::string set = material_name.substr(0,length);
- std::string part = material_name.substr(length + 1);
-// if (debug) std::cout << "Set: " << set << " - Part: " << part << std::endl;
- int material = m_core_model->loadCoreMaterial(path + (std::string)config.getItem(SECTION_model, KEY_material + "_" + material_name));
+ const std::string &set = material_name.substr(0,length);
+ const std::string &part = material_name.substr(length + 1);
+
+ std::string material_path = path + (std::string)config.getItem(SECTION_model, KEY_material + "_" + material_name);
+ System::instance()->getFileHandler()->getFilePath(material_path);
+ int material = m_core_model->loadCoreMaterial(material_path);
if (material == -1) {
- std::cerr << "Error loading material - " << path + (std::string)config.getItem(SECTION_model, KEY_material + "_" + material_name) << std::endl;
+ fprintf(stderr, "[Cal3dCoreModel] Error loading material - %s\n", material_path.c_str());
CalError::printLastError();
} else {
m_materials[set][part] = material;
@@ -197,41 +207,34 @@ int Cal3dCoreModel::readConfig(const std::string &filename) {
// Create material thread and assign material to a set;
if (m_sets[set] == 0) {
m_sets[set] = set_counter++;
-// if (debug) std::cout << "Creating set " << set << " with id " << m_sets[set] << std::endl;
}
if (m_parts[part] == 0) {
m_parts[part] = part_counter++;
-// if (debug) std::cout << "Creating part " << part << " with id " << m_parts[part] << std::endl;
}
m_core_model->createCoreMaterialThread(m_parts[part] - 1);
-// _core_model->createCoreMaterialThread(material);
// initialize the material thread
m_core_model->setCoreMaterialId(m_parts[part] - 1, m_sets[set] - 1, material);
}
// Check for custom material settings
for (MaterialsMap::const_iterator I = m_materials.begin(); I != m_materials.end(); ++I) {
- std::string set = I->first;
+ const std::string &set = I->first;
for (MaterialMap::const_iterator J = I->second.begin(); J != I->second.end(); ++J) {
- std::string part = J->first;
- std::string section = SECTION_material + "_" + set + "_" + part;
+ const std::string &part = J->first;
+ const std::string §ion = SECTION_material + "_" + set + "_" + part;
CalCoreMaterial *material = m_core_model->getCoreMaterial(J->second);
if (!material) continue;
// Check all keys
if (config.findItem(section, KEY_ambient_red)) {
material->getAmbientColor().red = (int)config.getItem(section, KEY_ambient_red);
-// std::cout << "Setting ambient red to " << (int)material->getAmbientColor().red << std::endl;
}
if (config.findItem(section, KEY_ambient_green)) {
material->getAmbientColor().green = (int)config.getItem(section, KEY_ambient_green);
-// std::cout << "Setting ambient green to " << (int)material->getAmbientColor().green << std::endl;
}
if (config.findItem(section, KEY_ambient_blue)) {
material->getAmbientColor().blue = (int)config.getItem(section, KEY_ambient_blue);
-// std::cout << "Setting ambient blue to " << (int)material->getAmbientColor().blue << std::endl;
}
if (config.findItem(section, KEY_ambient_alpha)) {
material->getAmbientColor().alpha = (int)config.getItem(section, KEY_ambient_alpha);
-// std::cout << "Setting ambient alpha to " << (int)material->getAmbientColor().alpha << std::endl;
}
if (config.findItem(section, KEY_diffuse_red)) {
material->getDiffuseColor().red = (int)config.getItem(section, KEY_diffuse_red);
@@ -264,9 +267,9 @@ int Cal3dCoreModel::readConfig(const std::string &filename) {
// TODO this limit should not be hardcoded!
// Need to query object
for (int i = 0; i < 2; ++i) {
- std::string key = KEY_texture_map + "_" + string_fmt(i);
+ const std::string &key = KEY_texture_map + "_" + string_fmt(i);
if (config.findItem(section, key)) { // Is texture name over-ridden?
- std::string texture = (std::string)config.getItem(section, key);
+ const std::string &texture = (std::string)config.getItem(section, key);
unsigned int textureId = loadTexture(texture, false);
unsigned int textureMaskId = loadTexture(texture, true);
if (material->getMapCount() <= i) {
@@ -283,7 +286,7 @@ int Cal3dCoreModel::readConfig(const std::string &filename) {
std::cerr << "Error setting map user data" << std::endl;
}
} else { // Use default texture
- std::string texture = material->getMapFilename(i);
+ const std::string &texture = material->getMapFilename(i);
if (texture.empty()) continue;
unsigned int textureId = loadTexture(texture, false);
unsigned int textureMaskId = loadTexture(texture, true);
@@ -321,7 +324,6 @@ int Cal3dCoreModel::readConfig(const std::string &filename) {
model->shutdown();
delete model;
float s = 1.0f / (max_z - min_z);
-printf("Scale %f, %f -> %f\n", min_z, max_z, s);
m_core_model->scale(s);
}
}
@@ -347,7 +349,7 @@ void Cal3dCoreModel::varconf_callback(const std::string §ion, const std::str
} else if (section == SECTION_bone_map) {
m_bone_map[key] = (std::string)config.getItem(section, key);
} else if (section == SECTION_bone_rotation) {
- std::string rot = (std::string)config.getItem(section, key);
+ const std::string &rot = (std::string)config.getItem(section, key);
float w,x,y,z;
sscanf(rot.c_str(), "%f;%f;%f;%f", &w, &x, &y, &z);
m_bone_rotation[key] = WFMath::Quaternion(w,x,y,z);
@@ -355,13 +357,12 @@ void Cal3dCoreModel::varconf_callback(const std::string §ion, const std::str
// Add animations weights to map
// Get weight value
varconf::Variable temp = config.getItem(section, key);
- std::string sec = section.substr(KEY_animation.size() + 1);
+ const std::string &sec = section.substr(KEY_animation.size() + 1);
if (section.size() >= KEY_animation.size() && section.substr(0, KEY_animation.size()) == KEY_animation) {
if (temp.is_double()) {
// Get animation name
- std::string k = key.substr(KEY_animation.size() + 1);
+ const std::string &k = key.substr(KEY_animation.size() + 1);
// Add pair to map.
- if (debug) printf("[Debug:Cal3d]Adding animation: %s %s %f\n", section.c_str() , k.c_str(), (double)temp);
m_anims[sec].push_back(AnimWeight(k, (double)temp));
}
}
d
Index: sear.spec
===================================================================
RCS file: /cvs/extras/rpms/sear/F-8/sear.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sear.spec 19 Dec 2007 07:17:53 -0000 1.5
+++ sear.spec 1 Jan 2008 19:13:02 -0000 1.6
@@ -1,6 +1,6 @@
Name: sear
Version: 0.6.3
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: 3D WorldForge client
Group: Amusements/Games
@@ -9,6 +9,7 @@
Source0: http://downloads.sourceforge.net/worldforge/%{name}-%{version}.tar.gz
Patch0: sear-0.6.3-desktop.patch
Patch1: sear-0.6.3-erisupgrade.patch
+Patch2: cal3d-paths.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: lib3ds-devel mercator-devel varconf-devel eris-devel sage-devel
@@ -28,6 +29,7 @@
%setup -q
%patch0 -p0 -b .desktop
%patch1 -p1 -b .erisupgrade
+%patch2 -p1 -b .paths
chmod a-x COPYING AUTHORS
chmod a-x */*.h
chmod a-x */*.cpp
@@ -73,6 +75,10 @@
%changelog
+* Tue Jan 1 2008 Wart <wart at kobold.org> 0.6.3-8
+- Add patch to support locally installed media files from sear-media
+ (BZ #425774)
+
* Tue Dec 18 2007 Wart <wart at kobold.org> 0.6.3-7
- Add patch to support eris-1.3.13
- Previous message (by thread): rpms/sear/devel cal3d-paths.patch,NONE,1.1 sear.spec,1.6,1.7
- Next message (by thread): rpms/e2fsprogs/devel e2fsprogs.spec, 1.88, 1.89 e2fsprogs-1.38-no_pottcdate.patch, 1.2, NONE e2fsprogs-1.38-resize-inode.patch, 1.1, NONE e2fsprogs-1.39-multilib.patch, 1.3, NONE e2fsprogs-1.40.2-protect-open-ops.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list