mirror
/
openmw
mirror of https://github.com/OpenMW/openmw.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Started porting NIF records from D.

Browse Source
pull/7/head
Nicolay Korslund 15 years ago
parent f1d40fdf32
commit 2d92d39f05
8 changed files with 271 additions and 10 deletions
Show Stats Download Patch File Download Diff File

57
nif/controlled.h
Unescape Escape View File

@ -0,0 +1,57 @@
/*
OpenMW - The completely unofficial reimplementation of Morrowind
Copyright (C) 2008-2010 Nicolay Korslund
Email: < korslund@gmail.com >
WWW: http://openmw.sourceforge.net/
This file (controlled.h) is part of the OpenMW package.
OpenMW is distributed as free software: you can redistribute it
and/or modify it under the terms of the GNU General Public License
version 3, as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
version 3 along with this program. If not, see
http://www.gnu.org/licenses/ .
*/
#ifndef _NIF_CONTROLLED_H_
#define _NIF_CONTROLLED_H_
#include "extra.h"
namespace Nif
{
/// Anything that has a controller
struct Controlled : Extra
{
ControllerPtr controller;
void read(NIFFile *nif)
{
Extra::read(nif);
controller.read(nif);
}
};
/// Has name, extra-data and controller
struct Named : Controlled
{
SString name;
void read(NIFFile *nif)
{
name = nif->getString();
Controlled::read(nif);
}
};
} // Namespace
#endif

46
nif/extra.h
Unescape Escape View File

@ -0,0 +1,46 @@
/*
OpenMW - The completely unofficial reimplementation of Morrowind
Copyright (C) 2008-2010 Nicolay Korslund
Email: < korslund@gmail.com >
WWW: http://openmw.sourceforge.net/
This file (extra.h) is part of the OpenMW package.
OpenMW is distributed as free software: you can redistribute it
and/or modify it under the terms of the GNU General Public License
version 3, as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
version 3 along with this program. If not, see
http://www.gnu.org/licenses/ .
*/
#ifndef _NIF_EXTRA_H_
#define _NIF_EXTRA_H_
#include "record.h"
#include "nif_file.h"
#include "record_ptr.h"
namespace Nif
{
/** A record that can have extra data. The extra data objects
themselves decend from the Extra class, and all the extra data
connected to an object form a linked list
*/
struct Extra : Record
{
ExtraPtr extra;
void read(NIFFile *nif) { extra.read(nif); }
};
} // Namespace
#endif

18
nif/nif_file.cpp
Unescape Escape View File

@ -22,11 +22,16 @@
*/ */
#include "nif_file.h" #include "nif_file.h"
#include "record.h"
#include "../tools/stringops.h" #include "../tools/stringops.h"
#include "extra.h"
#include "controlled.h"
#include "node.h"
#include <iostream> #include <iostream>
using namespace std; using namespace std;
using namespace Nif;
void NIFFile::parse() void NIFFile::parse()
{ {
@ -50,12 +55,11 @@ void NIFFile::parse()
cout << i << ": " << rec.toString() << endl; cout << i << ": " << rec.toString() << endl;
NifRecord *r = NULL; Node r;
r.read(this);
if(rec == "NiNode") cout << " got a node!\n"; cout << r.name.toString() << endl;
cout << r.extra.getIndex() << endl;
if(r) r->read(this); cout << r.controller.getIndex() << endl;
else cout << "No record was created\n";
break; break;
} }

16
nif/nif_file.h
Unescape Escape View File

