RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

roll softimage database into a multifile per scene

This commit is contained in:
David Rose 2003-08-25 13:06:54 +00:00
parent 6d2580e3f4
commit eb7cb09795
4 changed files with 160 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

179
pandatool/src/softprogs/softCVS.cxx
View File

@ -18,7 +18,8 @@
#include "softCVS.h"
#include <notify.h>
#include "notify.h"
#include "multifile.h"
#include <algorithm>
@ -32,14 +33,18 @@ SoftCVS() {
_cvs_binary = "cvs";
set_program_description
("softcvs scrubs over a SoftImage database that was recently copied "
"into a CVS-controlled directory and prepares it for cvs updating. "
"It eliminates SoftImage's silly filename-based versioning system by "
"renaming versioned filenames higher than 1-0 back to version 1-0 "
"(thus overwriting the previous file version 1-0). This allows CVS "
"to manage the versioning rather than having to change the filename "
"with each new version. This program also automatically adds each "
"new file to the CVS repository.\n\n"
("softcvs is designed to prepare a directory hierarchy "
"representing a SoftImage database for adding to CVS. "
"First, it eliminates SoftImage's silly filename-based "
"versioning system by renaming versioned filenames higher "
"than 1-0 back to version 1-0. Then, it rolls up all the "
"files for each scene except the texture images into a Panda "
"multifile, which is added to CVS; the texture images are "
"directly added to CVS where they are.\n\n"
"The reduction of hundreds of SoftImage files per scene down to one "
"multifile and a handle of texture images should greatly improve "
"the update and commit times of CVS.\n\n"
"You must run this from within the root of a SoftImage database "
"directory; e.g. the directory that contains SCENES, PICTURES, MODELS, "
@ -95,7 +100,9 @@ run() {
// Now determine which element files are actually referenced by at
// least one of the scene files.
count_references();
if (!get_scenes()) {
exit(1);
}
// Finally, remove all the element files that are no longer
// referenced by any scenes.
@ -159,6 +166,7 @@ traverse_subdir(const Filename &directory) {
bool is_scenes = false;
bool keep_all = false;
bool wants_cvs = false;
// Now make some special-case behavior based on the particular
// SoftImage subdirectory we're in.
@ -170,8 +178,18 @@ traverse_subdir(const Filename &directory) {
// In the pictures directory, we must keep everything, since the
// scene files don't explicitly reference these but they're still
// important. Textures that are no longer used will pile up; we
// leave this is as the user's problem.
// leave this as the user's problem.
// We not only keep the textures, but we also move them into CVS,
// since (again) they're not part of the scene files and thus
// won't get added to the multifiles. Also, some textures are
// shared between different scenes, and it would be wasteful to
// add them to each scene multifile; furthermore, some scenes are
// used for animation only, and we don't want to modify these
// multifiles when the textures change.
keep_all = true;
wants_cvs = !_no_cvs;
}
vector_string::const_iterator fi;
@ -182,15 +200,13 @@ traverse_subdir(const Filename &directory) {
} else if (filename == "Chapter.rsrc") {
// This special filename should not be considered, except to add
// it to CVS.
if (in_cvs && cvs_elements.count(filename) == 0) {
_cvs_add.push_back(Filename(directory, filename));
}
// it to the multifiles.
_global_files.push_back(Filename(directory, filename));
} else {
SoftFilename soft(directory, filename);
if (in_cvs && cvs_elements.count(filename) != 0) {
if (cvs_elements.count(filename) != 0) {
// This file is known to be in CVS.
soft.set_in_cvs(true);
}
@ -198,6 +214,12 @@ traverse_subdir(const Filename &directory) {
if (keep_all) {
soft.increment_use_count();
}
if (wants_cvs && !in_cvs) {
// Try to CVSify the directory.
cvs_add(directory);
in_cvs = true;
}
soft.set_wants_cvs(wants_cvs);
if (is_scenes && soft.has_version() && soft.get_extension() == ".dsc") {
_scene_files.push_back(soft);
@ -253,21 +275,27 @@ collapse_scene_files() {
}
////////////////////////////////////////////////////////////////////
// Function: SoftCVS::count_references
// Function: SoftCVS::get_scenes
// Access: Private
// Description: Walks through the list of scene files and looks for
// the set of element files referenced by the scene
// file. Also add the scene files to CVS if warranted.
// the set of element files referenced by each one,
// updating multifile accordingly.
////////////////////////////////////////////////////////////////////
void SoftCVS::
count_references() {
bool SoftCVS::
get_scenes() {
bool okflag = true;
// We will be added the multifiles to CVS if they're not already
// added, so we have to know which files are in CVS already.
pset<string> cvs_elements;
if (!_no_cvs) {
scan_cvs(".", cvs_elements);
}
SceneFiles::const_iterator vi;
for (vi = _scene_files.begin(); vi != _scene_files.end(); ++vi) {
const SoftFilename &sf = (*vi);
Filename file(sf.get_dirname(), sf.get_filename());
if (!sf.get_in_cvs()) {
_cvs_add.push_back(file);
}
file.set_text();
ifstream in;
@ -275,9 +303,58 @@ count_references() {
nout << "Unable to read " << file << "\n";
} else {
nout << "Scanning " << file << "\n";
scan_scene_file(in);
Multifile multifile;
Filename multifile_name = sf.get_base() + "mf";
if (!multifile.open_read_write(multifile_name)) {
nout << "Unable to open " << multifile_name << " for updating.\n";
okflag = false;
} else {
if (!scan_scene_file(in, multifile)) {
okflag = false;
}
// Add all the global files to the multifile too. These
// probably can't take compression (since in SoftImage they're
// just the Chapter.rsrc files, each very tiny).
vector_string::const_iterator gi;
for (gi = _global_files.begin(); gi != _global_files.end(); ++gi) {
if (multifile.update_subfile((*gi), (*gi), 0).empty()) {
nout << "Unable to add " << (*gi) << "\n";
okflag = false;
}
}
// Also add the scene file itself.
if (multifile.update_subfile(file, file, 6).empty()) {
nout << "Unable to add " << file << "\n";
okflag = false;
}
bool flushed = false;
if (multifile.needs_repack()) {
flushed = multifile.repack();
} else {
flushed = multifile.flush();
}
if (!flushed) {
nout << "Failed to write " << multifile_name << ".\n";
okflag = false;
} else {
nout << "Wrote " << multifile_name << ".\n";
if (!_no_cvs && cvs_elements.count(multifile_name) == 0) {
// Add the multifile to CVS.
_cvs_add.push_back(multifile_name);
}
}
}
}
}
return okflag;
}
@ -305,7 +382,7 @@ remove_unused_elements() {
_cvs_remove.push_back(file);
}
} else if (!sf.get_in_cvs()) {
} else if (sf.get_wants_cvs() && !sf.get_in_cvs()) {
_cvs_add.push_back(file);
}
}
@ -349,22 +426,11 @@ rename_file(SoftCVS::SceneFiles::iterator begin,
// Now remove all of the "wrong" files.
bool cvs_has_1_0 = false;
SceneFiles::const_iterator p;
for (p = begin + 1; p != end; ++p) {
Filename file((*p).get_dirname(), (*p).get_filename());
if (!file.unlink()) {
nout << "Unable to remove " << file << ".\n";
} else {
if ((*p).get_in_cvs()) {
if ((*p).is_1_0()) {
// We don't cvs remove the 1.0 version.
cvs_has_1_0 = true;
} else {
_cvs_remove.push_back(file);
}
}
}
}
@ -377,18 +443,6 @@ rename_file(SoftCVS::SceneFiles::iterator begin,
exit(1);
}
if (orig.get_in_cvs()) {
// We do have to cvs remove the old one.
_cvs_remove.push_back(source);
}
if (!cvs_has_1_0) {
// And we have to cvs add the new one.
_cvs_add.push_back(dest);
}
orig.set_in_cvs(true);
return true;
}
@ -404,10 +458,7 @@ bool SoftCVS::
scan_cvs(const string &dirname, pset<string> &cvs_elements) {
Filename cvs_entries = dirname + "/CVS/Entries";
if (!cvs_entries.exists()) {
// Try to CVSify the directory.
if (!cvs_add(dirname)) {
return false;
}
return false;
}
ifstream in;
@ -444,13 +495,14 @@ scan_cvs(const string &dirname, pset<string> &cvs_elements) {
////////////////////////////////////////////////////////////////////
// Function: SoftCVS::scan_scene_file
// Access: Private
// Description: Copies a scene file from the input stream to the
// output stream, looking for references to element
// Description: Reads a scene file, looking for references to element
// files. For each reference found, increments the
// appropriate element file's reference count.
////////////////////////////////////////////////////////////////////
void SoftCVS::
scan_scene_file(istream &in) {
bool SoftCVS::
scan_scene_file(istream &in, Multifile &multifile) {
bool okflag = true;
int c = in.get();
while (!in.eof() && !in.fail()) {
// Skip whitespace.
@ -477,11 +529,19 @@ scan_scene_file(istream &in) {
// We cheat and get a non-const reference to the filename out
// of the set. We can safely do this because incrementing the
// use count won't change its position in the set.
SoftFilename &file = (SoftFilename &)(*ei);
file.increment_use_count();
SoftFilename &sf = (SoftFilename &)(*ei);
sf.increment_use_count();
Filename file(sf.get_dirname(), sf.get_filename());
if (multifile.update_subfile(file, file, 6).empty()) {
nout << "Unable to add " << file << "\n";
okflag = false;
}
}
}
}
return okflag;
}
////////////////////////////////////////////////////////////////////
@ -551,6 +611,7 @@ cvs_add_or_remove(const string &cvs_command, const vector_string &paths) {
return true;
}
int main(int argc, char *argv[]) {
SoftCVS prog;
prog.parse_command_line(argc, argv);

17
pandatool/src/softprogs/softCVS.h
View File

@ -19,17 +19,19 @@
#ifndef SOFTCVS_H
#define SOFTCVS_H
#include <pandatoolbase.h>
#include "pandatoolbase.h"
#include "softFilename.h"
#include <programBase.h>
#include <vector_string.h>
#include <filename.h>
#include "programBase.h"
#include "vector_string.h"
#include "filename.h"
#include "pvector.h"
#include "pset.h"
class Multifile;
////////////////////////////////////////////////////////////////////
// Class : SoftCVS
// Description : This program prepares a SoftImage database for CVS by
@ -50,13 +52,12 @@ private:
void traverse_subdir(const Filename &directory);
void collapse_scene_files();
void count_references();
bool get_scenes();
void remove_unused_elements();
bool rename_file(SceneFiles::iterator begin, SceneFiles::iterator end);
bool scan_cvs(const string &dirname, pset<string> &cvs_elements);
void scan_scene_file(istream &in);
bool scan_scene_file(istream &in, Multifile &multifile);
bool cvs_add(const string &path);
bool cvs_add_or_remove(const string &cvs_command,
@ -64,11 +65,11 @@ private:
SceneFiles _scene_files;
ElementFiles _element_files;
vector_string _global_files;
vector_string _cvs_add;
vector_string _cvs_remove;
protected:
bool _no_cvs;
string _cvs_binary;
};

27
pandatool/src/softprogs/softFilename.cxx
View File

@ -18,7 +18,7 @@
#include "softFilename.h"
#include <notify.h>
#include "notify.h"
////////////////////////////////////////////////////////////////////
// Function: SoftFilename::Constructor
@ -34,6 +34,7 @@ SoftFilename(const string &dirname, const string &filename) :
_major = 0;
_minor = 0;
_in_cvs = false;
_wants_cvs = false;
_use_count = 0;
_base = _filename;
@ -82,6 +83,7 @@ SoftFilename(const SoftFilename &copy) :
_minor(copy._minor),
_ext(copy._ext),
_in_cvs(copy._in_cvs),
_wants_cvs(copy._wants_cvs),
_use_count(copy._use_count)
{
}
@ -101,6 +103,7 @@ operator = (const SoftFilename &copy) {
_minor = copy._minor;
_ext = copy._ext;
_in_cvs = copy._in_cvs;
_wants_cvs = copy._wants_cvs;
_use_count = copy._use_count;
}
@ -299,6 +302,28 @@ get_in_cvs() const {
return _in_cvs;
}
////////////////////////////////////////////////////////////////////
// Function: SoftFilename::set_wants_cvs
// Access: Public
// Description: Sets the flag that indicates whether this file
// should be entered into the CVS database.
////////////////////////////////////////////////////////////////////
void SoftFilename::
set_wants_cvs(bool wants_cvs) {
_wants_cvs = wants_cvs;
}
////////////////////////////////////////////////////////////////////
// Function: SoftFilename::get_wants_cvs
// Access: Public
// Description: Returns true if this file should be entered into the
// CVS database, false otherwise.
////////////////////////////////////////////////////////////////////
bool SoftFilename::
get_wants_cvs() const {
return _wants_cvs;
}
////////////////////////////////////////////////////////////////////
// Function: SoftFilename::increment_use_count
// Access: Public

6
pandatool/src/softprogs/softFilename.h
View File

@ -19,7 +19,7 @@
#ifndef SOFTFILENAME_H
#define SOFTFILENAME_H
#include <pandatoolbase.h>
#include "pandatoolbase.h"
////////////////////////////////////////////////////////////////////
// Class : SoftFilename
@ -59,6 +59,9 @@ public:
void set_in_cvs(bool in_cvs);
bool get_in_cvs() const;
void set_wants_cvs(bool wants_cvs);
bool get_wants_cvs() const;
void increment_use_count();
int get_use_count() const;
@ -71,6 +74,7 @@ private:
int _minor;
string _ext;
bool _in_cvs;
bool _wants_cvs;
int _use_count;
};