@ -32,11 +32,15 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include <assert.h>
#include "record.h" #include "record.h"
using namespace Mangle::Stream; using namespace Mangle::Stream;
namespace Nif
{
class NIFFile class NIFFile
{ {
enum NIFVersion enum NIFVersion
@ -54,7 +58,7 @@ class NIFFile
std::string filename; std::string filename;
/// Record list /// Record list
std::vector<NifRecord*> records; std::vector<Record*> records;
/// Used for error handling /// Used for error handling
void fail(const std::string &msg) void fail(const std::string &msg)
@ -88,6 +92,14 @@ class NIFFile
parse(); parse();
} }
Record *getRecord(int index)
{
assert(index >= 0 && index < records.size());
Record *res = records[index];
assert(res != NULL);
return res;
}
/* ************************************************ /* ************************************************
@ -110,4 +122,6 @@ class NIFFile
const char *getString(int size) const char *getString(int size)
{ return (const char*)inp->getPtr(size); } { return (const char*)inp->getPtr(size); }
}; };
} // Namespace
#endif #endif

47
nif/node.h
Unescape Escape View File

@ -0,0 +1,47 @@
/*
OpenMW - The completely unofficial reimplementation of Morrowind
Copyright (C) 2008-2010 Nicolay Korslund
Email: < korslund@gmail.com >
WWW: http://openmw.sourceforge.net/
This file (node.h) is part of the OpenMW package.
OpenMW is distributed as free software: you can redistribute it
and/or modify it under the terms of the GNU General Public License
version 3, as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
version 3 along with this program. If not, see
http://www.gnu.org/licenses/ .
*/
#ifndef _NIF_NODE_H_
#define _NIF_NODE_H_
#include "controlled.h"
namespace Nif
{
/** A Node is an object that's part of the main NIF tree. It has
parent node (unless it's the root), and transformation (location
and rotation) relative to it's parent.
*/
struct Node : Named
{
// Not done
void read(NIFFile *nif)
{
Named::read(nif);
}
};
} // Namespace
#endif

8
nif/record.h
Unescape Escape View File

@ -24,11 +24,14 @@
#ifndef _NIF_RECORD_H_ #ifndef _NIF_RECORD_H_
#define _NIF_RECORD_H_ #define _NIF_RECORD_H_
namespace Nif
{
class NIFFile; class NIFFile;
class NifRecord /// Base class for all records
struct Record
{ {
public:
virtual void read(NIFFile *nif) = 0; virtual void read(NIFFile *nif) = 0;
/* /*
@ -39,4 +42,5 @@ class NifRecord
*/ */
}; };
} // Namespace
#endif #endif

88
nif/record_ptr.h
Unescape Escape View File

@ -0,0 +1,88 @@
/*
OpenMW - The completely unofficial reimplementation of Morrowind
Copyright (C) 2008-2010 Nicolay Korslund
Email: < korslund@gmail.com >
WWW: http://openmw.sourceforge.net/
This file (record_ptr.h) is part of the OpenMW package.
OpenMW is distributed as free software: you can redistribute it
and/or modify it under the terms of the GNU General Public License
version 3, as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
version 3 along with this program. If not, see
http://www.gnu.org/licenses/ .
*/
#ifndef _NIF_RECORD_PTR_H_
#define _NIF_RECORD_PTR_H_
#include "nif_file.h"
namespace Nif
{
template <class X>
class RecordPtrT
{
int index;
X* ptr;
NIFFile *nif;
public:
RecordPtrT() : index(-2), ptr(NULL) {}
/// Read the index from the nif
void read(NIFFile *_nif)
{
// Can only read the index once
assert(index == -2);
// Store the NIFFile pointer for later
nif = _nif;
// And the index, of course
index = nif->getInt();
}
/// Look up the actual object from the index
X* operator->()
{
// Have we found the pointer already?
if(ptr == NULL)
{
// Get the record
assert(index >= 0);
Record *r = nif->getRecord(index);
// And cast it
ptr = dynamic_cast<X*>(r);
assert(ptr != NULL);
}
return ptr;
}
/// Pointers are allowed to be empty
bool empty() { return index == -1; }
int getIndex() { return index; }
};
class Extra;
class Controller;
class Node;
typedef RecordPtrT<Extra> ExtraPtr;
typedef RecordPtrT<Controller> ControllerPtr;
typedef RecordPtrT<Node> NodePtr;
} // Namespace
#endif

1
nif/tests/niftool.cpp
Unescape Escape View File

@ -9,6 +9,7 @@
using namespace Mangle::Stream; using namespace Mangle::Stream;
using namespace std; using namespace std;
using namespace Nif;
int main(int argc, char **args) int main(int argc, char **args)
{ {

Write Preview
Loading…
Cancel
Save