mojotrollz/mojo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Die trailing whitespace, die, die die!!!

Browse Source
This commit is contained in:
Shlainn 2011-11-29 12:36:59 +01:00
parent aad7a7fabc
commit 8dd5fb940b
247 changed files with 8393 additions and 8394 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Client/ControlSocket.cpp
View File

@ -13,7 +13,7 @@ ControlSocket::ControlSocket(SocketHandler& h) : TcpSocket(h)
void ControlSocket::OnAccept(void)
{
logdetail("ControlSocket: Incoming connection from %s:%u [host:%s]",GetRemoteAddress().c_str(),GetRemotePort(),GetRemoteHostname().c_str());
// must perform some crappy ptr conversion here, doesnt want to typecast SocketHandler -> ControlSocketHandler directly
SocketHandler& hnd = Handler();
ControlSocketHandler *chnd = static_cast<ControlSocketHandler*>(&hnd);
@ -33,7 +33,7 @@ void ControlSocket::OnAccept(void)
if(_instance->GetConf()->rmcontrolpass.size())
{
SendTelnetText("Authentication?");
}
}
_ok = true;
}

26
src/Client/DefScript/DefScript.cpp
View File

@ -280,7 +280,7 @@ bool DefScriptPackage::LoadScriptFromFile(std::string fn){
// line.erase(line.length()-1);
if(line.empty())
continue;
if(line.at(0)=='/' && line.at(1)=='/')
if(line.at(0)=='/' && line.at(1)=='/')
continue; // line is comment, proceed with next line
if(line_strip)
@ -315,7 +315,7 @@ bool DefScriptPackage::LoadScriptFromFile(std::string fn){
commented = false;
continue;
}
// commented lines will not be loaded nor have any #-tags evaluated (except the one above!)
if(commented)
continue;
@ -582,7 +582,7 @@ DefReturnResult DefScriptPackage::RunScript(std::string name, CmdSet *pSet,std::
std::string line;
for(unsigned int i=0;i<sc->GetLines();i++)
{
{
line=sc->GetLine(i);
if(line.empty() || line[0] == '#') // skip markers and preload statements if not removed before
continue;
@ -765,8 +765,8 @@ void DefScriptPackage::SplitLine(CmdSet& Set,std::string line)
curParam++;
}
tempLine.clear();
}
}
else if( line[i]==' ' && !bracketsOpen)
{
if(!cmdDefined){
@ -777,8 +777,8 @@ void DefScriptPackage::SplitLine(CmdSet& Set,std::string line)
}
Set.defaultarg=line.substr(i+1,line.length()-i);
break;
break;
}
else if(line[i]=='\\')
{
@ -836,7 +836,7 @@ std::string DefScriptPackage::RemoveBracketsFromString(std::string t)
t.erase(ob,blen);
t.insert(ob,retStr);
i=ob-1;
}
isVar=false;
}
@ -882,7 +882,7 @@ DefXChgResult DefScriptPackage::ReplaceVars(std::string str, CmdSet *pSet, unsig
bracketsOpen=0, // amount of brackets opened
bLen=0; // the lenth of the string in brackets, e.g. ${abc} == 3
unsigned char
unsigned char
nextVar=DEFSCRIPT_NONE; // '$' or '?'
bool
hasChanged=false, // additional helper. once true, xchg.result will be true later also
@ -1071,7 +1071,7 @@ std::string DefScriptPackage::_NormalizeVarName(std::string vn, std::string sn)
break;
}
if( (!global) && (vn[0]!='@') )
if( (!global) && (vn[0]!='@') )
vn=sn+"::"+vn;
return vn;
@ -1099,7 +1099,7 @@ DefReturnResult DefScriptPackage::Interpret(CmdSet& Set)
{
if(_functable[i].escape) // if we are going to use a C++ function, unescape the whole set, if supposed to do so.
UnescapeSet(Set); // it will not have any bad side effects, we leave the func within this block!
result=(this->*(_functable[i].func))(Set);
if(_functable[i].escape)
result.ret = EscapeString(result.ret); // and since we are returning a string into the engine, escape it again, if set.
@ -1118,7 +1118,7 @@ DefReturnResult DefScriptPackage::Interpret(CmdSet& Set)
result=RunScript(Set.cmd, &Set);
if((!result.ok) /*&& Script[Set.cmd]->GetDebug()*/)
PRINT_ERROR("Could not execute script command '%s'",Set.cmd.c_str());
return result;
}
@ -1148,7 +1148,7 @@ std::string DefScriptPackage::SecureString(std::string s)
return out;
}
// escapes whole string, which can no longer be parsed & interpreted
// escapes whole string, which can no longer be parsed & interpreted
std::string DefScriptPackage::EscapeString(std::string s)
{
std::string out;

6
src/Client/DefScript/DefScript.h
View File

@ -45,7 +45,7 @@ struct DefXChgResult
bool changed;
std::string str;
DefReturnResult result;
};
};
typedef std::map<unsigned int,std::string> _CmdSetArgMap;
@ -103,7 +103,7 @@ private:
std::string scriptname;
unsigned char permission;
bool debugmode;
DefScriptPackage *_parent;
};
@ -142,7 +142,7 @@ public:
std::string EscapeString(std::string);
std::string UnescapeString(std::string);
std::string GetUnescapedVar(std::string);
std::string scPath;
// Own executor functions

2
src/Client/DefScript/DefScriptBBFunctions.cpp
View File

@ -46,7 +46,7 @@ DefReturnResult DefScriptPackage::func_bbappend(CmdSet& Set)
std::string dtype = DefScriptTools::stringToLower(Set.arg[1]);
if (dtype == "string")
if (dtype == "string")
{
*bb << Set.defaultarg;
return true;

6
src/Client/DefScript/DefScriptFunctions.cpp
View File

@ -53,7 +53,7 @@ DefReturnResult DefScriptPackage::func_reloaddef(CmdSet& Set){
}
if(ppos==std::string::npos || ppos < slashpos) // even if there was neither / nor . they will be equal
fn+=".def";
result=LoadScriptFromFile(fn);
r.ret=fn;
@ -127,7 +127,7 @@ DefReturnResult DefScriptPackage::func_set(CmdSet& Set)
variables.Set(vname,vval);
r.ret=vval;
DefScript *sc = GetScript(Set.myname);
if(sc && sc->GetDebug())
printf("VAR: %s = '%s'\n",vname.c_str(),vval.c_str());
@ -523,7 +523,7 @@ DefReturnResult DefScriptPackage::func_strfind(CmdSet& Set)
unsigned int pos = Set.defaultarg.find(Set.arg[0],(unsigned int)toNumber(Set.arg[1]));
if(pos == std::string::npos)
return "";
return toString((uint64)pos);
return toString((uint64)pos);
}
DefReturnResult DefScriptPackage::func_scriptexists(CmdSet& Set)

2
src/Client/DefScript/DefScriptListFunctions.cpp
View File

@ -261,7 +261,7 @@ DefReturnResult DefScriptPackage::func_lerase(CmdSet& Set)
unsigned int pos = (unsigned int)toNumber(Set.defaultarg);
if(pos > l->size()) // if the list is too short to erase at that pos...
return ""; // ... return nothing
DefList::iterator it = l->begin();
advance(it,pos);
r = *it;

4
src/Client/DefScriptInterface.cpp
View File

@ -57,7 +57,7 @@ void DefScriptPackage::_InitDefScriptInterface(void)
AddFunc("getobjectdist",&DefScriptPackage::SCGetObjectDistance);
AddFunc("getobjectpos",&DefScriptPackage::SCGetPos);
AddFunc("switchopcodehandler",&DefScriptPackage::SCSwitchOpcodeHandler);
AddFunc("opcodedisabled",&DefScriptPackage::SCOpcodeDisabled);
AddFunc("opcodedisabled",&DefScriptPackage::SCOpcodeDisabled);
AddFunc("spoofworldpacket",&DefScriptPackage::SCSpoofWorldPacket);
AddFunc("loaddb",&DefScriptPackage::SCLoadDB);
AddFunc("adddbpath",&DefScriptPackage::SCAddDBPath);
@ -404,7 +404,7 @@ DefReturnResult DefScriptPackage::SCGetScpValue(CmdSet& Set)
{
return DefScriptTools::toString(db->GetInt(keyid,(char*)entry.c_str()));
}
case SCP_TYPE_FLOAT:
case SCP_TYPE_FLOAT:
{
return DefScriptTools::toString(db->GetFloat(keyid,(char*)entry.c_str()));
}

2
src/Client/GUI/DrawObjMgr.cpp
View File

@ -75,7 +75,7 @@ void DrawObjMgr::Update(void)
uint64 guid = _del.next();
if(_storage.find(guid) != _storage.end())
{
DrawObject *o = _storage[guid];
DEBUG(logdebug("DrawObjMgr: removing DrawObj 0x%X guid "I64FMT" from main storage",o,guid));
_storage.erase(guid);

14
src/Client/GUI/DrawObject.cpp
View File

@ -69,10 +69,10 @@ void DrawObject::_Init(void)
MemoryDataHolder::MakeModelFilename(buf,(cmd ? cmd->GetString(modelid,"mpqfilename") : ""));
modelfilename = buf;
logdebug("Unit %s",cmd->GetString(modelid,"mpqfilename"));
// if (cdi && strcmp(cdi->GetString(displayid,"name1"), "") != 0)
// if (cdi && strcmp(cdi->GetString(displayid,"name1"), "") != 0)
// texturename = std::string("data/texture/") + cdi->GetString(displayid,"name1");
opacity = cdi && displayid ? cdi->GetUint32(displayid,"opacity") : 255;
}
}
else if (_obj->IsCorpse())
{
uint8 race = (_obj->GetUInt32Value(CORPSE_FIELD_BYTES_1) >> 8)&0xFF;
@ -92,12 +92,12 @@ void DrawObject::_Init(void)
modelfilename = buf;
logdebug("Corpse %s",buf);
}
else if (_obj->IsGameObject())
{
GameobjectTemplate* gotempl = _instance->GetWSession()->objmgr.GetGOTemplate(_obj->GetEntry());
while (!gotempl)
while (!gotempl)
{
ZThread::Thread::sleep(10);
gotempl = _instance->GetWSession()->objmgr.GetGOTemplate(_obj->GetEntry());
@ -127,7 +127,7 @@ void DrawObject::_Init(void)
texturename = buf;
}
}
DEBUG(logdebug("GAMEOBJECT: %u - %u", _obj->GetEntry(), displayid));
} else {
DEBUG(logdebug("GAMEOBJECT UNKNOWN: %u", _obj->GetEntry()));
@ -146,7 +146,7 @@ void DrawObject::_Init(void)
{
node = _smgr->addAnimatedMeshSceneNode(mesh);
scene::IAnimatedMeshSceneNode* aninode = (scene::IAnimatedMeshSceneNode*)node;
aninode->setAnimationSpeed(1000);
aninode->setM2Animation(0);
//video::ITexture *tex = _device->getVideoDriver()->getTexture("data/misc/square.jpg");
@ -163,7 +163,7 @@ void DrawObject::_Init(void)
if (!texturefile)
{
logerror("DrawObject: texture file not found: %s", texturename.c_str());
}
}
node->setMaterialTexture(0, _device->getVideoDriver()->getTexture(texturefile));
}

138
src/Client/GUI/MCamera.h
View File

@ -22,7 +22,7 @@ class MCameraFPS
f32 rotationX;
f32 rotationY;
core::vector3df direction;
public:
MCameraFPS(scene::ISceneManager* smgr)
{
@ -31,7 +31,7 @@ public:
rotationY = 0.0f;
direction = core::vector3df(0,0,1);
}
~MCameraFPS(){}
void update(void)
@ -71,23 +71,23 @@ public:
camera->updateAbsolutePosition();
}
void turnRight(f32 i)
{
rotationY += i;
if(rotationY>=360)rotationY-=360;
if(rotationY<0)rotationY+=360;
direction = core::vector3df(0,0,1);
core::matrix4 matrix;
matrix.setRotationDegrees(core::vector3df (rotationX,rotationY,0));
matrix.rotateVect(direction);
camera->setTarget(camera->getPosition() + direction);
camera->updateAbsolutePosition();
}
void turnLeft(f32 i)
{
rotationY -= i;
@ -103,169 +103,169 @@ public:
camera->setTarget(camera->getPosition() + direction);
camera->updateAbsolutePosition();
}
void turnUp(f32 i)
{
rotationX += i;
if(rotationX>=360)rotationX-=360;
if(rotationX<0)rotationX+=360;
direction = core::vector3df(0,0,1);
core::matrix4 matrix;
matrix.setRotationDegrees(core::vector3df (rotationX,rotationY,0));
matrix.rotateVect(direction);
camera->setTarget(camera->getPosition() + direction);
camera->updateAbsolutePosition();
}
void turnDown(f32 i)
{
rotationX -= i;
if(rotationX>=360)rotationX-=360;
if(rotationX<0)rotationX+=360;
direction = core::vector3df(0,0,1);
core::matrix4 matrix;
matrix.setRotationDegrees(core::vector3df (rotationX,rotationY,0));
matrix.rotateVect(direction);
camera->setTarget(camera->getPosition() + direction);
camera->updateAbsolutePosition();
}
void moveForward(f32 i)
{
core::vector3df step = core::vector3df(0,0,i);
core::matrix4 matrix;
matrix.setRotationDegrees(core::vector3df (0,rotationY,0));
matrix.rotateVect(step);
camera->setPosition(camera->getPosition() + step);
camera->setTarget(camera->getPosition() + direction);
camera->updateAbsolutePosition();
}
void moveBack(f32 i)
{
core::vector3df step = core::vector3df(0,0,-i);
core::matrix4 matrix;
matrix.setRotationDegrees(core::vector3df (0,rotationY,0));
matrix.rotateVect(step);
camera->setPosition(camera->getPosition() + step);
camera->setTarget(camera->getPosition() + direction);
camera->updateAbsolutePosition();
}
void moveRight(f32 i)
{
core::vector3df step = core::vector3df(i,0,0);
core::matrix4 matrix;
matrix.setRotationDegrees(core::vector3df (0,rotationY,0));
matrix.rotateVect(step);
camera->setPosition(camera->getPosition() + step);
camera->setTarget(camera->getPosition() + direction);
camera->updateAbsolutePosition();
}
void moveLeft(f32 i)
{
core::vector3df step = core::vector3df(-i,0,0);
core::matrix4 matrix;
matrix.setRotationDegrees(core::vector3df (0,rotationY,0));
matrix.rotateVect(step);
camera->setPosition(camera->getPosition() + step);
camera->setTarget(camera->getPosition() + direction);
camera->updateAbsolutePosition();
}
void setHeight(f32 i)
{
camera->setPosition(core::vector3df(camera->getPosition().X, i, camera->getPosition().Z));
camera->setTarget(camera->getPosition() + direction);
camera->updateAbsolutePosition();
}
void setPosition(core::vector3df pos)
{
camera->setPosition(pos);
camera->updateAbsolutePosition();
}
core::vector3df getPosition()
{
return camera->getPosition();
}
core::vector3df getDirection()
{
return direction;
}
core::vector3df getTarget()
{
return camera->getTarget();
}
f32 getHeading()
{
return rotationY;
}
f32 getPitch()
{
return rotationX;
}
f32 getFarValue()
{
return camera->getFarValue();
}
void setFarValue(f32 f)
{
camera->setFarValue(f);
}
f32 getNearValue()
{
return camera->getNearValue();
}
void setNearValue(f32 n)
{
camera->setNearValue(n);
}
f32 getFOV()
{
return camera->getFOV();
}
void setFOV(f32 v)
{
camera->setFOV(v);
}
f32 getAspectRatio()
{
return camera->getAspectRatio();
}
void setAspectRatio(f32 a)
{
camera->setAspectRatio(a);
}
scene::ISceneNode* getNode()
{
return camera;
@ -281,19 +281,19 @@ class MCameraOrbit
f32 rotationX;
f32 rotationY;
f32 distance;
void update()
{
core::vector3df direction = core::vector3df(0,0,distance);
core::matrix4 matrix;
matrix.setRotationDegrees(core::vector3df (rotationX,rotationY,0));
matrix.rotateVect(direction);
camera->setPosition(camera->getTarget() + direction);
camera->updateAbsolutePosition();
}
public:
MCameraOrbit(scene::ISceneManager* smgr)
{
@ -304,9 +304,9 @@ public:
camera->setTarget(core::vector3df(0,0,0));
update();
}
~MCameraOrbit(){}
void turnRight(f32 i)
{
rotationY += i;
@ -314,7 +314,7 @@ public:
if(rotationY<0)rotationY+=360;
update();
}
void turnLeft(f32 i)
{
rotationY -= i;
@ -322,7 +322,7 @@ public:
if(rotationY<0)rotationY+=360;
update();
}
void turnUp(f32 i)
{
rotationX += i;
@ -330,7 +330,7 @@ public:
if(rotationX<0)rotationX+=360;
update();
}
void turnDown(f32 i)
{
rotationX -= i;
@ -338,90 +338,90 @@ public:
if(rotationX<0)rotationX+=360;
update();
}
core::vector3df getTarget()
{
return camera->getTarget();
}
void setTarget(core::vector3df target)
{
camera->setTarget(target);
update();
}
core::vector3df getPosition()
{
return camera->getPosition();
}
f32 getDistance()
{
return distance;
}
void setDistance(f32 i)
{
distance = i;
update();
}
void adjustDistance(f32 i)
{
distance += i;
update();
}
f32 getHeading()
{
return rotationY;
}
f32 getPitch()
{
return rotationX;
}
f32 getFarValue()
{
return camera->getFarValue();
}
void setFarValue(f32 f)
{
camera->setFarValue(f);
}
f32 getNearValue()
{
return camera->getNearValue();
}
void setNearValue(f32 n)
{
camera->setNearValue(n);
}
f32 getFOV()
{
return camera->getFOV();
}
void setFOV(f32 v)
{
camera->setFOV(v);
}
f32 getAspectRatio()
{
return camera->getAspectRatio();
}
void setAspectRatio(f32 a)
{
camera->setAspectRatio(a);
}
scene::ISceneNode* getNode()
{
return camera;

2
src/Client/GUI/SceneGuiStart.cpp
View File

@ -6,7 +6,7 @@
SceneGuiStart::SceneGuiStart(PseuGUI *gui) : Scene(gui)
{
irrlogo = guienv->addImage(driver->getTexture("data/misc/irrlichtlogo.png"), core::position2d<s32>(5,5));
const char *fn;
switch(gui->_driverType)

8
src/Client/GUI/SceneWorld.cpp
View File

@ -463,7 +463,7 @@ void SceneWorld::OnUpdate(s32 timediff)
str += driver->getFPS();
str += L" FPS";
debugText->setText(str.c_str());
@ -642,7 +642,7 @@ void SceneWorld::UpdateTerrain(void)
{
logerror("Error! modelfile not found: %s", filename.c_str());
continue;
}
}
mesh = smgr->getMesh(modelfile);
modelfile->drop();
}
@ -706,7 +706,7 @@ void SceneWorld::UpdateTerrain(void)
{
filename= wmo->model.c_str();
}
scene::IAnimatedMesh *mesh;
if(!smgr->getMeshCache()->isMeshLoaded(filename.c_str()))
{
@ -715,7 +715,7 @@ void SceneWorld::UpdateTerrain(void)
{
logerror("Error! modelfile not found: %s", filename.c_str());
continue;
}
}
mesh = smgr->getMesh(modelfile);
modelfile->drop();
}

220
src/Client/GUI/decoder/mpaudectab.h
View File

@ -65,137 +65,137 @@ static const int quant_steps[17] = {
/* we use a negative value if grouped */
static const int quant_bits[17] = {
-5, -7, 3, -10, 4,
-5, -7, 3, -10, 4,
5, 6, 7, 8, 9,
10, 11, 12, 13, 14,
15, 16
15, 16
};
/* encoding tables which give the quantization index. Note how it is
possible to store them efficiently ! */
static const unsigned char alloc_table_0[] = {
4, 0, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
4, 0, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
4, 0, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
2, 0, 1, 16,
2, 0, 1, 16,
2, 0, 1, 16,
2, 0, 1, 16,
4, 0, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
4, 0, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
4, 0, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
2, 0, 1, 16,
2, 0, 1, 16,
2, 0, 1, 16,
2, 0, 1, 16,
};
static const unsigned char alloc_table_1[] = {
4, 0, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
4, 0, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
4, 0, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
2, 0, 1, 16,
2, 0, 1, 16,
2, 0, 1, 16,
2, 0, 1, 16,
2, 0, 1, 16,
2, 0, 1, 16,
2, 0, 1, 16,
4, 0, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
4, 0, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
4, 0, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
3, 0, 1, 2, 3, 4, 5, 16,
2, 0, 1, 16,
2, 0, 1, 16,
2, 0, 1, 16,
2, 0, 1, 16,
2, 0, 1, 16,
2, 0, 1, 16,
2, 0, 1, 16,
};
static const unsigned char alloc_table_2[] = {
4, 0, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
4, 0, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
4, 0, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
4, 0, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
};
static const unsigned char alloc_table_3[] = {
4, 0, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
4, 0, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
4, 0, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
4, 0, 1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
};
static const unsigned char alloc_table_4[] = {
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
4, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
3, 0, 1, 3, 4, 5, 6, 7,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
2, 0, 1, 3,
};
static const unsigned char *alloc_tables[5] =
static const unsigned char *alloc_tables[5] =
{ alloc_table_0, alloc_table_1, alloc_table_2, alloc_table_3, alloc_table_4, };
/*******************************************************/
@ -212,7 +212,7 @@ static const uint8_t lsf_nsf_table[6][3][4] = {
{ { 6, 5, 5, 5 }, { 9, 9, 9, 9 }, { 6, 9, 9, 9 } },
{ { 6, 5, 7, 3 }, { 9, 9, 12, 6 }, { 6, 9, 12, 6 } },
{ { 11, 10, 0, 0 }, { 18, 18, 0, 0 }, { 15, 18, 0, 0 } },
{ { 7, 7, 7, 0 }, { 12, 12, 12, 0 }, { 6, 15, 12, 0 } },
{ { 7, 7, 7, 0 }, { 12, 12, 12, 0 }, { 6, 15, 12, 0 } },
{ { 6, 6, 6, 3 }, { 12, 9, 9, 6 }, { 6, 12, 9, 6 } },
{ { 8, 8, 5, 0 }, { 15, 12, 9, 0 }, { 6, 18, 9, 0 } },
};

2
src/Client/GUI/decoder/mpegaudio.h
View File

@ -2,7 +2,7 @@
stand-alone mpaudec library. Based on mpegaudio.h from libavcodec. */
/* max frame size, in samples */
#define MPA_FRAME_SIZE 1152
#define MPA_FRAME_SIZE 1152
/* max compressed frame size */
#define MPA_MAX_CODED_FRAME_SIZE 1792

12
src/Client/GUI/irrKlangSceneNode.cpp
View File

@ -10,7 +10,7 @@ const char* irrKlangSceneNodeTypeName = "irrKlangSceneNode";
CIrrKlangSceneNode::CIrrKlangSceneNode(irrklang::ISoundEngine* soundEngine,
CIrrKlangSceneNode::CIrrKlangSceneNode(irrklang::ISoundEngine* soundEngine,
scene::ISceneNode* parent,
scene::ISceneManager* mgr, s32 id)
: scene::ISceneNode(parent, mgr, id), SoundEngine(soundEngine)
@ -188,7 +188,7 @@ void CIrrKlangSceneNode::render()
video::IVideoDriver* driver = SceneManager->getVideoDriver();
driver->setTransform(video::ETS_WORLD, AbsoluteTransformation);
scene::ICameraSceneNode* camera = SceneManager->getActiveCamera();
if (camera)
{
@ -288,7 +288,7 @@ void CIrrKlangSceneNode::stop()
}
//! Sets the play mode to 'play once', a sound file is played once, and
//! Sets the play mode to 'play once', a sound file is played once, and
//! the scene node deletes itself then, if wished.
void CIrrKlangSceneNode::setPlayOnceMode(bool deleteWhenFinished)
{
@ -384,7 +384,7 @@ ISceneNode* CIrrKlangSceneNodeFactory::addSceneNode(ESCENE_NODE_TYPE type, IScen
{
CIrrKlangSceneNode* node = new CIrrKlangSceneNode(SoundEngine, parent, Manager, -1);
node->drop();
return node;
return node;
}
return 0;
@ -415,7 +415,7 @@ ESCENE_NODE_TYPE CIrrKlangSceneNodeFactory::getCreateableSceneNodeType(u32 idx)
}
//! returns type name of a createable scene node type
//! returns type name of a createable scene node type
const c8* CIrrKlangSceneNodeFactory::getCreateableSceneNodeTypeName(u32 idx) const
{
if (idx==0)
@ -425,7 +425,7 @@ const c8* CIrrKlangSceneNodeFactory::getCreateableSceneNodeTypeName(u32 idx) con
}
//! returns type name of a createable scene node type
//! returns type name of a createable scene node type
const c8* CIrrKlangSceneNodeFactory::getCreateableSceneNodeTypeName(ESCENE_NODE_TYPE type) const
{
if (type == IRRKLANG_SCENE_NODE_ID)

8
src/Client/GUI/irrKlangSceneNode.h
View File

@ -5,7 +5,7 @@
// play back sounds and music in 3D. Just place it into 3d space and set
// what sound it should play.
// It uses the free irrKlang sound engine (http://www.ambiera.com/irrklang).
// This file also contains a sound engine factory, CIrrKlangSceneNodeFactory. Just
// This file also contains a sound engine factory, CIrrKlangSceneNodeFactory. Just
// register this factory in your scene manager, and you will be able to load and
// save irrKlang scene nodes from and into .irr files:
//
@ -32,7 +32,7 @@ scene::ISceneManager* smgr = device->getSceneManager();
// .. other code here
CIrrKlangSceneNode* soundNode =
CIrrKlangSceneNode* soundNode =
new CIrrKlangSceneNode(soundEngine, smgr->getRootSceneNode(), smgr, 666);
soundNode->setSoundFilename("yourfile.wav");
@ -40,7 +40,7 @@ CIrrKlangSceneNode* soundNode =
soundNode->setRandomMode(1000, 5000); // plays sound multiple times with random interval
// other modes would be:
// soundNode->setLoopingStreamMode()
// soundNode->setLoopingStreamMode()
// or
// soundNode->setPlayOnceMode();
@ -57,7 +57,7 @@ public:
// play modes:
//! Sets the play mode to 'play once', a sound file is played once, and
//! Sets the play mode to 'play once', a sound file is played once, and
//! the scene node deletes itself then, if wished.
void setPlayOnceMode(bool deleteWhenFinished=false);

2
src/Client/PseuWoW.h
View File

@ -81,7 +81,7 @@ class PseuInstanceConf
bool softquit;
uint8 dataLoaderThreads;
bool useMPQ;
// gui related
bool enablegui;
uint32 terrainsectors;

4
src/Client/Realm/RealmSession.cpp
View File

@ -276,7 +276,7 @@ void RealmSession::_HandleRealmList(ByteBuffer& pkt)
{
uint32 icon;
pkt >> icon;
_realms[i].icon=icon;
_realms[i].icon=icon;
_realms[i].locked=0x00; //locked is specified in the RealmFlags
}
else
@ -622,7 +622,7 @@ void RealmSession::_HandleLogonProof(ByteBuffer& pkt)
{
pkt.read((uint8*)&lp, sizeof(sAuthLogonProof_S));
}
//printchex((char*)&lp, sizeof(sAuthLogonProof_S),true);
if(!memcmp(lp.M2,this->_m2,20))
{

2
src/Client/Realm/RealmSocket.cpp
View File

@ -93,4 +93,4 @@ uint32 RealmSocket::GetMyIP(void)
{
return GetRemoteIP4();
}

4
src/Client/SCPDatabase.cpp
View File

@ -125,7 +125,7 @@ uint32 SCPDatabase::GetFieldByStringValue(const char *entry, const char *val)
std::map<std::string,SCPFieldDef>::iterator fi = _fielddefs.find(entry);
if(fi == _fielddefs.end())
return SCP_INVALID_INT;
uint32 field_id = _fielddefs[entry].id;
return GetFieldByStringValue(field_id,val);
}
@ -696,7 +696,7 @@ void SCPDatabaseMgr::AddSearchPath(const char *path)
return;
#endif
}
_paths.push_back(p);
}

4
src/Client/World/CMSGConstructor.cpp
View File

@ -121,14 +121,14 @@ void WorldSession::SendCastSpell(uint32 spellid, bool nocheck)
packet << (uint8)0; // unk
packet << spellid;
packet << (uint8)0; // unk
if(target && my->GetTarget() != GetGuid()) // self cast?
{
if(target->GetTypeId() == TYPEID_PLAYER || target->GetTypeId() == TYPEID_UNIT)
{
flags |= TARGET_FLAG_UNIT;
temp << (uint8)0xFF << my->GetTarget(); // need to send packed guid?
}
}
if(target->GetTypeId() == TYPEID_OBJECT)
{
flags |= TARGET_FLAG_OBJECT;

2
src/Client/World/CacheHandler.h
View File

@ -1,7 +1,7 @@
#ifndef _CACHEHANDLER_H
#define _CACHEHANDLER_H
typedef std::map<uint64,std::string> PlayerNameMap;
typedef std::map<uint64,std::string> PlayerNameMap;
class PlayerNameCache
{

2
src/Client/World/Item.cpp
View File

@ -109,7 +109,7 @@ void WorldSession::_HandleItemQuerySingleResponseOpcode(WorldPacket& recvPacket)
recvPacket >> proto->socketBonus;
recvPacket >> proto->GemProperties;
recvPacket >> proto->RequiredDisenchantSkill;
recvPacket >> proto->ArmorDamageModifier;
recvPacket >> proto->ArmorDamageModifier;
recvPacket >> proto->Duration;
recvPacket >> proto->ItemLimitCategory;
recvPacket >> proto->HolidayId;

16
src/Client/World/Item.h
View File

@ -294,14 +294,14 @@ enum ITEM_SUBCLASS_TRADE_GOODS
ITEM_SUBCLASS_PARTS = 1,
ITEM_SUBCLASS_EXPLOSIVES = 2,
ITEM_SUBCLASS_DEVICES = 3,
ITEM_SUBCLASS_JEWELCRAFTING = 4,
ITEM_SUBCLASS_CLOTH = 5,
ITEM_SUBCLASS_LEATHER = 6,
ITEM_SUBCLASS_METAL_STONE = 7,
ITEM_SUBCLASS_MEAT = 8,
ITEM_SUBCLASS_HERB = 9,
ITEM_SUBCLASS_ELEMENTAZL = 10,
ITEM_SUBCLASS_TRADE_GOODS_OTHER = 11,
ITEM_SUBCLASS_JEWELCRAFTING = 4,
ITEM_SUBCLASS_CLOTH = 5,
ITEM_SUBCLASS_LEATHER = 6,
ITEM_SUBCLASS_METAL_STONE = 7,
ITEM_SUBCLASS_MEAT = 8,
ITEM_SUBCLASS_HERB = 9,
ITEM_SUBCLASS_ELEMENTAZL = 10,
ITEM_SUBCLASS_TRADE_GOODS_OTHER = 11,
ITEM_SUBCLASS_ENCHANTING = 12,
ITEM_SUBCLASS_MATERIAL = 13,
ITEM_SUBCLASS_ARMOR_ENCHANTMENT = 14,

6
src/Client/World/MapMgr.cpp
View File

@ -13,7 +13,7 @@ char* MapMgr::MapID2Name(uint32 mid)
}
uint32 name_id = mapdb->GetFieldId("name_general");
return mapdb->GetString(mid,name_id);
}
@ -41,7 +41,7 @@ void MapMgr::Update(float x, float y, uint32 m)
char buf[255];
std::string mapname = MapID2Name(m);
MemoryDataHolder::MakeWDTFilename(buf,m,mapname);
// Loading WDT
MemoryDataHolder::MemoryDataResult mdr = MemoryDataHolder::GetFileBasic(buf);
if(mdr.flags & MemoryDataHolder::MDH_FILE_OK && mdr.data.size)
@ -98,7 +98,7 @@ void MapMgr::_LoadNearTiles(uint32 gx, uint32 gy, uint32 m)
void MapMgr::_LoadTile(uint32 gx, uint32 gy, uint32 m)
{
_mapsLoaded = false;
std::string mapname = MapID2Name(m);
logdebug("Mapname: %s",mapname.c_str());

4
src/Client/World/MovementInfo.h
View File

@ -92,11 +92,11 @@ enum SplineFlags{
struct MovementInfo
{
static uint8 _c; //Version switch helper
// Read/Write methods
void Read(ByteBuffer &data);
void Write(ByteBuffer &data) const;
// common
uint32 flags;
uint16 flags2;

2
src/Client/World/MovementMgr.cpp
View File

@ -128,7 +128,7 @@ void MovementMgr::Update(bool sendDirect)
else if(pos.o > 2 * M_PI)
pos.o -= float(2 * M_PI);
//pos.z = _instance->GetWSession()->GetWorld()->GetPosZ(pos.x,pos.y);
if(_movemode == MOVEMODE_AUTO)
{
_mychar->SetPosition(pos);

8
src/Client/World/ObjMgr.cpp
View File

@ -49,11 +49,11 @@ void ObjMgr::RemoveAll(void)
void ObjMgr::Remove(uint64 guid, bool del)
{
Object *o = GetObj(guid, true); // here get also depleted objs and delete if necessary
if(o)
if(o)
{
o->_SetDepleted();
if(!del)
logdebug("ObjMgr: "I64FMT" '%s' -> depleted.",guid,o->GetName().c_str());
logdebug("ObjMgr: "I64FMT" '%s' -> depleted.",guid,o->GetName().c_str());
PseuGUI *gui = _instance->GetGUI();
if(gui)
gui->NotifyObjectDeletion(guid); // we have a gui, which must delete linked DrawObject
@ -67,8 +67,8 @@ void ObjMgr::Remove(uint64 guid, bool del)
{
_obj.erase(guid); // we can safely erase an object that does not exist
// - if we reach this point there was a bug anyway
logcustom(2,LRED,"ObjMgr::Remove("I64FMT") - not existing",guid);
}
logcustom(2,LRED,"ObjMgr::Remove("I64FMT") - not existing",guid);
}
}
// -- Object part --

8
src/Client/World/Object.h
View File

@ -112,14 +112,14 @@ public:
void Create(uint64 guid);
inline bool _IsDepleted(void) { return _depleted; }
inline void _SetDepleted(void) { _depleted = true; }
static uint32 maxvalues[];
static UpdateField updatefields[];
protected:
Object();
void _InitValues(void);
uint16 _valuescount;
union
{
@ -130,7 +130,7 @@ protected:
uint8 _typeid;
std::string _name;
bool _depleted : 1; // true if the object was deleted from the objmgr, but not from memory
};

22
src/Client/World/ObjectDefines.h
View File

@ -1,4 +1,4 @@
/*
/*
* Copyright (C) 2005,2006,2007 MaNGOS <http://www.mangosproject.org/>
*
* This program is free software; you can redistribute it and/or modify
@ -21,17 +21,17 @@
enum HighGuid
{
HIGHGUID_ITEM = 0x4000, // blizz 4000
HIGHGUID_CONTAINER = 0x4000, // blizz 4000
HIGHGUID_PLAYER = 0x0000, // blizz 0000
HIGHGUID_GAMEOBJECT = 0xF110, // blizz F110
HIGHGUID_TRANSPORT = 0xF120, // blizz F120 (for GAMEOBJECT_TYPE_TRANSPORT)
HIGHGUID_UNIT = 0xF130, // blizz F130
HIGHGUID_PET = 0xF140, // blizz F140
HIGHGUID_ITEM = 0x4000, // blizz 4000
HIGHGUID_CONTAINER = 0x4000, // blizz 4000
HIGHGUID_PLAYER = 0x0000, // blizz 0000
HIGHGUID_GAMEOBJECT = 0xF110, // blizz F110
HIGHGUID_TRANSPORT = 0xF120, // blizz F120 (for GAMEOBJECT_TYPE_TRANSPORT)
HIGHGUID_UNIT = 0xF130, // blizz F130
HIGHGUID_PET = 0xF140, // blizz F140
HIGHGUID_VEHICLE = 0xF150,
HIGHGUID_DYNAMICOBJECT = 0xF100, // blizz F100
HIGHGUID_CORPSE = 0xF101, // blizz F100
HIGHGUID_MO_TRANSPORT = 0x1FC0, // blizz 1FC0 (for GAMEOBJECT_TYPE_MO_TRANSPORT)
HIGHGUID_DYNAMICOBJECT = 0xF100, // blizz F100
HIGHGUID_CORPSE = 0xF101, // blizz F100
HIGHGUID_MO_TRANSPORT = 0x1FC0, // blizz 1FC0 (for GAMEOBJECT_TYPE_MO_TRANSPORT)
};
#define IS_CREATURE_GUID(Guid) ( GUID_HIPART(Guid) == HIGHGUID_UNIT )

2
src/Client/World/Opcodes.cpp
View File

@ -1,4 +1,4 @@
/*
/*
* Copyright (C) 2005,2006,2007 MaNGOS <http://www.mangosproject.org/>
*
* This program is free software; you can redistribute it and/or modify

2
src/Client/World/Opcodes.h
View File

@ -1,4 +1,4 @@
/*
/*
* Copyright (C) 2005,2006,2007 MaNGOS <http://www.mangosproject.org/>
*
* This program is free software; you can redistribute it and/or modify

2
src/Client/World/SharedDefines.h
View File

@ -1,4 +1,4 @@
/*
/*
* Copyright (C) 2005,2006 MaNGOS <http://www.mangosproject.org/>
*
* This program is free software; you can redistribute it and/or modify

226
src/Client/World/UpdateFields.cpp
View File

@ -19,10 +19,10 @@ void WorldSession::_SetupObjectFields()
CORPSE_END
};
memcpy(Object::maxvalues,mv,sizeof(mv));
Object::updatefields[ OBJECT_FIELD_GUID ] = UpdateField( 0x0000 , UF_UINT64 ); // Size:2
Object::updatefields[ OBJECT_FIELD_GUID_LOW ] = UpdateField( 0x0000 , UF_UINT32 );
Object::updatefields[ OBJECT_FIELD_GUID_HIGH ] = UpdateField( 0x0001 , UF_UINT32 );
Object::updatefields[ OBJECT_FIELD_GUID_LOW ] = UpdateField( 0x0000 , UF_UINT32 );
Object::updatefields[ OBJECT_FIELD_GUID_HIGH ] = UpdateField( 0x0001 , UF_UINT32 );
Object::updatefields[ OBJECT_FIELD_TYPE ] = UpdateField( 0x0002 , UF_UINT32 ); // Size:1
Object::updatefields[ OBJECT_FIELD_ENTRY ] = UpdateField( 0x0003 , UF_UINT32 ); // Size:1
Object::updatefields[ OBJECT_FIELD_SCALE_X ] = UpdateField( 0x0004 , UF_FLOAT ); // Size:1
@ -35,10 +35,10 @@ void WorldSession::_SetupObjectFields()
Object::updatefields[ ITEM_FIELD_STACK_COUNT ] = UpdateField( mv[TYPEID_OBJECT] + 0x0008 , UF_UINT32 ); // Size:1
Object::updatefields[ ITEM_FIELD_DURATION ] = UpdateField( mv[TYPEID_OBJECT] + 0x0009 , UF_UINT32 ); // Size:1
Object::updatefields[ ITEM_FIELD_SPELL_CHARGES ] = UpdateField( mv[TYPEID_OBJECT] + 0x000A , UF_UINT32 ); // Size:5
Object::updatefields[ ITEM_FIELD_SPELL_CHARGES_01 ] = UpdateField( mv[TYPEID_OBJECT] + 0x000B , UF_UINT32 );
Object::updatefields[ ITEM_FIELD_SPELL_CHARGES_02 ] = UpdateField( mv[TYPEID_OBJECT] + 0x000C , UF_UINT32 );
Object::updatefields[ ITEM_FIELD_SPELL_CHARGES_03 ] = UpdateField( mv[TYPEID_OBJECT] + 0x000D , UF_UINT32 );
Object::updatefields[ ITEM_FIELD_SPELL_CHARGES_04 ] = UpdateField( mv[TYPEID_OBJECT] + 0x000E , UF_UINT32 );
Object::updatefields[ ITEM_FIELD_SPELL_CHARGES_01 ] = UpdateField( mv[TYPEID_OBJECT] + 0x000B , UF_UINT32 );
Object::updatefields[ ITEM_FIELD_SPELL_CHARGES_02 ] = UpdateField( mv[TYPEID_OBJECT] + 0x000C , UF_UINT32 );
Object::updatefields[ ITEM_FIELD_SPELL_CHARGES_03 ] = UpdateField( mv[TYPEID_OBJECT] + 0x000D , UF_UINT32 );
Object::updatefields[ ITEM_FIELD_SPELL_CHARGES_04 ] = UpdateField( mv[TYPEID_OBJECT] + 0x000E , UF_UINT32 );
Object::updatefields[ ITEM_FIELD_FLAGS ] = UpdateField( mv[TYPEID_OBJECT] + 0x000F , UF_UINT32 ); // Size:1
Object::updatefields[ ITEM_FIELD_ENCHANTMENT ] = UpdateField( mv[TYPEID_OBJECT] + 0x0010 , UF_UINT32 ); // Count=21
Object::updatefields[ ITEM_FIELD_PROPERTY_SEED ] = UpdateField( mv[TYPEID_OBJECT] + 0x0025 , UF_UINT32 ); // Size:1
@ -50,7 +50,7 @@ void WorldSession::_SetupObjectFields()
Object::updatefields[ CONTAINER_FIELD_NUM_SLOTS ] = UpdateField( mv[TYPEID_UNIT] + 0x0000 , UF_UINT32 ); // Size:1
Object::updatefields[ CONTAINER_ALIGN_PAD ] = UpdateField( mv[TYPEID_UNIT] + 0x0001 , UF_UINT32 ); // Size:1
Object::updatefields[ CONTAINER_FIELD_SLOT_1 ] = UpdateField( mv[TYPEID_UNIT] + 0x0002 , UF_UINT32 ); // Count=56
Object::updatefields[ CONTAINER_FIELD_SLOT_LAST ] = UpdateField( mv[TYPEID_UNIT] + 0x0038 , UF_UINT32 );
Object::updatefields[ CONTAINER_FIELD_SLOT_LAST ] = UpdateField( mv[TYPEID_UNIT] + 0x0038 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_CHARM ] = UpdateField( mv[TYPEID_OBJECT] + 0x0000 , UF_UINT64 ); // Size:2
Object::updatefields[ UNIT_FIELD_SUMMON ] = UpdateField( mv[TYPEID_OBJECT] + 0x0002 , UF_UINT64 ); // Size:2
@ -76,27 +76,27 @@ void WorldSession::_SetupObjectFields()
Object::updatefields[ UNIT_FIELD_FACTIONTEMPLATE ] = UpdateField( mv[TYPEID_OBJECT] + 0x001D , UF_UINT32 ); // Size:1
Object::updatefields[ UNIT_FIELD_BYTES_0 ] = UpdateField( mv[TYPEID_OBJECT] + 0x001E , UF_UINT32 ); // Size:1
Object::updatefields[ UNIT_VIRTUAL_ITEM_SLOT_DISPLAY ] = UpdateField( mv[TYPEID_OBJECT] + 0x001F , UF_UINT32 ); // Size:3
Object::updatefields[ UNIT_VIRTUAL_ITEM_SLOT_DISPLAY_01 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0020 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_SLOT_DISPLAY_02 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0021 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_SLOT_DISPLAY_01 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0020 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_SLOT_DISPLAY_02 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0021 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO ] = UpdateField( mv[TYPEID_OBJECT] + 0x0022 , UF_UINT32 ); // Size:6
Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_01 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0023 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_02 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0024 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_03 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0025 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_04 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0026 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_05 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0027 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_01 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0023 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_02 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0024 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_03 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0025 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_04 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0026 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_05 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0027 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_FLAGS ] = UpdateField( mv[TYPEID_OBJECT] + 0x0028 , UF_UINT32 ); // Size:1
Object::updatefields[ UNIT_FIELD_AURA ] = UpdateField( mv[TYPEID_OBJECT] + 0x0029 , UF_UINT32 ); // Size:48
Object::updatefields[ UNIT_FIELD_AURA_LAST ] = UpdateField( mv[TYPEID_OBJECT] + 0x0058 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_AURA_LAST ] = UpdateField( mv[TYPEID_OBJECT] + 0x0058 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_AURAFLAGS ] = UpdateField( mv[TYPEID_OBJECT] + 0x0059 , UF_UINT32 ); // Size:6
Object::updatefields[ UNIT_FIELD_AURAFLAGS_01 ] = UpdateField( mv[TYPEID_OBJECT] + 0x005A , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_AURAFLAGS_02 ] = UpdateField( mv[TYPEID_OBJECT] + 0x005B , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_AURAFLAGS_03 ] = UpdateField( mv[TYPEID_OBJECT] + 0x005C , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_AURAFLAGS_04 ] = UpdateField( mv[TYPEID_OBJECT] + 0x005D , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_AURAFLAGS_05 ] = UpdateField( mv[TYPEID_OBJECT] + 0x005E , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_AURAFLAGS_01 ] = UpdateField( mv[TYPEID_OBJECT] + 0x005A , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_AURAFLAGS_02 ] = UpdateField( mv[TYPEID_OBJECT] + 0x005B , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_AURAFLAGS_03 ] = UpdateField( mv[TYPEID_OBJECT] + 0x005C , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_AURAFLAGS_04 ] = UpdateField( mv[TYPEID_OBJECT] + 0x005D , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_AURAFLAGS_05 ] = UpdateField( mv[TYPEID_OBJECT] + 0x005E , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_AURALEVELS ] = UpdateField( mv[TYPEID_OBJECT] + 0x005F , UF_UINT32 ); // Size:12
Object::updatefields[ UNIT_FIELD_AURALEVELS_LAST ] = UpdateField( mv[TYPEID_OBJECT] + 0x006A , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_AURALEVELS_LAST ] = UpdateField( mv[TYPEID_OBJECT] + 0x006A , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_AURAAPPLICATIONS ] = UpdateField( mv[TYPEID_OBJECT] + 0x006B , UF_UINT32 ); // Size:12
Object::updatefields[ UNIT_FIELD_AURAAPPLICATIONS_LAST ] = UpdateField( mv[TYPEID_OBJECT] + 0x0076 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_AURAAPPLICATIONS_LAST ] = UpdateField( mv[TYPEID_OBJECT] + 0x0076 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_AURASTATE ] = UpdateField( mv[TYPEID_OBJECT] + 0x0077 , UF_UINT32 ); // Size:1
Object::updatefields[ UNIT_FIELD_BASEATTACKTIME ] = UpdateField( mv[TYPEID_OBJECT] + 0x0078 , UF_UINT64 ); // Size:2
Object::updatefields[ UNIT_FIELD_OFFHANDATTACKTIME ] = UpdateField( mv[TYPEID_OBJECT] + 0x0079 , UF_UINT64 ); // Size:2
@ -128,12 +128,12 @@ void WorldSession::_SetupObjectFields()
Object::updatefields[ UNIT_FIELD_STAT3 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0093 , UF_UINT32 ); // Size:1
Object::updatefields[ UNIT_FIELD_STAT4 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0094 , UF_UINT32 ); // Size:1
Object::updatefields[ UNIT_FIELD_RESISTANCES ] = UpdateField( mv[TYPEID_OBJECT] + 0x0095 , UF_UINT32 ); // Size:7
Object::updatefields[ UNIT_FIELD_RESISTANCES_01 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0096 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_RESISTANCES_02 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0097 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_RESISTANCES_03 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0098 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_RESISTANCES_04 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0099 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_RESISTANCES_05 ] = UpdateField( mv[TYPEID_OBJECT] + 0x009A , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_RESISTANCES_06 ] = UpdateField( mv[TYPEID_OBJECT] + 0x009B , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_RESISTANCES_01 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0096 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_RESISTANCES_02 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0097 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_RESISTANCES_03 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0098 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_RESISTANCES_04 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0099 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_RESISTANCES_05 ] = UpdateField( mv[TYPEID_OBJECT] + 0x009A , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_RESISTANCES_06 ] = UpdateField( mv[TYPEID_OBJECT] + 0x009B , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_BASE_MANA ] = UpdateField( mv[TYPEID_OBJECT] + 0x009C , UF_UINT32 ); // Size:1
Object::updatefields[ UNIT_FIELD_BASE_HEALTH ] = UpdateField( mv[TYPEID_OBJECT] + 0x009D , UF_UINT32 ); // Size:1
Object::updatefields[ UNIT_FIELD_BYTES_2 ] = UpdateField( mv[TYPEID_OBJECT] + 0x009E , UF_UINT32 ); // Size:1
@ -146,20 +146,20 @@ void WorldSession::_SetupObjectFields()
Object::updatefields[ UNIT_FIELD_MINRANGEDDAMAGE ] = UpdateField( mv[TYPEID_OBJECT] + 0x00A5 , UF_UINT32 ); // Size:1
Object::updatefields[ UNIT_FIELD_MAXRANGEDDAMAGE ] = UpdateField( mv[TYPEID_OBJECT] + 0x00A6 , UF_UINT32 ); // Size:1
Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER ] = UpdateField( mv[TYPEID_OBJECT] + 0x00A7 , UF_UINT32 ); // Size:7
Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_01 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00A8 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_02 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00A9 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_03 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00AA , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_04 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00AB , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_05 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00AC , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_06 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00AD , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_01 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00A8 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_02 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00A9 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_03 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00AA , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_04 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00AB , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_05 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00AC , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER_06 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00AD , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER ] = UpdateField( mv[TYPEID_OBJECT] + 0x00AE , UF_UINT32 ); // Size:7
Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_01 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00AF , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_02 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00B0 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_03 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00B1 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_04 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00B2 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_05 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00B3 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_06 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00B4 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_PADDING ] = UpdateField( mv[TYPEID_OBJECT] + 0x00B5 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_01 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00AF , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_02 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00B0 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_03 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00B1 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_04 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00B2 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_05 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00B3 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER_06 ] = UpdateField( mv[TYPEID_OBJECT] + 0x00B4 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_PADDING ] = UpdateField( mv[TYPEID_OBJECT] + 0x00B5 , UF_UINT32 );
Object::updatefields[ PLAYER_DUEL_ARBITER ] = UpdateField( mv[TYPEID_UNIT] + 0x0000 , UF_UINT64 ); // Size:2
Object::updatefields[ PLAYER_FLAGS ] = UpdateField( mv[TYPEID_UNIT] + 0x0002 , UF_UINT32 ); // Size:1
@ -171,30 +171,30 @@ void WorldSession::_SetupObjectFields()
Object::updatefields[ PLAYER_DUEL_TEAM ] = UpdateField( mv[TYPEID_UNIT] + 0x0008 , UF_UINT32 ); // Size:1
Object::updatefields[ PLAYER_GUILD_TIMESTAMP ] = UpdateField( mv[TYPEID_UNIT] + 0x0009 , UF_UINT32 ); // Size:1
Object::updatefields[ PLAYER_QUEST_LOG_1_1 ] = UpdateField( mv[TYPEID_UNIT] + 0x000A , UF_UINT32 ); // Count = 20
Object::updatefields[ PLAYER_QUEST_LOG_1_2 ] = UpdateField( mv[TYPEID_UNIT] + 0x000B , UF_UINT32 );
Object::updatefields[ PLAYER_QUEST_LOG_1_3 ] = UpdateField( mv[TYPEID_UNIT] + 0x000C , UF_UINT32 );
Object::updatefields[ PLAYER_QUEST_LOG_LAST_1 ] = UpdateField( mv[TYPEID_UNIT] + 0x0043 , UF_UINT32 );
Object::updatefields[ PLAYER_QUEST_LOG_LAST_2 ] = UpdateField( mv[TYPEID_UNIT] + 0x0044 , UF_UINT32 );
Object::updatefields[ PLAYER_QUEST_LOG_LAST_3 ] = UpdateField( mv[TYPEID_UNIT] + 0x0045 , UF_UINT32 );
Object::updatefields[ PLAYER_QUEST_LOG_1_2 ] = UpdateField( mv[TYPEID_UNIT] + 0x000B , UF_UINT32 );
Object::updatefields[ PLAYER_QUEST_LOG_1_3 ] = UpdateField( mv[TYPEID_UNIT] + 0x000C , UF_UINT32 );
Object::updatefields[ PLAYER_QUEST_LOG_LAST_1 ] = UpdateField( mv[TYPEID_UNIT] + 0x0043 , UF_UINT32 );
Object::updatefields[ PLAYER_QUEST_LOG_LAST_2 ] = UpdateField( mv[TYPEID_UNIT] + 0x0044 , UF_UINT32 );
Object::updatefields[ PLAYER_QUEST_LOG_LAST_3 ] = UpdateField( mv[TYPEID_UNIT] + 0x0045 , UF_UINT32 );
Object::updatefields[ PLAYER_VISIBLE_ITEM_1_CREATOR ] = UpdateField( mv[TYPEID_UNIT] + 0x0046 , UF_UINT64 ); // Size:2, Count = 19
Object::updatefields[ PLAYER_VISIBLE_ITEM_1_0 ] = UpdateField( mv[TYPEID_UNIT] + 0x0048 , UF_UINT64 ); // Size:8
Object::updatefields[ PLAYER_VISIBLE_ITEM_1_PROPERTIES ] = UpdateField( mv[TYPEID_UNIT] + 0x0050 , UF_UINT32 ); // Size:1
Object::updatefields[ PLAYER_VISIBLE_ITEM_1_PAD ] = UpdateField( mv[TYPEID_UNIT] + 0x0051 , UF_UINT32 ); // Size:1
Object::updatefields[ PLAYER_VISIBLE_ITEM_LAST_CREATOR ] = UpdateField( mv[TYPEID_UNIT] + 0x011E , UF_UINT32 );
Object::updatefields[ PLAYER_VISIBLE_ITEM_LAST_0 ] = UpdateField( mv[TYPEID_UNIT] + 0x0120 , UF_UINT32 );
Object::updatefields[ PLAYER_VISIBLE_ITEM_LAST_PROPERTIES ] = UpdateField( mv[TYPEID_UNIT] + 0x0128 , UF_UINT32 );
Object::updatefields[ PLAYER_VISIBLE_ITEM_LAST_PAD ] = UpdateField( mv[TYPEID_UNIT] + 0x0129 , UF_UINT32 );
Object::updatefields[ PLAYER_VISIBLE_ITEM_LAST_CREATOR ] = UpdateField( mv[TYPEID_UNIT] + 0x011E , UF_UINT32 );
Object::updatefields[ PLAYER_VISIBLE_ITEM_LAST_0 ] = UpdateField( mv[TYPEID_UNIT] + 0x0120 , UF_UINT32 );
Object::updatefields[ PLAYER_VISIBLE_ITEM_LAST_PROPERTIES ] = UpdateField( mv[TYPEID_UNIT] + 0x0128 , UF_UINT32 );
Object::updatefields[ PLAYER_VISIBLE_ITEM_LAST_PAD ] = UpdateField( mv[TYPEID_UNIT] + 0x0129 , UF_UINT32 );
Object::updatefields[ PLAYER_FIELD_INV_SLOT_HEAD ] = UpdateField( mv[TYPEID_UNIT] + 0x012A , UF_UINT32 ); // Size:46
Object::updatefields[ PLAYER_FIELD_PACK_SLOT_1 ] = UpdateField( mv[TYPEID_UNIT] + 0x0158 , UF_UINT32 ); // Size:32
Object::updatefields[ PLAYER_FIELD_PACK_SLOT_LAST ] = UpdateField( mv[TYPEID_UNIT] + 0x0176 , UF_UINT32 );
Object::updatefields[ PLAYER_FIELD_PACK_SLOT_LAST ] = UpdateField( mv[TYPEID_UNIT] + 0x0176 , UF_UINT32 );
Object::updatefields[ PLAYER_FIELD_BANK_SLOT_1 ] = UpdateField( mv[TYPEID_UNIT] + 0x0178 , UF_UINT32 ); // Size:48
Object::updatefields[ PLAYER_FIELD_BANK_SLOT_LAST ] = UpdateField( mv[TYPEID_UNIT] + 0x01A6 , UF_UINT32 );
Object::updatefields[ PLAYER_FIELD_BANK_SLOT_LAST ] = UpdateField( mv[TYPEID_UNIT] + 0x01A6 , UF_UINT32 );
Object::updatefields[ PLAYER_FIELD_BANKBAG_SLOT_1 ] = UpdateField( mv[TYPEID_UNIT] + 0x01A8 , UF_UINT32 ); // Size:12
Object::updatefields[ PLAYER_FIELD_BANKBAG_SLOT_LAST ] = UpdateField( mv[TYPEID_UNIT] + 0x0AB2 , UF_UINT32 );
Object::updatefields[ PLAYER_FIELD_BANKBAG_SLOT_LAST ] = UpdateField( mv[TYPEID_UNIT] + 0x0AB2 , UF_UINT32 );
Object::updatefields[ PLAYER_FIELD_VENDORBUYBACK_SLOT_1 ] = UpdateField( mv[TYPEID_UNIT] + 0x01B4 , UF_UINT32 ); // Size:24
Object::updatefields[ PLAYER_FIELD_VENDORBUYBACK_SLOT_LAST ] = UpdateField( mv[TYPEID_UNIT] + 0x01CA , UF_UINT32 );
Object::updatefields[ PLAYER_FIELD_VENDORBUYBACK_SLOT_LAST ] = UpdateField( mv[TYPEID_UNIT] + 0x01CA , UF_UINT32 );
Object::updatefields[ PLAYER_FIELD_KEYRING_SLOT_1 ] = UpdateField( mv[TYPEID_UNIT] + 0x01CC , UF_UINT32 ); // Size:64
Object::updatefields[ PLAYER_FIELD_KEYRING_SLOT_LAST ] = UpdateField( mv[TYPEID_UNIT] + 0x020A , UF_UINT32 );
Object::updatefields[ PLAYER_FIELD_KEYRING_SLOT_LAST ] = UpdateField( mv[TYPEID_UNIT] + 0x020A , UF_UINT32 );
Object::updatefields[ PLAYER_FARSIGHT ] = UpdateField( mv[TYPEID_UNIT] + 0x020C , UF_UINT64 ); // Size:2
Object::updatefields[ PLAYER_FIELD_COMBO_TARGET ] = UpdateField( mv[TYPEID_UNIT] + 0x020E , UF_UINT64 ); // Size:2
Object::updatefields[ PLAYER_XP ] = UpdateField( mv[TYPEID_UNIT] + 0x0210 , UF_UINT32 ); // Size:1
@ -232,9 +232,9 @@ void WorldSession::_SetupObjectFields()
Object::updatefields[ PLAYER_SELF_RES_SPELL ] = UpdateField( mv[TYPEID_UNIT] + 0x040C , UF_UINT32 ); // Size:1
Object::updatefields[ PLAYER_FIELD_PVP_MEDALS ] = UpdateField( mv[TYPEID_UNIT] + 0x040D , UF_UINT32 ); // Size:1
Object::updatefields[ PLAYER_FIELD_BUYBACK_PRICE_1 ] = UpdateField( mv[TYPEID_UNIT] + 0x040E , UF_UINT32 ); // Count=12
Object::updatefields[ PLAYER_FIELD_BUYBACK_PRICE_LAST ] = UpdateField( mv[TYPEID_UNIT] + 0x0419 , UF_UINT32 );
Object::updatefields[ PLAYER_FIELD_BUYBACK_PRICE_LAST ] = UpdateField( mv[TYPEID_UNIT] + 0x0419 , UF_UINT32 );
Object::updatefields[ PLAYER_FIELD_BUYBACK_TIMESTAMP_1 ] = UpdateField( mv[TYPEID_UNIT] + 0x041A , UF_UINT32 ); // Count=12
Object::updatefields[ PLAYER_FIELD_BUYBACK_TIMESTAMP_LAST ] = UpdateField( mv[TYPEID_UNIT] + 0x0425 , UF_UINT32 );
Object::updatefields[ PLAYER_FIELD_BUYBACK_TIMESTAMP_LAST ] = UpdateField( mv[TYPEID_UNIT] + 0x0425 , UF_UINT32 );
Object::updatefields[ PLAYER_FIELD_SESSION_KILLS ] = UpdateField( mv[TYPEID_UNIT] + 0x0426 , UF_UINT32 ); // Size:1
Object::updatefields[ PLAYER_FIELD_YESTERDAY_KILLS ] = UpdateField( mv[TYPEID_UNIT] + 0x0427 , UF_UINT32 ); // Size:1
Object::updatefields[ PLAYER_FIELD_LAST_WEEK_KILLS ] = UpdateField( mv[TYPEID_UNIT] + 0x0428 , UF_UINT32 ); // Size:1
@ -249,47 +249,47 @@ void WorldSession::_SetupObjectFields()
Object::updatefields[ PLAYER_FIELD_WATCHED_FACTION_INDEX ] = UpdateField( mv[TYPEID_UNIT] + 0x0431 , UF_UINT32 ); // Size:1
Object::updatefields[ PLAYER_FIELD_COMBAT_RATING_1 ] = UpdateField( mv[TYPEID_UNIT] + 0x0432 , UF_UINT32 ); // Size:20
Object::updatefields[ OBJECT_FIELD_CREATED_BY ] = UpdateField( mv[TYPEID_OBJECT] + 0x0000 , UF_UINT64 );
Object::updatefields[ GAMEOBJECT_DISPLAYID ] = UpdateField( mv[TYPEID_OBJECT] + 0x0002 , UF_UINT32 );
Object::updatefields[ GAMEOBJECT_FLAGS ] = UpdateField( mv[TYPEID_OBJECT] + 0x0003 , UF_UINT32 );
Object::updatefields[ GAMEOBJECT_ROTATION ] = UpdateField( mv[TYPEID_OBJECT] + 0x0004 , UF_UINT32 );
Object::updatefields[ GAMEOBJECT_STATE ] = UpdateField( mv[TYPEID_OBJECT] + 0x0008 , UF_UINT32 );
Object::updatefields[ GAMEOBJECT_POS_X ] = UpdateField( mv[TYPEID_OBJECT] + 0x0009 , UF_FLOAT );
Object::updatefields[ GAMEOBJECT_POS_Y ] = UpdateField( mv[TYPEID_OBJECT] + 0x000A , UF_FLOAT );
Object::updatefields[ GAMEOBJECT_POS_Z ] = UpdateField( mv[TYPEID_OBJECT] + 0x000B , UF_FLOAT );
Object::updatefields[ GAMEOBJECT_FACING ] = UpdateField( mv[TYPEID_OBJECT] + 0x000C , UF_UINT32 );
Object::updatefields[ GAMEOBJECT_DYN_FLAGS ] = UpdateField( mv[TYPEID_OBJECT] + 0x000D , UF_UINT32 );
Object::updatefields[ GAMEOBJECT_FACTION ] = UpdateField( mv[TYPEID_OBJECT] + 0x000E , UF_UINT32 );
Object::updatefields[ GAMEOBJECT_TYPE_ID ] = UpdateField( mv[TYPEID_OBJECT] + 0x000F , UF_UINT32 );
Object::updatefields[ GAMEOBJECT_LEVEL ] = UpdateField( mv[TYPEID_OBJECT] + 0x0010 , UF_UINT32 );
Object::updatefields[ GAMEOBJECT_ARTKIT ] = UpdateField( mv[TYPEID_OBJECT] + 0x0011 , UF_UINT32 );
Object::updatefields[ GAMEOBJECT_ANIMPROGRESS ] = UpdateField( mv[TYPEID_OBJECT] + 0x0012 , UF_UINT32 );
Object::updatefields[ GAMEOBJECT_PADDING ] = UpdateField( mv[TYPEID_OBJECT] + 0x0013 , UF_UINT32 );
Object::updatefields[ OBJECT_FIELD_CREATED_BY ] = UpdateField( mv[TYPEID_OBJECT] + 0x0000 , UF_UINT64 );
Object::updatefields[ GAMEOBJECT_DISPLAYID ] = UpdateField( mv[TYPEID_OBJECT] + 0x0002 , UF_UINT32 );
Object::updatefields[ GAMEOBJECT_FLAGS ] = UpdateField( mv[TYPEID_OBJECT] + 0x0003 , UF_UINT32 );
Object::updatefields[ GAMEOBJECT_ROTATION ] = UpdateField( mv[TYPEID_OBJECT] + 0x0004 , UF_UINT32 );
Object::updatefields[ GAMEOBJECT_STATE ] = UpdateField( mv[TYPEID_OBJECT] + 0x0008 , UF_UINT32 );
Object::updatefields[ GAMEOBJECT_POS_X ] = UpdateField( mv[TYPEID_OBJECT] + 0x0009 , UF_FLOAT );
Object::updatefields[ GAMEOBJECT_POS_Y ] = UpdateField( mv[TYPEID_OBJECT] + 0x000A , UF_FLOAT );
Object::updatefields[ GAMEOBJECT_POS_Z ] = UpdateField( mv[TYPEID_OBJECT] + 0x000B , UF_FLOAT );
Object::updatefields[ GAMEOBJECT_FACING ] = UpdateField( mv[TYPEID_OBJECT] + 0x000C , UF_UINT32 );
Object::updatefields[ GAMEOBJECT_DYN_FLAGS ] = UpdateField( mv[TYPEID_OBJECT] + 0x000D , UF_UINT32 );
Object::updatefields[ GAMEOBJECT_FACTION ] = UpdateField( mv[TYPEID_OBJECT] + 0x000E , UF_UINT32 );
Object::updatefields[ GAMEOBJECT_TYPE_ID ] = UpdateField( mv[TYPEID_OBJECT] + 0x000F , UF_UINT32 );
Object::updatefields[ GAMEOBJECT_LEVEL ] = UpdateField( mv[TYPEID_OBJECT] + 0x0010 , UF_UINT32 );
Object::updatefields[ GAMEOBJECT_ARTKIT ] = UpdateField( mv[TYPEID_OBJECT] + 0x0011 , UF_UINT32 );
Object::updatefields[ GAMEOBJECT_ANIMPROGRESS ] = UpdateField( mv[TYPEID_OBJECT] + 0x0012 , UF_UINT32 );
Object::updatefields[ GAMEOBJECT_PADDING ] = UpdateField( mv[TYPEID_OBJECT] + 0x0013 , UF_UINT32 );
Object::updatefields[ DYNAMICOBJECT_CASTER ] = UpdateField( mv[TYPEID_OBJECT] + 0x0000 , UF_UINT64 );
Object::updatefields[ DYNAMICOBJECT_BYTES ] = UpdateField( mv[TYPEID_OBJECT] + 0x0002 , UF_UINT32 );
Object::updatefields[ DYNAMICOBJECT_SPELLID ] = UpdateField( mv[TYPEID_OBJECT] + 0x0003 , UF_UINT32 );
Object::updatefields[ DYNAMICOBJECT_RADIUS ] = UpdateField( mv[TYPEID_OBJECT] + 0x0004 , UF_UINT32 );
Object::updatefields[ DYNAMICOBJECT_POS_X ] = UpdateField( mv[TYPEID_OBJECT] + 0x0005 , UF_UINT32 );
Object::updatefields[ DYNAMICOBJECT_POS_Y ] = UpdateField( mv[TYPEID_OBJECT] + 0x0006 , UF_UINT32 );
Object::updatefields[ DYNAMICOBJECT_POS_Z ] = UpdateField( mv[TYPEID_OBJECT] + 0x0007 , UF_UINT32 );
Object::updatefields[ DYNAMICOBJECT_FACING ] = UpdateField( mv[TYPEID_OBJECT] + 0x0008 , UF_UINT32 );
Object::updatefields[ DYNAMICOBJECT_PAD ] = UpdateField( mv[TYPEID_OBJECT] + 0x0009 , UF_UINT32 );
Object::updatefields[ DYNAMICOBJECT_CASTER ] = UpdateField( mv[TYPEID_OBJECT] + 0x0000 , UF_UINT64 );
Object::updatefields[ DYNAMICOBJECT_BYTES ] = UpdateField( mv[TYPEID_OBJECT] + 0x0002 , UF_UINT32 );
Object::updatefields[ DYNAMICOBJECT_SPELLID ] = UpdateField( mv[TYPEID_OBJECT] + 0x0003 , UF_UINT32 );
Object::updatefields[ DYNAMICOBJECT_RADIUS ] = UpdateField( mv[TYPEID_OBJECT] + 0x0004 , UF_UINT32 );
Object::updatefields[ DYNAMICOBJECT_POS_X ] = UpdateField( mv[TYPEID_OBJECT] + 0x0005 , UF_UINT32 );
Object::updatefields[ DYNAMICOBJECT_POS_Y ] = UpdateField( mv[TYPEID_OBJECT] + 0x0006 , UF_UINT32 );
Object::updatefields[ DYNAMICOBJECT_POS_Z ] = UpdateField( mv[TYPEID_OBJECT] + 0x0007 , UF_UINT32 );
Object::updatefields[ DYNAMICOBJECT_FACING ] = UpdateField( mv[TYPEID_OBJECT] + 0x0008 , UF_UINT32 );
Object::updatefields[ DYNAMICOBJECT_PAD ] = UpdateField( mv[TYPEID_OBJECT] + 0x0009 , UF_UINT32 );
Object::updatefields[ CORPSE_FIELD_OWNER ] = UpdateField( mv[TYPEID_OBJECT] + 0x0000 , UF_UINT64 );
Object::updatefields[ CORPSE_FIELD_FACING ] = UpdateField( mv[TYPEID_OBJECT] + 0x0002 , UF_UINT32 );
Object::updatefields[ CORPSE_FIELD_POS_X ] = UpdateField( mv[TYPEID_OBJECT] + 0x0003 , UF_UINT32 );
Object::updatefields[ CORPSE_FIELD_POS_Y ] = UpdateField( mv[TYPEID_OBJECT] + 0x0004 , UF_UINT32 );
Object::updatefields[ CORPSE_FIELD_POS_Z ] = UpdateField( mv[TYPEID_OBJECT] + 0x0005 , UF_UINT32 );
Object::updatefields[ CORPSE_FIELD_DISPLAY_ID ] = UpdateField( mv[TYPEID_OBJECT] + 0x0006 , UF_UINT32 );
Object::updatefields[ CORPSE_FIELD_OWNER ] = UpdateField( mv[TYPEID_OBJECT] + 0x0000 , UF_UINT64 );
Object::updatefields[ CORPSE_FIELD_FACING ] = UpdateField( mv[TYPEID_OBJECT] + 0x0002 , UF_UINT32 );
Object::updatefields[ CORPSE_FIELD_POS_X ] = UpdateField( mv[TYPEID_OBJECT] + 0x0003 , UF_UINT32 );
Object::updatefields[ CORPSE_FIELD_POS_Y ] = UpdateField( mv[TYPEID_OBJECT] + 0x0004 , UF_UINT32 );
Object::updatefields[ CORPSE_FIELD_POS_Z ] = UpdateField( mv[TYPEID_OBJECT] + 0x0005 , UF_UINT32 );
Object::updatefields[ CORPSE_FIELD_DISPLAY_ID ] = UpdateField( mv[TYPEID_OBJECT] + 0x0006 , UF_UINT32 );
Object::updatefields[ CORPSE_FIELD_ITEM ] = UpdateField( mv[TYPEID_OBJECT] + 0x0007 , UF_UINT32 ); // 19
Object::updatefields[ CORPSE_FIELD_BYTES_1 ] = UpdateField( mv[TYPEID_OBJECT] + 0x001A , UF_UINT32 );
Object::updatefields[ CORPSE_FIELD_BYTES_2 ] = UpdateField( mv[TYPEID_OBJECT] + 0x001B , UF_UINT32 );
Object::updatefields[ CORPSE_FIELD_GUILD ] = UpdateField( mv[TYPEID_OBJECT] + 0x001C , UF_UINT32 );
Object::updatefields[ CORPSE_FIELD_FLAGS ] = UpdateField( mv[TYPEID_OBJECT] + 0x001D , UF_UINT32 );
Object::updatefields[ CORPSE_FIELD_DYNAMIC_FLAGS ] = UpdateField( mv[TYPEID_OBJECT] + 0x001E , UF_UINT32 );
Object::updatefields[ CORPSE_FIELD_PAD ] = UpdateField( mv[TYPEID_OBJECT] + 0x001F , UF_UINT32 );
Object::updatefields[ CORPSE_FIELD_BYTES_1 ] = UpdateField( mv[TYPEID_OBJECT] + 0x001A , UF_UINT32 );
Object::updatefields[ CORPSE_FIELD_BYTES_2 ] = UpdateField( mv[TYPEID_OBJECT] + 0x001B , UF_UINT32 );
Object::updatefields[ CORPSE_FIELD_GUILD ] = UpdateField( mv[TYPEID_OBJECT] + 0x001C , UF_UINT32 );
Object::updatefields[ CORPSE_FIELD_FLAGS ] = UpdateField( mv[TYPEID_OBJECT] + 0x001D , UF_UINT32 );
Object::updatefields[ CORPSE_FIELD_DYNAMIC_FLAGS ] = UpdateField( mv[TYPEID_OBJECT] + 0x001E , UF_UINT32 );
Object::updatefields[ CORPSE_FIELD_PAD ] = UpdateField( mv[TYPEID_OBJECT] + 0x001F , UF_UINT32 );
break;
}
case CLIENT_TBC: //2.4.3
@ -307,13 +307,13 @@ void WorldSession::_SetupObjectFields()
memcpy(Object::maxvalues,mv,sizeof(mv));
Object::updatefields[ OBJECT_FIELD_GUID ] = UpdateField( 0x0000 , UF_UINT64);
Object::updatefields[ OBJECT_FIELD_GUID_LOW ] = UpdateField( 0x0000 , UF_UINT32);
Object::updatefields[ OBJECT_FIELD_GUID_HIGH ] = UpdateField( 0x0001 , UF_UINT32);
Object::updatefields[ OBJECT_FIELD_GUID_LOW ] = UpdateField( 0x0000 , UF_UINT32);
Object::updatefields[ OBJECT_FIELD_GUID_HIGH ] = UpdateField( 0x0001 , UF_UINT32);
Object::updatefields[ OBJECT_FIELD_TYPE ] = UpdateField( 0x0002 , UF_UINT32);
Object::updatefields[ OBJECT_FIELD_ENTRY ] = UpdateField( 0x0003 , UF_UINT32);
Object::updatefields[ OBJECT_FIELD_SCALE_X ] = UpdateField( 0x0004 , UF_FLOAT);
Object::updatefields[ OBJECT_FIELD_PADDING ] = UpdateField( 0x0005 , UF_UINT32);
Object::updatefields[ ITEM_FIELD_OWNER ] = UpdateField( mv[TYPEID_OBJECT] + 0x0000 , UF_UINT64);
Object::updatefields[ ITEM_FIELD_CONTAINED ] = UpdateField( mv[TYPEID_OBJECT] + 0x0002 , UF_UINT64);
Object::updatefields[ ITEM_FIELD_CREATOR ] = UpdateField( mv[TYPEID_OBJECT] + 0x0004 , UF_UINT64);
@ -357,14 +357,14 @@ void WorldSession::_SetupObjectFields()
Object::updatefields[ UNIT_FIELD_FACTIONTEMPLATE ] = UpdateField( mv[TYPEID_OBJECT] + 0x001D , UF_UINT32 ); // Size:1
Object::updatefields[ UNIT_FIELD_BYTES_0 ] = UpdateField( mv[TYPEID_OBJECT] + 0x001E , UF_UINT32 ); // Size:1
Object::updatefields[ UNIT_VIRTUAL_ITEM_SLOT_DISPLAY ] = UpdateField( mv[TYPEID_OBJECT] + 0x001F , UF_UINT32 ); // Size:3
Object::updatefields[ UNIT_VIRTUAL_ITEM_SLOT_DISPLAY_01 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0020 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_SLOT_DISPLAY_02 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0021 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_SLOT_DISPLAY_01 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0020 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_SLOT_DISPLAY_02 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0021 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO ] = UpdateField( mv[TYPEID_OBJECT] + 0x0022 , UF_UINT32 ); // Size:6
Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_01 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0023 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_02 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0024 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_03 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0025 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_04 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0026 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_05 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0027 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_01 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0023 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_02 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0024 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_03 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0025 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_04 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0026 , UF_UINT32 );
Object::updatefields[ UNIT_VIRTUAL_ITEM_INFO_05 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0027 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_FLAGS ] = UpdateField( mv[TYPEID_OBJECT] + 0x0028 , UF_UINT32 ); // Size:1
Object::updatefields[ UNIT_FIELD_FLAGS_2 ] = UpdateField( mv[TYPEID_OBJECT] + 0x0029 , UF_UINT32 ); // Size:1
Object::updatefields[ UNIT_FIELD_AURA ] = UpdateField( mv[TYPEID_OBJECT] + 0x002A , UF_UINT32 ); // Size:56
@ -427,8 +427,8 @@ void WorldSession::_SetupObjectFields()
Object::updatefields[ UNIT_FIELD_MAXRANGEDDAMAGE ] = UpdateField( mv[TYPEID_OBJECT] + 0x00D3 , UF_UINT32 ); // Size:1
Object::updatefields[ UNIT_FIELD_POWER_COST_MODIFIER ] = UpdateField( mv[TYPEID_OBJECT] + 0x00D4 , UF_UINT32 ); // Size:7
Object::updatefields[ UNIT_FIELD_POWER_COST_MULTIPLIER ] = UpdateField( mv[TYPEID_OBJECT] + 0x00DB , UF_UINT32 ); // Size:7
Object::updatefields[ UNIT_FIELD_MAXHEALTHMODIFIER ] = UpdateField( mv[TYPEID_OBJECT] + 0x00E2 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_PADDING ] = UpdateField( mv[TYPEID_OBJECT] + 0x00E3 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_MAXHEALTHMODIFIER ] = UpdateField( mv[TYPEID_OBJECT] + 0x00E2 , UF_UINT32 );
Object::updatefields[ UNIT_FIELD_PADDING ] = UpdateField( mv[TYPEID_OBJECT] + 0x00E3 , UF_UINT32 );
Object::updatefields[ PLAYER_DUEL_ARBITER ] = UpdateField( mv[TYPEID_UNIT] + 0x0000 , UF_UINT32 ); // Size: 2, Type: LONG, Flags: PUBLIC
Object::updatefields[ PLAYER_FLAGS ] = UpdateField( mv[TYPEID_UNIT] + 0x0002 , UF_UINT32 ); // Size: 1, Type: INT, Flags: PUBLIC
@ -730,10 +730,10 @@ void WorldSession::_SetupObjectFields()
CORPSE_END
};
memcpy(Object::maxvalues,mv,sizeof(mv));
Object::updatefields[ OBJECT_FIELD_GUID ] = UpdateField( 0x0000 , UF_UINT64);
Object::updatefields[ OBJECT_FIELD_GUID_LOW ] = UpdateField( 0x0000 , UF_UINT32);
Object::updatefields[ OBJECT_FIELD_GUID_HIGH ] = UpdateField( 0x0001 , UF_UINT32);
Object::updatefields[ OBJECT_FIELD_GUID_LOW ] = UpdateField( 0x0000 , UF_UINT32);
Object::updatefields[ OBJECT_FIELD_GUID_HIGH ] = UpdateField( 0x0001 , UF_UINT32);
Object::updatefields[ OBJECT_FIELD_TYPE ] = UpdateField( 0x0002 , UF_UINT32);
Object::updatefields[ OBJECT_FIELD_ENTRY ] = UpdateField( 0x0003 , UF_UINT32);
Object::updatefields[ OBJECT_FIELD_SCALE_X ] = UpdateField( 0x0004 , UF_FLOAT);
@ -1110,8 +1110,8 @@ void WorldSession::_SetupObjectFields()
Object::updatefields[ CORPSE_FIELD_FLAGS ] = UpdateField( mv[TYPEID_OBJECT] + 0x001B , UF_UINT32);
Object::updatefields[ CORPSE_FIELD_DYNAMIC_FLAGS ] = UpdateField( mv[TYPEID_OBJECT] + 0x001C , UF_UINT32);
Object::updatefields[ CORPSE_FIELD_PAD ] = UpdateField( mv[TYPEID_OBJECT] + 0x001D , UF_UINT32);
break;
}
}

10
src/Client/World/UpdateFields.h
View File

@ -11,7 +11,7 @@ enum UpdateFieldTypes
enum UpdateFieldLimits
{
OBJECT_END = 0x0006,
OBJECT_END = 0x0006,
ITEM_END = OBJECT_END + 0x003A,
CONTAINER_END = ITEM_END + 0x004A,
UNIT_END = OBJECT_END + 0x008E,
@ -26,13 +26,13 @@ enum UpdateFieldLimits
GAMEOBJECT_END_8606 = OBJECT_END + 0x0014,
DYNAMICOBJECT_END_8606 = OBJECT_END + 0x000A,
CORPSE_END_8606 = OBJECT_END + 0x0022,
ITEM_END_6005 = OBJECT_END + 0x002A,
CONTAINER_END_6005 = ITEM_END_6005 + 0x003A,
UNIT_END_6005 = OBJECT_END + 0x00B6,
PLAYER_END_6005 = UNIT_END_6005 + 0x0446,
GAMEOBJECT_END_6005 = OBJECT_END + 0x0014
};
@ -288,7 +288,7 @@ enum UpdateFieldName
PLAYER_FIELD_MOD_HEALING_DONE_POS,
PLAYER_FIELD_MOD_HEALING_PCT,
PLAYER_FIELD_MOD_MANA_REGEN,
PLAYER_FIELD_MOD_MANA_REGEN_INTERRUPT,
PLAYER_FIELD_MOD_MANA_REGEN_INTERRUPT,
PLAYER_FIELD_MOD_TARGET_PHYSICAL_RESISTANCE,
PLAYER_FIELD_MOD_TARGET_RESISTANCE,
PLAYER_FIELD_NEGSTAT0,
@ -582,7 +582,7 @@ enum UpdateFieldName
PLAYER_VISIBLE_ITEM_19_0,
PLAYER_VISIBLE_ITEM_19_PROPERTIES,
PLAYER_VISIBLE_ITEM_19_PAD,
PLAYER_VISIBLE_ITEM_LAST_PROPERTIES,
PLAYER_XP,

8
src/Client/World/UpdateMask.h
View File

@ -1,4 +1,4 @@
/*
/*
* Copyright (C) 2005,2006,2007 MaNGOS <http://www.mangosproject.org/>
*
* This program is free software; you can redistribute it and/or modify
@ -52,12 +52,12 @@ class UpdateMask
inline uint32 GetLength() { return mBlocks << 2; }
inline uint32 GetCount() { return mCount; }
inline uint8* GetMask() { return (uint8*)mUpdateMask; }
inline void SetMask(uint32 *updateMask)
{
inline void SetMask(uint32 *updateMask)
{
if(mUpdateMask)
delete [] mUpdateMask;
mUpdateMask = updateMask;
mUpdateMask = updateMask;
}
inline void SetCount (uint32 valuesCount)

30
src/Client/World/WorldSession.cpp
View File

@ -45,7 +45,7 @@ WorldSession::WorldSession(PseuInstance *in)
_SetupObjectFields();
MovementInfo::_c=in->GetConf()->client;
in->GetScripts()->RunScriptIfExists("_onworldsessioncreate");
DEBUG(logdebug("WorldSession 0x%X constructor finished",this));
@ -529,7 +529,7 @@ std::string WorldSession::GetOrRequestPlayerName(uint64 guid)
void WorldSession::_HandleAuthChallengeOpcode(WorldPacket& recvPacket)
{
//Read Packet
//Read Packet
uint32 sp, serverseed;
if(GetInstance()->GetConf()->client > CLIENT_TBC)
{
@ -553,7 +553,7 @@ void WorldSession::_HandleAuthChallengeOpcode(WorldPacket& recvPacket)
digest.UpdateData((uint8*)&serverseed,sizeof(uint32));
digest.UpdateBigNumbers(GetInstance()->GetSessionKey(),NULL);
digest.Finalize();
// Send Reply
WorldPacket auth;
if(GetInstance()->GetConf()->client<=CLIENT_TBC)
@ -1059,7 +1059,7 @@ void WorldSession::_HandleNameQueryResponseOpcode(WorldPacket& recvPacket)
if(GetInstance()->GetConf()->client > CLIENT_TBC)
recvPacket >> unk;
recvPacket >> pname >> realm;
if(GetInstance()->GetConf()->client > CLIENT_TBC)
{
@ -1134,7 +1134,7 @@ void WorldSession::_HandleSetSpeedOpcode(WorldPacket& recvPacket)
float speed;
uint32 movetype;
MovementInfo mi;
switch(recvPacket.GetOpcode())
{
case MSG_MOVE_SET_WALK_SPEED:
@ -1278,7 +1278,7 @@ void WorldSession::_HandleTelePortAckOpcode(WorldPacket& recvPacket)
wp << guid;
wp << (uint32)0 << (uint32)getMSTime(); //First value is some counter
SendWorldPacket(wp);
_world->GetMoveMgr()->SetFallTime(100);
_world->GetMoveMgr()->MoveFallLand();
@ -1334,7 +1334,7 @@ void WorldSession::_HandleNewWorldOpcode(WorldPacket& recvPacket)
my->ClearSpells(); // will be resent by server
my->SetPosition(x,y,z,o,mapid);
}
_world->GetMoveMgr()->SetFallTime(100);
_world->GetMoveMgr()->MoveFallLand();//Must be sent after character was set to new position
@ -1413,7 +1413,7 @@ void WorldSession::_HandleInitialSpellsOpcode(WorldPacket& recvPacket)
logdebug("Initial Spell: id=%u slot=%u",spellid,not_spellslot);
GetMyChar()->AddSpell(spellid, not_spellslot);
}
}
//TODO: Parse packet completely
}
@ -1696,7 +1696,7 @@ void WorldSession::_HandleCreatureQueryResponseOpcode(WorldPacket& recvPacket)
recvPacket >> unkf;
recvPacket >> ct->RacialLeader;
if(GetInstance()->GetConf()->client == CLIENT_WOTLK)
{
{
for(uint32 i = 0; i < 4; i++)
recvPacket >> ct->questItems[i];
recvPacket >> ct->movementId;
@ -1806,7 +1806,7 @@ void WorldSession::_HandleMonsterMoveOpcode(WorldPacket& recvPacket)
{
uint64 guid;
guid = recvPacket.readPackGUID();
Object* obj = objmgr.GetObj(guid);
if (!obj || !obj->IsWorldObject())
return;
@ -1816,7 +1816,7 @@ void WorldSession::_HandleMonsterMoveOpcode(WorldPacket& recvPacket)
float x, y, z;
if(GetInstance()->GetConf()->client > CLIENT_TBC)
recvPacket >> unk;
recvPacket >> x >> y >> z >> time >> type;
float oldx = ((WorldObject*)obj)->GetX(),
@ -1825,19 +1825,19 @@ void WorldSession::_HandleMonsterMoveOpcode(WorldPacket& recvPacket)
// not much good, better than nothing
((WorldObject*)obj)->SetPosition(x, y, z, o);
switch(type)
switch(type)
{
case 0: break; // normal packet
case 1: return; // stop packet
case 2:
case 2:
float unkf;
recvPacket >> unkf >> unkf >> unkf;
break;
case 3:
case 3:
uint64 unkguid;
recvPacket >> unkguid;
break;
case 4:
case 4:
float angle;
recvPacket >> angle;
break;

6
src/Client/World/WorldSocket.cpp
View File

@ -11,7 +11,7 @@ WorldSocket::WorldSocket(SocketHandler &h, WorldSession *s) : TcpSocket(h)
_session = s;
_gothdr = false;
_ok=false;
//Dummy functions for unencrypted packets on WorldSocket
pDecryptRecv = &AuthCrypt::DecryptRecvDummy;
pEncryptSend = &AuthCrypt::EncryptSendDummy;
@ -120,9 +120,9 @@ void WorldSocket::OnRead()
_remaining = ntohs(hdr.size) - 2;
_opcode = hdr.cmd;
}
if(_opcode > MAX_OPCODE_ID)
{
logcritical("CRYPT ERROR: opcode=%u, remain=%u",_opcode,_remaining); // this should never be the case!

8
src/Client/main.cpp
View File

@ -38,7 +38,7 @@ void _OnSignal(int s)
case SIGINT:
case SIGQUIT:
case SIGTERM:
quitproc();
quitproc();
break;
case SIGABRT:
#ifndef _DEBUG
@ -98,7 +98,7 @@ int main(int argc, char* argv[])
logcustom(0,GREEN,"Platform: %s",PLATFORM_NAME);
logcustom(0,GREEN,"Compiler: %s ("COMPILER_VERSION_OUT")",COMPILER_NAME,COMPILER_VERSION);
logcustom(0,GREEN,"Compiled: %s %s",__DATE__,__TIME__);
_HookSignals();
MemoryDataHolder::Init();
@ -116,10 +116,10 @@ int main(int argc, char* argv[])
raise(SIGABRT); // this way to terminate is not nice but the only way to quit the CLI thread
raise(SIGQUIT);
return 0;
}
}
catch (...)
{
printf("ERROR: Unhandled exception in main thread!\n");
printf("ERROR: Unhandled exception in main thread!\n");
raise(SIGABRT);
return 1;
}

2
src/Client/resource.h
View File

@ -5,7 +5,7 @@
#define IDI_ICON1 101
// Next default values for new objects
//
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 102

3298
src/dep/include/DXSDK/include/D3D10.h
View File

File diff suppressed because it is too large Load Diff

332
src/dep/include/DXSDK/include/D3D10effect.h
View File

@ -43,7 +43,7 @@ typedef enum _D3D10_DEVICE_STATE_TYPES
D3D10_DST_PS_SAMPLERS, // Count: D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT
D3D10_DST_PS_SHADER_RESOURCES, // Count: D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT
D3D10_DST_PS_CONSTANT_BUFFERS, // Count: D3D10_COMMONSHADER_CONSTANT_BUFFER_SLOT_COUNT
D3D10_DST_IA_VERTEX_BUFFERS, // Count: D3D10_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT
D3D10_DST_IA_INDEX_BUFFER, // Single-value state
D3D10_DST_IA_INPUT_LAYOUT, // Single-value state
@ -79,32 +79,32 @@ typedef struct _D3D10_STATE_BLOCK_MASK
BYTE VSSamplers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT)];
BYTE VSShaderResources[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT)];
BYTE VSConstantBuffers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_CONSTANT_BUFFER_SLOT_COUNT)];
BYTE GS;
BYTE GSSamplers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT)];
BYTE GSShaderResources[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT)];
BYTE GSConstantBuffers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_CONSTANT_BUFFER_SLOT_COUNT)];
BYTE PS;
BYTE PSSamplers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT)];
BYTE PSShaderResources[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT)];
BYTE PSConstantBuffers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_CONSTANT_BUFFER_SLOT_COUNT)];
BYTE IAVertexBuffers[D3D10_BYTES_FROM_BITS(D3D10_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT)];
BYTE IAIndexBuffer;
BYTE IAInputLayout;
BYTE IAPrimitiveTopology;
BYTE OMRenderTargets;
BYTE OMDepthStencilState;
BYTE OMBlendState;
BYTE RSViewports;
BYTE RSScissorRects;
BYTE RSRasterizerState;
BYTE SOBuffers;
BYTE Predication;
} D3D10_STATE_BLOCK_MASK;
@ -116,7 +116,7 @@ typedef interface ID3D10StateBlock ID3D10StateBlock;
typedef interface ID3D10StateBlock *LPD3D10STATEBLOCK;
// {0803425A-57F5-4dd6-9465-A87570834A08}
DEFINE_GUID(IID_ID3D10StateBlock,
DEFINE_GUID(IID_ID3D10StateBlock,
0x803425a, 0x57f5, 0x4dd6, 0x94, 0x65, 0xa8, 0x75, 0x70, 0x83, 0x4a, 0x8);
#undef INTERFACE
@ -127,7 +127,7 @@ DECLARE_INTERFACE_(ID3D10StateBlock, IUnknown)
STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
STDMETHOD(Capture)(THIS) PURE;
STDMETHOD(Apply)(THIS) PURE;
STDMETHOD(GetDevice)(THIS_ ID3D10Device **ppDevice) PURE;
@ -156,8 +156,8 @@ extern "C" {
//
// UINT RangeStart, RangeLength, Entry
// The specific bit or range of bits for a given state type to operate on.
// Consult the comments for D3D10_DEVICE_STATE_TYPES and
// D3D10_STATE_BLOCK_MASK for information on the valid bit ranges for
// Consult the comments for D3D10_DEVICE_STATE_TYPES and
// D3D10_STATE_BLOCK_MASK for information on the valid bit ranges for
// each state.
//
//----------------------------------------------------------------------------
@ -259,21 +259,21 @@ HRESULT D3D10CreateStateBlock(ID3D10Device *pDevice, D3D10_STATE_BLOCK_MASK *pSt
typedef struct _D3D10_EFFECT_TYPE_DESC
{
LPCSTR TypeName; // Name of the type
LPCSTR TypeName; // Name of the type
// (e.g. "float4" or "MyStruct")
D3D10_SHADER_VARIABLE_CLASS Class; // (e.g. scalar, vector, object, etc.)
D3D10_SHADER_VARIABLE_TYPE Type; // (e.g. float, texture, vertexshader, etc.)
UINT Elements; // Number of elements in this type
// (0 if not an array)
// (0 if not an array)
UINT Members; // Number of members
// (0 if not a structure)
UINT Rows; // Number of rows in this type
// (0 if not a numeric primitive)
UINT Columns; // Number of columns in this type
// (0 if not a numeric primitive)
UINT PackedSize; // Number of bytes required to represent
// this data type, when tightly packed
UINT UnpackedSize; // Number of bytes occupied by this data
@ -286,7 +286,7 @@ typedef interface ID3D10EffectType ID3D10EffectType;
typedef interface ID3D10EffectType *LPD3D10EFFECTTYPE;
// {4E9E1DDC-CD9D-4772-A837-00180B9B88FD}
DEFINE_GUID(IID_ID3D10EffectType,
DEFINE_GUID(IID_ID3D10EffectType,
0x4e9e1ddc, 0xcd9d, 0x4772, 0xa8, 0x37, 0x0, 0x18, 0xb, 0x9b, 0x88, 0xfd);
#undef INTERFACE
@ -315,12 +315,12 @@ DECLARE_INTERFACE(ID3D10EffectType)
typedef struct _D3D10_EFFECT_VARIABLE_DESC
{
LPCSTR Name; // Name of this variable, annotation,
LPCSTR Name; // Name of this variable, annotation,
// or structure member
LPCSTR Semantic; // Semantic string of this variable
// or structure member (NULL for
// or structure member (NULL for
// annotations or if not present)
UINT Flags; // D3D10_EFFECT_VARIABLE_* flags
UINT Annotations; // Number of annotations on this variable
// (always 0 for annotations)
@ -334,7 +334,7 @@ typedef interface ID3D10EffectVariable ID3D10EffectVariable;
typedef interface ID3D10EffectVariable *LPD3D10EFFECTVARIABLE;
// {AE897105-00E6-45bf-BB8E-281DD6DB8E1B}
DEFINE_GUID(IID_ID3D10EffectVariable,
DEFINE_GUID(IID_ID3D10EffectVariable,
0xae897105, 0xe6, 0x45bf, 0xbb, 0x8e, 0x28, 0x1d, 0xd6, 0xdb, 0x8e, 0x1b);
#undef INTERFACE
@ -358,18 +358,18 @@ DECLARE_INTERFACE(ID3D10EffectVariable)
STDMETHOD_(BOOL, IsValid)(THIS) PURE;
STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
@ -381,7 +381,7 @@ DECLARE_INTERFACE(ID3D10EffectVariable)
STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
STDMETHOD(SetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(GetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
};
@ -394,7 +394,7 @@ typedef interface ID3D10EffectScalarVariable ID3D10EffectScalarVariable;
typedef interface ID3D10EffectScalarVariable *LPD3D10EFFECTSCALARVARIABLE;
// {00E48F7B-D2C8-49e8-A86C-022DEE53431F}
DEFINE_GUID(IID_ID3D10EffectScalarVariable,
DEFINE_GUID(IID_ID3D10EffectScalarVariable,
0xe48f7b, 0xd2c8, 0x49e8, 0xa8, 0x6c, 0x2, 0x2d, 0xee, 0x53, 0x43, 0x1f);
#undef INTERFACE
@ -405,18 +405,18 @@ DECLARE_INTERFACE_(ID3D10EffectScalarVariable, ID3D10EffectVariable)
STDMETHOD_(BOOL, IsValid)(THIS) PURE;
STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
@ -428,25 +428,25 @@ DECLARE_INTERFACE_(ID3D10EffectScalarVariable, ID3D10EffectVariable)
STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
STDMETHOD(SetRawValue)(THIS_ void *pData, UINT ByteOffset, UINT ByteCount) PURE;
STDMETHOD(GetRawValue)(THIS_ void *pData, UINT ByteOffset, UINT ByteCount) PURE;
STDMETHOD(SetFloat)(THIS_ float Value) PURE;
STDMETHOD(GetFloat)(THIS_ float *pValue) PURE;
STDMETHOD(GetFloat)(THIS_ float *pValue) PURE;
STDMETHOD(SetFloatArray)(THIS_ float *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(GetFloatArray)(THIS_ float *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(SetInt)(THIS_ int Value) PURE;
STDMETHOD(GetInt)(THIS_ int *pValue) PURE;
STDMETHOD(SetIntArray)(THIS_ int *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(GetIntArray)(THIS_ int *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(SetBool)(THIS_ BOOL Value) PURE;
STDMETHOD(GetBool)(THIS_ BOOL *pValue) PURE;
STDMETHOD(SetBoolArray)(THIS_ BOOL *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(GetBoolArray)(THIS_ BOOL *pData, UINT Offset, UINT Count) PURE;
};
@ -459,7 +459,7 @@ typedef interface ID3D10EffectVectorVariable ID3D10EffectVectorVariable;
typedef interface ID3D10EffectVectorVariable *LPD3D10EFFECTVECTORVARIABLE;
// {62B98C44-1F82-4c67-BCD0-72CF8F217E81}
DEFINE_GUID(IID_ID3D10EffectVectorVariable,
DEFINE_GUID(IID_ID3D10EffectVectorVariable,
0x62b98c44, 0x1f82, 0x4c67, 0xbc, 0xd0, 0x72, 0xcf, 0x8f, 0x21, 0x7e, 0x81);
#undef INTERFACE
@ -470,22 +470,22 @@ DECLARE_INTERFACE_(ID3D10EffectVectorVariable, ID3D10EffectVariable)
STDMETHOD_(BOOL, IsValid)(THIS) PURE;
STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
STDMETHOD_(ID3D10EffectStringVariable*, AsString)(THIS) PURE;
STDMETHOD_(ID3D10EffectStringVariable*, AsString)(THIS) PURE;
STDMETHOD_(ID3D10EffectShaderResourceVariable*, AsShaderResource)(THIS) PURE;
STDMETHOD_(ID3D10EffectConstantBuffer*, AsConstantBuffer)(THIS) PURE;
STDMETHOD_(ID3D10EffectShaderVariable*, AsShader)(THIS) PURE;
@ -493,10 +493,10 @@ DECLARE_INTERFACE_(ID3D10EffectVectorVariable, ID3D10EffectVariable)
STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
STDMETHOD(SetRawValue)(THIS_ void *pData, UINT ByteOffset, UINT ByteCount) PURE;
STDMETHOD(GetRawValue)(THIS_ void *pData, UINT ByteOffset, UINT ByteCount) PURE;
STDMETHOD(SetBoolVector) (THIS_ BOOL *pData) PURE;
STDMETHOD(SetIntVector) (THIS_ int *pData) PURE;
STDMETHOD(SetFloatVector)(THIS_ float *pData) PURE;
@ -522,7 +522,7 @@ typedef interface ID3D10EffectMatrixVariable ID3D10EffectMatrixVariable;
typedef interface ID3D10EffectMatrixVariable *LPD3D10EFFECTMATRIXVARIABLE;
// {50666C24-B82F-4eed-A172-5B6E7E8522E0}
DEFINE_GUID(IID_ID3D10EffectMatrixVariable,
DEFINE_GUID(IID_ID3D10EffectMatrixVariable,
0x50666c24, 0xb82f, 0x4eed, 0xa1, 0x72, 0x5b, 0x6e, 0x7e, 0x85, 0x22, 0xe0);
#undef INTERFACE
@ -533,18 +533,18 @@ DECLARE_INTERFACE_(ID3D10EffectMatrixVariable, ID3D10EffectVariable)
STDMETHOD_(BOOL, IsValid)(THIS) PURE;
STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
@ -556,19 +556,19 @@ DECLARE_INTERFACE_(ID3D10EffectMatrixVariable, ID3D10EffectVariable)
STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
STDMETHOD(SetRawValue)(THIS_ void *pData, UINT ByteOffset, UINT ByteCount) PURE;
STDMETHOD(GetRawValue)(THIS_ void *pData, UINT ByteOffset, UINT ByteCount) PURE;
STDMETHOD(SetMatrix)(THIS_ float *pData) PURE;
STDMETHOD(GetMatrix)(THIS_ float *pData) PURE;
STDMETHOD(SetMatrixArray)(THIS_ float *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(GetMatrixArray)(THIS_ float *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(SetMatrixTranspose)(THIS_ float *pData) PURE;
STDMETHOD(GetMatrixTranspose)(THIS_ float *pData) PURE;
STDMETHOD(SetMatrixTransposeArray)(THIS_ float *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(GetMatrixTransposeArray)(THIS_ float *pData, UINT Offset, UINT Count) PURE;
};
@ -581,7 +581,7 @@ typedef interface ID3D10EffectStringVariable ID3D10EffectStringVariable;
typedef interface ID3D10EffectStringVariable *LPD3D10EFFECTSTRINGVARIABLE;
// {71417501-8DF9-4e0a-A78A-255F9756BAFF}
DEFINE_GUID(IID_ID3D10EffectStringVariable,
DEFINE_GUID(IID_ID3D10EffectStringVariable,
0x71417501, 0x8df9, 0x4e0a, 0xa7, 0x8a, 0x25, 0x5f, 0x97, 0x56, 0xba, 0xff);
#undef INTERFACE
@ -592,18 +592,18 @@ DECLARE_INTERFACE_(ID3D10EffectStringVariable, ID3D10EffectVariable)
STDMETHOD_(BOOL, IsValid)(THIS) PURE;
STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
@ -615,10 +615,10 @@ DECLARE_INTERFACE_(ID3D10EffectStringVariable, ID3D10EffectVariable)
STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
STDMETHOD(SetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(GetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(GetString)(THIS_ LPCSTR *ppString) PURE;
STDMETHOD(GetStringArray)(THIS_ LPCSTR *ppStrings, UINT Offset, UINT Count) PURE;
};
@ -631,7 +631,7 @@ typedef interface ID3D10EffectShaderResourceVariable ID3D10EffectShaderResourceV
typedef interface ID3D10EffectShaderResourceVariable *LPD3D10EFFECTSHADERRESOURCEVARIABLE;
// {C0A7157B-D872-4b1d-8073-EFC2ACD4B1FC}
DEFINE_GUID(IID_ID3D10EffectShaderResourceVariable,
DEFINE_GUID(IID_ID3D10EffectShaderResourceVariable,
0xc0a7157b, 0xd872, 0x4b1d, 0x80, 0x73, 0xef, 0xc2, 0xac, 0xd4, 0xb1, 0xfc);
@ -643,18 +643,18 @@ DECLARE_INTERFACE_(ID3D10EffectShaderResourceVariable, ID3D10EffectVariable)
STDMETHOD_(BOOL, IsValid)(THIS) PURE;
STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
@ -666,13 +666,13 @@ DECLARE_INTERFACE_(ID3D10EffectShaderResourceVariable, ID3D10EffectVariable)
STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
STDMETHOD(SetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(GetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(SetResource)(THIS_ ID3D10ShaderResourceView *pResource) PURE;
STDMETHOD(GetResource)(THIS_ ID3D10ShaderResourceView **ppResource) PURE;
STDMETHOD(SetResourceArray)(THIS_ ID3D10ShaderResourceView **ppResources, UINT Offset, UINT Count) PURE;
STDMETHOD(GetResourceArray)(THIS_ ID3D10ShaderResourceView **ppResources, UINT Offset, UINT Count) PURE;
};
@ -685,7 +685,7 @@ typedef interface ID3D10EffectConstantBuffer ID3D10EffectConstantBuffer;
typedef interface ID3D10EffectConstantBuffer *LPD3D10EFFECTCONSTANTBUFFER;
// {56648F4D-CC8B-4444-A5AD-B5A3D76E91B3}
DEFINE_GUID(IID_ID3D10EffectConstantBuffer,
DEFINE_GUID(IID_ID3D10EffectConstantBuffer,
0x56648f4d, 0xcc8b, 0x4444, 0xa5, 0xad, 0xb5, 0xa3, 0xd7, 0x6e, 0x91, 0xb3);
#undef INTERFACE
@ -695,18 +695,18 @@ DECLARE_INTERFACE_(ID3D10EffectConstantBuffer, ID3D10EffectVariable)
{
STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
@ -718,13 +718,13 @@ DECLARE_INTERFACE_(ID3D10EffectConstantBuffer, ID3D10EffectVariable)
STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
STDMETHOD(SetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(GetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(SetConstantBuffer)(THIS_ ID3D10Buffer *pConstantBuffer) PURE;
STDMETHOD(GetConstantBuffer)(THIS_ ID3D10Buffer **ppConstantBuffer) PURE;
STDMETHOD(SetTextureBuffer)(THIS_ ID3D10ShaderResourceView *pTextureBuffer) PURE;
STDMETHOD(GetTextureBuffer)(THIS_ ID3D10ShaderResourceView **ppTextureBuffer) PURE;
};
@ -743,17 +743,17 @@ typedef struct _D3D10_EFFECT_SHADER_DESC
{
CONST BYTE *pInputSignature; // Passed into CreateInputLayout,
// valid on VS and GS only
BOOL IsInline; // Is this an anonymous shader variable
// resulting from an inline shader assignment?
// -- The following fields are not valid after Optimize() --
CONST BYTE *pBytecode; // Shader bytecode
UINT BytecodeLength;
LPCSTR SODecl; // Stream out declaration string (for GS with SO)
UINT NumInputSignatureEntries; // Number of entries in the input signature
UINT NumOutputSignatureEntries; // Number of entries in the output signature
} D3D10_EFFECT_SHADER_DESC;
@ -763,7 +763,7 @@ typedef interface ID3D10EffectShaderVariable ID3D10EffectShaderVariable;
typedef interface ID3D10EffectShaderVariable *LPD3D10EFFECTSHADERVARIABLE;
// {80849279-C799-4797-8C33-0407A07D9E06}
DEFINE_GUID(IID_ID3D10EffectShaderVariable,
DEFINE_GUID(IID_ID3D10EffectShaderVariable,
0x80849279, 0xc799, 0x4797, 0x8c, 0x33, 0x4, 0x7, 0xa0, 0x7d, 0x9e, 0x6);
#undef INTERFACE
@ -773,18 +773,18 @@ DECLARE_INTERFACE_(ID3D10EffectShaderVariable, ID3D10EffectVariable)
{
STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
@ -796,16 +796,16 @@ DECLARE_INTERFACE_(ID3D10EffectShaderVariable, ID3D10EffectVariable)
STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
STDMETHOD(SetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(GetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(GetShaderDesc)(THIS_ UINT ShaderIndex, D3D10_EFFECT_SHADER_DESC *pDesc) PURE;
STDMETHOD(GetVertexShader)(THIS_ UINT ShaderIndex, ID3D10VertexShader **ppVS) PURE;
STDMETHOD(GetGeometryShader)(THIS_ UINT ShaderIndex, ID3D10GeometryShader **ppGS) PURE;
STDMETHOD(GetPixelShader)(THIS_ UINT ShaderIndex, ID3D10PixelShader **ppPS) PURE;
STDMETHOD(GetInputSignatureElementDesc)(THIS_ UINT ShaderIndex, UINT Element, D3D10_SIGNATURE_PARAMETER_DESC *pDesc) PURE;
STDMETHOD(GetOutputSignatureElementDesc)(THIS_ UINT ShaderIndex, UINT Element, D3D10_SIGNATURE_PARAMETER_DESC *pDesc) PURE;
};
@ -818,7 +818,7 @@ typedef interface ID3D10EffectBlendVariable ID3D10EffectBlendVariable;
typedef interface ID3D10EffectBlendVariable *LPD3D10EFFECTBLENDVARIABLE;
// {1FCD2294-DF6D-4eae-86B3-0E9160CFB07B}
DEFINE_GUID(IID_ID3D10EffectBlendVariable,
DEFINE_GUID(IID_ID3D10EffectBlendVariable,
0x1fcd2294, 0xdf6d, 0x4eae, 0x86, 0xb3, 0xe, 0x91, 0x60, 0xcf, 0xb0, 0x7b);
#undef INTERFACE
@ -828,18 +828,18 @@ DECLARE_INTERFACE_(ID3D10EffectBlendVariable, ID3D10EffectVariable)
{
STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
@ -851,10 +851,10 @@ DECLARE_INTERFACE_(ID3D10EffectBlendVariable, ID3D10EffectVariable)
STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
STDMETHOD(SetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(GetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(GetBlendState)(THIS_ UINT Index, ID3D10BlendState **ppBlendState) PURE;
STDMETHOD(GetBackingStore)(THIS_ UINT Index, D3D10_BLEND_DESC *pBlendDesc) PURE;
};
@ -867,7 +867,7 @@ typedef interface ID3D10EffectDepthStencilVariable ID3D10EffectDepthStencilVaria
typedef interface ID3D10EffectDepthStencilVariable *LPD3D10EFFECTDEPTHSTENCILVARIABLE;
// {AF482368-330A-46a5-9A5C-01C71AF24C8D}
DEFINE_GUID(IID_ID3D10EffectDepthStencilVariable,
DEFINE_GUID(IID_ID3D10EffectDepthStencilVariable,
0xaf482368, 0x330a, 0x46a5, 0x9a, 0x5c, 0x1, 0xc7, 0x1a, 0xf2, 0x4c, 0x8d);
#undef INTERFACE
@ -877,18 +877,18 @@ DECLARE_INTERFACE_(ID3D10EffectDepthStencilVariable, ID3D10EffectVariable)
{
STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
@ -900,10 +900,10 @@ DECLARE_INTERFACE_(ID3D10EffectDepthStencilVariable, ID3D10EffectVariable)
STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
STDMETHOD(SetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(GetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(GetDepthStencilState)(THIS_ UINT Index, ID3D10DepthStencilState **ppDepthStencilState) PURE;
STDMETHOD(GetBackingStore)(THIS_ UINT Index, D3D10_DEPTH_STENCIL_DESC *pDepthStencilDesc) PURE;
};
@ -916,7 +916,7 @@ typedef interface ID3D10EffectRasterizerVariable ID3D10EffectRasterizerVariable;
typedef interface ID3D10EffectRasterizerVariable *LPD3D10EFFECTRASTERIZERVARIABLE;
// {21AF9F0E-4D94-4ea9-9785-2CB76B8C0B34}
DEFINE_GUID(IID_ID3D10EffectRasterizerVariable,
DEFINE_GUID(IID_ID3D10EffectRasterizerVariable,
0x21af9f0e, 0x4d94, 0x4ea9, 0x97, 0x85, 0x2c, 0xb7, 0x6b, 0x8c, 0xb, 0x34);
#undef INTERFACE
@ -926,18 +926,18 @@ DECLARE_INTERFACE_(ID3D10EffectRasterizerVariable, ID3D10EffectVariable)
{
STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
@ -949,10 +949,10 @@ DECLARE_INTERFACE_(ID3D10EffectRasterizerVariable, ID3D10EffectVariable)
STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
STDMETHOD(SetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(GetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(GetRasterizerState)(THIS_ UINT Index, ID3D10RasterizerState **ppRasterizerState) PURE;
STDMETHOD(GetBackingStore)(THIS_ UINT Index, D3D10_RASTERIZER_DESC *pRasterizerDesc) PURE;
};
@ -965,7 +965,7 @@ typedef interface ID3D10EffectSamplerVariable ID3D10EffectSamplerVariable;
typedef interface ID3D10EffectSamplerVariable *LPD3D10EFFECTSAMPLERVARIABLE;
// {6530D5C7-07E9-4271-A418-E7CE4BD1E480}
DEFINE_GUID(IID_ID3D10EffectSamplerVariable,
DEFINE_GUID(IID_ID3D10EffectSamplerVariable,
0x6530d5c7, 0x7e9, 0x4271, 0xa4, 0x18, 0xe7, 0xce, 0x4b, 0xd1, 0xe4, 0x80);
#undef INTERFACE
@ -975,18 +975,18 @@ DECLARE_INTERFACE_(ID3D10EffectSamplerVariable, ID3D10EffectVariable)
{
STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE;
STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE;
STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE;
STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE;
@ -998,10 +998,10 @@ DECLARE_INTERFACE_(ID3D10EffectSamplerVariable, ID3D10EffectVariable)
STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE;
STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE;
STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE;
STDMETHOD(SetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(GetRawValue)(THIS_ void *pData, UINT Offset, UINT Count) PURE;
STDMETHOD(GetSampler)(THIS_ UINT Index, ID3D10SamplerState **ppSampler) PURE;
STDMETHOD(GetBackingStore)(THIS_ UINT Index, D3D10_SAMPLER_DESC *pSamplerDesc) PURE;
};
@ -1018,12 +1018,12 @@ DECLARE_INTERFACE_(ID3D10EffectSamplerVariable, ID3D10EffectVariable)
typedef struct _D3D10_PASS_DESC
{
LPCSTR Name; // Name of this pass (NULL if not anonymous)
LPCSTR Name; // Name of this pass (NULL if not anonymous)
UINT Annotations; // Number of annotations on this pass
BYTE *pIAInputSignature; // Signature from VS or GS (if there is no VS)
// or NULL if neither exists
UINT StencilRef; // Specified in SetDepthStencilState()
UINT SampleMask; // Specified in SetBlendState()
FLOAT BlendFactor[4]; // Specified in SetBlendState()
@ -1039,7 +1039,7 @@ typedef struct _D3D10_PASS_SHADER_DESC
{
ID3D10EffectShaderVariable *pShaderVariable; // The variable that this shader came from.
// If this is an inline shader assignment,
// the returned interface will be an
// the returned interface will be an
// anonymous shader variable, which is
// not retrievable any other way. It's
// name in the variable description will
@ -1047,7 +1047,7 @@ typedef struct _D3D10_PASS_SHADER_DESC
// If there is no assignment of this type in
// the pass block, pShaderVariable != NULL,
// but pShaderVariable->IsValid() == FALSE.
UINT ShaderIndex; // The element of pShaderVariable (if an array)
// or 0 if not applicable
} D3D10_PASS_SHADER_DESC;
@ -1056,7 +1056,7 @@ typedef interface ID3D10EffectPass ID3D10EffectPass;
typedef interface ID3D10EffectPass *LPD3D10EFFECTPASS;
// {5CFBEB89-1A06-46e0-B282-E3F9BFA36A54}
DEFINE_GUID(IID_ID3D10EffectPass,
DEFINE_GUID(IID_ID3D10EffectPass,
0x5cfbeb89, 0x1a06, 0x46e0, 0xb2, 0x82, 0xe3, 0xf9, 0xbf, 0xa3, 0x6a, 0x54);
#undef INTERFACE
@ -1066,16 +1066,16 @@ DECLARE_INTERFACE(ID3D10EffectPass)
{
STDMETHOD_(BOOL, IsValid)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_PASS_DESC *pDesc) PURE;
STDMETHOD(GetVertexShaderDesc)(THIS_ D3D10_PASS_SHADER_DESC *pDesc) PURE;
STDMETHOD(GetGeometryShaderDesc)(THIS_ D3D10_PASS_SHADER_DESC *pDesc) PURE;
STDMETHOD(GetPixelShaderDesc)(THIS_ D3D10_PASS_SHADER_DESC *pDesc) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD(Apply)(THIS_ UINT Flags) PURE;
STDMETHOD(ComputeStateBlockMask)(THIS_ D3D10_STATE_BLOCK_MASK *pStateBlockMask) PURE;
};
@ -1100,7 +1100,7 @@ typedef interface ID3D10EffectTechnique ID3D10EffectTechnique;
typedef interface ID3D10EffectTechnique *LPD3D10EFFECTTECHNIQUE;
// {DB122CE8-D1C9-4292-B237-24ED3DE8B175}
DEFINE_GUID(IID_ID3D10EffectTechnique,
DEFINE_GUID(IID_ID3D10EffectTechnique,
0xdb122ce8, 0xd1c9, 0x4292, 0xb2, 0x37, 0x24, 0xed, 0x3d, 0xe8, 0xb1, 0x75);
#undef INTERFACE
@ -1110,13 +1110,13 @@ DECLARE_INTERFACE(ID3D10EffectTechnique)
{
STDMETHOD_(BOOL, IsValid)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_TECHNIQUE_DESC *pDesc) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectPass*, GetPassByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectPass*, GetPassByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD(ComputeStateBlockMask)(THIS_ D3D10_STATE_BLOCK_MASK *pStateBlockMask) PURE;
};
@ -1135,20 +1135,20 @@ typedef struct _D3D10_EFFECT_DESC
//TODO: do we need these?
//LPCSTR Creator;
//UINT Version;
BOOL IsChildEffect; // TRUE if this is a child effect,
BOOL IsChildEffect; // TRUE if this is a child effect,
// FALSE if this is standalone or an effect pool.
UINT ConstantBuffers; // Number of constant buffers in this effect,
// excluding the effect pool.
UINT SharedConstantBuffers; // Number of constant buffers shared in this
// effect's pool.
UINT GlobalVariables; // Number of global variables in this effect,
// excluding the effect pool.
UINT SharedGlobalVariables; // Number of global variables shared in this
// effect's pool.
UINT Techniques; // Number of techniques in this effect,
// excluding the effect pool.
} D3D10_EFFECT_DESC;
@ -1157,7 +1157,7 @@ typedef interface ID3D10Effect ID3D10Effect;
typedef interface ID3D10Effect *LPD3D10EFFECT;
// {51B0CA8B-EC0B-4519-870D-8EE1CB5017C7}
DEFINE_GUID(IID_ID3D10Effect,
DEFINE_GUID(IID_ID3D10Effect,
0x51b0ca8b, 0xec0b, 0x4519, 0x87, 0xd, 0x8e, 0xe1, 0xcb, 0x50, 0x17, 0xc7);
#undef INTERFACE
@ -1169,26 +1169,26 @@ DECLARE_INTERFACE_(ID3D10Effect, IUnknown)
STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
STDMETHOD_(BOOL, IsValid)(THIS) PURE;
STDMETHOD_(BOOL, IsPool)(THIS) PURE;
// Managing D3D Device
STDMETHOD(GetDevice)(THIS_ ID3D10Device** ppDevice) PURE;
// New Reflection APIs
STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_DESC *pDesc) PURE;
STDMETHOD_(ID3D10EffectConstantBuffer*, GetConstantBufferByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectConstantBuffer*, GetConstantBufferByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetVariableByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetVariableByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(ID3D10EffectVariable*, GetVariableBySemantic)(THIS_ LPCSTR Semantic) PURE;
STDMETHOD_(ID3D10EffectTechnique*, GetTechniqueByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10EffectTechnique*, GetTechniqueByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD(Optimize)(THIS) PURE;
STDMETHOD_(BOOL, IsOptimized)(THIS) PURE;
@ -1202,7 +1202,7 @@ typedef interface ID3D10EffectPool ID3D10EffectPool;
typedef interface ID3D10EffectPool *LPD3D10EFFECTPOOL;
// {9537AB04-3250-412e-8213-FCD2F8677933}
DEFINE_GUID(IID_ID3D10EffectPool,
DEFINE_GUID(IID_ID3D10EffectPool,
0x9537ab04, 0x3250, 0x412e, 0x82, 0x13, 0xfc, 0xd2, 0xf8, 0x67, 0x79, 0x33);
#undef INTERFACE
@ -1214,9 +1214,9 @@ DECLARE_INTERFACE_(ID3D10EffectPool, IUnknown)
STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
STDMETHOD_(ID3D10Effect*, AsEffect)(THIS) PURE;
// No public methods
};
@ -1277,16 +1277,16 @@ extern "C" {
// ppEffectPool
// Address of the newly created Effect pool interface
// ppErrors
// If non-NULL, address of a buffer with error messages that occurred
// If non-NULL, address of a buffer with error messages that occurred
// during parsing or compilation
//
//----------------------------------------------------------------------------
HRESULT WINAPI D3D10CompileEffectFromMemory(void *pData, SIZE_T DataLength, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags,
HRESULT WINAPI D3D10CompileEffectFromMemory(void *pData, SIZE_T DataLength, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags,
ID3D10Blob **ppCompiledEffect, ID3D10Blob **ppErrors);
HRESULT WINAPI D3D10CreateEffectFromMemory(void *pData, SIZE_T DataLength, UINT FXFlags, ID3D10Device *pDevice,
HRESULT WINAPI D3D10CreateEffectFromMemory(void *pData, SIZE_T DataLength, UINT FXFlags, ID3D10Device *pDevice,
ID3D10EffectPool *pEffectPool, ID3D10Effect **ppEffect);
HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *pData, SIZE_T DataLength, UINT FXFlags, ID3D10Device *pDevice,

64
src/dep/include/DXSDK/include/D3D10shader.h
View File

@ -33,9 +33,9 @@
// you KNOW will work. (ie. have compiled before without this option.)
// Shaders are always validated by D3D before they are set to the device.
//
// D3D10_SHADER_SKIP_OPTIMIZATION
// D3D10_SHADER_SKIP_OPTIMIZATION
// Instructs the compiler to skip optimization steps during code generation.
// Unless you are trying to isolate a problem in your code using this option
// Unless you are trying to isolate a problem in your code using this option
// is not recommended.
//
// D3D10_SHADER_PACK_MATRIX_ROW_MAJOR
@ -43,8 +43,8 @@
// on input and output from the shader.
//
// D3D10_SHADER_PACK_MATRIX_COLUMN_MAJOR
// Unless explicitly specified, matrices will be packed in column-major
// order on input and output from the shader. This is generally more
// Unless explicitly specified, matrices will be packed in column-major
// order on input and output from the shader. This is generally more
// efficient, since it allows vector-matrix multiplication to be performed
// using a series of dot-products.
//
@ -54,16 +54,16 @@
//
// D3D10_SHADER_FORCE_VS_SOFTWARE_NO_OPT
// Force compiler to compile against the next highest available software
// target for vertex shaders. This flag also turns optimizations off,
// and debugging on.
// target for vertex shaders. This flag also turns optimizations off,
// and debugging on.
//
// D3D10_SHADER_FORCE_PS_SOFTWARE_NO_OPT
// Force compiler to compile against the next highest available software
// target for pixel shaders. This flag also turns optimizations off,
// target for pixel shaders. This flag also turns optimizations off,
// and debugging on.
//
// D3D10_SHADER_NO_PRESHADER
// Disables Preshaders. Using this flag will cause the compiler to not
// Disables Preshaders. Using this flag will cause the compiler to not
// pull out static expression for evaluation on the host cpu
//
// D3D10_SHADER_AVOID_FLOW_CONTROL
@ -289,7 +289,7 @@ typedef struct _D3D10_SHADER_DESC
UINT Version; // Shader version
LPCSTR Creator; // Creator string
UINT Flags; // Shader compilation/parse flags
UINT ConstantBuffers; // Number of constant buffers
UINT BoundResources; // Number of bound resources
UINT InputParameters; // Number of parameters in the input signature
@ -328,7 +328,7 @@ typedef struct _D3D10_SHADER_INPUT_BIND_DESC
D3D10_SHADER_INPUT_TYPE Type; // Type of resource (e.g. texture, cbuffer, etc.)
UINT BindPoint; // Starting bind point
UINT BindCount; // Number of contiguous bind points (for arrays)
D3D10_RESOURCE_RETURN_TYPE ReturnType; // Return type (if texture)
D3D10_RESOURCE_DIMENSION Dimension; // Dimension (if texture)
} D3D10_SHADER_INPUT_BIND_DESC;
@ -342,11 +342,11 @@ typedef struct _D3D10_SIGNATURE_PARAMETER_DESC
D3D10_REGISTER_COMPONENT_TYPE ComponentType;// Scalar type (e.g. uint, float, etc.)
BYTE Mask; // Mask to indicate which components of the register
// are used (combination of D3D10_COMPONENT_MASK values)
BYTE ReadWriteMask; // Mask to indicate whether a given component is
BYTE ReadWriteMask; // Mask to indicate whether a given component is
// never written (if this is an output signature) or
// always read (if this is an input signature).
// (combination of D3D10_COMPONENT_MASK values)
} D3D10_SIGNATURE_PARAMETER_DESC;
//
@ -357,7 +357,7 @@ typedef interface ID3D10ShaderReflectionType ID3D10ShaderReflectionType;
typedef interface ID3D10ShaderReflectionType *LPD3D10SHADERREFLECTIONTYPE;
// {C530AD7D-9B16-4395-A979-BA2ECFF83ADD}
DEFINE_GUID(IID_ID3D10ShaderReflectionType,
DEFINE_GUID(IID_ID3D10ShaderReflectionType,
0xc530ad7d, 0x9b16, 0x4395, 0xa9, 0x79, 0xba, 0x2e, 0xcf, 0xf8, 0x3a, 0xdd);
#undef INTERFACE
@ -366,7 +366,7 @@ DEFINE_GUID(IID_ID3D10ShaderReflectionType,
DECLARE_INTERFACE(ID3D10ShaderReflectionType)
{
STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_TYPE_DESC *pDesc) PURE;
STDMETHOD_(ID3D10ShaderReflectionType*, GetMemberTypeByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10ShaderReflectionType*, GetMemberTypeByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD_(LPCSTR, GetMemberTypeName)(THIS_ UINT Index) PURE;
@ -376,7 +376,7 @@ typedef interface ID3D10ShaderReflectionVariable ID3D10ShaderReflectionVariable;
typedef interface ID3D10ShaderReflectionVariable *LPD3D10SHADERREFLECTIONVARIABLE;
// {1BF63C95-2650-405d-99C1-3636BD1DA0A1}
DEFINE_GUID(IID_ID3D10ShaderReflectionVariable,
DEFINE_GUID(IID_ID3D10ShaderReflectionVariable,
0x1bf63c95, 0x2650, 0x405d, 0x99, 0xc1, 0x36, 0x36, 0xbd, 0x1d, 0xa0, 0xa1);
#undef INTERFACE
@ -385,7 +385,7 @@ DEFINE_GUID(IID_ID3D10ShaderReflectionVariable,
DECLARE_INTERFACE(ID3D10ShaderReflectionVariable)
{
STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_VARIABLE_DESC *pDesc) PURE;
STDMETHOD_(ID3D10ShaderReflectionType*, GetType)(THIS) PURE;
};
@ -393,7 +393,7 @@ typedef interface ID3D10ShaderReflectionConstantBuffer ID3D10ShaderReflectionCon
typedef interface ID3D10ShaderReflectionConstantBuffer *LPD3D10SHADERREFLECTIONCONSTANTBUFFER;
// {66C66A94-DDDD-4b62-A66A-F0DA33C2B4D0}
DEFINE_GUID(IID_ID3D10ShaderReflectionConstantBuffer,
DEFINE_GUID(IID_ID3D10ShaderReflectionConstantBuffer,
0x66c66a94, 0xdddd, 0x4b62, 0xa6, 0x6a, 0xf0, 0xda, 0x33, 0xc2, 0xb4, 0xd0);
#undef INTERFACE
@ -402,7 +402,7 @@ DEFINE_GUID(IID_ID3D10ShaderReflectionConstantBuffer,
DECLARE_INTERFACE(ID3D10ShaderReflectionConstantBuffer)
{
STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_BUFFER_DESC *pDesc) PURE;
STDMETHOD_(ID3D10ShaderReflectionVariable*, GetVariableByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10ShaderReflectionVariable*, GetVariableByName)(THIS_ LPCSTR Name) PURE;
};
@ -411,7 +411,7 @@ typedef interface ID3D10ShaderReflection ID3D10ShaderReflection;
typedef interface ID3D10ShaderReflection *LPD3D10SHADERREFLECTION;
// {D40E20B6-F8F7-42ad-AB20-4BAF8F15DFAA}
DEFINE_GUID(IID_ID3D10ShaderReflection,
DEFINE_GUID(IID_ID3D10ShaderReflection,
0xd40e20b6, 0xf8f7, 0x42ad, 0xab, 0x20, 0x4b, 0xaf, 0x8f, 0x15, 0xdf, 0xaa);
#undef INTERFACE
@ -424,15 +424,15 @@ DECLARE_INTERFACE_(ID3D10ShaderReflection, IUnknown)
STDMETHOD_(ULONG, Release)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_DESC *pDesc) PURE;
STDMETHOD_(ID3D10ShaderReflectionConstantBuffer*, GetConstantBufferByIndex)(THIS_ UINT Index) PURE;
STDMETHOD_(ID3D10ShaderReflectionConstantBuffer*, GetConstantBufferByName)(THIS_ LPCSTR Name) PURE;
STDMETHOD(GetResourceBindingDesc)(THIS_ UINT ResourceIndex, D3D10_SHADER_INPUT_BIND_DESC *pDesc) PURE;
STDMETHOD(GetInputParameterDesc)(THIS_ UINT ParameterIndex, D3D10_SIGNATURE_PARAMETER_DESC *pDesc) PURE;
STDMETHOD(GetOutputParameterDesc)(THIS_ UINT ParameterIndex, D3D10_SIGNATURE_PARAMETER_DESC *pDesc) PURE;
};
//////////////////////////////////////////////////////////////////////////////
@ -483,7 +483,7 @@ extern "C" {
// these are the same messages you will see in your debug output.
//----------------------------------------------------------------------------
HRESULT WINAPI D3D10CompileShader(LPCSTR pSrcData, SIZE_T SrcDataLen, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude,
HRESULT WINAPI D3D10CompileShader(LPCSTR pSrcData, SIZE_T SrcDataLen, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude,
LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags, ID3D10Blob** ppShader, ID3D10Blob** ppErrorMsgs);
//----------------------------------------------------------------------------
@ -521,7 +521,7 @@ UINT WINAPI D3D10GetShaderSize(CONST UINT *pFunction);
//----------------------------------------------------------------------------
// D3D10GetShaderVersion:
// -----------------------
// Returns the shader version of a given shader. Returns zero if the shader
// Returns the shader version of a given shader. Returns zero if the shader
// function is NULL.
//
// Parameters:
@ -561,7 +561,7 @@ LPCSTR WINAPI D3D10GetGeometryShaderProfile(ID3D10Device *pDevice);
// BytecodeLength
// Length of the shader bytecode buffer
// ppReflector
// [out] Returns a ID3D10ShaderReflection object that can be used to
// [out] Returns a ID3D10ShaderReflection object that can be used to
// retrieve shader resource and constant buffer information
//
//----------------------------------------------------------------------------
@ -596,7 +596,7 @@ HRESULT WINAPI D3D10ReflectShader(void *pShaderBytecode, SIZE_T BytecodeLength,
// these are the same messages you will see in your debug output.
//----------------------------------------------------------------------------
HRESULT WINAPI D3D10PreprocessShader(LPCSTR pSrcData, SIZE_T SrcDataSize, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines,
HRESULT WINAPI D3D10PreprocessShader(LPCSTR pSrcData, SIZE_T SrcDataSize, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines,
LPD3D10INCLUDE pInclude, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs);
//////////////////////////////////////////////////////////////////////////
@ -605,14 +605,14 @@ HRESULT WINAPI D3D10PreprocessShader(LPCSTR pSrcData, SIZE_T SrcDataSize, LPCSTR
// ---------------------------------
//
// void *pShaderBytecode - a buffer containing the result of an HLSL
// compilation. Typically this opaque buffer contains several
// compilation. Typically this opaque buffer contains several
// discrete sections including the shader executable code, the input
// signature, and the output signature. This can typically be retrieved
// signature, and the output signature. This can typically be retrieved
// by calling ID3D10Blob::GetBufferPointer() on the returned blob
// from HLSL's compile APIs.
//
// UINT BytecodeLength - the length of pShaderBytecode. This can
// typically be retrieved by calling ID3D10Blob::GetBufferSize()
// UINT BytecodeLength - the length of pShaderBytecode. This can
// typically be retrieved by calling ID3D10Blob::GetBufferSize()
// on the returned blob from HLSL's compile APIs.
//
// ID3D10Blob **ppSignatureBlob(s) - a newly created buffer that
@ -635,6 +635,6 @@ HRESULT D3D10GetInputAndOutputSignatureBlob(void *pShaderBytecode, SIZE_T Byteco
#ifdef __cplusplus
}
#endif //__cplusplus
#endif //__D3D10SHADER_H__

66
src/dep/include/DXSDK/include/D3DX10core.h
View File

@ -17,7 +17,7 @@
#define D3DX10_DLL_A "d3dx10.dll"
#ifdef UNICODE
#define D3DX10_DLL D3DX10_DLL_W
#define D3DX10_DLL D3DX10_DLL_W
#else
#define D3DX10_DLL D3DX10_DLL_A
#endif
@ -30,9 +30,9 @@ extern "C" {
// D3DX10_SDK_VERSION:
// -----------------
// This identifier is passed to D3DX10CheckVersion in order to ensure that an
// application was built against the correct header files and lib files.
// This number is incremented whenever a header (or other) change would
// require applications to be rebuilt. If the version doesn't match,
// application was built against the correct header files and lib files.
// This number is incremented whenever a header (or other) change would
// require applications to be rebuilt. If the version doesn't match,
// D3DX10CreateVersion will return FALSE. (The number itself has no meaning.)
///////////////////////////////////////////////////////////////////////////
@ -57,10 +57,10 @@ UINT WINAPI D3DX10GetDriverLevel(ID3D10Device *pDevice);
// drawing non-overlapping sprites of uniform depth. For example, drawing
// screen-aligned text with ID3DX10Font.
// D3DX10SPRITE_SORT_DEPTH_FRONT_TO_BACK
// Sprites are sorted by depth front-to-back prior to drawing. This is
// Sprites are sorted by depth front-to-back prior to drawing. This is
// recommended when drawing opaque sprites of varying depths.
// D3DX10SPRITE_SORT_DEPTH_BACK_TO_FRONT
// Sprites are sorted by depth back-to-front prior to drawing. This is
// Sprites are sorted by depth back-to-front prior to drawing. This is
// recommended when drawing transparent sprites of varying depths.
// D3DX10SPRITE_ADDREF_TEXTURES
// AddRef/Release all textures passed in to DrawSpritesBuffered
@ -94,7 +94,7 @@ typedef struct _D3DX10_SPRITE
// ------------
// This object intends to provide an easy way to drawing sprites using D3D.
//
// Begin -
// Begin -
// Prepares device for drawing sprites.
//
// Draw -
@ -103,7 +103,7 @@ typedef struct _D3DX10_SPRITE
// Flush -
// Forces all batched sprites to submitted to the device.
//
// End -
// End -
// Restores device state to how it was when Begin was called.
//
//////////////////////////////////////////////////////////////////////////////
@ -113,7 +113,7 @@ typedef interface ID3DX10Sprite *LPD3DX10SPRITE;
// {BA0B762D-8D28-43ec-B9DC-2F84443B0614}
DEFINE_GUID(IID_ID3DX10Sprite,
DEFINE_GUID(IID_ID3DX10Sprite,
0xba0b762d, 0x8d28, 0x43ec, 0xb9, 0xdc, 0x2f, 0x84, 0x44, 0x3b, 0x6, 0x14);
@ -129,7 +129,7 @@ DECLARE_INTERFACE_(ID3DX10Sprite, IUnknown)
// ID3DX10Sprite
STDMETHOD(Begin)(THIS_ UINT flags) PURE;
STDMETHOD(DrawSpritesBuffered)(THIS_ D3DX10_SPRITE *pSprites, UINT cSprites) PURE;
STDMETHOD(Flush)(THIS) PURE;
@ -149,9 +149,9 @@ DECLARE_INTERFACE_(ID3DX10Sprite, IUnknown)
extern "C" {
#endif //__cplusplus
HRESULT WINAPI
D3DX10CreateSprite(
ID3D10Device* pDevice,
HRESULT WINAPI
D3DX10CreateSprite(
ID3D10Device* pDevice,
UINT cDeviceBufferSize,
LPD3DX10SPRITE* ppSprite);
@ -185,7 +185,7 @@ DECLARE_INTERFACE(ID3DX10DataProcessor)
};
// {C93FECFA-6967-478a-ABBC-402D90621FCB}
DEFINE_GUID(IID_ID3DX10ThreadPump,
DEFINE_GUID(IID_ID3DX10ThreadPump,
0xc93fecfa, 0x6967, 0x478a, 0xab, 0xbc, 0x40, 0x2d, 0x90, 0x62, 0x1f, 0xcb);
#undef INTERFACE
@ -201,13 +201,13 @@ DECLARE_INTERFACE_(ID3DX10ThreadPump, IUnknown)
// ID3DX10ThreadPump
STDMETHOD(AddWorkItem)(THIS_ ID3DX10DataLoader *pDataLoader, ID3DX10DataProcessor *pDataProcessor, HRESULT *pHResult, void **ppDeviceObject) PURE;
STDMETHOD_(UINT, GetWorkItemCount)(THIS) PURE;
STDMETHOD(WaitForAllItems)(THIS) PURE;
STDMETHOD(ProcessDeviceWorkItems)(THIS_ UINT iWorkItemCount);
STDMETHOD(PurgeAllItems)(THIS) PURE;
STDMETHOD(GetQueueStatus)(THIS_ UINT *pIoQueue, UINT *pProcessQueue, UINT *pDeviceQueue) PURE;
};
HRESULT WINAPI D3DX10CreateThreadPump(UINT cIoThreads, UINT cProcThreads, ID3DX10ThreadPump **ppThreadPump);
@ -216,7 +216,7 @@ HRESULT WINAPI D3DX10CreateThreadPump(UINT cIoThreads, UINT cProcThreads, ID3DX1
//////////////////////////////////////////////////////////////////////////////
// ID3DX10Font:
// ----------
// Font objects contain the textures and resources needed to render a specific
// Font objects contain the textures and resources needed to render a specific
// font on a specific device.
//
// GetGlyphData -
@ -226,8 +226,8 @@ HRESULT WINAPI D3DX10CreateThreadPump(UINT cIoThreads, UINT cProcThreads, ID3DX1
// Preloads glyphs into the glyph cache textures.
//
// DrawText -
// Draws formatted text on a D3D device. Some parameters are
// surprisingly similar to those of GDI's DrawText function. See GDI
// Draws formatted text on a D3D device. Some parameters are
// surprisingly similar to those of GDI's DrawText function. See GDI
// documentation for a detailed description of these parameters.
// If pSprite is NULL, an internal sprite object will be used.
//
@ -277,7 +277,7 @@ typedef interface ID3DX10Font *LPD3DX10FONT;
// {D79DBB70-5F21-4d36-BBC2-FF525C213CDC}
DEFINE_GUID(IID_ID3DX10Font,
DEFINE_GUID(IID_ID3DX10Font,
0xd79dbb70, 0x5f21, 0x4d36, 0xbb, 0xc2, 0xff, 0x52, 0x5c, 0x21, 0x3c, 0xdc);
@ -342,9 +342,9 @@ extern "C" {
#endif //__cplusplus
HRESULT WINAPI
HRESULT WINAPI
D3DX10CreateFontA(
ID3D10Device* pDevice,
ID3D10Device* pDevice,
INT Height,
UINT Width,
UINT Weight,
@ -357,9 +357,9 @@ HRESULT WINAPI
LPCSTR pFaceName,
LPD3DX10FONT* ppFont);
HRESULT WINAPI
HRESULT WINAPI
D3DX10CreateFontW(
ID3D10Device* pDevice,
ID3D10Device* pDevice,
INT Height,
UINT Width,
UINT Weight,
@ -379,16 +379,16 @@ HRESULT WINAPI
#endif
HRESULT WINAPI
D3DX10CreateFontIndirectA(
ID3D10Device* pDevice,
CONST D3DX10_FONT_DESCA* pDesc,
HRESULT WINAPI
D3DX10CreateFontIndirectA(
ID3D10Device* pDevice,
CONST D3DX10_FONT_DESCA* pDesc,
LPD3DX10FONT* ppFont);
HRESULT WINAPI
D3DX10CreateFontIndirectW(
ID3D10Device* pDevice,
CONST D3DX10_FONT_DESCW* pDesc,
HRESULT WINAPI
D3DX10CreateFontIndirectW(
ID3D10Device* pDevice,
CONST D3DX10_FONT_DESCW* pDesc,
LPD3DX10FONT* ppFont);
#ifdef UNICODE
@ -406,7 +406,7 @@ HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *pDevice);
///////////////////////////////////////////////////////////////////////////
//
// TODO: move these to a central error header file
//
//
#define _FACD3D 0x876
#define MAKE_D3DHRESULT( code ) MAKE_HRESULT( 1, _FACD3D, code )
#define MAKE_D3DSTATUS( code ) MAKE_HRESULT( 0, _FACD3D, code )

106
src/dep/include/DXSDK/include/D3DX10math.h
View File

@ -397,7 +397,7 @@ typedef struct _D3DMATRIX D3DXMATRIX, *LPD3DXMATRIX;
// This class helps keep matrices 16-byte aligned as preferred by P4 cpus.
// It aligns matrices on the stack and on the heap or in global scope.
// It does this using __declspec(align(16)) which works on VC7 and on VC 6
// with the processor pack. Unfortunately there is no way to detect the
// with the processor pack. Unfortunately there is no way to detect the
// latter so this is turned on only on VC7. On other compilers this is the
// the same as D3DXMATRIX.
//
@ -424,9 +424,9 @@ typedef struct _D3DXMATRIXA16 : public D3DXMATRIX
void* operator new[] ( size_t );
// delete operators
void operator delete ( void* ); // These are NOT virtual; Do not
void operator delete ( void* ); // These are NOT virtual; Do not
void operator delete[] ( void* ); // cast to D3DXMATRIX and delete.
// assignment operators
_D3DXMATRIXA16& operator = ( CONST D3DXMATRIX& );
@ -693,7 +693,7 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformCoord
// Transform (x, y, 0, 0) by matrix.
D3DXVECTOR2* WINAPI D3DXVec2TransformNormal
( D3DXVECTOR2 *pOut, CONST D3DXVECTOR2 *pV, CONST D3DXMATRIX *pM );
// Transform Array (x, y, 0, 1) by matrix.
D3DXVECTOR4* WINAPI D3DXVec2TransformArray
( D3DXVECTOR4 *pOut, UINT OutStride, CONST D3DXVECTOR2 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n);
@ -705,8 +705,8 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformCoordArray
// Transform Array (x, y, 0, 0) by matrix.
D3DXVECTOR2* WINAPI D3DXVec2TransformNormalArray
( D3DXVECTOR2 *pOut, UINT OutStride, CONST D3DXVECTOR2 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n );
#ifdef __cplusplus
}
@ -785,14 +785,14 @@ D3DXVECTOR4* WINAPI D3DXVec3Transform
D3DXVECTOR3* WINAPI D3DXVec3TransformCoord
( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV, CONST D3DXMATRIX *pM );
// Transform (x, y, z, 0) by matrix. If you transforming a normal by a
// non-affine matrix, the matrix you pass to this function should be the
// Transform (x, y, z, 0) by matrix. If you transforming a normal by a
// non-affine matrix, the matrix you pass to this function should be the
// transpose of the inverse of the matrix you would use to transform a coord.
D3DXVECTOR3* WINAPI D3DXVec3TransformNormal
( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV, CONST D3DXMATRIX *pM );
// Transform Array (x, y, z, 1) by matrix.
// Transform Array (x, y, z, 1) by matrix.
D3DXVECTOR4* WINAPI D3DXVec3TransformArray
( D3DXVECTOR4 *pOut, UINT OutStride, CONST D3DXVECTOR3 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n );
@ -800,8 +800,8 @@ D3DXVECTOR4* WINAPI D3DXVec3TransformArray
D3DXVECTOR3* WINAPI D3DXVec3TransformCoordArray
( D3DXVECTOR3 *pOut, UINT OutStride, CONST D3DXVECTOR3 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n );
// Transform (x, y, z, 0) by matrix. If you transforming a normal by a
// non-affine matrix, the matrix you pass to this function should be the
// Transform (x, y, z, 0) by matrix. If you transforming a normal by a
// non-affine matrix, the matrix you pass to this function should be the
// transpose of the inverse of the matrix you would use to transform a coord.
D3DXVECTOR3* WINAPI D3DXVec3TransformNormalArray
( D3DXVECTOR3 *pOut, UINT OutStride, CONST D3DXVECTOR3 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n );
@ -815,7 +815,7 @@ D3DXVECTOR3* WINAPI D3DXVec3Project
D3DXVECTOR3* WINAPI D3DXVec3Unproject
( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV, CONST D3D10_VIEWPORT *pViewport,
CONST D3DXMATRIX *pProjection, CONST D3DXMATRIX *pView, CONST D3DXMATRIX *pWorld);
// Project vector Array from object space into screen space
D3DXVECTOR3* WINAPI D3DXVec3ProjectArray
( D3DXVECTOR3 *pOut, UINT OutStride,CONST D3DXVECTOR3 *pV, UINT VStride,CONST D3D10_VIEWPORT *pViewport,
@ -902,7 +902,7 @@ D3DXVECTOR4* WINAPI D3DXVec4BaryCentric
// Transform vector by matrix.
D3DXVECTOR4* WINAPI D3DXVec4Transform
( D3DXVECTOR4 *pOut, CONST D3DXVECTOR4 *pV, CONST D3DXMATRIX *pM );
// Transform vector array by matrix.
D3DXVECTOR4* WINAPI D3DXVec4TransformArray
( D3DXVECTOR4 *pOut, UINT OutStride, CONST D3DXVECTOR4 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n );
@ -934,7 +934,7 @@ FLOAT WINAPI D3DXMatrixDeterminant
( CONST D3DXMATRIX *pM );
HRESULT WINAPI D3DXMatrixDecompose
( D3DXVECTOR3 *pOutScale, D3DXQUATERNION *pOutRotation,
( D3DXVECTOR3 *pOutScale, D3DXQUATERNION *pOutRotation,
D3DXVECTOR3 *pOutTranslation, CONST D3DXMATRIX *pM );
D3DXMATRIX* WINAPI D3DXMatrixTranspose
@ -999,9 +999,9 @@ D3DXMATRIX* WINAPI D3DXMatrixTransformation
// Build 2D transformation matrix in XY plane. NULL arguments are treated as identity.
// Mout = Msc-1 * Msr-1 * Ms * Msr * Msc * Mrc-1 * Mr * Mrc * Mt
D3DXMATRIX* WINAPI D3DXMatrixTransformation2D
( D3DXMATRIX *pOut, CONST D3DXVECTOR2* pScalingCenter,
FLOAT ScalingRotation, CONST D3DXVECTOR2* pScaling,
CONST D3DXVECTOR2* pRotationCenter, FLOAT Rotation,
( D3DXMATRIX *pOut, CONST D3DXVECTOR2* pScalingCenter,
FLOAT ScalingRotation, CONST D3DXVECTOR2* pScaling,
CONST D3DXVECTOR2* pRotationCenter, FLOAT Rotation,
CONST D3DXVECTOR2* pTranslation);
// Build affine transformation matrix. NULL arguments are treated as identity.
@ -1013,7 +1013,7 @@ D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation
// Build 2D affine transformation matrix in XY plane. NULL arguments are treated as identity.
// Mout = Ms * Mrc-1 * Mr * Mrc * Mt
D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation2D
( D3DXMATRIX *pOut, FLOAT Scaling, CONST D3DXVECTOR2* pRotationCenter,
( D3DXMATRIX *pOut, FLOAT Scaling, CONST D3DXVECTOR2* pRotationCenter,
FLOAT Rotation, CONST D3DXVECTOR2* pTranslation);
// Build a lookat matrix. (right-handed)
@ -1157,7 +1157,7 @@ D3DXQUATERNION* WINAPI D3DXQuaternionLn
// if q = (0, theta * v); exp(q) = (cos(theta), sin(theta) * v)
D3DXQUATERNION* WINAPI D3DXQuaternionExp
( D3DXQUATERNION *pOut, CONST D3DXQUATERNION *pQ );
// Spherical linear interpolation between Q1 (t == 0) and Q2 (t == 1).
// Expects unit quaternions.
D3DXQUATERNION* WINAPI D3DXQuaternionSlerp
@ -1172,11 +1172,11 @@ D3DXQUATERNION* WINAPI D3DXQuaternionSquad
CONST D3DXQUATERNION *pC, FLOAT t );
// Setup control points for spherical quadrangle interpolation
// from Q1 to Q2. The control points are chosen in such a way
// from Q1 to Q2. The control points are chosen in such a way
// to ensure the continuity of tangents with adjacent segments.
void WINAPI D3DXQuaternionSquadSetup
( D3DXQUATERNION *pAOut, D3DXQUATERNION *pBOut, D3DXQUATERNION *pCOut,
CONST D3DXQUATERNION *pQ0, CONST D3DXQUATERNION *pQ1,
CONST D3DXQUATERNION *pQ0, CONST D3DXQUATERNION *pQ1,
CONST D3DXQUATERNION *pQ2, CONST D3DXQUATERNION *pQ3 );
// Barycentric interpolation.
@ -1240,7 +1240,7 @@ D3DXPLANE* WINAPI D3DXPlaneFromPoints
// M should be the inverse transpose of the transformation desired.
D3DXPLANE* WINAPI D3DXPlaneTransform
( D3DXPLANE *pOut, CONST D3DXPLANE *pP, CONST D3DXMATRIX *pM );
// Transform an array of planes by a matrix. The vectors (a,b,c) must be normal.
// M should be the inverse transpose of the transformation desired.
D3DXPLANE* WINAPI D3DXPlaneTransformArray
@ -1310,7 +1310,7 @@ extern "C" {
// Calculate Fresnel term given the cosine of theta (likely obtained by
// taking the dot of two normals), and the refraction index of the material.
FLOAT WINAPI D3DXFresnelTerm
(FLOAT CosTheta, FLOAT RefractionIndex);
(FLOAT CosTheta, FLOAT RefractionIndex);
#ifdef __cplusplus
}
@ -1328,7 +1328,7 @@ typedef interface ID3DXMatrixStack ID3DXMatrixStack;
typedef interface ID3DXMatrixStack *LPD3DXMATRIXSTACK;
// {C7885BA7-F990-4fe7-922D-8515E477DD85}
DEFINE_GUID(IID_ID3DXMatrixStack,
DEFINE_GUID(IID_ID3DXMatrixStack,
0xc7885ba7, 0xf990, 0x4fe7, 0x92, 0x2d, 0x85, 0x15, 0xe4, 0x77, 0xdd, 0x85);
@ -1423,9 +1423,9 @@ DECLARE_INTERFACE_(ID3DXMatrixStack, IUnknown)
extern "C" {
#endif
HRESULT WINAPI
D3DXCreateMatrixStack(
UINT Flags,
HRESULT WINAPI
D3DXCreateMatrixStack(
UINT Flags,
LPD3DXMATRIXSTACK* ppStack);
#ifdef __cplusplus
@ -1465,7 +1465,7 @@ extern "C" {
FLOAT* WINAPI D3DXSHEvalDirection
( FLOAT *pOut, UINT Order, CONST D3DXVECTOR3 *pDir );
//============================================================================
//
// D3DXSHRotate:
@ -1488,7 +1488,7 @@ FLOAT* WINAPI D3DXSHEvalDirection
FLOAT* WINAPI D3DXSHRotate
( FLOAT *pOut, UINT Order, CONST D3DXMATRIX *pMatrix, CONST FLOAT *pIn );
//============================================================================
//
// D3DXSHRotateZ:
@ -1511,7 +1511,7 @@ FLOAT* WINAPI D3DXSHRotate
FLOAT* WINAPI D3DXSHRotateZ
( FLOAT *pOut, UINT Order, FLOAT Angle, CONST FLOAT *pIn );
//============================================================================
//
// D3DXSHAdd:
@ -1555,7 +1555,7 @@ FLOAT* WINAPI D3DXSHAdd
FLOAT* WINAPI D3DXSHScale
( FLOAT *pOut, UINT Order, CONST FLOAT *pIn, CONST FLOAT Scale );
//============================================================================
//
// D3DXSHDot:
@ -1585,7 +1585,7 @@ FLOAT WINAPI D3DXSHDot
//
// D3DXSHEvalDirectionalLight:
// --------------------
// Evaluates a directional light and returns spectral SH data. The output
// Evaluates a directional light and returns spectral SH data. The output
// vector is computed so that if the intensity of R/G/B is unit the resulting
// exit radiance of a point directly under the light on a diffuse object with
// an albedo of 1 would be 1.0. This will compute 3 spectral samples, pROut
@ -1607,12 +1607,12 @@ FLOAT WINAPI D3DXSHDot
// pGOut
// Output SH vector for Green (optional.)
// pBOut
// Output SH vector for Blue (optional.)
// Output SH vector for Blue (optional.)
//
//============================================================================
HRESULT WINAPI D3DXSHEvalDirectionalLight
( UINT Order, CONST D3DXVECTOR3 *pDir,
( UINT Order, CONST D3DXVECTOR3 *pDir,
FLOAT RIntensity, FLOAT GIntensity, FLOAT BIntensity,
FLOAT *pROut, FLOAT *pGOut, FLOAT *pBOut );
@ -1620,10 +1620,10 @@ HRESULT WINAPI D3DXSHEvalDirectionalLight
//
// D3DXSHEvalSphericalLight:
// --------------------
// Evaluates a spherical light and returns spectral SH data. There is no
// Evaluates a spherical light and returns spectral SH data. There is no
// normalization of the intensity of the light like there is for directional
// lights, care has to be taken when specifiying the intensities. This will
// compute 3 spectral samples, pROut has to be specified, while pGout and
// lights, care has to be taken when specifiying the intensities. This will
// compute 3 spectral samples, pROut has to be specified, while pGout and
// pBout are optional.
//
// Parameters:
@ -1644,7 +1644,7 @@ HRESULT WINAPI D3DXSHEvalDirectionalLight
// pGOut
// Output SH vector for Green (optional.)
// pBOut
// Output SH vector for Blue (optional.)
// Output SH vector for Blue (optional.)
//
//============================================================================
@ -1682,7 +1682,7 @@ HRESULT WINAPI D3DXSHEvalSphericalLight
// pGOut
// Output SH vector for Green (optional.)
// pBOut
// Output SH vector for Blue (optional.)
// Output SH vector for Blue (optional.)
//
//============================================================================
@ -1690,7 +1690,7 @@ HRESULT WINAPI D3DXSHEvalConeLight
( UINT Order, CONST D3DXVECTOR3 *pDir, FLOAT Radius,
FLOAT RIntensity, FLOAT GIntensity, FLOAT BIntensity,
FLOAT *pROut, FLOAT *pGOut, FLOAT *pBOut );
//============================================================================
//
// D3DXSHEvalHemisphereLight:
@ -1702,7 +1702,7 @@ HRESULT WINAPI D3DXSHEvalConeLight
// is normalized so that a point on a perfectly diffuse surface with no
// shadowing and a normal pointed in the direction pDir would result in exit
// radiance with a value of 1 if the top color was white and the bottom color
// was black. This is a very simple model where Top represents the intensity
// was black. This is a very simple model where Top represents the intensity
// of the "sky" and Bottom represents the intensity of the "ground".
//
// Parameters:
@ -1719,7 +1719,7 @@ HRESULT WINAPI D3DXSHEvalConeLight
// pGOut
// Output SH vector for Green
// pBOut
// Output SH vector for Blue
// Output SH vector for Blue
//
//============================================================================
@ -1729,7 +1729,7 @@ HRESULT WINAPI D3DXSHEvalHemisphereLight
// Math intersection functions
BOOL WINAPI D3DXIntersectTri
BOOL WINAPI D3DXIntersectTri
(
CONST D3DXVECTOR3 *p0, // Triangle vertex 0 position
CONST D3DXVECTOR3 *p1, // Triangle vertex 1 position
@ -1747,27 +1747,27 @@ BOOL WINAPI
CONST D3DXVECTOR3 *pRayPosition,
CONST D3DXVECTOR3 *pRayDirection);
BOOL WINAPI
BOOL WINAPI
D3DXBoxBoundProbe(
CONST D3DXVECTOR3 *pMin,
CONST D3DXVECTOR3 *pMin,
CONST D3DXVECTOR3 *pMax,
CONST D3DXVECTOR3 *pRayPosition,
CONST D3DXVECTOR3 *pRayDirection);
HRESULT WINAPI
HRESULT WINAPI
D3DXComputeBoundingSphere(
CONST D3DXVECTOR3 *pFirstPosition, // pointer to first position
DWORD NumVertices,
DWORD NumVertices,
DWORD dwStride, // count in bytes to subsequent position vectors
D3DXVECTOR3 *pCenter,
D3DXVECTOR3 *pCenter,
FLOAT *pRadius);
HRESULT WINAPI
HRESULT WINAPI
D3DXComputeBoundingBox(
CONST D3DXVECTOR3 *pFirstPosition, // pointer to first position
DWORD NumVertices,
DWORD NumVertices,
DWORD dwStride, // count in bytes to subsequent position vectors
D3DXVECTOR3 *pMin,
D3DXVECTOR3 *pMin,
D3DXVECTOR3 *pMax);

38
src/dep/include/DXSDK/include/D3DX10mesh.h
View File

@ -13,27 +13,27 @@
#define __D3DX10MESH_H__
// {7ED943DD-52E8-40b5-A8D8-76685C406330}
DEFINE_GUID(IID_ID3DX10BaseMesh,
DEFINE_GUID(IID_ID3DX10BaseMesh,
0x7ed943dd, 0x52e8, 0x40b5, 0xa8, 0xd8, 0x76, 0x68, 0x5c, 0x40, 0x63, 0x30);
// {04B0D117-1041-46b1-AA8A-3952848BA22E}
DEFINE_GUID(IID_ID3DX10MeshBuffer,
DEFINE_GUID(IID_ID3DX10MeshBuffer,
0x4b0d117, 0x1041, 0x46b1, 0xaa, 0x8a, 0x39, 0x52, 0x84, 0x8b, 0xa2, 0x2e);
// {4020E5C2-1403-4929-883F-E2E849FAC195}
DEFINE_GUID(IID_ID3DX10Mesh,
DEFINE_GUID(IID_ID3DX10Mesh,
0x4020e5c2, 0x1403, 0x4929, 0x88, 0x3f, 0xe2, 0xe8, 0x49, 0xfa, 0xc1, 0x95);
// {8875769A-D579-4088-AAEB-534D1AD84E96}
DEFINE_GUID(IID_ID3DX10PMesh,
DEFINE_GUID(IID_ID3DX10PMesh,
0x8875769a, 0xd579, 0x4088, 0xaa, 0xeb, 0x53, 0x4d, 0x1a, 0xd8, 0x4e, 0x96);
// {667EA4C7-F1CD-4386-B523-7C0290B83CC5}
DEFINE_GUID(IID_ID3DX10SPMesh,
DEFINE_GUID(IID_ID3DX10SPMesh,
0x667ea4c7, 0xf1cd, 0x4386, 0xb5, 0x23, 0x7c, 0x2, 0x90, 0xb8, 0x3c, 0xc5);
// {3CE6CC22-DBF2-44f4-894D-F9C34A337139}
DEFINE_GUID(IID_ID3DX10PatchMesh,
DEFINE_GUID(IID_ID3DX10PatchMesh,
0x3ce6cc22, 0xdbf2, 0x44f4, 0x89, 0x4d, 0xf9, 0xc3, 0x4a, 0x33, 0x71, 0x39);
@ -85,7 +85,7 @@ typedef D3DX10_WELD_EPSILONS* LPD3DX10_WELD_EPSILONS;
typedef struct _D3DX10_INTERSECT_INFO
{
UINT FaceIndex; // index of face intersected
FLOAT U; // Barycentric Hit Coordinates
FLOAT U; // Barycentric Hit Coordinates
FLOAT V; // Barycentric Hit Coordinates
FLOAT Dist; // Ray-Intersection Parameter Distance
} D3DX10_INTERSECT_INFO, *LPD3DX10_INTERSECT_INFO;
@ -100,7 +100,7 @@ DECLARE_INTERFACE_(ID3DX10MeshBuffer, IUnknown)
STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE;
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
// ID3DX10MeshBuffer
STDMETHOD(Map)(THIS_ void **ppData, SIZE_T *pSize) PURE;
STDMETHOD(Unmap)(THIS) PURE;
@ -145,18 +145,18 @@ DECLARE_INTERFACE_(ID3DX10Mesh, IUnknown)
STDMETHOD(SetPointRepData)(THIS_ CONST UINT *pPointReps) PURE;
STDMETHOD(GetPointRepBuffer)(THIS_ ID3DX10MeshBuffer **ppPointReps) PURE;
STDMETHOD(Discard)(THIS_ D3DX10_MESH_DISCARD_FLAGS dwDiscard) PURE;
STDMETHOD(CloneMesh)(THIS_ UINT Flags, LPCWSTR pPosSemantic, CONST D3D10_INPUT_ELEMENT_DESC *pDesc, UINT DeclCount, ID3DX10Mesh** ppCloneMesh) PURE;
STDMETHOD(Optimize)(THIS_ UINT Flags, UINT * pFaceRemap, LPD3D10BLOB *ppVertexRemap) PURE;
STDMETHOD(GenerateAttributeBufferFromTable)(THIS) PURE;
STDMETHOD(Intersect)(THIS_ D3DXVECTOR3 *pRayPos, D3DXVECTOR3 *pRayDir,
STDMETHOD(Intersect)(THIS_ D3DXVECTOR3 *pRayPos, D3DXVECTOR3 *pRayDir,
UINT *pHitCount, UINT *pFaceIndex, float *pU, float *pV, float *pDist, ID3D10Blob **ppAllHits);
STDMETHOD(IntersectSubset)(THIS_ UINT AttribId, D3DXVECTOR3 *pRayPos, D3DXVECTOR3 *pRayDir,
STDMETHOD(IntersectSubset)(THIS_ UINT AttribId, D3DXVECTOR3 *pRayPos, D3DXVECTOR3 *pRayDir,
UINT *pHitCount, UINT *pFaceIndex, float *pU, float *pV, float *pDist, ID3D10Blob **ppAllHits);
// ID3DX10Mesh - Device functions
STDMETHOD(CommitToDevice)(THIS) PURE;
STDMETHOD(DrawSubset)(THIS_ UINT AttribId) PURE;
@ -172,15 +172,15 @@ DECLARE_INTERFACE_(ID3DX10Mesh, IUnknown)
extern "C" {
#endif //__cplusplus
HRESULT WINAPI
HRESULT WINAPI
D3DX10CreateMesh(
ID3D10Device *pDevice,
CONST D3D10_INPUT_ELEMENT_DESC *pDeclaration,
CONST D3D10_INPUT_ELEMENT_DESC *pDeclaration,
UINT DeclCount,
LPCWSTR pPositionSemantic,
UINT VertexCount,
UINT FaceCount,
UINT Options,
UINT Options,
ID3DX10Mesh **ppMesh);
#ifdef __cplusplus
@ -197,7 +197,7 @@ enum _D3DX10MESHOPT {
D3DX10_MESHOPT_IGNORE_VERTS = 0x10000000, // optimize faces only, don't touch vertices
D3DX10_MESHOPT_DO_NOT_SPLIT = 0x20000000, // do not split vertices shared between attribute groups when attribute sorting
D3DX10_MESHOPT_DEVICE_INDEPENDENT = 0x00400000, // Only affects VCache. uses a static known good cache size for all cards
// D3DX10_MESHOPT_SHAREVB has been removed, please use D3DX10MESH_VB_SHARE instead
};
@ -208,7 +208,7 @@ enum _D3DX10MESHOPT {
//////////////////////////////////////////////////////////////////////////
// {420BD604-1C76-4a34-A466-E45D0658A32C}
DEFINE_GUID(IID_ID3DX10SkinInfo,
DEFINE_GUID(IID_ID3DX10SkinInfo,
0x420bd604, 0x1c76, 0x4a34, 0xa4, 0x66, 0xe4, 0x5d, 0x6, 0x58, 0xa3, 0x2c);
// scaling modes for ID3DX10SkinInfo::Compact() & ID3DX10SkinInfo::UpdateMesh()
@ -264,7 +264,7 @@ extern "C" {
HRESULT WINAPI
D3DX10CreateSkinInfo(LPD3DX10SKININFO* ppSkinInfo);
#ifdef __cplusplus
}
#endif //__cplusplus

38
src/dep/include/DXSDK/include/D3DX10tex.h
View File

@ -27,14 +27,14 @@
// from the source image.
// D3DX10_FILTER_LINEAR
// Each destination pixel is computed by linearly interpolating between
// the nearest pixels in the source image. This filter works best
// the nearest pixels in the source image. This filter works best
// when the scale on each axis is less than 2.
// D3DX10_FILTER_TRIANGLE
// Every pixel in the source image contributes equally to the
// destination image. This is the slowest of all the filters.
// D3DX10_FILTER_BOX
// Each pixel is computed by averaging a 2x2(x2) box pixels from
// the source image. Only works when the dimensions of the
// Each pixel is computed by averaging a 2x2(x2) box pixels from
// the source image. Only works when the dimensions of the
// destination are half those of the source. (as with mip maps)
//
// And can be OR'd with any of these optional flags:
@ -98,7 +98,7 @@ typedef enum D3DX10_FILTER_FLAG
// D3DX10_NORMALMAP_MIRROR
// Same as specifying D3DX10_NORMALMAP_MIRROR_U | D3DX10_NORMALMAP_MIRROR_V
// D3DX10_NORMALMAP_INVERTSIGN
// Inverts the direction of each normal
// Inverts the direction of each normal
// D3DX10_NORMALMAP_COMPUTE_OCCLUSION
// Compute the per pixel Occlusion term and encodes it into the alpha.
// An Alpha of 1 means that the pixel is not obscured in anyway, and
@ -130,7 +130,7 @@ typedef enum D3DX10_NORMALMAP_FLAG
// D3DX10_CHANNEL_ALPHA
// Indicates the alpha channel should be used
// D3DX10_CHANNEL_LUMINANCE
// Indicates the luminaces of the red green and blue channels should be
// Indicates the luminaces of the red green and blue channels should be
// used.
//
//----------------------------------------------------------------------------
@ -171,7 +171,7 @@ typedef enum _D3DX10_IMAGE_FILE_FORMAT
// ---------------
// This structure is used to return a rough description of what the
// the original contents of an image file looked like.
//
//
// Width
// Width of original image in pixels
// Height
@ -222,10 +222,10 @@ extern "C" {
//----------------------------------------------------------------------------
// D3DX10_IMAGE_LOAD_INFO:
// ---------------
// This structure can be optionally passed in to texture loader APIs to
// This structure can be optionally passed in to texture loader APIs to
// control how textures get loaded. Pass in D3DX10_DEFAULT for any of these
// to have D3DX automatically pick defaults based on the source file.
//
//
// Width
// Rescale texture to Width texels wide
// Height
@ -249,10 +249,10 @@ extern "C" {
// Filter
// Filter the texture using the specified filter (only when resampling)
// MipFilter
// Filter the texture mip levels using the specified filter (only if
// Filter the texture mip levels using the specified filter (only if
// generating mips)
// pSrcInfo
// (optional) pointer to a D3DX10_IMAGE_INFO structure that will get
// (optional) pointer to a D3DX10_IMAGE_INFO structure that will get
// populated with source image information
//
//----------------------------------------------------------------------------
@ -274,7 +274,7 @@ typedef struct _D3DX10_IMAGE_LOAD_INFO
UINT Filter;
UINT MipFilter;
D3DX10_IMAGE_INFO* pSrcInfo;
#ifdef __cplusplus
_D3DX10_IMAGE_LOAD_INFO()
{
@ -291,7 +291,7 @@ typedef struct _D3DX10_IMAGE_LOAD_INFO
Filter = D3DX10_DEFAULT;
MipFilter = D3DX10_DEFAULT;
pSrcInfo = NULL;
}
}
#endif
} D3DX10_IMAGE_LOAD_INFO;
@ -338,7 +338,7 @@ HRESULT WINAPI D3DX10CreateAsyncShaderResourceViewProcessor(ID3D10Device *pDevic
// pPump
// Optional pointer to a thread pump object to use.
// pSrcInfo
// Pointer to a D3DX10_IMAGE_INFO structure to be filled in with the
// Pointer to a D3DX10_IMAGE_INFO structure to be filled in with the
// description of the data in the source image file.
//
//----------------------------------------------------------------------------
@ -505,8 +505,8 @@ HRESULT WINAPI
ID3D10Device* pDevice,
HMODULE hSrcModule,
LPCSTR pSrcResource,
D3DX10_IMAGE_LOAD_INFO *pLoadInfo,
ID3DX10ThreadPump* pPump,
D3DX10_IMAGE_LOAD_INFO *pLoadInfo,
ID3DX10ThreadPump* pPump,
ID3D10Resource** ppTexture);
HRESULT WINAPI
@ -533,7 +533,7 @@ HRESULT WINAPI
LPCVOID pSrcData,
SIZE_T SrcDataSize,
D3DX10_IMAGE_LOAD_INFO *pLoadInfo,
ID3DX10ThreadPump* pPump,
ID3DX10ThreadPump* pPump,
ID3D10ShaderResourceView** ppShaderResourceView);
HRESULT WINAPI
@ -541,8 +541,8 @@ HRESULT WINAPI
ID3D10Device* pDevice,
LPCVOID pSrcData,
SIZE_T SrcDataSize,
D3DX10_IMAGE_LOAD_INFO *pLoadInfo,
ID3DX10ThreadPump* pPump,
D3DX10_IMAGE_LOAD_INFO *pLoadInfo,
ID3DX10ThreadPump* pPump,
ID3D10Resource** ppTexture);
@ -610,7 +610,7 @@ HRESULT WINAPI
//
// Parameters
// pSrcTexture
// Pointer to the source heightmap texture
// Pointer to the source heightmap texture
// Flags
// D3DX10_NORMALMAP flags
// Channel

966
src/dep/include/DXSDK/include/DXGI.h
View File

File diff suppressed because it is too large Load Diff

22
src/dep/include/DXSDK/include/DXGIType.h
View File

@ -7,8 +7,8 @@
/* Compiler settings for dxgitype.idl:
Oicf, W1, Zp8, env=Win32 (32b run)
protocol : dce , ms_ext, c_ext, robust
error checks: allocation ref bounds_check enum stub_data
VC __declspec() decoration level:
error checks: allocation ref bounds_check enum stub_data
VC __declspec() decoration level:
__declspec(uuid()), __declspec(selectany), __declspec(novtable)
DECLSPEC_UUID(), MIDL_INTERFACE()
*/
@ -42,7 +42,7 @@
#pragma once
#endif
/* Forward Declarations */
/* Forward Declarations */
/* header files for imported files */
#include "oaidl.h"
@ -50,11 +50,11 @@
#ifdef __cplusplus
extern "C"{
#endif
#endif
/* interface __MIDL_itf_dxgitype_0000_0000 */
/* [local] */
/* [local] */
#define _FACDXGI 0x87a
#define MAKE_DXGI_HRESULT( code ) MAKE_HRESULT( 1, _FACDXGI, code )
@ -84,7 +84,7 @@ extern "C"{
#define DXGI_USAGE_PRIMARY ( 1L << (4 + 4) )
typedef UINT DXGI_USAGE;
typedef
typedef
enum DXGI_FORMAT
{ DXGI_FORMAT_UNKNOWN = 0,
DXGI_FORMAT_R32G32B32A32_TYPELESS = 1,
@ -216,7 +216,7 @@ typedef struct DXGI_RATIONAL
UINT Denominator;
} DXGI_RATIONAL;
typedef
typedef
enum DXGI_MODE_SCANLINE_ORDER
{ DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED = 0,
DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE = 1,
@ -224,14 +224,14 @@ enum DXGI_MODE_SCANLINE_ORDER
DXGI_MODE_SCANLINE_ORDER_LOWER_FIELD_FIRST = 3
} DXGI_MODE_SCANLINE_ORDER;
typedef
typedef
enum DXGI_MODE_SCALING
{ DXGI_MODE_SCALING_UNSPECIFIED = 0,
DXGI_MODE_SCALING_CENTERED = 1,
DXGI_MODE_SCALING_STRETCHED = 2
} DXGI_MODE_SCALING;
typedef
typedef
enum DXGI_MODE_ROTATION
{ DXGI_MODE_ROTATION_UNSPECIFIED = 0,
DXGI_MODE_ROTATION_IDENTITY = 1,
@ -306,7 +306,7 @@ typedef struct DXGI_SHARED_RESOURCE
#define DXGI_RESOURCE_PRIORITY_MAXIMUM ( 0xc8000000 )
typedef
typedef
enum DXGI_RESIDENCY
{ DXGI_RESIDENCY_FULLY_RESIDENT = 1,
DXGI_RESIDENCY_RESIDENT_IN_SHARED_MEMORY = 2,
@ -321,7 +321,7 @@ typedef struct DXGI_SURFACE_DESC
DXGI_SAMPLE_DESC SampleDesc;
} DXGI_SURFACE_DESC;
typedef
typedef
enum DXGI_SWAP_EFFECT
{ DXGI_SWAP_EFFECT_DISCARD = 0,
DXGI_SWAP_EFFECT_COPY = 1

22
src/dep/include/DXSDK/include/DxErr.h
View File

@ -15,13 +15,13 @@ extern "C" {
//
// DXGetErrorString
//
// Desc: Converts a DirectX HRESULT to a string
//
// Desc: Converts a DirectX HRESULT to a string
//
// Args: HRESULT hr Can be any error code from
// XACT D3D10 D3DX10 D3D9 D3DX9 D3D8 D3DX8 DDRAW DPLAY8 DMUSIC DSOUND DINPUT DSHOW
//
// Return: Converted string
// Return: Converted string
//
const char* WINAPI DXGetErrorStringA(HRESULT hr);
const WCHAR* WINAPI DXGetErrorStringW(HRESULT hr);
@ -30,16 +30,16 @@ const WCHAR* WINAPI DXGetErrorStringW(HRESULT hr);
#define DXGetErrorString DXGetErrorStringW
#else
#define DXGetErrorString DXGetErrorStringA
#endif
#endif
//
// DXGetErrorDescription
//
//
// Desc: Returns a string description of a DirectX HRESULT
//
// Args: HRESULT hr Can be any error code from
// XACT D3D10 D3DX10 D3D9 D3DX9 D3D8 D3DX8 DDRAW DPLAY8 DMUSIC DSOUND DINPUT DSHOW
// XACT D3D10 D3DX10 D3D9 D3DX9 D3D8 D3DX8 DDRAW DPLAY8 DMUSIC DSOUND DINPUT DSHOW
//
// Return: String description
//
@ -50,7 +50,7 @@ const WCHAR* WINAPI DXGetErrorDescriptionW(HRESULT hr);
#define DXGetErrorDescription DXGetErrorDescriptionW
#else
#define DXGetErrorDescription DXGetErrorDescriptionA
#endif
#endif
//
@ -58,15 +58,15 @@ const WCHAR* WINAPI DXGetErrorDescriptionW(HRESULT hr);
//
// Desc: Outputs a formatted error message to the debug stream
//
// Args: CHAR* strFile The current file, typically passed in using the
// Args: CHAR* strFile The current file, typically passed in using the
// __FILE__ macro.
// DWORD dwLine The current line number, typically passed in using the
// DWORD dwLine The current line number, typically passed in using the
// __LINE__ macro.
// HRESULT hr An HRESULT that will be traced to the debug stream.
// CHAR* strMsg A string that will be traced to the debug stream (may be NULL)
// BOOL bPopMsgBox If TRUE, then a message box will popup also containing the passed info.
//
// Return: The hr that was passed in.
// Return: The hr that was passed in.
//
HRESULT WINAPI DXTraceA( const char* strFile, DWORD dwLine, HRESULT hr, const char* strMsg, BOOL bPopMsgBox );
HRESULT WINAPI DXTraceW( const char* strFile, DWORD dwLine, HRESULT hr, const WCHAR* strMsg, BOOL bPopMsgBox );
@ -75,7 +75,7 @@ HRESULT WINAPI DXTraceW( const char* strFile, DWORD dwLine, HRESULT hr, const WC
#define DXTrace DXTraceW
#else
#define DXTrace DXTraceA
#endif
#endif
//

10
src/dep/include/DXSDK/include/PIXPlugin.h
View File

@ -9,7 +9,7 @@
#pragma once
#ifdef __cplusplus
extern "C"
extern "C"
{
#endif
@ -55,7 +55,7 @@ struct PIXPLUGININFO
//==================================================================================================
// PIXCOUNTERINFO - This structure is filled out by PIXGetCounterInfo and passed back to PIX
// PIXCOUNTERINFO - This structure is filled out by PIXGetCounterInfo and passed back to PIX
// to allow PIX to determine information about the counters in the plugin.
//==================================================================================================
struct PIXCOUNTERINFO
@ -73,7 +73,7 @@ BOOL WINAPI PIXGetPluginInfo( PIXPLUGININFO* pPIXPluginInfo );
//==================================================================================================
// PIXGetCounterInfo - This returns an array of PIXCOUNTERINFO structs to PIX.
// PIXGetCounterInfo - This returns an array of PIXCOUNTERINFO structs to PIX.
// These PIXCOUNTERINFOs allow PIX to enumerate the counters contained
// in this plugin.
//==================================================================================================
@ -96,8 +96,8 @@ BOOL WINAPI PIXBeginExperiment( PIXCOUNTERID id, const WCHAR* pstrApplication );
// PIXEndFrame - This is called by PIX once per counter at the end of each frame to gather the
// counter value for that frame. Note that the pointer to the return data must
// continue to point to valid counter data until the next call to PIXEndFrame (or
// PIXEndExperiment) for the same counter. So do not set *ppReturnData to the same
// pointer for multiple counters, or point to a local variable that will go out of
// PIXEndExperiment) for the same counter. So do not set *ppReturnData to the same
// pointer for multiple counters, or point to a local variable that will go out of
// scope. See the sample PIX plugin for an example of how to structure a plugin
// properly.
//==================================================================================================

4
src/dep/include/DXSDK/include/XInput.h
View File

@ -19,7 +19,7 @@
#define XINPUT_DLL XINPUT_DLL_W
#else
#define XINPUT_DLL XINPUT_DLL_A
#endif
#endif
//
// Device types available in XINPUT_CAPABILITIES
@ -135,7 +135,7 @@ DWORD WINAPI XInputGetCapabilities
void WINAPI XInputEnable
(
BOOL enable // [in] Indicates weather xinput is enabled or disabled.
BOOL enable // [in] Indicates weather xinput is enabled or disabled.
);

30
src/dep/include/DXSDK/include/d3d10misc.h
View File

@ -28,7 +28,7 @@ typedef interface ID3D10Blob ID3D10Blob;
typedef interface ID3D10Blob *LPD3D10BLOB;
// {8BA5FB08-5195-40e2-AC58-0D989C3A0102}
DEFINE_GUID(IID_ID3D10Blob,
DEFINE_GUID(IID_ID3D10Blob,
0x8ba5fb08, 0x5195, 0x40e2, 0xac, 0x58, 0xd, 0x98, 0x9c, 0x3a, 0x1, 0x2);
#undef INTERFACE
@ -68,7 +68,7 @@ typedef enum D3D10_DRIVER_TYPE
D3D10_DRIVER_TYPE_SOFTWARE = 3,
} D3D10_DRIVER_TYPE;
DEFINE_GUID(GUID_DeviceType,
DEFINE_GUID(GUID_DeviceType,
0xd722fb4d, 0x7a68, 0x437a, 0xb2, 0x0c, 0x58, 0x04, 0xee, 0x24, 0x94, 0xa6);
///////////////////////////////////////////////////////////////////////////
@ -76,13 +76,13 @@ DEFINE_GUID(GUID_DeviceType,
// ------------------
//
// pAdapter
// If NULL, D3D10CreateDevice will choose the primary adapter and
// If NULL, D3D10CreateDevice will choose the primary adapter and
// create a new instance from a temporarily created IDXGIFactory.
// If non-NULL, D3D10CreateDevice will register the appropriate
// device, if necessary (via IDXGIAdapter::RegisterDrver), before
// If non-NULL, D3D10CreateDevice will register the appropriate
// device, if necessary (via IDXGIAdapter::RegisterDrver), before
// creating the device.
// DriverType
// Specifies the driver type to be created: hardware, reference or
// Specifies the driver type to be created: hardware, reference or
// null.
// Software
// HMODULE of a DLL implementing a software rasterizer. Must be NULL for
@ -95,12 +95,12 @@ DEFINE_GUID(GUID_DeviceType,
// Pointer to returned interface.
//
// Return Values
// Any of those documented for
// Any of those documented for
// CreateDXGIFactory
// IDXGIFactory::EnumAdapters
// IDXGIAdapter::RegisterDriver
// D3D10CreateDevice
//
//
///////////////////////////////////////////////////////////////////////////
HRESULT WINAPI D3D10CreateDevice(
IDXGIAdapter *pAdapter,
@ -115,13 +115,13 @@ HRESULT WINAPI D3D10CreateDevice(
// ------------------------------
//
// ppAdapter
// If NULL, D3D10CreateDevice will choose the primary adapter and
// If NULL, D3D10CreateDevice will choose the primary adapter and
// create a new instance from a temporarily created IDXGIFactory.
// If non-NULL, D3D10CreateDevice will register the appropriate
// device, if necessary (via IDXGIAdapter::RegisterDrver), before
// If non-NULL, D3D10CreateDevice will register the appropriate
// device, if necessary (via IDXGIAdapter::RegisterDrver), before
// creating the device.
// DriverType
// Specifies the driver type to be created: hardware, reference or
// Specifies the driver type to be created: hardware, reference or
// null.
// Software
// HMODULE of a DLL implementing a software rasterizer. Must be NULL for
@ -138,13 +138,13 @@ HRESULT WINAPI D3D10CreateDevice(
// Pointer to returned interface.
//
// Return Values
// Any of those documented for
// Any of those documented for
// CreateDXGIFactory
// IDXGIFactory::EnumAdapters
// IDXGIAdapter::RegisterDriver
// D3D10CreateDevice
// IDXGIFactory::CreateSwapChain
//
//
///////////////////////////////////////////////////////////////////////////
HRESULT WINAPI D3D10CreateDeviceAndSwapChain(
IDXGIAdapter *pAdapter,
@ -153,7 +153,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(
UINT Flags,
UINT SDKVersion,
DXGI_SWAP_CHAIN_DESC *pSwapChainDesc,
IDXGISwapChain **ppSwapChain,
IDXGISwapChain **ppSwapChain,
ID3D10Device **ppDevice);

418
src/dep/include/DXSDK/include/d3d10sdklayers.h
View File

@ -7,8 +7,8 @@
/* Compiler settings for d3d10sdklayers.idl:
Oicf, W1, Zp8, env=Win32 (32b run)
protocol : dce , ms_ext, c_ext, robust
error checks: allocation ref bounds_check enum stub_data
VC __declspec() decoration level:
error checks: allocation ref bounds_check enum stub_data
VC __declspec() decoration level:
__declspec(uuid()), __declspec(selectany), __declspec(novtable)
DECLSPEC_UUID(), MIDL_INTERFACE()
*/
@ -46,7 +46,7 @@
#pragma once
#endif
/* Forward Declarations */
/* Forward Declarations */
#ifndef __ID3D10Debug_FWD_DEFINED__
#define __ID3D10Debug_FWD_DEFINED__
@ -66,11 +66,11 @@ typedef interface ID3D10InfoQueue ID3D10InfoQueue;
#ifdef __cplusplus
extern "C"{
#endif
#endif
/* interface __MIDL_itf_d3d10sdklayers_0000_0000 */
/* [local] */
/* [local] */
#define D3D10_SDK_LAYERS_VERSION ( 2 )
@ -85,54 +85,54 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10sdklayers_0000_0000_v0_0_s_ifspec;
#define __ID3D10Debug_INTERFACE_DEFINED__
/* interface ID3D10Debug */
/* [unique][local][object][uuid] */
/* [unique][local][object][uuid] */
EXTERN_C const IID IID_ID3D10Debug;
#if defined(__cplusplus) && !defined(CINTERFACE)
MIDL_INTERFACE("9B7E4E01-342C-4106-A19F-4F2704F689F0")
ID3D10Debug : public IUnknown
{
public:
virtual HRESULT STDMETHODCALLTYPE SetFeatureMask(
virtual HRESULT STDMETHODCALLTYPE SetFeatureMask(
UINT Mask) = 0;
virtual UINT STDMETHODCALLTYPE GetFeatureMask( void) = 0;
virtual HRESULT STDMETHODCALLTYPE Validate( void) = 0;
};
#else /* C style interface */
typedef struct ID3D10DebugVtbl
{
BEGIN_INTERFACE
HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
ID3D10Debug * This,
/* [in] */ REFIID riid,
/* [iid_is][out] */
/* [iid_is][out] */
__RPC__deref_out void **ppvObject);
ULONG ( STDMETHODCALLTYPE *AddRef )(
ULONG ( STDMETHODCALLTYPE *AddRef )(
ID3D10Debug * This);
ULONG ( STDMETHODCALLTYPE *Release )(
ULONG ( STDMETHODCALLTYPE *Release )(
ID3D10Debug * This);
HRESULT ( STDMETHODCALLTYPE *SetFeatureMask )(
HRESULT ( STDMETHODCALLTYPE *SetFeatureMask )(
ID3D10Debug * This,
UINT Mask);
UINT ( STDMETHODCALLTYPE *GetFeatureMask )(
UINT ( STDMETHODCALLTYPE *GetFeatureMask )(
ID3D10Debug * This);
HRESULT ( STDMETHODCALLTYPE *Validate )(
HRESULT ( STDMETHODCALLTYPE *Validate )(
ID3D10Debug * This);
END_INTERFACE
} ID3D10DebugVtbl;
@ -141,29 +141,29 @@ EXTERN_C const IID IID_ID3D10Debug;
CONST_VTBL struct ID3D10DebugVtbl *lpVtbl;
};
#ifdef COBJMACROS
#define ID3D10Debug_QueryInterface(This,riid,ppvObject) \
( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
#define ID3D10Debug_AddRef(This) \
( (This)->lpVtbl -> AddRef(This) )
( (This)->lpVtbl -> AddRef(This) )
#define ID3D10Debug_Release(This) \
( (This)->lpVtbl -> Release(This) )
( (This)->lpVtbl -> Release(This) )
#define ID3D10Debug_SetFeatureMask(This,Mask) \
( (This)->lpVtbl -> SetFeatureMask(This,Mask) )
( (This)->lpVtbl -> SetFeatureMask(This,Mask) )
#define ID3D10Debug_GetFeatureMask(This) \
( (This)->lpVtbl -> GetFeatureMask(This) )
( (This)->lpVtbl -> GetFeatureMask(This) )
#define ID3D10Debug_Validate(This) \
( (This)->lpVtbl -> Validate(This) )
( (This)->lpVtbl -> Validate(This) )
#endif /* COBJMACROS */
@ -177,9 +177,9 @@ EXTERN_C const IID IID_ID3D10Debug;
/* interface __MIDL_itf_d3d10sdklayers_0000_0001 */
/* [local] */
/* [local] */
typedef
typedef
enum D3D10_MESSAGE_CATEGORY
{ D3D10_MESSAGE_CATEGORY_APPLICATION_DEFINED = 0,
D3D10_MESSAGE_CATEGORY_MISCELLANEOUS = ( D3D10_MESSAGE_CATEGORY_APPLICATION_DEFINED + 1 ) ,
@ -190,18 +190,18 @@ enum D3D10_MESSAGE_CATEGORY
D3D10_MESSAGE_CATEGORY_STATE_SETTING = ( D3D10_MESSAGE_CATEGORY_STATE_CREATION + 1 ) ,
D3D10_MESSAGE_CATEGORY_STATE_GETTING = ( D3D10_MESSAGE_CATEGORY_STATE_SETTING + 1 ) ,
D3D10_MESSAGE_CATEGORY_RESOURCE_MANIPULATION = ( D3D10_MESSAGE_CATEGORY_STATE_GETTING + 1 ) ,
D3D10_MESSAGE_CATEGORY_EXECUTION = ( D3D10_MESSAGE_CATEGORY_RESOURCE_MANIPULATION + 1 )
D3D10_MESSAGE_CATEGORY_EXECUTION = ( D3D10_MESSAGE_CATEGORY_RESOURCE_MANIPULATION + 1 )
} D3D10_MESSAGE_CATEGORY;
typedef
typedef
enum D3D10_MESSAGE_SEVERITY
{ D3D10_MESSAGE_SEVERITY_CORRUPTION = 0,
D3D10_MESSAGE_SEVERITY_ERROR = ( D3D10_MESSAGE_SEVERITY_CORRUPTION + 1 ) ,
D3D10_MESSAGE_SEVERITY_WARNING = ( D3D10_MESSAGE_SEVERITY_ERROR + 1 ) ,
D3D10_MESSAGE_SEVERITY_INFO = ( D3D10_MESSAGE_SEVERITY_WARNING + 1 )
D3D10_MESSAGE_SEVERITY_INFO = ( D3D10_MESSAGE_SEVERITY_WARNING + 1 )
} D3D10_MESSAGE_SEVERITY;
typedef
typedef
enum D3D10_MESSAGE_ID
{ D3D10_MESSAGE_ID_UNKNOWN = 0,
D3D10_MESSAGE_ID_STRING_FROM_APPLICATION = ( D3D10_MESSAGE_ID_UNKNOWN + 1 ) ,
@ -594,7 +594,7 @@ enum D3D10_MESSAGE_ID
D3D10_MESSAGE_ID_DEVICE_PSGETCONSTANTBUFFERS_BUFFERS_EMPTY = ( D3D10_MESSAGE_ID_DEVICE_PSGETSHADERRESOURCES_VIEWS_EMPTY + 1 ) ,
D3D10_MESSAGE_ID_DEVICE_PSGETSAMPLERS_SAMPLERS_EMPTY = ( D3D10_MESSAGE_ID_DEVICE_PSGETCONSTANTBUFFERS_BUFFERS_EMPTY + 1 ) ,
D3D10_MESSAGE_ID_DEVICE_RSGETVIEWPORTS_VIEWPORTS_EMPTY = ( D3D10_MESSAGE_ID_DEVICE_PSGETSAMPLERS_SAMPLERS_EMPTY + 1 ) ,
D3D10_MESSAGE_ID_DEVICE_RSGETSCISSORRECTS_RECTS_EMPTY = ( D3D10_MESSAGE_ID_DEVICE_RSGETVIEWPORTS_VIEWPORTS_EMPTY + 1 )
D3D10_MESSAGE_ID_DEVICE_RSGETSCISSORRECTS_RECTS_EMPTY = ( D3D10_MESSAGE_ID_DEVICE_RSGETVIEWPORTS_VIEWPORTS_EMPTY + 1 )
} D3D10_MESSAGE_ID;
typedef struct D3D10_MESSAGE
@ -632,244 +632,244 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10sdklayers_0000_0001_v0_0_s_ifspec;
#define __ID3D10InfoQueue_INTERFACE_DEFINED__
/* interface ID3D10InfoQueue */
/* [unique][local][object][uuid] */
/* [unique][local][object][uuid] */
EXTERN_C const IID IID_ID3D10InfoQueue;
#if defined(__cplusplus) && !defined(CINTERFACE)
MIDL_INTERFACE("1b940b17-2642-4d1f-ab1f-b99bad0c395f")
ID3D10InfoQueue : public IUnknown
{
public:
virtual HRESULT STDMETHODCALLTYPE SetMessageCountLimit(
/* */
virtual HRESULT STDMETHODCALLTYPE SetMessageCountLimit(
/* */
__in UINT64 MessageCountLimit) = 0;
virtual void STDMETHODCALLTYPE ClearStoredMessages( void) = 0;
virtual HRESULT STDMETHODCALLTYPE GetMessage(
/* */
virtual HRESULT STDMETHODCALLTYPE GetMessage(
/* */
__in UINT64 MessageIndex,
/* */
/* */
__out_bcount_opt(*pMessageByteLength) D3D10_MESSAGE *pMessage,
/* */
/* */
__inout SIZE_T *pMessageByteLength) = 0;
virtual UINT64 STDMETHODCALLTYPE GetNumMessagesAllowedByStorageFilter( void) = 0;
virtual UINT64 STDMETHODCALLTYPE GetNumMessagesDeniedByStorageFilter( void) = 0;
virtual UINT64 STDMETHODCALLTYPE GetNumStoredMessages( void) = 0;
virtual UINT64 STDMETHODCALLTYPE GetNumStoredMessagesAllowedByRetrievalFilter( void) = 0;
virtual UINT64 STDMETHODCALLTYPE GetNumMessagesDiscardedByMessageCountLimit( void) = 0;
virtual UINT64 STDMETHODCALLTYPE GetMessageCountLimit( void) = 0;
virtual HRESULT STDMETHODCALLTYPE AddStorageFilterEntries(
/* */
virtual HRESULT STDMETHODCALLTYPE AddStorageFilterEntries(
/* */
__in D3D10_INFO_QUEUE_FILTER *pFilter) = 0;
virtual HRESULT STDMETHODCALLTYPE GetStorageFilter(
/* */
virtual HRESULT STDMETHODCALLTYPE GetStorageFilter(
/* */
__out_bcount_opt(*pFilterByteLength) D3D10_INFO_QUEUE_FILTER *pFilter,
/* */
/* */
__inout SIZE_T *pFilterByteLength) = 0;
virtual void STDMETHODCALLTYPE ClearStorageFilter( void) = 0;
virtual HRESULT STDMETHODCALLTYPE PushEmptyStorageFilter( void) = 0;
virtual HRESULT STDMETHODCALLTYPE PushCopyOfStorageFilter( void) = 0;
virtual HRESULT STDMETHODCALLTYPE PushStorageFilter(
/* */
virtual HRESULT STDMETHODCALLTYPE PushStorageFilter(
/* */
__in D3D10_INFO_QUEUE_FILTER *pFilter) = 0;
virtual void STDMETHODCALLTYPE PopStorageFilter( void) = 0;
virtual UINT STDMETHODCALLTYPE GetStorageFilterStackSize( void) = 0;
virtual HRESULT STDMETHODCALLTYPE AddRetrievalFilterEntries(
/* */
virtual HRESULT STDMETHODCALLTYPE AddRetrievalFilterEntries(
/* */
__in D3D10_INFO_QUEUE_FILTER *pFilter) = 0;
virtual HRESULT STDMETHODCALLTYPE GetRetrievalFilter(
/* */
virtual HRESULT STDMETHODCALLTYPE GetRetrievalFilter(
/* */
__out_bcount_opt(*pFilterByteLength) D3D10_INFO_QUEUE_FILTER *pFilter,
/* */
/* */
__inout SIZE_T *pFilterByteLength) = 0;
virtual void STDMETHODCALLTYPE ClearRetrievalFilter( void) = 0;
virtual HRESULT STDMETHODCALLTYPE PushEmptyRetrievalFilter( void) = 0;
virtual HRESULT STDMETHODCALLTYPE PushCopyOfRetrievalFilter( void) = 0;
virtual HRESULT STDMETHODCALLTYPE PushRetrievalFilter(
/* */
virtual HRESULT STDMETHODCALLTYPE PushRetrievalFilter(
/* */
__in D3D10_INFO_QUEUE_FILTER *pFilter) = 0;
virtual void STDMETHODCALLTYPE PopRetrievalFilter( void) = 0;
virtual UINT STDMETHODCALLTYPE GetRetrievalFilterStackSize( void) = 0;
virtual HRESULT STDMETHODCALLTYPE AddMessage(
/* */
virtual HRESULT STDMETHODCALLTYPE AddMessage(
/* */
__in D3D10_MESSAGE_CATEGORY Category,
/* */
/* */
__in D3D10_MESSAGE_SEVERITY Severity,
/* */
/* */
__in D3D10_MESSAGE_ID ID,
/* */
/* */
__in LPCWSTR pDescription) = 0;
virtual HRESULT STDMETHODCALLTYPE AddApplicationMessage(
/* */
virtual HRESULT STDMETHODCALLTYPE AddApplicationMessage(
/* */
__in D3D10_MESSAGE_SEVERITY Severity,
/* */
/* */
__in LPCWSTR pDescription) = 0;
};
#else /* C style interface */
typedef struct ID3D10InfoQueueVtbl
{
BEGIN_INTERFACE
HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
ID3D10InfoQueue * This,
/* [in] */ REFIID riid,
/* [iid_is][out] */
/* [iid_is][out] */
__RPC__deref_out void **ppvObject);
ULONG ( STDMETHODCALLTYPE *AddRef )(
ULONG ( STDMETHODCALLTYPE *AddRef )(
ID3D10InfoQueue * This);
ULONG ( STDMETHODCALLTYPE *Release )(
ULONG ( STDMETHODCALLTYPE *Release )(
ID3D10InfoQueue * This);
HRESULT ( STDMETHODCALLTYPE *SetMessageCountLimit )(
HRESULT ( STDMETHODCALLTYPE *SetMessageCountLimit )(
ID3D10InfoQueue * This,
/* */
/* */
__in UINT64 MessageCountLimit);
void ( STDMETHODCALLTYPE *ClearStoredMessages )(
void ( STDMETHODCALLTYPE *ClearStoredMessages )(
ID3D10InfoQueue * This);
HRESULT ( STDMETHODCALLTYPE *GetMessage )(
HRESULT ( STDMETHODCALLTYPE *GetMessage )(
ID3D10InfoQueue * This,
/* */
/* */
__in UINT64 MessageIndex,
/* */
/* */
__out_bcount_opt(*pMessageByteLength) D3D10_MESSAGE *pMessage,
/* */
/* */
__inout SIZE_T *pMessageByteLength);
UINT64 ( STDMETHODCALLTYPE *GetNumMessagesAllowedByStorageFilter )(
UINT64 ( STDMETHODCALLTYPE *GetNumMessagesAllowedByStorageFilter )(
ID3D10InfoQueue * This);
UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDeniedByStorageFilter )(
UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDeniedByStorageFilter )(
ID3D10InfoQueue * This);
UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessages )(
UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessages )(
ID3D10InfoQueue * This);
UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessagesAllowedByRetrievalFilter )(
UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessagesAllowedByRetrievalFilter )(
ID3D10InfoQueue * This);
UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDiscardedByMessageCountLimit )(
UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDiscardedByMessageCountLimit )(
ID3D10InfoQueue * This);
UINT64 ( STDMETHODCALLTYPE *GetMessageCountLimit )(
UINT64 ( STDMETHODCALLTYPE *GetMessageCountLimit )(
ID3D10InfoQueue * This);
HRESULT ( STDMETHODCALLTYPE *AddStorageFilterEntries )(
HRESULT ( STDMETHODCALLTYPE *AddStorageFilterEntries )(
ID3D10InfoQueue * This,
/* */
/* */
__in D3D10_INFO_QUEUE_FILTER *pFilter);
HRESULT ( STDMETHODCALLTYPE *GetStorageFilter )(
HRESULT ( STDMETHODCALLTYPE *GetStorageFilter )(
ID3D10InfoQueue * This,
/* */
/* */
__out_bcount_opt(*pFilterByteLength) D3D10_INFO_QUEUE_FILTER *pFilter,
/* */
/* */
__inout SIZE_T *pFilterByteLength);
void ( STDMETHODCALLTYPE *ClearStorageFilter )(
void ( STDMETHODCALLTYPE *ClearStorageFilter )(
ID3D10InfoQueue * This);
HRESULT ( STDMETHODCALLTYPE *PushEmptyStorageFilter )(
HRESULT ( STDMETHODCALLTYPE *PushEmptyStorageFilter )(
ID3D10InfoQueue * This);
HRESULT ( STDMETHODCALLTYPE *PushCopyOfStorageFilter )(
HRESULT ( STDMETHODCALLTYPE *PushCopyOfStorageFilter )(
ID3D10InfoQueue * This);
HRESULT ( STDMETHODCALLTYPE *PushStorageFilter )(
HRESULT ( STDMETHODCALLTYPE *PushStorageFilter )(
ID3D10InfoQueue * This,
/* */
/* */
__in D3D10_INFO_QUEUE_FILTER *pFilter);
void ( STDMETHODCALLTYPE *PopStorageFilter )(
void ( STDMETHODCALLTYPE *PopStorageFilter )(
ID3D10InfoQueue * This);
UINT ( STDMETHODCALLTYPE *GetStorageFilterStackSize )(
UINT ( STDMETHODCALLTYPE *GetStorageFilterStackSize )(
ID3D10InfoQueue * This);
HRESULT ( STDMETHODCALLTYPE *AddRetrievalFilterEntries )(
HRESULT ( STDMETHODCALLTYPE *AddRetrievalFilterEntries )(
ID3D10InfoQueue * This,
/* */
/* */
__in D3D10_INFO_QUEUE_FILTER *pFilter);
HRESULT ( STDMETHODCALLTYPE *GetRetrievalFilter )(
HRESULT ( STDMETHODCALLTYPE *GetRetrievalFilter )(
ID3D10InfoQueue * This,
/* */
/* */
__out_bcount_opt(*pFilterByteLength) D3D10_INFO_QUEUE_FILTER *pFilter,
/* */
/* */
__inout SIZE_T *pFilterByteLength);
void ( STDMETHODCALLTYPE *ClearRetrievalFilter )(
void ( STDMETHODCALLTYPE *ClearRetrievalFilter )(
ID3D10InfoQueue * This);
HRESULT ( STDMETHODCALLTYPE *PushEmptyRetrievalFilter )(
HRESULT ( STDMETHODCALLTYPE *PushEmptyRetrievalFilter )(
ID3D10InfoQueue * This);
HRESULT ( STDMETHODCALLTYPE *PushCopyOfRetrievalFilter )(
HRESULT ( STDMETHODCALLTYPE *PushCopyOfRetrievalFilter )(
ID3D10InfoQueue * This);
HRESULT ( STDMETHODCALLTYPE *PushRetrievalFilter )(
HRESULT ( STDMETHODCALLTYPE *PushRetrievalFilter )(
ID3D10InfoQueue * This,
/* */
/* */
__in D3D10_INFO_QUEUE_FILTER *pFilter);
void ( STDMETHODCALLTYPE *PopRetrievalFilter )(
void ( STDMETHODCALLTYPE *PopRetrievalFilter )(
ID3D10InfoQueue * This);
UINT ( STDMETHODCALLTYPE *GetRetrievalFilterStackSize )(
UINT ( STDMETHODCALLTYPE *GetRetrievalFilterStackSize )(
ID3D10InfoQueue * This);
HRESULT ( STDMETHODCALLTYPE *AddMessage )(
HRESULT ( STDMETHODCALLTYPE *AddMessage )(
ID3D10InfoQueue * This,
/* */
/* */
__in D3D10_MESSAGE_CATEGORY Category,
/* */
/* */
__in D3D10_MESSAGE_SEVERITY Severity,
/* */
/* */
__in D3D10_MESSAGE_ID ID,
/* */
/* */
__in LPCWSTR pDescription);
HRESULT ( STDMETHODCALLTYPE *AddApplicationMessage )(
HRESULT ( STDMETHODCALLTYPE *AddApplicationMessage )(
ID3D10InfoQueue * This,
/* */
/* */
__in D3D10_MESSAGE_SEVERITY Severity,
/* */
/* */
__in LPCWSTR pDescription);
END_INTERFACE
} ID3D10InfoQueueVtbl;
@ -878,101 +878,101 @@ EXTERN_C const IID IID_ID3D10InfoQueue;
CONST_VTBL struct ID3D10InfoQueueVtbl *lpVtbl;
};
#ifdef COBJMACROS
#define ID3D10InfoQueue_QueryInterface(This,riid,ppvObject) \
( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
#define ID3D10InfoQueue_AddRef(This) \
( (This)->lpVtbl -> AddRef(This) )
( (This)->lpVtbl -> AddRef(This) )
#define ID3D10InfoQueue_Release(This) \
( (This)->lpVtbl -> Release(This) )
( (This)->lpVtbl -> Release(This) )
#define ID3D10InfoQueue_SetMessageCountLimit(This,MessageCountLimit) \
( (This)->lpVtbl -> SetMessageCountLimit(This,MessageCountLimit) )
( (This)->lpVtbl -> SetMessageCountLimit(This,MessageCountLimit) )
#define ID3D10InfoQueue_ClearStoredMessages(This) \
( (This)->lpVtbl -> ClearStoredMessages(This) )
( (This)->lpVtbl -> ClearStoredMessages(This) )
#define ID3D10InfoQueue_GetMessage(This,MessageIndex,pMessage,pMessageByteLength) \
( (This)->lpVtbl -> GetMessage(This,MessageIndex,pMessage,pMessageByteLength) )
( (This)->lpVtbl -> GetMessage(This,MessageIndex,pMessage,pMessageByteLength) )
#define ID3D10InfoQueue_GetNumMessagesAllowedByStorageFilter(This) \
( (This)->lpVtbl -> GetNumMessagesAllowedByStorageFilter(This) )
( (This)->lpVtbl -> GetNumMessagesAllowedByStorageFilter(This) )
#define ID3D10InfoQueue_GetNumMessagesDeniedByStorageFilter(This) \
( (This)->lpVtbl -> GetNumMessagesDeniedByStorageFilter(This) )
( (This)->lpVtbl -> GetNumMessagesDeniedByStorageFilter(This) )
#define ID3D10InfoQueue_GetNumStoredMessages(This) \
( (This)->lpVtbl -> GetNumStoredMessages(This) )
( (This)->lpVtbl -> GetNumStoredMessages(This) )
#define ID3D10InfoQueue_GetNumStoredMessagesAllowedByRetrievalFilter(This) \
( (This)->lpVtbl -> GetNumStoredMessagesAllowedByRetrievalFilter(This) )
( (This)->lpVtbl -> GetNumStoredMessagesAllowedByRetrievalFilter(This) )
#define ID3D10InfoQueue_GetNumMessagesDiscardedByMessageCountLimit(This) \
( (This)->lpVtbl -> GetNumMessagesDiscardedByMessageCountLimit(This) )
( (This)->lpVtbl -> GetNumMessagesDiscardedByMessageCountLimit(This) )
#define ID3D10InfoQueue_GetMessageCountLimit(This) \
( (This)->lpVtbl -> GetMessageCountLimit(This) )
( (This)->lpVtbl -> GetMessageCountLimit(This) )
#define ID3D10InfoQueue_AddStorageFilterEntries(This,pFilter) \
( (This)->lpVtbl -> AddStorageFilterEntries(This,pFilter) )
( (This)->lpVtbl -> AddStorageFilterEntries(This,pFilter) )
#define ID3D10InfoQueue_GetStorageFilter(This,pFilter,pFilterByteLength) \
( (This)->lpVtbl -> GetStorageFilter(This,pFilter,pFilterByteLength) )
( (This)->lpVtbl -> GetStorageFilter(This,pFilter,pFilterByteLength) )
#define ID3D10InfoQueue_ClearStorageFilter(This) \
( (This)->lpVtbl -> ClearStorageFilter(This) )
( (This)->lpVtbl -> ClearStorageFilter(This) )
#define ID3D10InfoQueue_PushEmptyStorageFilter(This) \
( (This)->lpVtbl -> PushEmptyStorageFilter(This) )
( (This)->lpVtbl -> PushEmptyStorageFilter(This) )
#define ID3D10InfoQueue_PushCopyOfStorageFilter(This) \
( (This)->lpVtbl -> PushCopyOfStorageFilter(This) )
( (This)->lpVtbl -> PushCopyOfStorageFilter(This) )
#define ID3D10InfoQueue_PushStorageFilter(This,pFilter) \
( (This)->lpVtbl -> PushStorageFilter(This,pFilter) )
( (This)->lpVtbl -> PushStorageFilter(This,pFilter) )
#define ID3D10InfoQueue_PopStorageFilter(This) \
( (This)->lpVtbl -> PopStorageFilter(This) )
( (This)->lpVtbl -> PopStorageFilter(This) )
#define ID3D10InfoQueue_GetStorageFilterStackSize(This) \
( (This)->lpVtbl -> GetStorageFilterStackSize(This) )
( (This)->lpVtbl -> GetStorageFilterStackSize(This) )
#define ID3D10InfoQueue_AddRetrievalFilterEntries(This,pFilter) \
( (This)->lpVtbl -> AddRetrievalFilterEntries(This,pFilter) )
( (This)->lpVtbl -> AddRetrievalFilterEntries(This,pFilter) )
#define ID3D10InfoQueue_GetRetrievalFilter(This,pFilter,pFilterByteLength) \
( (This)->lpVtbl -> GetRetrievalFilter(This,pFilter,pFilterByteLength) )
( (This)->lpVtbl -> GetRetrievalFilter(This,pFilter,pFilterByteLength) )
#define ID3D10InfoQueue_ClearRetrievalFilter(This) \
( (This)->lpVtbl -> ClearRetrievalFilter(This) )
( (This)->lpVtbl -> ClearRetrievalFilter(This) )
#define ID3D10InfoQueue_PushEmptyRetrievalFilter(This) \
( (This)->lpVtbl -> PushEmptyRetrievalFilter(This) )
( (This)->lpVtbl -> PushEmptyRetrievalFilter(This) )
#define ID3D10InfoQueue_PushCopyOfRetrievalFilter(This) \
( (This)->lpVtbl -> PushCopyOfRetrievalFilter(This) )
( (This)->lpVtbl -> PushCopyOfRetrievalFilter(This) )
#define ID3D10InfoQueue_PushRetrievalFilter(This,pFilter) \
( (This)->lpVtbl -> PushRetrievalFilter(This,pFilter) )
( (This)->lpVtbl -> PushRetrievalFilter(This,pFilter) )
#define ID3D10InfoQueue_PopRetrievalFilter(This) \
( (This)->lpVtbl -> PopRetrievalFilter(This) )
( (This)->lpVtbl -> PopRetrievalFilter(This) )
#define ID3D10InfoQueue_GetRetrievalFilterStackSize(This) \
( (This)->lpVtbl -> GetRetrievalFilterStackSize(This) )
( (This)->lpVtbl -> GetRetrievalFilterStackSize(This) )
#define ID3D10InfoQueue_AddMessage(This,Category,Severity,ID,pDescription) \
( (This)->lpVtbl -> AddMessage(This,Category,Severity,ID,pDescription) )
( (This)->lpVtbl -> AddMessage(This,Category,Severity,ID,pDescription) )
#define ID3D10InfoQueue_AddApplicationMessage(This,Severity,pDescription) \
( (This)->lpVtbl -> AddApplicationMessage(This,Severity,pDescription) )
( (This)->lpVtbl -> AddApplicationMessage(This,Severity,pDescription) )
#endif /* COBJMACROS */

4
src/dep/include/DXSDK/include/d3d8types.h
View File

@ -967,7 +967,7 @@ typedef enum _D3DSHADER_PARAM_DSTMOD_TYPE
D3DSPDM_FORCE_DWORD = 0x7fffffff, // force 32-bit size enum
} D3DSHADER_PARAM_DSTMOD_TYPE;
// destination parameter
// destination parameter
#define D3DSP_DSTSHIFT_SHIFT 24
#define D3DSP_DSTSHIFT_MASK 0x0F000000
@ -1098,7 +1098,7 @@ typedef enum _D3DSHADER_PARAM_SRCMOD_TYPE
D3DSPSM_COMP = 6<<D3DSP_SRCMOD_SHIFT, // complement
D3DSPSM_X2 = 7<<D3DSP_SRCMOD_SHIFT, // *2
D3DSPSM_X2NEG = 8<<D3DSP_SRCMOD_SHIFT, // *2 and negate
D3DSPSM_DZ = 9<<D3DSP_SRCMOD_SHIFT, // divide through by z component
D3DSPSM_DZ = 9<<D3DSP_SRCMOD_SHIFT, // divide through by z component
D3DSPSM_DW = 10<<D3DSP_SRCMOD_SHIFT, // divide through by w component
D3DSPSM_FORCE_DWORD = 0x7fffffff, // force 32-bit size enum
} D3DSHADER_PARAM_SRCMOD_TYPE;

80
src/dep/include/DXSDK/include/d3d9.h
View File

@ -229,7 +229,7 @@ IDirect3D9 * WINAPI Direct3DCreate9(UINT SDKVersion);
/*
* Stubs for graphics profiling.
*/
int WINAPI D3DPERF_BeginEvent( D3DCOLOR col, LPCWSTR wszName );
int WINAPI D3DPERF_EndEvent( void );
void WINAPI D3DPERF_SetMarker( D3DCOLOR col, LPCWSTR wszName );
@ -273,12 +273,12 @@ DECLARE_INTERFACE_(IDirect3D9, IUnknown)
STDMETHOD(GetDeviceCaps)(THIS_ UINT Adapter,D3DDEVTYPE DeviceType,D3DCAPS9* pCaps) PURE;
STDMETHOD_(HMONITOR, GetAdapterMonitor)(THIS_ UINT Adapter) PURE;
STDMETHOD(CreateDevice)(THIS_ UINT Adapter,D3DDEVTYPE DeviceType,HWND hFocusWindow,DWORD BehaviorFlags,D3DPRESENT_PARAMETERS* pPresentationParameters,IDirect3DDevice9** ppReturnedDeviceInterface) PURE;
#ifdef D3D_DEBUG_INFO
LPCWSTR Version;
#endif
};
typedef struct IDirect3D9 *LPDIRECT3D9, *PDIRECT3D9;
#if !defined(__cplusplus) || defined(CINTERFACE)
@ -468,13 +468,13 @@ DECLARE_INTERFACE_(IDirect3DDevice9, IUnknown)
STDMETHOD(DrawTriPatch)(THIS_ UINT Handle,CONST float* pNumSegs,CONST D3DTRIPATCH_INFO* pTriPatchInfo) PURE;
STDMETHOD(DeletePatch)(THIS_ UINT Handle) PURE;
STDMETHOD(CreateQuery)(THIS_ D3DQUERYTYPE Type,IDirect3DQuery9** ppQuery) PURE;
#ifdef D3D_DEBUG_INFO
D3DDEVICE_CREATION_PARAMETERS CreationParameters;
D3DPRESENT_PARAMETERS PresentParameters;
D3DDISPLAYMODE DisplayMode;
D3DCAPS9 Caps;
UINT AvailableTextureMem;
UINT SwapChains;
UINT Textures;
@ -482,29 +482,29 @@ DECLARE_INTERFACE_(IDirect3DDevice9, IUnknown)
UINT IndexBuffers;
UINT VertexShaders;
UINT PixelShaders;
D3DVIEWPORT9 Viewport;
D3DMATRIX ProjectionMatrix;
D3DMATRIX ViewMatrix;
D3DMATRIX WorldMatrix;
D3DMATRIX TextureMatrices[8];
DWORD FVF;
UINT VertexSize;
DWORD VertexShaderVersion;
DWORD PixelShaderVersion;
BOOL SoftwareVertexProcessing;
D3DMATERIAL9 Material;
D3DLIGHT9 Lights[16];
BOOL LightsEnabled[16];
D3DGAMMARAMP GammaRamp;
RECT ScissorRect;
BOOL DialogBoxMode;
#endif
};
typedef struct IDirect3DDevice9 *LPDIRECT3DDEVICE9, *PDIRECT3DDEVICE9;
#if !defined(__cplusplus) || defined(CINTERFACE)
@ -764,12 +764,12 @@ DECLARE_INTERFACE_(IDirect3DStateBlock9, IUnknown)
STDMETHOD(GetDevice)(THIS_ IDirect3DDevice9** ppDevice) PURE;
STDMETHOD(Capture)(THIS) PURE;
STDMETHOD(Apply)(THIS) PURE;
#ifdef D3D_DEBUG_INFO
LPCWSTR CreationCallStack;
#endif
};
typedef struct IDirect3DStateBlock9 *LPDIRECT3DSTATEBLOCK9, *PDIRECT3DSTATEBLOCK9;
#if !defined(__cplusplus) || defined(CINTERFACE)
@ -809,14 +809,14 @@ DECLARE_INTERFACE_(IDirect3DSwapChain9, IUnknown)
STDMETHOD(GetDisplayMode)(THIS_ D3DDISPLAYMODE* pMode) PURE;
STDMETHOD(GetDevice)(THIS_ IDirect3DDevice9** ppDevice) PURE;
STDMETHOD(GetPresentParameters)(THIS_ D3DPRESENT_PARAMETERS* pPresentationParameters) PURE;
#ifdef D3D_DEBUG_INFO
D3DPRESENT_PARAMETERS PresentParameters;
D3DDISPLAYMODE DisplayMode;
LPCWSTR CreationCallStack;
#endif
};
typedef struct IDirect3DSwapChain9 *LPDIRECT3DSWAPCHAIN9, *PDIRECT3DSWAPCHAIN9;
#if !defined(__cplusplus) || defined(CINTERFACE)
@ -865,7 +865,7 @@ DECLARE_INTERFACE_(IDirect3DResource9, IUnknown)
STDMETHOD_(void, PreLoad)(THIS) PURE;
STDMETHOD_(D3DRESOURCETYPE, GetType)(THIS) PURE;
};
typedef struct IDirect3DResource9 *LPDIRECT3DRESOURCE9, *PDIRECT3DRESOURCE9;
#if !defined(__cplusplus) || defined(CINTERFACE)
@ -910,12 +910,12 @@ DECLARE_INTERFACE_(IDirect3DVertexDeclaration9, IUnknown)
/*** IDirect3DVertexDeclaration9 methods ***/
STDMETHOD(GetDevice)(THIS_ IDirect3DDevice9** ppDevice) PURE;
STDMETHOD(GetDeclaration)(THIS_ D3DVERTEXELEMENT9* pElement,UINT* pNumElements) PURE;
#ifdef D3D_DEBUG_INFO
LPCWSTR CreationCallStack;
#endif
};
typedef struct IDirect3DVertexDeclaration9 *LPDIRECT3DVERTEXDECLARATION9, *PDIRECT3DVERTEXDECLARATION9;
#if !defined(__cplusplus) || defined(CINTERFACE)
@ -948,13 +948,13 @@ DECLARE_INTERFACE_(IDirect3DVertexShader9, IUnknown)
/*** IDirect3DVertexShader9 methods ***/
STDMETHOD(GetDevice)(THIS_ IDirect3DDevice9** ppDevice) PURE;
STDMETHOD(GetFunction)(THIS_ void*,UINT* pSizeOfData) PURE;
#ifdef D3D_DEBUG_INFO
DWORD Version;
LPCWSTR CreationCallStack;
#endif
};
typedef struct IDirect3DVertexShader9 *LPDIRECT3DVERTEXSHADER9, *PDIRECT3DVERTEXSHADER9;
#if !defined(__cplusplus) || defined(CINTERFACE)
@ -987,13 +987,13 @@ DECLARE_INTERFACE_(IDirect3DPixelShader9, IUnknown)
/*** IDirect3DPixelShader9 methods ***/
STDMETHOD(GetDevice)(THIS_ IDirect3DDevice9** ppDevice) PURE;
STDMETHOD(GetFunction)(THIS_ void*,UINT* pSizeOfData) PURE;
#ifdef D3D_DEBUG_INFO
DWORD Version;
LPCWSTR CreationCallStack;
#endif
};
typedef struct IDirect3DPixelShader9 *LPDIRECT3DPIXELSHADER9, *PDIRECT3DPIXELSHADER9;
#if !defined(__cplusplus) || defined(CINTERFACE)
@ -1039,7 +1039,7 @@ DECLARE_INTERFACE_(IDirect3DBaseTexture9, IDirect3DResource9)
STDMETHOD_(D3DTEXTUREFILTERTYPE, GetAutoGenFilterType)(THIS) PURE;
STDMETHOD_(void, GenerateMipSubLevels)(THIS) PURE;
};
typedef struct IDirect3DBaseTexture9 *LPDIRECT3DBASETEXTURE9, *PDIRECT3DBASETEXTURE9;
#if !defined(__cplusplus) || defined(CINTERFACE)
@ -1114,7 +1114,7 @@ DECLARE_INTERFACE_(IDirect3DTexture9, IDirect3DBaseTexture9)
STDMETHOD(LockRect)(THIS_ UINT Level,D3DLOCKED_RECT* pLockedRect,CONST RECT* pRect,DWORD Flags) PURE;
STDMETHOD(UnlockRect)(THIS_ UINT Level) PURE;
STDMETHOD(AddDirtyRect)(THIS_ CONST RECT* pDirtyRect) PURE;
#ifdef D3D_DEBUG_INFO
LPCWSTR Name;
UINT Width;
@ -1130,7 +1130,7 @@ DECLARE_INTERFACE_(IDirect3DTexture9, IDirect3DBaseTexture9)
LPCWSTR CreationCallStack;
#endif
};
typedef struct IDirect3DTexture9 *LPDIRECT3DTEXTURE9, *PDIRECT3DTEXTURE9;
#if !defined(__cplusplus) || defined(CINTERFACE)
@ -1215,7 +1215,7 @@ DECLARE_INTERFACE_(IDirect3DVolumeTexture9, IDirect3DBaseTexture9)
STDMETHOD(LockBox)(THIS_ UINT Level,D3DLOCKED_BOX* pLockedVolume,CONST D3DBOX* pBox,DWORD Flags) PURE;
STDMETHOD(UnlockBox)(THIS_ UINT Level) PURE;
STDMETHOD(AddDirtyBox)(THIS_ CONST D3DBOX* pDirtyBox) PURE;
#ifdef D3D_DEBUG_INFO
LPCWSTR Name;
UINT Width;
@ -1232,7 +1232,7 @@ DECLARE_INTERFACE_(IDirect3DVolumeTexture9, IDirect3DBaseTexture9)
LPCWSTR CreationCallStack;
#endif
};
typedef struct IDirect3DVolumeTexture9 *LPDIRECT3DVOLUMETEXTURE9, *PDIRECT3DVOLUMETEXTURE9;
#if !defined(__cplusplus) || defined(CINTERFACE)
@ -1317,7 +1317,7 @@ DECLARE_INTERFACE_(IDirect3DCubeTexture9, IDirect3DBaseTexture9)
STDMETHOD(LockRect)(THIS_ D3DCUBEMAP_FACES FaceType,UINT Level,D3DLOCKED_RECT* pLockedRect,CONST RECT* pRect,DWORD Flags) PURE;
STDMETHOD(UnlockRect)(THIS_ D3DCUBEMAP_FACES FaceType,UINT Level) PURE;
STDMETHOD(AddDirtyRect)(THIS_ D3DCUBEMAP_FACES FaceType,CONST RECT* pDirtyRect) PURE;
#ifdef D3D_DEBUG_INFO
LPCWSTR Name;
UINT Width;
@ -1333,7 +1333,7 @@ DECLARE_INTERFACE_(IDirect3DCubeTexture9, IDirect3DBaseTexture9)
LPCWSTR CreationCallStack;
#endif
};
typedef struct IDirect3DCubeTexture9 *LPDIRECT3DCUBETEXTURE9, *PDIRECT3DCUBETEXTURE9;
#if !defined(__cplusplus) || defined(CINTERFACE)
@ -1409,7 +1409,7 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer9, IDirect3DResource9)
STDMETHOD(Lock)(THIS_ UINT OffsetToLock,UINT SizeToLock,void** ppbData,DWORD Flags) PURE;
STDMETHOD(Unlock)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3DVERTEXBUFFER_DESC *pDesc) PURE;
#ifdef D3D_DEBUG_INFO
LPCWSTR Name;
UINT Length;
@ -1421,7 +1421,7 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer9, IDirect3DResource9)
LPCWSTR CreationCallStack;
#endif
};
typedef struct IDirect3DVertexBuffer9 *LPDIRECT3DVERTEXBUFFER9, *PDIRECT3DVERTEXBUFFER9;
#if !defined(__cplusplus) || defined(CINTERFACE)
@ -1481,7 +1481,7 @@ DECLARE_INTERFACE_(IDirect3DIndexBuffer9, IDirect3DResource9)
STDMETHOD(Lock)(THIS_ UINT OffsetToLock,UINT SizeToLock,void** ppbData,DWORD Flags) PURE;
STDMETHOD(Unlock)(THIS) PURE;
STDMETHOD(GetDesc)(THIS_ D3DINDEXBUFFER_DESC *pDesc) PURE;
#ifdef D3D_DEBUG_INFO
LPCWSTR Name;
UINT Length;
@ -1493,7 +1493,7 @@ DECLARE_INTERFACE_(IDirect3DIndexBuffer9, IDirect3DResource9)
LPCWSTR CreationCallStack;
#endif
};
typedef struct IDirect3DIndexBuffer9 *LPDIRECT3DINDEXBUFFER9, *PDIRECT3DINDEXBUFFER9;
#if !defined(__cplusplus) || defined(CINTERFACE)
@ -1556,7 +1556,7 @@ DECLARE_INTERFACE_(IDirect3DSurface9, IDirect3DResource9)
STDMETHOD(UnlockRect)(THIS) PURE;
STDMETHOD(GetDC)(THIS_ HDC *phdc) PURE;
STDMETHOD(ReleaseDC)(THIS_ HDC hdc) PURE;
#ifdef D3D_DEBUG_INFO
LPCWSTR Name;
UINT Width;
@ -1572,7 +1572,7 @@ DECLARE_INTERFACE_(IDirect3DSurface9, IDirect3DResource9)
LPCWSTR CreationCallStack;
#endif
};
typedef struct IDirect3DSurface9 *LPDIRECT3DSURFACE9, *PDIRECT3DSURFACE9;
#if !defined(__cplusplus) || defined(CINTERFACE)
@ -1636,7 +1636,7 @@ DECLARE_INTERFACE_(IDirect3DVolume9, IUnknown)
STDMETHOD(GetDesc)(THIS_ D3DVOLUME_DESC *pDesc) PURE;
STDMETHOD(LockBox)(THIS_ D3DLOCKED_BOX * pLockedVolume,CONST D3DBOX* pBox,DWORD Flags) PURE;
STDMETHOD(UnlockBox)(THIS) PURE;
#ifdef D3D_DEBUG_INFO
LPCWSTR Name;
UINT Width;
@ -1649,7 +1649,7 @@ DECLARE_INTERFACE_(IDirect3DVolume9, IUnknown)
LPCWSTR CreationCallStack;
#endif
};
typedef struct IDirect3DVolume9 *LPDIRECT3DVOLUME9, *PDIRECT3DVOLUME9;
#if !defined(__cplusplus) || defined(CINTERFACE)
@ -1697,14 +1697,14 @@ DECLARE_INTERFACE_(IDirect3DQuery9, IUnknown)
STDMETHOD_(DWORD, GetDataSize)(THIS) PURE;
STDMETHOD(Issue)(THIS_ DWORD dwIssueFlags) PURE;
STDMETHOD(GetData)(THIS_ void* pData,DWORD dwSize,DWORD dwGetDataFlags) PURE;
#ifdef D3D_DEBUG_INFO
D3DQUERYTYPE Type;
DWORD DataSize;
LPCWSTR CreationCallStack;
#endif
};
typedef struct IDirect3DQuery9 *LPDIRECT3DQUERY9, *PDIRECT3DQUERY9;
#if !defined(__cplusplus) || defined(CINTERFACE)
@ -1757,9 +1757,9 @@ typedef struct IDirect3DQuery9 *LPDIRECT3DQUERY9, *PDIRECT3DQUERY9;
#define D3DCREATE_ADAPTERGROUP_DEVICE 0x00000200L
#define D3DCREATE_DISABLE_DRIVER_MANAGEMENT_EX 0x00000400L
// This flag causes the D3D runtime not to alter the focus
// This flag causes the D3D runtime not to alter the focus
// window in any way. Use with caution- the burden of supporting
// focus management events (alt-tab, etc.) falls on the
// focus management events (alt-tab, etc.) falls on the
// application, and appropriate responses (switching display
// mode, etc.) should be coded.
#define D3DCREATE_NOWINDOWCHANGES 0x00000800L

8
src/dep/include/DXSDK/include/d3d9caps.h
View File

@ -156,7 +156,7 @@ typedef struct _D3DCAPS9
DWORD VertexTextureFilterCaps; // D3DPTFILTERCAPS for IDirect3DTexture9's for texture, used in vertex shaders
DWORD MaxVShaderInstructionsExecuted; // maximum number of vertex shader instructions that can be executed
DWORD MaxPShaderInstructionsExecuted; // maximum number of pixel shader instructions that can be executed
DWORD MaxVertexShader30InstructionSlots;
DWORD MaxVertexShader30InstructionSlots;
DWORD MaxPixelShader30InstructionSlots;
} D3DCAPS9;
@ -189,7 +189,7 @@ typedef struct _D3DCAPS9
// COPY and COPYVSYNC swap effects work whether or not this flag is set.
#define D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD 0x00000020L
// Indicates that the device can perform a gamma correction from
// Indicates that the device can perform a gamma correction from
// a windowed back buffer containing linear content to the sRGB desktop.
#define D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION 0x00000080L
@ -288,7 +288,7 @@ typedef struct _D3DCAPS9
#define D3DPRASTERCAPS_COLORPERSPECTIVE 0x00400000L /* Device iterates colors perspective correct */
#define D3DPRASTERCAPS_SCISSORTEST 0x01000000L
#define D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS 0x02000000L
#define D3DPRASTERCAPS_DEPTHBIAS 0x04000000L
#define D3DPRASTERCAPS_DEPTHBIAS 0x04000000L
#define D3DPRASTERCAPS_MULTISAMPLE_TOGGLE 0x08000000L
//
@ -351,7 +351,7 @@ typedef struct _D3DCAPS9
#define D3DPTEXTURECAPS_MIPCUBEMAP 0x00010000L /* Device can do mipmapped cube maps */
#define D3DPTEXTURECAPS_CUBEMAP_POW2 0x00020000L /* Device requires that cubemaps be power-of-2 dimension */
#define D3DPTEXTURECAPS_VOLUMEMAP_POW2 0x00040000L /* Device requires that volume maps be power-of-2 dimension */
#define D3DPTEXTURECAPS_NOPROJECTEDBUMPENV 0x00200000L /* Device does not support projected bump env lookup operation
#define D3DPTEXTURECAPS_NOPROJECTEDBUMPENV 0x00200000L /* Device does not support projected bump env lookup operation
in programmable and fixed function pixel shaders */
//

4
src/dep/include/DXSDK/include/d3d9types.h
View File

@ -972,7 +972,7 @@ typedef enum _D3DSAMPLER_TEXTURE_TYPE
// "Centroid" is some location within the covered
// region of the pixel.
// destination parameter
// destination parameter
#define D3DSP_DSTSHIFT_SHIFT 24
#define D3DSP_DSTSHIFT_MASK 0x0F000000
@ -1572,7 +1572,7 @@ typedef enum _D3DCUBEMAP_FACES
#define D3DLOCK_DISCARD 0x00002000L
#define D3DLOCK_NOOVERWRITE 0x00001000L
#define D3DLOCK_NOSYSLOCK 0x00000800L
#define D3DLOCK_DONOTWAIT 0x00004000L
#define D3DLOCK_DONOTWAIT 0x00004000L
#define D3DLOCK_NO_DIRTY_UPDATE 0x00008000L

2
src/dep/include/DXSDK/include/d3dcaps.h
View File

@ -1,6 +1,6 @@
/*==========================================================================;
*
* Copyright (C) Microsoft Corporation. All Rights Reserved.
* Copyright (C) Microsoft Corporation. All Rights Reserved.
*
* File: d3dcaps.h
* Content: Direct3D capabilities include file

86
src/dep/include/DXSDK/include/d3dx10async.h
View File

@ -44,7 +44,7 @@ extern "C" {
// Name of the entrypoint function where execution should begin.
// pProfile
// Instruction set to be used when generating code. Currently supported
// profiles are "vs_1_1", "vs_2_0", "vs_2_a", "vs_2_sw", "ps_1_1",
// profiles are "vs_1_1", "vs_2_0", "vs_2_a", "vs_2_sw", "ps_1_1",
// "ps_1_2", "ps_1_3", "ps_1_4", "ps_2_0", "ps_2_a", "ps_2_sw", "tx_1_0"
// Flags
// See D3D10_SHADER_xxx flags.
@ -70,10 +70,10 @@ HRESULT WINAPI D3DX10CompileShaderFromFileW(LPCWSTR pSrcFile, CONST D3D10_SHADER
#define D3DX10CompileShaderFromFile D3DX10CompileShaderFromFileA
#endif
HRESULT WINAPI D3DX10CompileShaderFromResourceA(HMODULE hSrcModule, LPCSTR pSrcResource, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines,
HRESULT WINAPI D3DX10CompileShaderFromResourceA(HMODULE hSrcModule, LPCSTR pSrcResource, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines,
LPD3D10INCLUDE pInclude, LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags, ID3DX10ThreadPump* pPump, ID3D10Blob** ppShader, ID3D10Blob** ppErrorMsgs);
HRESULT WINAPI D3DX10CompileShaderFromResourceW(HMODULE hSrcModule, LPCWSTR pSrcResource, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines,
HRESULT WINAPI D3DX10CompileShaderFromResourceW(HMODULE hSrcModule, LPCWSTR pSrcResource, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines,
LPD3D10INCLUDE pInclude, LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags, ID3DX10ThreadPump* pPump, ID3D10Blob** ppShader, ID3D10Blob** ppErrorMsgs);
#ifdef UNICODE
@ -82,7 +82,7 @@ HRESULT WINAPI D3DX10CompileShaderFromResourceW(HMODULE hSrcModule, LPCWSTR pSrc
#define D3DX10CompileShaderFromResource D3DX10CompileShaderFromResourceA
#endif
HRESULT WINAPI D3DX10CompileShaderFromMemory(LPCSTR pSrcData, SIZE_T SrcDataLen, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude,
HRESULT WINAPI D3DX10CompileShaderFromMemory(LPCSTR pSrcData, SIZE_T SrcDataLen, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude,
LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags, ID3DX10ThreadPump* pPump, ID3D10Blob** ppShader, ID3D10Blob** ppErrorMsgs);
//----------------------------------------------------------------------------
@ -134,30 +134,30 @@ HRESULT WINAPI D3DX10CompileShaderFromMemory(LPCSTR pSrcData, SIZE_T SrcDataLen,
// ppEffectPool
// Address of the newly created Effect pool interface
// ppErrors
// If non-NULL, address of a buffer with error messages that occurred
// If non-NULL, address of a buffer with error messages that occurred
// during parsing or compilation
//
//----------------------------------------------------------------------------
HRESULT WINAPI D3DX10CompileEffectFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3DX10ThreadPump* pPump,
HRESULT WINAPI D3DX10CompileEffectFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3DX10ThreadPump* pPump,
ID3D10Blob **ppCompiledEffect, ID3D10Blob **ppErrors);
HRESULT WINAPI D3DX10CompileEffectFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3DX10ThreadPump* pPump,
HRESULT WINAPI D3DX10CompileEffectFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3DX10ThreadPump* pPump,
ID3D10Blob **ppCompiledEffect, ID3D10Blob **ppErrors);
HRESULT WINAPI D3DX10CompileEffectFromMemory(LPCVOID pData, SIZE_T DataLength, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags,
HRESULT WINAPI D3DX10CompileEffectFromMemory(LPCVOID pData, SIZE_T DataLength, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags,
ID3DX10ThreadPump* pPump, ID3D10Blob **ppCompiledEffect, ID3D10Blob **ppErrors);
HRESULT WINAPI D3DX10CompileEffectFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags,
HRESULT WINAPI D3DX10CompileEffectFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags,
ID3DX10ThreadPump* pPump, ID3D10Blob **ppCompiledEffect, ID3D10Blob **ppErrors);
HRESULT WINAPI D3DX10CompileEffectFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags,
HRESULT WINAPI D3DX10CompileEffectFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags,
ID3DX10ThreadPump* pPump, ID3D10Blob **ppCompiledEffect, ID3D10Blob **ppErrors);
#ifdef UNICODE
@ -168,24 +168,24 @@ HRESULT WINAPI D3DX10CompileEffectFromResourceW(HMODULE hModule, LPCWSTR pResour
#define D3DX10CompileEffectFromResource D3DX10CompileEffectFromResourceA
#endif
HRESULT WINAPI D3DX10CreateEffectFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice,
HRESULT WINAPI D3DX10CreateEffectFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice,
ID3D10EffectPool *pEffectPool, ID3DX10ThreadPump* pPump, ID3D10Effect **ppEffect, ID3D10Blob **ppErrors);
HRESULT WINAPI D3DX10CreateEffectFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice,
HRESULT WINAPI D3DX10CreateEffectFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice,
ID3D10EffectPool *pEffectPool, ID3DX10ThreadPump* pPump, ID3D10Effect **ppEffect, ID3D10Blob **ppErrors);
HRESULT WINAPI D3DX10CreateEffectFromMemory(LPCVOID pData, SIZE_T DataLength, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice,
HRESULT WINAPI D3DX10CreateEffectFromMemory(LPCVOID pData, SIZE_T DataLength, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice,
ID3D10EffectPool *pEffectPool, ID3DX10ThreadPump* pPump, ID3D10Effect **ppEffect, ID3D10Blob **ppErrors);
HRESULT WINAPI D3DX10CreateEffectFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice,
HRESULT WINAPI D3DX10CreateEffectFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice,
ID3D10EffectPool *pEffectPool, ID3DX10ThreadPump* pPump, ID3D10Effect **ppEffect, ID3D10Blob **ppErrors);
HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice,
HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice,
ID3D10EffectPool *pEffectPool, ID3DX10ThreadPump* pPump, ID3D10Effect **ppEffect, ID3D10Blob **ppErrors);
@ -197,23 +197,23 @@ HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE hModule, LPCWSTR pResourc
#define D3DX10CreateEffectFromResource D3DX10CreateEffectFromResourceA
#endif
HRESULT WINAPI D3DX10CreateEffectPoolFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, ID3DX10ThreadPump* pPump,
HRESULT WINAPI D3DX10CreateEffectPoolFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, ID3DX10ThreadPump* pPump,
ID3D10EffectPool **ppEffectPool, ID3D10Blob **ppErrors);
HRESULT WINAPI D3DX10CreateEffectPoolFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, ID3DX10ThreadPump* pPump,
HRESULT WINAPI D3DX10CreateEffectPoolFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, ID3DX10ThreadPump* pPump,
ID3D10EffectPool **ppEffectPool, ID3D10Blob **ppErrors);
HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(LPCVOID pData, SIZE_T DataLength, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(LPCVOID pData, SIZE_T DataLength, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice,
ID3DX10ThreadPump* pPump, ID3D10EffectPool **ppEffectPool, ID3D10Blob **ppErrors);
HRESULT WINAPI D3DX10CreateEffectPoolFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
HRESULT WINAPI D3DX10CreateEffectPoolFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice,
ID3DX10ThreadPump* pPump, ID3D10EffectPool **ppEffectPool, ID3D10Blob **ppErrors);
HRESULT WINAPI D3DX10CreateEffectPoolFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
HRESULT WINAPI D3DX10CreateEffectPoolFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines,
ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice,
ID3DX10ThreadPump* pPump, ID3D10EffectPool **ppEffectPool, ID3D10Blob **ppErrors);
@ -225,19 +225,19 @@ HRESULT WINAPI D3DX10CreateEffectPoolFromResourceW(HMODULE hModule, LPCWSTR pRes
#define D3DX10CreateEffectPoolFromResource D3DX10CreateEffectPoolFromResourceA
#endif
HRESULT WINAPI D3DX10PreprocessShaderFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines,
HRESULT WINAPI D3DX10PreprocessShaderFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines,
LPD3D10INCLUDE pInclude, ID3DX10ThreadPump *pPump, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs);
HRESULT WINAPI D3DX10PreprocessShaderFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines,
HRESULT WINAPI D3DX10PreprocessShaderFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines,
LPD3D10INCLUDE pInclude, ID3DX10ThreadPump *pPump, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs);
HRESULT WINAPI D3DX10PreprocessShaderFromMemory(LPCSTR pSrcData, SIZE_T SrcDataSize, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines,
HRESULT WINAPI D3DX10PreprocessShaderFromMemory(LPCSTR pSrcData, SIZE_T SrcDataSize, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines,
LPD3D10INCLUDE pInclude, ID3DX10ThreadPump *pPump, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs);
HRESULT WINAPI D3DX10PreprocessShaderFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines,
HRESULT WINAPI D3DX10PreprocessShaderFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines,
LPD3D10INCLUDE pInclude, ID3DX10ThreadPump *pPump, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs);
HRESULT WINAPI D3DX10PreprocessShaderFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines,
HRESULT WINAPI D3DX10PreprocessShaderFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines,
LPD3D10INCLUDE pInclude, ID3DX10ThreadPump *pPump, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs);
#ifdef UNICODE
@ -252,23 +252,23 @@ HRESULT WINAPI D3DX10PreprocessShaderFromResourceW(HMODULE hModule, LPCWSTR pRes
// Async processors
//----------------------------------------------------------------------------
HRESULT WINAPI D3DX10CreateAsyncShaderCompilerProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude,
HRESULT WINAPI D3DX10CreateAsyncShaderCompilerProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude,
LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags,
ID3D10Blob **ppCompiledShader, ID3D10Blob **ppErrorBuffer, ID3DX10DataProcessor **ppProcessor);
HRESULT WINAPI D3DX10CreateAsyncEffectCompilerProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude,
HRESULT WINAPI D3DX10CreateAsyncEffectCompilerProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude,
UINT Flags, UINT FXFlags,
ID3D10Blob **ppCompiledShader, ID3D10Blob **ppErrorBuffer, ID3DX10DataProcessor **ppProcessor);
HRESULT WINAPI D3DX10CreateAsyncEffectCreateProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude,
HRESULT WINAPI D3DX10CreateAsyncEffectCreateProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude,
UINT Flags, UINT FXFlags, ID3D10Device *pDevice,
ID3D10EffectPool *pPool, ID3D10Blob **ppErrorBuffer, ID3DX10DataProcessor **ppProcessor);
HRESULT WINAPI D3DX10CreateAsyncEffectPoolCreateProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude,
HRESULT WINAPI D3DX10CreateAsyncEffectPoolCreateProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude,
UINT Flags, UINT FXFlags, ID3D10Device *pDevice,
ID3D10Blob **ppErrorBuffer, ID3DX10DataProcessor **ppProcessor);
HRESULT WINAPI D3DX10CreateAsyncShaderPreprocessProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude,
HRESULT WINAPI D3DX10CreateAsyncShaderPreprocessProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude,
ID3D10Blob** ppShaderText, ID3D10Blob **ppErrorBuffer, ID3DX10DataProcessor **ppProcessor);
#ifdef __cplusplus

52
src/dep/include/DXSDK/include/d3dx8core.h
View File

@ -30,7 +30,7 @@ typedef interface ID3DXBuffer ID3DXBuffer;
typedef interface ID3DXBuffer *LPD3DXBUFFER;
// {932E6A7E-C68E-45dd-A7BF-53D19C86DB1F}
DEFINE_GUID(IID_ID3DXBuffer,
DEFINE_GUID(IID_ID3DXBuffer,
0x932e6a7e, 0xc68e, 0x45dd, 0xa7, 0xbf, 0x53, 0xd1, 0x9c, 0x86, 0xdb, 0x1f);
#undef INTERFACE
@ -61,8 +61,8 @@ DECLARE_INTERFACE_(ID3DXBuffer, IUnknown)
// is called outside of Begin/End, it will call Begin and End for you.
//
// DrawText -
// Draws formatted text on a D3D device. Some parameters are
// surprisingly similar to those of GDI's DrawText function. See GDI
// Draws formatted text on a D3D device. Some parameters are
// surprisingly similar to those of GDI's DrawText function. See GDI
// documentation for a detailed description of these parameters.
//
// End -
@ -80,7 +80,7 @@ typedef interface ID3DXFont *LPD3DXFONT;
// {89FAD6A5-024D-49af-8FE7-F51123B85E25}
DEFINE_GUID( IID_ID3DXFont,
DEFINE_GUID( IID_ID3DXFont,
0x89fad6a5, 0x24d, 0x49af, 0x8f, 0xe7, 0xf5, 0x11, 0x23, 0xb8, 0x5e, 0x25);
@ -145,15 +145,15 @@ HRESULT WINAPI
// ------------
// This object intends to provide an easy way to drawing sprites using D3D.
//
// Begin -
// Begin -
// Prepares device for drawing sprites
//
// Draw, DrawAffine, DrawTransform -
// Draws a sprite in screen-space. Before transformation, the sprite is
// the size of SrcRect, with its top-left corner at the origin (0,0).
// the size of SrcRect, with its top-left corner at the origin (0,0).
// The color and alpha channels are modulated by Color.
//
// End -
// End -
// Restores device state to how it was when Begin was called.
//
// OnLostDevice, OnResetDevice -
@ -167,7 +167,7 @@ typedef interface ID3DXSprite *LPD3DXSPRITE;
// {13D69D15-F9B0-4e0f-B39E-C91EB33F6CE7}
DEFINE_GUID( IID_ID3DXSprite,
DEFINE_GUID( IID_ID3DXSprite,
0x13d69d15, 0xf9b0, 0x4e0f, 0xb3, 0x9e, 0xc9, 0x1e, 0xb3, 0x3f, 0x6c, 0xe7);
@ -186,13 +186,13 @@ DECLARE_INTERFACE_(ID3DXSprite, IUnknown)
STDMETHOD(Begin)(THIS) PURE;
STDMETHOD(Draw)(THIS_ LPDIRECT3DTEXTURE8 pSrcTexture,
CONST RECT* pSrcRect, CONST D3DXVECTOR2* pScaling,
CONST D3DXVECTOR2* pRotationCenter, FLOAT Rotation,
STDMETHOD(Draw)(THIS_ LPDIRECT3DTEXTURE8 pSrcTexture,
CONST RECT* pSrcRect, CONST D3DXVECTOR2* pScaling,
CONST D3DXVECTOR2* pRotationCenter, FLOAT Rotation,
CONST D3DXVECTOR2* pTranslation, D3DCOLOR Color) PURE;
STDMETHOD(DrawTransform)(THIS_ LPDIRECT3DTEXTURE8 pSrcTexture,
CONST RECT* pSrcRect, CONST D3DXMATRIX* pTransform,
STDMETHOD(DrawTransform)(THIS_ LPDIRECT3DTEXTURE8 pSrcTexture,
CONST RECT* pSrcRect, CONST D3DXMATRIX* pTransform,
D3DCOLOR Color) PURE;
STDMETHOD(End)(THIS) PURE;
@ -222,14 +222,14 @@ HRESULT WINAPI
///////////////////////////////////////////////////////////////////////////
// ID3DXRenderToSurface:
// ---------------------
// This object abstracts rendering to surfaces. These surfaces do not
// This object abstracts rendering to surfaces. These surfaces do not
// necessarily need to be render targets. If they are not, a compatible
// render target is used, and the result copied into surface at end scene.
//
// BeginScene, EndScene -
// Call BeginScene() and EndScene() at the beginning and ending of your
// scene. These calls will setup and restore render targets, viewports,
// etc..
// scene. These calls will setup and restore render targets, viewports,
// etc..
//
// OnLostDevice, OnResetDevice -
// Call OnLostDevice() on this object before calling Reset() on the
@ -253,7 +253,7 @@ typedef interface ID3DXRenderToSurface *LPD3DXRENDERTOSURFACE;
// {82DF5B90-E34E-496e-AC1C-62117A6A5913}
DEFINE_GUID( IID_ID3DXRenderToSurface,
DEFINE_GUID( IID_ID3DXRenderToSurface,
0x82df5b90, 0xe34e, 0x496e, 0xac, 0x1c, 0x62, 0x11, 0x7a, 0x6a, 0x59, 0x13);
@ -302,8 +302,8 @@ HRESULT WINAPI
///////////////////////////////////////////////////////////////////////////
// ID3DXRenderToEnvMap:
// --------------------
// This object abstracts rendering to environment maps. These surfaces
// do not necessarily need to be render targets. If they are not, a
// This object abstracts rendering to environment maps. These surfaces
// do not necessarily need to be render targets. If they are not, a
// compatible render target is used, and the result copied into the
// environment map at end scene.
//
@ -313,8 +313,8 @@ HRESULT WINAPI
// the resulting environment map.
//
// Face -
// Call this function to initiate the drawing of each face. For each
// environment map, you will call this six times.. once for each face
// Call this function to initiate the drawing of each face. For each
// environment map, you will call this six times.. once for each face
// in D3DCUBEMAP_FACES.
//
// End -
@ -340,7 +340,7 @@ typedef interface ID3DXRenderToEnvMap ID3DXRenderToEnvMap;
typedef interface ID3DXRenderToEnvMap *LPD3DXRenderToEnvMap;
// {4E42C623-9451-44b7-8C86-ABCCDE5D52C8}
DEFINE_GUID( IID_ID3DXRenderToEnvMap,
DEFINE_GUID( IID_ID3DXRenderToEnvMap,
0x4e42c623, 0x9451, 0x44b7, 0x8c, 0x86, 0xab, 0xcc, 0xde, 0x5d, 0x52, 0xc8);
@ -358,17 +358,17 @@ DECLARE_INTERFACE_(ID3DXRenderToEnvMap, IUnknown)
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE8* ppDevice) PURE;
STDMETHOD(GetDesc)(THIS_ D3DXRTE_DESC* pDesc) PURE;
STDMETHOD(BeginCube)(THIS_
STDMETHOD(BeginCube)(THIS_
LPDIRECT3DCUBETEXTURE8 pCubeTex) PURE;
STDMETHOD(BeginSphere)(THIS_
LPDIRECT3DTEXTURE8 pTex) PURE;
STDMETHOD(BeginHemisphere)(THIS_
STDMETHOD(BeginHemisphere)(THIS_
LPDIRECT3DTEXTURE8 pTexZPos,
LPDIRECT3DTEXTURE8 pTexZNeg) PURE;
STDMETHOD(BeginParabolic)(THIS_
STDMETHOD(BeginParabolic)(THIS_
LPDIRECT3DTEXTURE8 pTexZPos,
LPDIRECT3DTEXTURE8 pTexZNeg) PURE;
@ -427,7 +427,7 @@ extern "C" {
//-------------------------------------------------------------------------
// D3DXAssembleShader:
// -------------------
// Assembles an ascii description of a vertex or pixel shader into
// Assembles an ascii description of a vertex or pixel shader into
// binary form.
//
// Parameters:

6
src/dep/include/DXSDK/include/d3dx8effect.h
View File

@ -75,7 +75,7 @@ typedef interface ID3DXEffect ID3DXEffect;
typedef interface ID3DXEffect *LPD3DXEFFECT;
// {648B1CEB-8D4E-4d66-B6FA-E44969E82E89}
DEFINE_GUID( IID_ID3DXEffect,
DEFINE_GUID( IID_ID3DXEffect,
0x648b1ceb, 0x8d4e, 0x4d66, 0xb6, 0xfa, 0xe4, 0x49, 0x69, 0xe8, 0x2e, 0x89);
@ -103,9 +103,9 @@ DECLARE_INTERFACE_(ID3DXEffect, IUnknown)
STDMETHOD(GetTechnique)(THIS_ LPCSTR* ppTechnique) PURE;
STDMETHOD(SetDword)(THIS_ LPCSTR pParameter, DWORD dw) PURE;
STDMETHOD(GetDword)(THIS_ LPCSTR pParameter, DWORD* pdw) PURE;
STDMETHOD(GetDword)(THIS_ LPCSTR pParameter, DWORD* pdw) PURE;
STDMETHOD(SetFloat)(THIS_ LPCSTR pParameter, FLOAT f) PURE;
STDMETHOD(GetFloat)(THIS_ LPCSTR pParameter, FLOAT* pf) PURE;
STDMETHOD(GetFloat)(THIS_ LPCSTR pParameter, FLOAT* pf) PURE;
STDMETHOD(SetVector)(THIS_ LPCSTR pParameter, CONST D3DXVECTOR4* pVector) PURE;
STDMETHOD(GetVector)(THIS_ LPCSTR pParameter, D3DXVECTOR4* pVector) PURE;
STDMETHOD(SetMatrix)(THIS_ LPCSTR pParameter, CONST D3DXMATRIX* pMatrix) PURE;

20
src/dep/include/DXSDK/include/d3dx8math.h
View File

@ -227,7 +227,7 @@ typedef struct _D3DMATRIX D3DXMATRIX, *LPD3DXMATRIX;
// This class helps keep matrices 16-byte aligned as preferred by P4 cpus.
// It aligns matrices on the stack and on the heap or in global scope.
// It does this using __declspec(align(16)) which works on VC7 and on VC 6
// with the processor pack. Unfortunately there is no way to detect the
// with the processor pack. Unfortunately there is no way to detect the
// latter so this is turned on only on VC7. On other compilers this is the
// the same as D3DXMATRIX.
// Using this class on a compiler that does not actually do the alignment
@ -616,8 +616,8 @@ D3DXVECTOR4* WINAPI D3DXVec3Transform
D3DXVECTOR3* WINAPI D3DXVec3TransformCoord
( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV, CONST D3DXMATRIX *pM );
// Transform (x, y, z, 0) by matrix. If you transforming a normal by a
// non-affine matrix, the matrix you pass to this function should be the
// Transform (x, y, z, 0) by matrix. If you transforming a normal by a
// non-affine matrix, the matrix you pass to this function should be the
// transpose of the inverse of the matrix you would use to transform a coord.
D3DXVECTOR3* WINAPI D3DXVec3TransformNormal
( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV, CONST D3DXMATRIX *pM );
@ -941,7 +941,7 @@ D3DXQUATERNION* WINAPI D3DXQuaternionLn
// if q = (0, theta * v); exp(q) = (cos(theta), sin(theta) * v)
D3DXQUATERNION* WINAPI D3DXQuaternionExp
( D3DXQUATERNION *pOut, CONST D3DXQUATERNION *pQ );
// Spherical linear interpolation between Q1 (t == 0) and Q2 (t == 1).
// Expects unit quaternions.
D3DXQUATERNION* WINAPI D3DXQuaternionSlerp
@ -956,11 +956,11 @@ D3DXQUATERNION* WINAPI D3DXQuaternionSquad
CONST D3DXQUATERNION *pC, FLOAT t );
// Setup control points for spherical quadrangle interpolation
// from Q1 to Q2. The control points are chosen in such a way
// from Q1 to Q2. The control points are chosen in such a way
// to ensure the continuity of tangents with adjacent segments.
void WINAPI D3DXQuaternionSquadSetup
( D3DXQUATERNION *pAOut, D3DXQUATERNION *pBOut, D3DXQUATERNION *pCOut,
CONST D3DXQUATERNION *pQ0, CONST D3DXQUATERNION *pQ1,
CONST D3DXQUATERNION *pQ0, CONST D3DXQUATERNION *pQ1,
CONST D3DXQUATERNION *pQ2, CONST D3DXQUATERNION *pQ3 );
// Barycentric interpolation.
@ -1086,7 +1086,7 @@ extern "C" {
// Calculate Fresnel term given the cosine of theta (likely obtained by
// taking the dot of two normals), and the refraction index of the material.
FLOAT WINAPI D3DXFresnelTerm
(FLOAT CosTheta, FLOAT RefractionIndex);
(FLOAT CosTheta, FLOAT RefractionIndex);
#ifdef __cplusplus
}
@ -1199,9 +1199,9 @@ DECLARE_INTERFACE_(ID3DXMatrixStack, IUnknown)
extern "C" {
#endif
HRESULT WINAPI
D3DXCreateMatrixStack(
DWORD Flags,
HRESULT WINAPI
D3DXCreateMatrixStack(
DWORD Flags,
LPD3DXMATRIXSTACK* ppStack);
#ifdef __cplusplus

270
src/dep/include/DXSDK/include/d3dx8mesh.h
View File

@ -15,34 +15,34 @@
#include "dxfile.h" // defines LPDIRECTXFILEDATA
// {2A835771-BF4D-43f4-8E14-82A809F17D8A}
DEFINE_GUID(IID_ID3DXBaseMesh,
DEFINE_GUID(IID_ID3DXBaseMesh,
0x2a835771, 0xbf4d, 0x43f4, 0x8e, 0x14, 0x82, 0xa8, 0x9, 0xf1, 0x7d, 0x8a);
// {CCAE5C3B-4DD1-4d0f-997E-4684CA64557F}
DEFINE_GUID(IID_ID3DXMesh,
DEFINE_GUID(IID_ID3DXMesh,
0xccae5c3b, 0x4dd1, 0x4d0f, 0x99, 0x7e, 0x46, 0x84, 0xca, 0x64, 0x55, 0x7f);
// {19FBE386-C282-4659-97BD-CB869B084A6C}
DEFINE_GUID(IID_ID3DXPMesh,
DEFINE_GUID(IID_ID3DXPMesh,
0x19fbe386, 0xc282, 0x4659, 0x97, 0xbd, 0xcb, 0x86, 0x9b, 0x8, 0x4a, 0x6c);
// {4E3CA05C-D4FF-4d11-8A02-16459E08F6F4}
DEFINE_GUID(IID_ID3DXSPMesh,
DEFINE_GUID(IID_ID3DXSPMesh,
0x4e3ca05c, 0xd4ff, 0x4d11, 0x8a, 0x2, 0x16, 0x45, 0x9e, 0x8, 0xf6, 0xf4);
// {8DB06ECC-EBFC-408a-9404-3074B4773515}
DEFINE_GUID(IID_ID3DXSkinMesh,
DEFINE_GUID(IID_ID3DXSkinMesh,
0x8db06ecc, 0xebfc, 0x408a, 0x94, 0x4, 0x30, 0x74, 0xb4, 0x77, 0x35, 0x15);
// Mesh options - lower 3 bytes only, upper byte used by _D3DXMESHOPT option flags
enum _D3DXMESH {
D3DXMESH_32BIT = 0x001, // If set, then use 32 bit indices, if not set use 16 bit indices.
D3DXMESH_DONOTCLIP = 0x002, // Use D3DUSAGE_DONOTCLIP for VB & IB.
D3DXMESH_POINTS = 0x004, // Use D3DUSAGE_POINTS for VB & IB.
D3DXMESH_RTPATCHES = 0x008, // Use D3DUSAGE_RTPATCHES for VB & IB.
D3DXMESH_NPATCHES = 0x4000,// Use D3DUSAGE_NPATCHES for VB & IB.
D3DXMESH_POINTS = 0x004, // Use D3DUSAGE_POINTS for VB & IB.
D3DXMESH_RTPATCHES = 0x008, // Use D3DUSAGE_RTPATCHES for VB & IB.
D3DXMESH_NPATCHES = 0x4000,// Use D3DUSAGE_NPATCHES for VB & IB.
D3DXMESH_VB_SYSTEMMEM = 0x010, // Use D3DPOOL_SYSTEMMEM for VB. Overrides D3DXMESH_MANAGEDVERTEXBUFFER
D3DXMESH_VB_MANAGED = 0x020, // Use D3DPOOL_MANAGED for VB.
D3DXMESH_VB_MANAGED = 0x020, // Use D3DPOOL_MANAGED for VB.
D3DXMESH_VB_WRITEONLY = 0x040, // Use D3DUSAGE_WRITEONLY for VB.
D3DXMESH_VB_DYNAMIC = 0x080, // Use D3DUSAGE_DYNAMIC for VB.
D3DXMESH_VB_SOFTWAREPROCESSING = 0x8000, // Use D3DUSAGE_SOFTWAREPROCESSING for VB.
@ -124,7 +124,7 @@ enum _D3DXWELDEPSILONSFLAGS
{
D3DXWELDEPSILONS_WELDALL = 0x1, // weld all vertices marked by adjacency as being overlapping
D3DXWELDEPSILONS_WELDPARTIALMATCHES = 0x2, // if a given vertex component is within epsilon, modify partial matched
D3DXWELDEPSILONS_WELDPARTIALMATCHES = 0x2, // if a given vertex component is within epsilon, modify partial matched
// vertices so that both components identical AND if all components "equal"
// remove one of the vertices
D3DXWELDEPSILONS_DONOTREMOVEVERTICES = 0x4, // instructs weld to only allow modifications to vertices and not removal
@ -161,9 +161,9 @@ DECLARE_INTERFACE_(ID3DXBaseMesh, IUnknown)
STDMETHOD(GetDeclaration)(THIS_ DWORD Declaration[MAX_FVF_DECL_SIZE]) PURE;
STDMETHOD_(DWORD, GetOptions)(THIS) PURE;
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE8* ppDevice) PURE;
STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options,
STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options,
DWORD FVF, LPDIRECT3DDEVICE8 pD3DDevice, LPD3DXMESH* ppCloneMesh) PURE;
STDMETHOD(CloneMesh)(THIS_ DWORD Options,
STDMETHOD(CloneMesh)(THIS_ DWORD Options,
CONST DWORD *pDeclaration, LPDIRECT3DDEVICE8 pD3DDevice, LPD3DXMESH* ppCloneMesh) PURE;
STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER8* ppVB) PURE;
STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER8* ppIB) PURE;
@ -198,9 +198,9 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh)
STDMETHOD(GetDeclaration)(THIS_ DWORD Declaration[MAX_FVF_DECL_SIZE]) PURE;
STDMETHOD_(DWORD, GetOptions)(THIS) PURE;
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE8* ppDevice) PURE;
STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options,
STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options,
DWORD FVF, LPDIRECT3DDEVICE8 pD3DDevice, LPD3DXMESH* ppCloneMesh) PURE;
STDMETHOD(CloneMesh)(THIS_ DWORD Options,
STDMETHOD(CloneMesh)(THIS_ DWORD Options,
CONST DWORD *pDeclaration, LPDIRECT3DDEVICE8 pD3DDevice, LPD3DXMESH* ppCloneMesh) PURE;
STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER8* ppVB) PURE;
STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER8* ppIB) PURE;
@ -218,10 +218,10 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh)
// ID3DXMesh
STDMETHOD(LockAttributeBuffer)(THIS_ DWORD Flags, DWORD** ppData) PURE;
STDMETHOD(UnlockAttributeBuffer)(THIS) PURE;
STDMETHOD(Optimize)(THIS_ DWORD Flags, CONST DWORD* pAdjacencyIn, DWORD* pAdjacencyOut,
DWORD* pFaceRemap, LPD3DXBUFFER *ppVertexRemap,
STDMETHOD(Optimize)(THIS_ DWORD Flags, CONST DWORD* pAdjacencyIn, DWORD* pAdjacencyOut,
DWORD* pFaceRemap, LPD3DXBUFFER *ppVertexRemap,
LPD3DXMESH* ppOptMesh) PURE;
STDMETHOD(OptimizeInplace)(THIS_ DWORD Flags, CONST DWORD* pAdjacencyIn, DWORD* pAdjacencyOut,
STDMETHOD(OptimizeInplace)(THIS_ DWORD Flags, CONST DWORD* pAdjacencyIn, DWORD* pAdjacencyOut,
DWORD* pFaceRemap, LPD3DXBUFFER *ppVertexRemap) PURE;
};
@ -245,9 +245,9 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh)
STDMETHOD(GetDeclaration)(THIS_ DWORD Declaration[MAX_FVF_DECL_SIZE]) PURE;
STDMETHOD_(DWORD, GetOptions)(THIS) PURE;
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE8* ppDevice) PURE;
STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options,
STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options,
DWORD FVF, LPDIRECT3DDEVICE8 pD3DDevice, LPD3DXMESH* ppCloneMesh) PURE;
STDMETHOD(CloneMesh)(THIS_ DWORD Options,
STDMETHOD(CloneMesh)(THIS_ DWORD Options,
CONST DWORD *pDeclaration, LPDIRECT3DDEVICE8 pD3DDevice, LPD3DXMESH* ppCloneMesh) PURE;
STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER8* ppVB) PURE;
STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER8* ppIB) PURE;
@ -263,9 +263,9 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh)
STDMETHOD(GenerateAdjacency)(THIS_ FLOAT Epsilon, DWORD* pAdjacency) PURE;
// ID3DXPMesh
STDMETHOD(ClonePMeshFVF)(THIS_ DWORD Options,
STDMETHOD(ClonePMeshFVF)(THIS_ DWORD Options,
DWORD FVF, LPDIRECT3DDEVICE8 pD3D, LPD3DXPMESH* ppCloneMesh) PURE;
STDMETHOD(ClonePMesh)(THIS_ DWORD Options,
STDMETHOD(ClonePMesh)(THIS_ DWORD Options,
CONST DWORD *pDeclaration, LPDIRECT3DDEVICE8 pD3D, LPD3DXPMESH* ppCloneMesh) PURE;
STDMETHOD(SetNumFaces)(THIS_ DWORD Faces) PURE;
STDMETHOD(SetNumVertices)(THIS_ DWORD Vertices) PURE;
@ -275,8 +275,8 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh)
STDMETHOD_(DWORD, GetMinVertices)(THIS) PURE;
STDMETHOD(Save)(THIS_ IStream *pStream, LPD3DXMATERIAL pMaterials, DWORD NumMaterials) PURE;
STDMETHOD(Optimize)(THIS_ DWORD Flags, DWORD* pAdjacencyOut,
DWORD* pFaceRemap, LPD3DXBUFFER *ppVertexRemap,
STDMETHOD(Optimize)(THIS_ DWORD Flags, DWORD* pAdjacencyOut,
DWORD* pFaceRemap, LPD3DXBUFFER *ppVertexRemap,
LPD3DXMESH* ppOptMesh) PURE;
STDMETHOD(OptimizeBaseLOD)(THIS_ DWORD Flags, DWORD* pFaceRemap) PURE;
@ -304,13 +304,13 @@ DECLARE_INTERFACE_(ID3DXSPMesh, IUnknown)
STDMETHOD(GetDeclaration)(THIS_ DWORD Declaration[MAX_FVF_DECL_SIZE]) PURE;
STDMETHOD_(DWORD, GetOptions)(THIS) PURE;
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE8* ppDevice) PURE;
STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options,
STDMETHOD(CloneMeshFVF)(THIS_ DWORD Options,
DWORD FVF, LPDIRECT3DDEVICE8 pD3D, DWORD *pAdjacencyOut, DWORD *pVertexRemapOut, LPD3DXMESH* ppCloneMesh) PURE;
STDMETHOD(CloneMesh)(THIS_ DWORD Options,
STDMETHOD(CloneMesh)(THIS_ DWORD Options,
CONST DWORD *pDeclaration, LPDIRECT3DDEVICE8 pD3DDevice, DWORD *pAdjacencyOut, DWORD *pVertexRemapOut, LPD3DXMESH* ppCloneMesh) PURE;
STDMETHOD(ClonePMeshFVF)(THIS_ DWORD Options,
STDMETHOD(ClonePMeshFVF)(THIS_ DWORD Options,
DWORD FVF, LPDIRECT3DDEVICE8 pD3D, DWORD *pVertexRemapOut, LPD3DXPMESH* ppCloneMesh) PURE;
STDMETHOD(ClonePMesh)(THIS_ DWORD Options,
STDMETHOD(ClonePMesh)(THIS_ DWORD Options,
CONST DWORD *pDeclaration, LPDIRECT3DDEVICE8 pD3D, DWORD *pVertexRemapOut, LPD3DXPMESH* ppCloneMesh) PURE;
STDMETHOD(ReduceFaces)(THIS_ DWORD Faces) PURE;
STDMETHOD(ReduceVertices)(THIS_ DWORD Vertices) PURE;
@ -380,31 +380,31 @@ DECLARE_INTERFACE_(ID3DXSkinMesh, IUnknown)
STDMETHOD(GetMaxVertexInfluences)(THIS_ DWORD* maxVertexInfluences) PURE;
STDMETHOD(GetMaxFaceInfluences)(THIS_ DWORD* maxFaceInfluences) PURE;
STDMETHOD(ConvertToBlendedMesh)(THIS_ DWORD Options,
CONST LPDWORD pAdjacencyIn,
STDMETHOD(ConvertToBlendedMesh)(THIS_ DWORD Options,
CONST LPDWORD pAdjacencyIn,
LPDWORD pAdjacencyOut,
DWORD* pNumBoneCombinations,
LPD3DXBUFFER* ppBoneCombinationTable,
DWORD* pFaceRemap,
LPD3DXBUFFER *ppVertexRemap,
DWORD* pNumBoneCombinations,
LPD3DXBUFFER* ppBoneCombinationTable,
DWORD* pFaceRemap,
LPD3DXBUFFER *ppVertexRemap,
LPD3DXMESH* ppMesh) PURE;
STDMETHOD(ConvertToIndexedBlendedMesh)(THIS_ DWORD Options,
CONST LPDWORD pAdjacencyIn,
DWORD paletteSize,
LPDWORD pAdjacencyOut,
DWORD* pNumBoneCombinations,
LPD3DXBUFFER* ppBoneCombinationTable,
DWORD* pFaceRemap,
LPD3DXBUFFER *ppVertexRemap,
STDMETHOD(ConvertToIndexedBlendedMesh)(THIS_ DWORD Options,
CONST LPDWORD pAdjacencyIn,
DWORD paletteSize,
LPDWORD pAdjacencyOut,
DWORD* pNumBoneCombinations,
LPD3DXBUFFER* ppBoneCombinationTable,
DWORD* pFaceRemap,
LPD3DXBUFFER *ppVertexRemap,
LPD3DXMESH* ppMesh) PURE;
STDMETHOD(GenerateSkinnedMesh)(THIS_ DWORD Options,
FLOAT minWeight,
CONST LPDWORD pAdjacencyIn,
LPDWORD pAdjacencyOut,
DWORD* pFaceRemap,
LPD3DXBUFFER *ppVertexRemap,
STDMETHOD(GenerateSkinnedMesh)(THIS_ DWORD Options,
FLOAT minWeight,
CONST LPDWORD pAdjacencyIn,
LPDWORD pAdjacencyOut,
DWORD* pFaceRemap,
LPD3DXBUFFER *ppVertexRemap,
LPD3DXMESH* ppMesh) PURE;
STDMETHOD(UpdateSkinnedMesh)(THIS_ CONST D3DXMATRIX* pBoneTransforms, CONST D3DXMATRIX* pBoneInvTransforms, LPD3DXMESH pMesh) PURE;
};
@ -413,28 +413,28 @@ DECLARE_INTERFACE_(ID3DXSkinMesh, IUnknown)
extern "C" {
#endif //__cplusplus
HRESULT WINAPI
HRESULT WINAPI
D3DXCreateMesh(
DWORD NumFaces,
DWORD NumVertices,
DWORD Options,
CONST DWORD *pDeclaration,
LPDIRECT3DDEVICE8 pD3D,
DWORD NumFaces,
DWORD NumVertices,
DWORD Options,
CONST DWORD *pDeclaration,
LPDIRECT3DDEVICE8 pD3D,
LPD3DXMESH* ppMesh);
HRESULT WINAPI
HRESULT WINAPI
D3DXCreateMeshFVF(
DWORD NumFaces,
DWORD NumVertices,
DWORD Options,
DWORD FVF,
LPDIRECT3DDEVICE8 pD3D,
DWORD NumFaces,
DWORD NumVertices,
DWORD Options,
DWORD FVF,
LPDIRECT3DDEVICE8 pD3D,
LPD3DXMESH* ppMesh);
HRESULT WINAPI
HRESULT WINAPI
D3DXCreateSPMesh(
LPD3DXMESH pMesh,
CONST DWORD* pAdjacency,
LPD3DXMESH pMesh,
CONST DWORD* pAdjacency,
CONST LPD3DXATTRIBUTEWEIGHTS pVertexAttributeWeights,
CONST FLOAT *pVertexWeights,
LPD3DXSPMESH* ppSMesh);
@ -454,87 +454,87 @@ HRESULT WINAPI
CONST DWORD* pAdjacency,
LPD3DXBUFFER* ppErrorsAndWarnings);
HRESULT WINAPI
HRESULT WINAPI
D3DXGeneratePMesh(
LPD3DXMESH pMesh,
CONST DWORD* pAdjacency,
LPD3DXMESH pMesh,
CONST DWORD* pAdjacency,
CONST LPD3DXATTRIBUTEWEIGHTS pVertexAttributeWeights,
CONST FLOAT *pVertexWeights,
DWORD MinValue,
DWORD Options,
DWORD MinValue,
DWORD Options,
LPD3DXPMESH* ppPMesh);
HRESULT WINAPI
HRESULT WINAPI
D3DXSimplifyMesh(
LPD3DXMESH pMesh,
CONST DWORD* pAdjacency,
LPD3DXMESH pMesh,
CONST DWORD* pAdjacency,
CONST LPD3DXATTRIBUTEWEIGHTS pVertexAttributeWeights,
CONST FLOAT *pVertexWeights,
DWORD MinValue,
DWORD Options,
DWORD MinValue,
DWORD Options,
LPD3DXMESH* ppMesh);
HRESULT WINAPI
HRESULT WINAPI
D3DXComputeBoundingSphere(
PVOID pPointsFVF,
DWORD NumVertices,
PVOID pPointsFVF,
DWORD NumVertices,
DWORD FVF,
D3DXVECTOR3 *pCenter,
D3DXVECTOR3 *pCenter,
FLOAT *pRadius);
HRESULT WINAPI
HRESULT WINAPI
D3DXComputeBoundingBox(
PVOID pPointsFVF,
DWORD NumVertices,
PVOID pPointsFVF,
DWORD NumVertices,
DWORD FVF,
D3DXVECTOR3 *pMin,
D3DXVECTOR3 *pMin,
D3DXVECTOR3 *pMax);
HRESULT WINAPI
HRESULT WINAPI
D3DXComputeNormals(
LPD3DXBASEMESH pMesh,
CONST DWORD *pAdjacency);
HRESULT WINAPI
HRESULT WINAPI
D3DXCreateBuffer(
DWORD NumBytes,
DWORD NumBytes,
LPD3DXBUFFER *ppBuffer);
HRESULT WINAPI
D3DXLoadMeshFromX(
LPSTR pFilename,
DWORD Options,
LPDIRECT3DDEVICE8 pD3D,
LPSTR pFilename,
DWORD Options,
LPDIRECT3DDEVICE8 pD3D,
LPD3DXBUFFER *ppAdjacency,
LPD3DXBUFFER *ppMaterials,
LPD3DXBUFFER *ppMaterials,
DWORD *pNumMaterials,
LPD3DXMESH *ppMesh);
HRESULT WINAPI
HRESULT WINAPI
D3DXLoadMeshFromXInMemory(
PBYTE Memory,
DWORD SizeOfMemory,
DWORD Options,
LPDIRECT3DDEVICE8 pD3D,
DWORD Options,
LPDIRECT3DDEVICE8 pD3D,
LPD3DXBUFFER *ppAdjacency,
LPD3DXBUFFER *ppMaterials,
LPD3DXBUFFER *ppMaterials,
DWORD *pNumMaterials,
LPD3DXMESH *ppMesh);
HRESULT WINAPI
HRESULT WINAPI
D3DXLoadMeshFromXResource(
HMODULE Module,
LPCTSTR Name,
LPCTSTR Type,
DWORD Options,
LPDIRECT3DDEVICE8 pD3D,
DWORD Options,
LPDIRECT3DDEVICE8 pD3D,
LPD3DXBUFFER *ppAdjacency,
LPD3DXBUFFER *ppMaterials,
LPD3DXBUFFER *ppMaterials,
DWORD *pNumMaterials,
LPD3DXMESH *ppMesh);
HRESULT WINAPI
HRESULT WINAPI
D3DXSaveMeshToX(
LPSTR pFilename,
LPD3DXMESH pMesh,
@ -544,33 +544,33 @@ HRESULT WINAPI
DWORD Format
);
HRESULT WINAPI
HRESULT WINAPI
D3DXCreatePMeshFromStream(
IStream *pStream,
IStream *pStream,
DWORD Options,
LPDIRECT3DDEVICE8 pD3DDevice,
LPDIRECT3DDEVICE8 pD3DDevice,
LPD3DXBUFFER *ppMaterials,
DWORD* pNumMaterials,
LPD3DXPMESH *ppPMesh);
HRESULT WINAPI
D3DXCreateSkinMesh(
DWORD NumFaces,
DWORD NumVertices,
DWORD NumFaces,
DWORD NumVertices,
DWORD NumBones,
DWORD Options,
CONST DWORD *pDeclaration,
LPDIRECT3DDEVICE8 pD3D,
DWORD Options,
CONST DWORD *pDeclaration,
LPDIRECT3DDEVICE8 pD3D,
LPD3DXSKINMESH* ppSkinMesh);
HRESULT WINAPI
D3DXCreateSkinMeshFVF(
DWORD NumFaces,
DWORD NumVertices,
DWORD NumFaces,
DWORD NumVertices,
DWORD NumBones,
DWORD Options,
DWORD FVF,
LPDIRECT3DDEVICE8 pD3D,
DWORD Options,
DWORD FVF,
LPDIRECT3DDEVICE8 pD3D,
LPD3DXSKINMESH* ppSkinMesh);
HRESULT WINAPI
@ -579,19 +579,19 @@ HRESULT WINAPI
DWORD numBones,
LPD3DXSKINMESH* ppSkinMesh);
HRESULT WINAPI
HRESULT WINAPI
D3DXLoadMeshFromXof(
LPDIRECTXFILEDATA pXofObjMesh,
DWORD Options,
LPDIRECT3DDEVICE8 pD3DDevice,
LPDIRECTXFILEDATA pXofObjMesh,
DWORD Options,
LPDIRECT3DDEVICE8 pD3DDevice,
LPD3DXBUFFER *ppAdjacency,
LPD3DXBUFFER *ppMaterials,
LPD3DXBUFFER *ppMaterials,
DWORD *pNumMaterials,
LPD3DXMESH *ppMesh);
HRESULT WINAPI
D3DXLoadSkinMeshFromXof(
LPDIRECTXFILEDATA pxofobjMesh,
LPDIRECTXFILEDATA pxofobjMesh,
DWORD Options,
LPDIRECT3DDEVICE8 pD3D,
LPD3DXBUFFER* ppAdjacency,
@ -603,9 +603,9 @@ HRESULT WINAPI
HRESULT WINAPI
D3DXTessellateNPatches(
LPD3DXMESH pMeshIn,
CONST DWORD* pAdjacencyIn,
FLOAT NumSegs,
LPD3DXMESH pMeshIn,
CONST DWORD* pAdjacencyIn,
FLOAT NumSegs,
BOOL QuadraticInterpNormals, // if false use linear intrep for normals, if true use quadratic
LPD3DXMESH *ppMeshOut,
LPD3DXBUFFER *ppAdjacencyOut);
@ -623,19 +623,19 @@ HRESULT WINAPI
CONST DWORD *pDeclarator,
DWORD *pFVF);
HRESULT WINAPI
HRESULT WINAPI
D3DXWeldVertices(
CONST LPD3DXMESH pMesh,
LPD3DXWELDEPSILONS pEpsilons,
CONST DWORD *pAdjacencyIn,
CONST LPD3DXMESH pMesh,
LPD3DXWELDEPSILONS pEpsilons,
CONST DWORD *pAdjacencyIn,
DWORD *pAdjacencyOut,
DWORD* pFaceRemap,
DWORD* pFaceRemap,
LPD3DXBUFFER *ppVertexRemap);
typedef struct _D3DXINTERSECTINFO
{
DWORD FaceIndex; // index of face intersected
FLOAT U; // Barycentric Hit Coordinates
FLOAT U; // Barycentric Hit Coordinates
FLOAT V; // Barycentric Hit Coordinates
FLOAT Dist; // Ray-Intersection Parameter Distance
} D3DXINTERSECTINFO, *LPD3DXINTERSECTINFO;
@ -645,13 +645,13 @@ HRESULT WINAPI
D3DXIntersect(
LPD3DXBASEMESH pMesh,
CONST D3DXVECTOR3 *pRayPos,
CONST D3DXVECTOR3 *pRayDir,
CONST D3DXVECTOR3 *pRayDir,
BOOL *pHit, // True if any faces were intersected
DWORD *pFaceIndex, // index of closest face intersected
FLOAT *pU, // Barycentric Hit Coordinates
FLOAT *pU, // Barycentric Hit Coordinates
FLOAT *pV, // Barycentric Hit Coordinates
FLOAT *pDist, // Ray-Intersection Parameter Distance
LPD3DXBUFFER *ppAllHits, // Array of D3DXINTERSECTINFOs for all hits (not just closest)
LPD3DXBUFFER *ppAllHits, // Array of D3DXINTERSECTINFOs for all hits (not just closest)
DWORD *pCountOfHits); // Number of entries in AllHits array
HRESULT WINAPI
@ -659,20 +659,20 @@ HRESULT WINAPI
LPD3DXBASEMESH pMesh,
DWORD AttribId,
CONST D3DXVECTOR3 *pRayPos,
CONST D3DXVECTOR3 *pRayDir,
CONST D3DXVECTOR3 *pRayDir,
BOOL *pHit, // True if any faces were intersected
DWORD *pFaceIndex, // index of closest face intersected
FLOAT *pU, // Barycentric Hit Coordinates
FLOAT *pU, // Barycentric Hit Coordinates
FLOAT *pV, // Barycentric Hit Coordinates
FLOAT *pDist, // Ray-Intersection Parameter Distance
LPD3DXBUFFER *ppAllHits, // Array of D3DXINTERSECTINFOs for all hits (not just closest)
LPD3DXBUFFER *ppAllHits, // Array of D3DXINTERSECTINFOs for all hits (not just closest)
DWORD *pCountOfHits); // Number of entries in AllHits array
HRESULT WINAPI D3DXSplitMesh
(
CONST LPD3DXMESH pMeshIn,
CONST DWORD *pAdjacencyIn,
CONST LPD3DXMESH pMeshIn,
CONST DWORD *pAdjacencyIn,
CONST DWORD MaxSize,
CONST DWORD Options,
DWORD *pMeshesOut,
@ -682,7 +682,7 @@ HRESULT WINAPI D3DXSplitMesh
LPD3DXBUFFER *ppVertRemapArrayOut
);
BOOL D3DXIntersectTri
BOOL D3DXIntersectTri
(
CONST D3DXVECTOR3 *p0, // Triangle vertex 0 position
CONST D3DXVECTOR3 *p1, // Triangle vertex 1 position
@ -700,9 +700,9 @@ BOOL WINAPI
CONST D3DXVECTOR3 *pRayPosition,
CONST D3DXVECTOR3 *pRayDirection);
BOOL WINAPI
BOOL WINAPI
D3DXBoxBoundProbe(
CONST D3DXVECTOR3 *pMin,
CONST D3DXVECTOR3 *pMin,
CONST D3DXVECTOR3 *pMax,
CONST D3DXVECTOR3 *pRayPosition,
CONST D3DXVECTOR3 *pRayDirection);

48
src/dep/include/DXSDK/include/d3dx8shape.h
View File

@ -22,7 +22,7 @@ extern "C" {
//-------------------------------------------------------------------------
// D3DXCreatePolygon:
// D3DXCreatePolygon:
// ------------------
// Creates a mesh containing an n-sided polygon. The polygon is centered
// at the origin.
@ -35,17 +35,17 @@ extern "C" {
// ppMesh The mesh object which will be created
// ppAdjacency Returns a buffer containing adjacency info. Can be NULL.
//-------------------------------------------------------------------------
HRESULT WINAPI
HRESULT WINAPI
D3DXCreatePolygon(
LPDIRECT3DDEVICE8 pDevice,
FLOAT Length,
UINT Sides,
FLOAT Length,
UINT Sides,
LPD3DXMESH* ppMesh,
LPD3DXBUFFER* ppAdjacency);
//-------------------------------------------------------------------------
// D3DXCreateBox:
// D3DXCreateBox:
// --------------
// Creates a mesh containing an axis-aligned box. The box is centered at
// the origin.
@ -59,9 +59,9 @@ HRESULT WINAPI
// ppMesh The mesh object which will be created
// ppAdjacency Returns a buffer containing adjacency info. Can be NULL.
//-------------------------------------------------------------------------
HRESULT WINAPI
HRESULT WINAPI
D3DXCreateBox(
LPDIRECT3DDEVICE8 pDevice,
LPDIRECT3DDEVICE8 pDevice,
FLOAT Width,
FLOAT Height,
FLOAT Depth,
@ -86,14 +86,14 @@ HRESULT WINAPI
// ppMesh The mesh object which will be created
// ppAdjacency Returns a buffer containing adjacency info. Can be NULL.
//-------------------------------------------------------------------------
HRESULT WINAPI
HRESULT WINAPI
D3DXCreateCylinder(
LPDIRECT3DDEVICE8 pDevice,
FLOAT Radius1,
FLOAT Radius2,
FLOAT Length,
UINT Slices,
UINT Stacks,
FLOAT Radius1,
FLOAT Radius2,
FLOAT Length,
UINT Slices,
UINT Stacks,
LPD3DXMESH* ppMesh,
LPD3DXBUFFER* ppAdjacency);
@ -115,9 +115,9 @@ HRESULT WINAPI
//-------------------------------------------------------------------------
HRESULT WINAPI
D3DXCreateSphere(
LPDIRECT3DDEVICE8 pDevice,
FLOAT Radius,
UINT Slices,
LPDIRECT3DDEVICE8 pDevice,
FLOAT Radius,
UINT Slices,
UINT Stacks,
LPD3DXMESH* ppMesh,
LPD3DXBUFFER* ppAdjacency);
@ -129,7 +129,7 @@ HRESULT WINAPI
// Creates a mesh containing a torus. The generated torus is centered at
// the origin, and its axis is aligned with the Z-axis.
//
// Parameters:
// Parameters:
//
// pDevice The D3D device with which the mesh is going to be used.
// InnerRadius Inner radius of the torus (should be >= 0.0f)
@ -143,19 +143,19 @@ HRESULT WINAPI
D3DXCreateTorus(
LPDIRECT3DDEVICE8 pDevice,
FLOAT InnerRadius,
FLOAT OuterRadius,
FLOAT OuterRadius,
UINT Sides,
UINT Rings,
UINT Rings,
LPD3DXMESH* ppMesh,
LPD3DXBUFFER* ppAdjacency);
//-------------------------------------------------------------------------
// D3DXCreateTeapot:
// D3DXCreateTeapot:
// -----------------
// Creates a mesh containing a teapot.
//
// Parameters:
// Parameters:
//
// pDevice The D3D device with which the mesh is going to be used.
// ppMesh The mesh object which will be created
@ -169,8 +169,8 @@ HRESULT WINAPI
//-------------------------------------------------------------------------
// D3DXCreateText:
// ---------------
// D3DXCreateText:
// ---------------
// Creates a mesh containing the specified text using the font associated
// with the device context.
//
@ -215,6 +215,6 @@ HRESULT WINAPI
#ifdef __cplusplus
}
#endif //__cplusplus
#endif //__cplusplus
#endif //__D3DX8SHAPES_H__

50
src/dep/include/DXSDK/include/d3dx8tex.h
View File

@ -27,14 +27,14 @@
// from the source image.
// D3DX_FILTER_LINEAR
// Each destination pixel is computed by linearly interpolating between
// the nearest pixels in the source image. This filter works best
// the nearest pixels in the source image. This filter works best
// when the scale on each axis is less than 2.
// D3DX_FILTER_TRIANGLE
// Every pixel in the source image contributes equally to the
// destination image. This is the slowest of all the filters.
// D3DX_FILTER_BOX
// Each pixel is computed by averaging a 2x2(x2) box pixels from
// the source image. Only works when the dimensions of the
// Each pixel is computed by averaging a 2x2(x2) box pixels from
// the source image. Only works when the dimensions of the
// destination are half those of the source. (as with mip maps)
//
// And can be OR'd with any of these optional flags:
@ -84,7 +84,7 @@
// D3DX_NORMALMAP_MIRROR
// Same as specifying D3DX_NORMALMAP_MIRROR_U | D3DX_NORMALMAP_MIRROR_V
// D3DX_NORMALMAP_INVERTSIGN
// Inverts the direction of each normal
// Inverts the direction of each normal
// D3DX_NORMALMAP_COMPUTE_OCCLUSION
// Compute the per pixel Occlusion term and encodes it into the alpha.
// An Alpha of 1 means that the pixel is not obscured in anyway, and
@ -118,7 +118,7 @@
// D3DX_CHANNEL_ALPHA
// Indicates the alpha channel should be used
// D3DX_CHANNEL_LUMINANCE
// Indicates the luminaces of the red green and blue channels should be
// Indicates the luminaces of the red green and blue channels should be
// used.
//
//----------------------------------------------------------------------------
@ -161,10 +161,10 @@ typedef enum _D3DXIMAGE_FILEFORMAT
// Parameters:
// pOut
// Pointer to a vector which the function uses to return its result.
// X,Y,Z,W will be mapped to R,G,B,A respectivly.
// X,Y,Z,W will be mapped to R,G,B,A respectivly.
// pTexCoord
// Pointer to a vector containing the coordinates of the texel currently
// being evaluated. Textures and VolumeTexture texcoord components
// Pointer to a vector containing the coordinates of the texel currently
// being evaluated. Textures and VolumeTexture texcoord components
// range from 0 to 1. CubeTexture texcoord component range from -1 to 1.
// pTexelSize
// Pointer to a vector containing the dimensions of the current texel.
@ -175,7 +175,7 @@ typedef enum _D3DXIMAGE_FILEFORMAT
typedef VOID (*LPD3DXFILL2D)(D3DXVECTOR4 *pOut, D3DXVECTOR2 *pTexCoord, D3DXVECTOR2 *pTexelSize, LPVOID pData);
typedef VOID (*LPD3DXFILL3D)(D3DXVECTOR4 *pOut, D3DXVECTOR3 *pTexCoord, D3DXVECTOR3 *pTexelSize, LPVOID pData);
//----------------------------------------------------------------------------
@ -183,7 +183,7 @@ typedef VOID (*LPD3DXFILL3D)(D3DXVECTOR4 *pOut, D3DXVECTOR3 *pTexCoord, D3DXVECT
// ---------------
// This structure is used to return a rough description of what the
// the original contents of an image file looked like.
//
//
// Width
// Width of original image in pixels
// Height
@ -246,7 +246,7 @@ extern "C" {
// SrcDataSize
// Size in bytes of file in memory.
// pSrcInfo
// Pointer to a D3DXIMAGE_INFO structure to be filled in with the
// Pointer to a D3DXIMAGE_INFO structure to be filled in with the
// description of the data in the source image file.
//
//----------------------------------------------------------------------------
@ -331,10 +331,10 @@ HRESULT WINAPI
// ColorKey
// Color to replace with transparent black, or 0 to disable colorkey.
// This is always a 32-bit ARGB color, independent of the source image
// format. Alpha is significant, and should usually be set to FF for
// format. Alpha is significant, and should usually be set to FF for
// opaque colorkeys. (ex. Opaque black == 0xff000000)
// pSrcInfo
// Pointer to a D3DXIMAGE_INFO structure to be filled in with the
// Pointer to a D3DXIMAGE_INFO structure to be filled in with the
// description of the data in the source image file, or NULL.
//
//----------------------------------------------------------------------------
@ -440,7 +440,7 @@ HRESULT WINAPI
// ColorKey
// Color to replace with transparent black, or 0 to disable colorkey.
// This is always a 32-bit ARGB color, independent of the source image
// format. Alpha is significant, and should usually be set to FF for
// format. Alpha is significant, and should usually be set to FF for
// opaque colorkeys. (ex. Opaque black == 0xff000000)
//
//----------------------------------------------------------------------------
@ -486,7 +486,7 @@ HRESULT WINAPI
// ColorKey
// Color to replace with transparent black, or 0 to disable colorkey.
// This is always a 32-bit ARGB color, independent of the source image
// format. Alpha is significant, and should usually be set to FF for
// format. Alpha is significant, and should usually be set to FF for
// opaque colorkeys. (ex. Opaque black == 0xff000000)
//
//----------------------------------------------------------------------------
@ -584,10 +584,10 @@ HRESULT WINAPI
// ColorKey
// Color to replace with transparent black, or 0 to disable colorkey.
// This is always a 32-bit ARGB color, independent of the source image
// format. Alpha is significant, and should usually be set to FF for
// format. Alpha is significant, and should usually be set to FF for
// opaque colorkeys. (ex. Opaque black == 0xff000000)
// pSrcInfo
// Pointer to a D3DXIMAGE_INFO structure to be filled in with the
// Pointer to a D3DXIMAGE_INFO structure to be filled in with the
// description of the data in the source image file, or NULL.
//
//----------------------------------------------------------------------------
@ -691,7 +691,7 @@ HRESULT WINAPI
// ColorKey
// Color to replace with transparent black, or 0 to disable colorkey.
// This is always a 32-bit ARGB color, independent of the source image
// format. Alpha is significant, and should usually be set to FF for
// format. Alpha is significant, and should usually be set to FF for
// opaque colorkeys. (ex. Opaque black == 0xff000000)
//
//----------------------------------------------------------------------------
@ -741,7 +741,7 @@ HRESULT WINAPI
// ColorKey
// Color to replace with transparent black, or 0 to disable colorkey.
// This is always a 32-bit ARGB color, independent of the source image
// format. Alpha is significant, and should usually be set to FF for
// format. Alpha is significant, and should usually be set to FF for
// opaque colorkeys. (ex. Opaque black == 0xff000000)
//
//----------------------------------------------------------------------------
@ -965,10 +965,10 @@ HRESULT WINAPI
// ColorKey
// Color to replace with transparent black, or 0 to disable colorkey.
// This is always a 32-bit ARGB color, independent of the source image
// format. Alpha is significant, and should usually be set to FF for
// format. Alpha is significant, and should usually be set to FF for
// opaque colorkeys. (ex. Opaque black == 0xff000000)
// pSrcInfo
// Pointer to a D3DXIMAGE_INFO structure to be filled in with the
// Pointer to a D3DXIMAGE_INFO structure to be filled in with the
// description of the data in the source image file, or NULL.
// pPalette
// 256 color palette to be filled in, or NULL
@ -1496,7 +1496,7 @@ HRESULT WINAPI
// pPalette
// 256 color palette to be used, or NULL for non-palettized formats
// SrcLevel
// The level whose image is used to generate the subsequent levels.
// The level whose image is used to generate the subsequent levels.
// Filter
// D3DX_FILTER flags controlling how each miplevel is filtered.
// Or D3DX_DEFAULT for D3DX_FILTER_BOX,
@ -1525,10 +1525,10 @@ HRESULT WINAPI
// pTexture, pCubeTexture, pVolumeTexture
// Pointer to the texture to be filled.
// pFunction
// Pointer to user provided evalutor function which will be used to
// Pointer to user provided evalutor function which will be used to
// compute the value of each texel.
// pData
// Pointer to an arbitrary block of user defined data. This pointer
// Pointer to an arbitrary block of user defined data. This pointer
// will be passed to the function provided in pFunction
//-----------------------------------------------------------------------------
@ -1562,7 +1562,7 @@ HRESULT WINAPI
// pTexture
// Pointer to the destination texture
// pSrcTexture
// Pointer to the source heightmap texture
// Pointer to the source heightmap texture
// pSrcPalette
// Source palette of 256 colors, or NULL
// Flags

202
src/dep/include/DXSDK/include/d3dx9anim.h
View File

@ -11,19 +11,19 @@
#define __D3DX9ANIM_H__
// {698CFB3F-9289-4d95-9A57-33A94B5A65F9}
DEFINE_GUID(IID_ID3DXAnimationSet,
DEFINE_GUID(IID_ID3DXAnimationSet,
0x698cfb3f, 0x9289, 0x4d95, 0x9a, 0x57, 0x33, 0xa9, 0x4b, 0x5a, 0x65, 0xf9);
// {FA4E8E3A-9786-407d-8B4C-5995893764AF}
DEFINE_GUID(IID_ID3DXKeyframedAnimationSet,
DEFINE_GUID(IID_ID3DXKeyframedAnimationSet,
0xfa4e8e3a, 0x9786, 0x407d, 0x8b, 0x4c, 0x59, 0x95, 0x89, 0x37, 0x64, 0xaf);
// {6CC2480D-3808-4739-9F88-DE49FACD8D4C}
DEFINE_GUID(IID_ID3DXCompressedAnimationSet,
DEFINE_GUID(IID_ID3DXCompressedAnimationSet,
0x6cc2480d, 0x3808, 0x4739, 0x9f, 0x88, 0xde, 0x49, 0xfa, 0xcd, 0x8d, 0x4c);
// {AC8948EC-F86D-43e2-96DE-31FC35F96D9E}
DEFINE_GUID(IID_ID3DXAnimationController,
DEFINE_GUID(IID_ID3DXAnimationController,
0xac8948ec, 0xf86d, 0x43e2, 0x96, 0xde, 0x31, 0xfc, 0x35, 0xf9, 0x6d, 0x9e);
@ -43,7 +43,7 @@ typedef enum _D3DXMESHDATATYPE {
//----------------------------------------------------------------------------
// D3DXMESHDATA:
// -------------
// This struct encapsulates a the mesh data that can be present in a mesh
// This struct encapsulates a the mesh data that can be present in a mesh
// container. The supported mesh types are pMesh, pPMesh, pPatchMesh.
// The valid way to access this is determined by the Type enum.
//----------------------------------------------------------------------------
@ -131,7 +131,7 @@ DECLARE_INTERFACE(ID3DXAllocateHierarchy)
// Returns the created frame object
//
//------------------------------------------------------------------------
STDMETHOD(CreateFrame)(THIS_ LPCSTR Name,
STDMETHOD(CreateFrame)(THIS_ LPCSTR Name,
LPD3DXFRAME *ppNewFrame) PURE;
//------------------------------------------------------------------------
@ -159,20 +159,20 @@ DECLARE_INTERFACE(ID3DXAllocateHierarchy)
// pSkinInfo
// Pointer to the skininfo object if the mesh is skinned
// pBoneNames
// Array of names, one for each bone in the skinned mesh.
// Array of names, one for each bone in the skinned mesh.
// The numberof bones can be found from the pSkinMesh object
// pBoneOffsetMatrices
// Array of matrices, one for each bone in the skinned mesh.
//
//------------------------------------------------------------------------
STDMETHOD(CreateMeshContainer)(THIS_
LPCSTR Name,
CONST D3DXMESHDATA *pMeshData,
CONST D3DXMATERIAL *pMaterials,
CONST D3DXEFFECTINSTANCE *pEffectInstances,
DWORD NumMaterials,
CONST DWORD *pAdjacency,
LPD3DXSKININFO pSkinInfo,
STDMETHOD(CreateMeshContainer)(THIS_
LPCSTR Name,
CONST D3DXMESHDATA *pMeshData,
CONST D3DXMATERIAL *pMaterials,
CONST D3DXEFFECTINSTANCE *pEffectInstances,
DWORD NumMaterials,
CONST DWORD *pAdjacency,
LPD3DXSKININFO pSkinInfo,
LPD3DXMESHCONTAINER *ppNewMeshContainer) PURE;
//------------------------------------------------------------------------
@ -185,7 +185,7 @@ DECLARE_INTERFACE(ID3DXAllocateHierarchy)
// Pointer to the frame to be de-allocated
//
//------------------------------------------------------------------------
STDMETHOD(DestroyFrame)(THIS_ LPD3DXFRAME pFrameToFree) PURE;
STDMETHOD(DestroyFrame)(THIS_ LPD3DXFRAME pFrameToFree) PURE;
//------------------------------------------------------------------------
// DestroyMeshContainer:
@ -197,7 +197,7 @@ DECLARE_INTERFACE(ID3DXAllocateHierarchy)
// Pointer to the mesh container object to be de-allocated
//
//------------------------------------------------------------------------
STDMETHOD(DestroyMeshContainer)(THIS_ LPD3DXMESHCONTAINER pMeshContainerToFree) PURE;
STDMETHOD(DestroyMeshContainer)(THIS_ LPD3DXMESHCONTAINER pMeshContainerToFree) PURE;
};
//----------------------------------------------------------------------------
@ -216,12 +216,12 @@ typedef interface ID3DXLoadUserData *LPD3DXLOADUSERDATA;
DECLARE_INTERFACE(ID3DXLoadUserData)
{
STDMETHOD(LoadTopLevelData)(LPD3DXFILEDATA pXofChildData) PURE;
STDMETHOD(LoadFrameChildData)(LPD3DXFRAME pFrame,
STDMETHOD(LoadFrameChildData)(LPD3DXFRAME pFrame,
LPD3DXFILEDATA pXofChildData) PURE;
STDMETHOD(LoadMeshChildData)(LPD3DXMESHCONTAINER pMeshContainer,
LPD3DXFILEDATA pXofChildData) PURE;
STDMETHOD(LoadMeshChildData)(LPD3DXMESHCONTAINER pMeshContainer,
LPD3DXFILEDATA pXofChildData) PURE;
};
//----------------------------------------------------------------------------
@ -239,29 +239,29 @@ typedef interface ID3DXSaveUserData *LPD3DXSAVEUSERDATA;
DECLARE_INTERFACE(ID3DXSaveUserData)
{
STDMETHOD(AddFrameChildData)(CONST D3DXFRAME *pFrame,
LPD3DXFILESAVEOBJECT pXofSave,
STDMETHOD(AddFrameChildData)(CONST D3DXFRAME *pFrame,
LPD3DXFILESAVEOBJECT pXofSave,
LPD3DXFILESAVEDATA pXofFrameData) PURE;
STDMETHOD(AddMeshChildData)(CONST D3DXMESHCONTAINER *pMeshContainer,
LPD3DXFILESAVEOBJECT pXofSave,
STDMETHOD(AddMeshChildData)(CONST D3DXMESHCONTAINER *pMeshContainer,
LPD3DXFILESAVEOBJECT pXofSave,
LPD3DXFILESAVEDATA pXofMeshData) PURE;
// NOTE: this is called once per Save. All top level objects should be added using the
// NOTE: this is called once per Save. All top level objects should be added using the
// provided interface. One call adds objects before the frame hierarchy, the other after
STDMETHOD(AddTopLevelDataObjectsPre)(LPD3DXFILESAVEOBJECT pXofSave) PURE;
STDMETHOD(AddTopLevelDataObjectsPost)(LPD3DXFILESAVEOBJECT pXofSave) PURE;
STDMETHOD(AddTopLevelDataObjectsPre)(LPD3DXFILESAVEOBJECT pXofSave) PURE;
STDMETHOD(AddTopLevelDataObjectsPost)(LPD3DXFILESAVEOBJECT pXofSave) PURE;
// callbacks for the user to register and then save templates to the XFile
STDMETHOD(RegisterTemplates)(LPD3DXFILE pXFileApi) PURE;
STDMETHOD(SaveTemplates)(LPD3DXFILESAVEOBJECT pXofSave) PURE;
STDMETHOD(RegisterTemplates)(LPD3DXFILE pXFileApi) PURE;
STDMETHOD(SaveTemplates)(LPD3DXFILESAVEOBJECT pXofSave) PURE;
};
//----------------------------------------------------------------------------
// D3DXCALLBACK_SEARCH_FLAGS:
// --------------------------
// Flags that can be passed into ID3DXAnimationSet::GetCallback.
// Flags that can be passed into ID3DXAnimationSet::GetCallback.
//----------------------------------------------------------------------------
typedef enum _D3DXCALLBACK_SEARCH_FLAGS
{
@ -302,7 +302,7 @@ DECLARE_INTERFACE_(ID3DXAnimationSet, IUnknown)
STDMETHOD(GetAnimationIndexByName)(THIS_ LPCSTR pName, UINT *pIndex) PURE;
// SRT
STDMETHOD(GetSRT)(THIS_
STDMETHOD(GetSRT)(THIS_
DOUBLE PeriodicPosition, // Position mapped to period (use GetPeriodicPosition)
UINT Animation, // Animation index
D3DXVECTOR3 *pScale, // Returns the scale
@ -310,7 +310,7 @@ DECLARE_INTERFACE_(ID3DXAnimationSet, IUnknown)
D3DXVECTOR3 *pTranslation) PURE; // Returns the translation
// Callbacks
STDMETHOD(GetCallback)(THIS_
STDMETHOD(GetCallback)(THIS_
DOUBLE Position, // Position from which to find callbacks
DWORD Flags, // Callback search flags
DOUBLE *pCallbackPosition, // Returns the position of the callback
@ -365,7 +365,7 @@ typedef struct _D3DXKEY_QUATERNION
// D3DXKEY_CALLBACK:
// -----------------
// This structure describes an callback key for use in keyframe animation.
// It specifies a pointer to user data at a given Time.
// It specifies a pointer to user data at a given Time.
//----------------------------------------------------------------------------
typedef struct _D3DXKEY_CALLBACK
{
@ -377,7 +377,7 @@ typedef struct _D3DXKEY_CALLBACK
//----------------------------------------------------------------------------
// D3DXCOMPRESSION_FLAGS:
// ----------------------
// Flags that can be passed into ID3DXKeyframedAnimationSet::Compress.
// Flags that can be passed into ID3DXKeyframedAnimationSet::Compress.
//----------------------------------------------------------------------------
typedef enum _D3DXCOMPRESSION_FLAGS
{
@ -418,7 +418,7 @@ DECLARE_INTERFACE_(ID3DXKeyframedAnimationSet, ID3DXAnimationSet)
STDMETHOD(GetAnimationIndexByName)(THIS_ LPCSTR pName, UINT *pIndex) PURE;
// SRT
STDMETHOD(GetSRT)(THIS_
STDMETHOD(GetSRT)(THIS_
DOUBLE PeriodicPosition, // Position mapped to period (use GetPeriodicPosition)
UINT Animation, // Animation index
D3DXVECTOR3 *pScale, // Returns the scale
@ -426,7 +426,7 @@ DECLARE_INTERFACE_(ID3DXKeyframedAnimationSet, ID3DXAnimationSet)
D3DXVECTOR3 *pTranslation) PURE; // Returns the translation
// Callbacks
STDMETHOD(GetCallback)(THIS_
STDMETHOD(GetCallback)(THIS_
DOUBLE Position, // Position from which to find callbacks
DWORD Flags, // Callback search flags
DOUBLE *pCallbackPosition, // Returns the position of the callback
@ -466,7 +466,7 @@ DECLARE_INTERFACE_(ID3DXKeyframedAnimationSet, ID3DXAnimationSet)
STDMETHOD(UnregisterTranslationKey)(THIS_ UINT Animation, UINT Key) PURE;
// One-time animaton SRT keyframe registration
STDMETHOD(RegisterAnimationSRTKeys)(THIS_
STDMETHOD(RegisterAnimationSRTKeys)(THIS_
LPCSTR pName, // Animation name
UINT NumScaleKeys, // Number of scale keys
UINT NumRotationKeys, // Number of rotation keys
@ -474,10 +474,10 @@ DECLARE_INTERFACE_(ID3DXKeyframedAnimationSet, ID3DXAnimationSet)
CONST D3DXKEY_VECTOR3 *pScaleKeys, // Array of scale keys
CONST D3DXKEY_QUATERNION *pRotationKeys, // Array of rotation keys
CONST D3DXKEY_VECTOR3 *pTranslationKeys, // Array of translation keys
DWORD *pAnimationIndex) PURE; // Returns the animation index
DWORD *pAnimationIndex) PURE; // Returns the animation index
// Compression
STDMETHOD(Compress)(THIS_
STDMETHOD(Compress)(THIS_
DWORD Flags, // Compression flags (use D3DXCOMPRESS_STRONG for better results)
FLOAT Lossiness, // Compression loss ratio in the [0, 1] range
LPD3DXFRAME pHierarchy, // Frame hierarchy (optional)
@ -518,7 +518,7 @@ DECLARE_INTERFACE_(ID3DXCompressedAnimationSet, ID3DXAnimationSet)
STDMETHOD(GetAnimationIndexByName)(THIS_ LPCSTR pName, UINT *pIndex) PURE;
// SRT
STDMETHOD(GetSRT)(THIS_
STDMETHOD(GetSRT)(THIS_
DOUBLE PeriodicPosition, // Position mapped to period (use GetPeriodicPosition)
UINT Animation, // Animation index
D3DXVECTOR3 *pScale, // Returns the scale
@ -526,7 +526,7 @@ DECLARE_INTERFACE_(ID3DXCompressedAnimationSet, ID3DXAnimationSet)
D3DXVECTOR3 *pTranslation) PURE; // Returns the translation
// Callbacks
STDMETHOD(GetCallback)(THIS_
STDMETHOD(GetCallback)(THIS_
DOUBLE Position, // Position from which to find callbacks
DWORD Flags, // Callback search flags
DOUBLE *pCallbackPosition, // Returns the position of the callback
@ -560,12 +560,12 @@ typedef enum _D3DXPRIORITY_TYPE {
//----------------------------------------------------------------------------
// D3DXTRACK_DESC:
// ---------------
// This structure describes the mixing information of an animation track.
// The mixing information consists of the current position, speed, and blending
// weight for the track. The Flags field also specifies whether the track is
// This structure describes the mixing information of an animation track.
// The mixing information consists of the current position, speed, and blending
// weight for the track. The Flags field also specifies whether the track is
// low or high priority. Tracks with the same priority are blended together
// and then the two resulting values are blended using the priority blend factor.
// A track also has an animation set (stored separately) associated with it.
// A track also has an animation set (stored separately) associated with it.
//----------------------------------------------------------------------------
typedef struct _D3DXTRACK_DESC
{
@ -595,7 +595,7 @@ typedef enum _D3DXEVENT_TYPE
//----------------------------------------------------------------------------
// D3DXTRANSITION_TYPE:
// --------------------
// This enum defines the type of transtion performed on a event that
// This enum defines the type of transtion performed on a event that
// transitions from one value to another.
//----------------------------------------------------------------------------
typedef enum _D3DXTRANSITION_TYPE {
@ -609,7 +609,7 @@ typedef enum _D3DXTRANSITION_TYPE {
// D3DXEVENT_DESC:
// ---------------
// This structure describes a animation controller event.
// It gives the event's type, track (if the event is a track event), global
// It gives the event's type, track (if the event is a track event), global
// start time, duration, transition method, and target value.
//----------------------------------------------------------------------------
typedef struct _D3DXEVENT_DESC
@ -641,8 +641,8 @@ typedef D3DXEVENTHANDLE *LPD3DXEVENTHANDLE;
// ID3DXAnimationCallbackHandler:
// ------------------------------
// This interface is intended to be implemented by the application, and can
// be used to handle callbacks in animation sets generated when
// ID3DXAnimationController::AdvanceTime() is called.
// be used to handle callbacks in animation sets generated when
// ID3DXAnimationController::AdvanceTime() is called.
//----------------------------------------------------------------------------
typedef interface ID3DXAnimationCallbackHandler ID3DXAnimationCallbackHandler;
typedef interface ID3DXAnimationCallbackHandler *LPD3DXANIMATIONCALLBACKHANDLER;
@ -656,7 +656,7 @@ DECLARE_INTERFACE(ID3DXAnimationCallbackHandler)
// ID3DXAnimationCallbackHandler::HandleCallback:
// ----------------------------------------------
// This method gets called when a callback occurs for an animation set in one
// of the tracks during the ID3DXAnimationController::AdvanceTime() call.
// of the tracks during the ID3DXAnimationController::AdvanceTime() call.
//
// Parameters:
// Track
@ -665,7 +665,7 @@ DECLARE_INTERFACE(ID3DXAnimationCallbackHandler)
// Pointer to user owned callback data.
//
//----------------------------------------------------------------------------
STDMETHOD(HandleCallback)(THIS_ UINT Track, LPVOID pCallbackData) PURE;
STDMETHOD(HandleCallback)(THIS_ UINT Track, LPVOID pCallbackData) PURE;
};
@ -675,7 +675,7 @@ DECLARE_INTERFACE(ID3DXAnimationCallbackHandler)
// This interface implements the main animation functionality. It connects
// animation sets with the transform frames that are being animated. Allows
// mixing multiple animations for blended animations or for transistions
// It adds also has methods to modify blending parameters over time to
// It adds also has methods to modify blending parameters over time to
// enable smooth transistions and other effects.
//----------------------------------------------------------------------------
typedef interface ID3DXAnimationController ID3DXAnimationController;
@ -698,11 +698,11 @@ DECLARE_INTERFACE_(ID3DXAnimationController, IUnknown)
STDMETHOD_(UINT, GetMaxNumEvents)(THIS) PURE;
// Animation output registration
STDMETHOD(RegisterAnimationOutput)(THIS_
LPCSTR pName,
D3DXMATRIX *pMatrix,
D3DXVECTOR3 *pScale,
D3DXQUATERNION *pRotation,
STDMETHOD(RegisterAnimationOutput)(THIS_
LPCSTR pName,
D3DXMATRIX *pMatrix,
D3DXVECTOR3 *pScale,
D3DXQUATERNION *pRotation,
D3DXVECTOR3 *pTranslation) PURE;
// Animation set registration
@ -762,11 +762,11 @@ DECLARE_INTERFACE_(ID3DXAnimationController, IUnknown)
STDMETHOD(GetEventDesc)(THIS_ D3DXEVENTHANDLE hEvent, LPD3DXEVENT_DESC pDesc) PURE;
// Cloning
STDMETHOD(CloneAnimationController)(THIS_
UINT MaxNumAnimationOutputs,
UINT MaxNumAnimationSets,
UINT MaxNumTracks,
UINT MaxNumEvents,
STDMETHOD(CloneAnimationController)(THIS_
UINT MaxNumAnimationOutputs,
UINT MaxNumAnimationSets,
UINT MaxNumTracks,
UINT MaxNumEvents,
LPD3DXANIMATIONCONTROLLER *ppAnimController) PURE;
};
@ -798,26 +798,26 @@ extern "C" {
// in the .X file. This is created with default max tracks and events
//
//----------------------------------------------------------------------------
HRESULT WINAPI
HRESULT WINAPI
D3DXLoadMeshHierarchyFromXA
(
LPCSTR Filename,
DWORD MeshOptions,
LPDIRECT3DDEVICE9 pD3DDevice,
LPD3DXALLOCATEHIERARCHY pAlloc,
LPD3DXLOADUSERDATA pUserDataLoader,
LPD3DXLOADUSERDATA pUserDataLoader,
LPD3DXFRAME *ppFrameHierarchy,
LPD3DXANIMATIONCONTROLLER *ppAnimController
);
HRESULT WINAPI
HRESULT WINAPI
D3DXLoadMeshHierarchyFromXW
(
LPCWSTR Filename,
DWORD MeshOptions,
LPDIRECT3DDEVICE9 pD3DDevice,
LPD3DXALLOCATEHIERARCHY pAlloc,
LPD3DXLOADUSERDATA pUserDataLoader,
LPD3DXLOADUSERDATA pUserDataLoader,
LPD3DXFRAME *ppFrameHierarchy,
LPD3DXANIMATIONCONTROLLER *ppAnimController
);
@ -828,7 +828,7 @@ D3DXLoadMeshHierarchyFromXW
#define D3DXLoadMeshHierarchyFromX D3DXLoadMeshHierarchyFromXA
#endif
HRESULT WINAPI
HRESULT WINAPI
D3DXLoadMeshHierarchyFromXInMemory
(
LPCVOID Memory,
@ -836,7 +836,7 @@ D3DXLoadMeshHierarchyFromXInMemory
DWORD MeshOptions,
LPDIRECT3DDEVICE9 pD3DDevice,
LPD3DXALLOCATEHIERARCHY pAlloc,
LPD3DXLOADUSERDATA pUserDataLoader,
LPD3DXLOADUSERDATA pUserDataLoader,
LPD3DXFRAME *ppFrameHierarchy,
LPD3DXANIMATIONCONTROLLER *ppAnimController
);
@ -861,22 +861,22 @@ D3DXLoadMeshHierarchyFromXInMemory
// data objects saved to .X file
//
//----------------------------------------------------------------------------
HRESULT WINAPI
HRESULT WINAPI
D3DXSaveMeshHierarchyToFileA
(
LPCSTR Filename,
DWORD XFormat,
CONST D3DXFRAME *pFrameRoot,
CONST D3DXFRAME *pFrameRoot,
LPD3DXANIMATIONCONTROLLER pAnimcontroller,
LPD3DXSAVEUSERDATA pUserDataSaver
);
HRESULT WINAPI
HRESULT WINAPI
D3DXSaveMeshHierarchyToFileW
(
LPCWSTR Filename,
DWORD XFormat,
CONST D3DXFRAME *pFrameRoot,
CONST D3DXFRAME *pFrameRoot,
LPD3DXANIMATIONCONTROLLER pAnimController,
LPD3DXSAVEUSERDATA pUserDataSaver
);
@ -918,7 +918,7 @@ D3DXFrameDestroy
// Pointer to the child node
//
//----------------------------------------------------------------------------
HRESULT WINAPI
HRESULT WINAPI
D3DXFrameAppendChild
(
LPD3DXFRAME pFrameParent,
@ -937,7 +937,7 @@ D3DXFrameAppendChild
// Name of frame to find
//
//----------------------------------------------------------------------------
LPD3DXFRAME WINAPI
LPD3DXFRAME WINAPI
D3DXFrameFind
(
CONST D3DXFRAME *pFrameRoot,
@ -967,7 +967,7 @@ D3DXFrameRegisterNamedMatrices
//----------------------------------------------------------------------------
// D3DXFrameNumNamedMatrices:
// --------------------------
// Counts number of frames in a subtree that have non-null names
// Counts number of frames in a subtree that have non-null names
//
// Parameters:
// pFrameRoot
@ -999,9 +999,9 @@ D3DXFrameNumNamedMatrices
HRESULT WINAPI
D3DXFrameCalculateBoundingSphere
(
CONST D3DXFRAME *pFrameRoot,
LPD3DXVECTOR3 pObjectCenter,
FLOAT *pObjectRadius
CONST D3DXFRAME *pFrameRoot,
LPD3DXVECTOR3 pObjectCenter,
FLOAT *pObjectRadius
);
@ -1009,7 +1009,7 @@ D3DXFrameCalculateBoundingSphere
// D3DXCreateKeyframedAnimationSet:
// --------------------------------
// This function creates a compressable keyframed animations set interface.
//
//
// Parameters:
// pName
// Name of the animation set
@ -1025,27 +1025,27 @@ D3DXFrameCalculateBoundingSphere
// Array of callback keys
// ppAnimationSet
// Returns the animation set interface
//
//
//-----------------------------------------------------------------------------
HRESULT WINAPI
D3DXCreateKeyframedAnimationSet
(
LPCSTR pName,
LPCSTR pName,
DOUBLE TicksPerSecond,
D3DXPLAYBACK_TYPE Playback,
UINT NumAnimations,
UINT NumCallbackKeys,
CONST D3DXKEY_CALLBACK *pCallbackKeys,
LPD3DXKEYFRAMEDANIMATIONSET *ppAnimationSet
UINT NumAnimations,
UINT NumCallbackKeys,
CONST D3DXKEY_CALLBACK *pCallbackKeys,
LPD3DXKEYFRAMEDANIMATIONSET *ppAnimationSet
);
//----------------------------------------------------------------------------
// D3DXCreateCompressedAnimationSet:
// --------------------------------
// This function creates a compressed animations set interface from
// This function creates a compressed animations set interface from
// compressed data.
//
//
// Parameters:
// pName
// Name of the animation set
@ -1061,18 +1061,18 @@ D3DXCreateKeyframedAnimationSet
// Array of callback keys
// ppAnimationSet
// Returns the animation set interface
//
//
//-----------------------------------------------------------------------------
HRESULT WINAPI
D3DXCreateCompressedAnimationSet
(
LPCSTR pName,
LPCSTR pName,
DOUBLE TicksPerSecond,
D3DXPLAYBACK_TYPE Playback,
LPD3DXBUFFER pCompressedData,
UINT NumCallbackKeys,
CONST D3DXKEY_CALLBACK *pCallbackKeys,
LPD3DXCOMPRESSEDANIMATIONSET *ppAnimationSet
LPD3DXBUFFER pCompressedData,
UINT NumCallbackKeys,
CONST D3DXKEY_CALLBACK *pCallbackKeys,
LPD3DXCOMPRESSEDANIMATIONSET *ppAnimationSet
);
@ -1097,10 +1097,10 @@ D3DXCreateCompressedAnimationSet
HRESULT WINAPI
D3DXCreateAnimationController
(
UINT MaxNumMatrices,
UINT MaxNumAnimationSets,
UINT MaxNumTracks,
UINT MaxNumEvents,
UINT MaxNumMatrices,
UINT MaxNumAnimationSets,
UINT MaxNumTracks,
UINT MaxNumEvents,
LPD3DXANIMATIONCONTROLLER *ppAnimController
);

118
src/dep/include/DXSDK/include/d3dx9core.h
View File

@ -17,9 +17,9 @@
// D3DX_SDK_VERSION:
// -----------------
// This identifier is passed to D3DXCheckVersion in order to ensure that an
// application was built against the correct header files and lib files.
// This number is incremented whenever a header (or other) change would
// require applications to be rebuilt. If the version doesn't match,
// application was built against the correct header files and lib files.
// This number is incremented whenever a header (or other) change would
// require applications to be rebuilt. If the version doesn't match,
// D3DXCheckVersion will return FALSE. (The number itself has no meaning.)
///////////////////////////////////////////////////////////////////////////
@ -52,7 +52,7 @@ extern "C" {
#endif //__cplusplus
BOOL WINAPI
D3DXDebugMute(BOOL Mute);
D3DXDebugMute(BOOL Mute);
#ifdef __cplusplus
}
@ -96,7 +96,7 @@ typedef interface ID3DXBuffer ID3DXBuffer;
typedef interface ID3DXBuffer *LPD3DXBUFFER;
// {8BA5FB08-5195-40e2-AC58-0D989C3A0102}
DEFINE_GUID(IID_ID3DXBuffer,
DEFINE_GUID(IID_ID3DXBuffer,
0x8ba5fb08, 0x5195, 0x40e2, 0xac, 0x58, 0xd, 0x98, 0x9c, 0x3a, 0x1, 0x2);
#undef INTERFACE
@ -123,13 +123,13 @@ DECLARE_INTERFACE_(ID3DXBuffer, IUnknown)
// Specifies device state is not to be saved and restored in Begin/End.
// D3DXSPRITE_DONOTMODIFY_RENDERSTATE
// Specifies device render state is not to be changed in Begin. The device
// is assumed to be in a valid state to draw vertices containing POSITION0,
// is assumed to be in a valid state to draw vertices containing POSITION0,
// TEXCOORD0, and COLOR0 data.
// D3DXSPRITE_OBJECTSPACE
// The WORLD, VIEW, and PROJECTION transforms are NOT modified. The
// transforms currently set to the device are used to transform the sprites
// when the batch is drawn (at Flush or End). If this is not specified,
// WORLD, VIEW, and PROJECTION transforms are modified so that sprites are
// The WORLD, VIEW, and PROJECTION transforms are NOT modified. The
// transforms currently set to the device are used to transform the sprites
// when the batch is drawn (at Flush or End). If this is not specified,
// WORLD, VIEW, and PROJECTION transforms are modified so that sprites are
// drawn in screenspace coordinates.
// D3DXSPRITE_BILLBOARD
// Rotates each sprite about its center so that it is facing the viewer.
@ -141,10 +141,10 @@ DECLARE_INTERFACE_(ID3DXBuffer, IUnknown)
// drawing non-overlapping sprites of uniform depth. For example, drawing
// screen-aligned text with ID3DXFont.
// D3DXSPRITE_SORT_DEPTH_FRONTTOBACK
// Sprites are sorted by depth front-to-back prior to drawing. This is
// Sprites are sorted by depth front-to-back prior to drawing. This is
// recommended when drawing opaque sprites of varying depths.
// D3DXSPRITE_SORT_DEPTH_BACKTOFRONT
// Sprites are sorted by depth back-to-front prior to drawing. This is
// Sprites are sorted by depth back-to-front prior to drawing. This is
// recommended when drawing transparent sprites of varying depths.
//////////////////////////////////////////////////////////////////////////////
@ -163,18 +163,18 @@ DECLARE_INTERFACE_(ID3DXBuffer, IUnknown)
// ------------
// This object intends to provide an easy way to drawing sprites using D3D.
//
// Begin -
// Begin -
// Prepares device for drawing sprites.
//
// Draw -
// Draws a sprite. Before transformation, the sprite is the size of
// SrcRect, with its top-left corner specified by Position. The color
// Draws a sprite. Before transformation, the sprite is the size of
// SrcRect, with its top-left corner specified by Position. The color
// and alpha channels are modulated by Color.
//
// Flush -
// Forces all batched sprites to submitted to the device.
//
// End -
// End -
// Restores device state to how it was when Begin was called.
//
// OnLostDevice, OnResetDevice -
@ -188,7 +188,7 @@ typedef interface ID3DXSprite *LPD3DXSPRITE;
// {BA0B762D-7D28-43ec-B9DC-2F84443B0614}
DEFINE_GUID(IID_ID3DXSprite,
DEFINE_GUID(IID_ID3DXSprite,
0xba0b762d, 0x7d28, 0x43ec, 0xb9, 0xdc, 0x2f, 0x84, 0x44, 0x3b, 0x6, 0x14);
@ -225,9 +225,9 @@ DECLARE_INTERFACE_(ID3DXSprite, IUnknown)
extern "C" {
#endif //__cplusplus
HRESULT WINAPI
D3DXCreateSprite(
LPDIRECT3DDEVICE9 pDevice,
HRESULT WINAPI
D3DXCreateSprite(
LPDIRECT3DDEVICE9 pDevice,
LPD3DXSPRITE* ppSprite);
#ifdef __cplusplus
@ -239,7 +239,7 @@ HRESULT WINAPI
//////////////////////////////////////////////////////////////////////////////
// ID3DXFont:
// ----------
// Font objects contain the textures and resources needed to render a specific
// Font objects contain the textures and resources needed to render a specific
// font on a specific device.
//
// GetGlyphData -
@ -249,8 +249,8 @@ HRESULT WINAPI
// Preloads glyphs into the glyph cache textures.
//
// DrawText -
// Draws formatted text on a D3D device. Some parameters are
// surprisingly similar to those of GDI's DrawText function. See GDI
// Draws formatted text on a D3D device. Some parameters are
// surprisingly similar to those of GDI's DrawText function. See GDI
// documentation for a detailed description of these parameters.
// If pSprite is NULL, an internal sprite object will be used.
//
@ -304,7 +304,7 @@ typedef interface ID3DXFont *LPD3DXFONT;
// {D79DBB70-5F21-4d36-BBC2-FF525C213CDC}
DEFINE_GUID(IID_ID3DXFont,
DEFINE_GUID(IID_ID3DXFont,
0xd79dbb70, 0x5f21, 0x4d36, 0xbb, 0xc2, 0xff, 0x52, 0x5c, 0x21, 0x3c, 0xdc);
@ -372,9 +372,9 @@ extern "C" {
#endif //__cplusplus
HRESULT WINAPI
HRESULT WINAPI
D3DXCreateFontA(
LPDIRECT3DDEVICE9 pDevice,
LPDIRECT3DDEVICE9 pDevice,
INT Height,
UINT Width,
UINT Weight,
@ -387,9 +387,9 @@ HRESULT WINAPI
LPCSTR pFaceName,
LPD3DXFONT* ppFont);
HRESULT WINAPI
HRESULT WINAPI
D3DXCreateFontW(
LPDIRECT3DDEVICE9 pDevice,
LPDIRECT3DDEVICE9 pDevice,
INT Height,
UINT Width,
UINT Weight,
@ -409,16 +409,16 @@ HRESULT WINAPI
#endif
HRESULT WINAPI
D3DXCreateFontIndirectA(
LPDIRECT3DDEVICE9 pDevice,
CONST D3DXFONT_DESCA* pDesc,
HRESULT WINAPI
D3DXCreateFontIndirectA(
LPDIRECT3DDEVICE9 pDevice,
CONST D3DXFONT_DESCA* pDesc,
LPD3DXFONT* ppFont);
HRESULT WINAPI
D3DXCreateFontIndirectW(
LPDIRECT3DDEVICE9 pDevice,
CONST D3DXFONT_DESCW* pDesc,
HRESULT WINAPI
D3DXCreateFontIndirectW(
LPDIRECT3DDEVICE9 pDevice,
CONST D3DXFONT_DESCW* pDesc,
LPD3DXFONT* ppFont);
#ifdef UNICODE
@ -437,14 +437,14 @@ HRESULT WINAPI
///////////////////////////////////////////////////////////////////////////
// ID3DXRenderToSurface:
// ---------------------
// This object abstracts rendering to surfaces. These surfaces do not
// This object abstracts rendering to surfaces. These surfaces do not
// necessarily need to be render targets. If they are not, a compatible
// render target is used, and the result copied into surface at end scene.
//
// BeginScene, EndScene -
// Call BeginScene() and EndScene() at the beginning and ending of your
// scene. These calls will setup and restore render targets, viewports,
// etc..
// scene. These calls will setup and restore render targets, viewports,
// etc..
//
// OnLostDevice, OnResetDevice -
// Call OnLostDevice() on this object before calling Reset() on the
@ -468,7 +468,7 @@ typedef interface ID3DXRenderToSurface *LPD3DXRENDERTOSURFACE;
// {6985F346-2C3D-43b3-BE8B-DAAE8A03D894}
DEFINE_GUID(IID_ID3DXRenderToSurface,
DEFINE_GUID(IID_ID3DXRenderToSurface,
0x6985f346, 0x2c3d, 0x43b3, 0xbe, 0x8b, 0xda, 0xae, 0x8a, 0x3, 0xd8, 0x94);
@ -517,8 +517,8 @@ HRESULT WINAPI
///////////////////////////////////////////////////////////////////////////
// ID3DXRenderToEnvMap:
// --------------------
// This object abstracts rendering to environment maps. These surfaces
// do not necessarily need to be render targets. If they are not, a
// This object abstracts rendering to environment maps. These surfaces
// do not necessarily need to be render targets. If they are not, a
// compatible render target is used, and the result copied into the
// environment map at end scene.
//
@ -528,8 +528,8 @@ HRESULT WINAPI
// the resulting environment map.
//
// Face -
// Call this function to initiate the drawing of each face. For each
// environment map, you will call this six times.. once for each face
// Call this function to initiate the drawing of each face. For each
// environment map, you will call this six times.. once for each face
// in D3DCUBEMAP_FACES.
//
// End -
@ -558,7 +558,7 @@ typedef interface ID3DXRenderToEnvMap *LPD3DXRenderToEnvMap;
// {313F1B4B-C7B0-4fa2-9D9D-8D380B64385E}
DEFINE_GUID(IID_ID3DXRenderToEnvMap,
DEFINE_GUID(IID_ID3DXRenderToEnvMap,
0x313f1b4b, 0xc7b0, 0x4fa2, 0x9d, 0x9d, 0x8d, 0x38, 0xb, 0x64, 0x38, 0x5e);
@ -576,17 +576,17 @@ DECLARE_INTERFACE_(ID3DXRenderToEnvMap, IUnknown)
STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* ppDevice) PURE;
STDMETHOD(GetDesc)(THIS_ D3DXRTE_DESC* pDesc) PURE;
STDMETHOD(BeginCube)(THIS_
STDMETHOD(BeginCube)(THIS_
LPDIRECT3DCUBETEXTURE9 pCubeTex) PURE;
STDMETHOD(BeginSphere)(THIS_
LPDIRECT3DTEXTURE9 pTex) PURE;
STDMETHOD(BeginHemisphere)(THIS_
STDMETHOD(BeginHemisphere)(THIS_
LPDIRECT3DTEXTURE9 pTexZPos,
LPDIRECT3DTEXTURE9 pTexZNeg) PURE;
STDMETHOD(BeginParabolic)(THIS_
STDMETHOD(BeginParabolic)(THIS_
LPDIRECT3DTEXTURE9 pTexZPos,
LPDIRECT3DTEXTURE9 pTexZNeg) PURE;
@ -623,44 +623,44 @@ HRESULT WINAPI
// ------------
// This object intends to provide an easy way to draw lines using D3D.
//
// Begin -
// Begin -
// Prepares device for drawing lines
//
// Draw -
// Draws a line strip in screen-space.
// Input is in the form of a array defining points on the line strip. of D3DXVECTOR2
// Input is in the form of a array defining points on the line strip. of D3DXVECTOR2
//
// DrawTransform -
// Draws a line in screen-space with a specified input transformation matrix.
//
// End -
// End -
// Restores device state to how it was when Begin was called.
//
// SetPattern -
// SetPattern -
// Applies a stipple pattern to the line. Input is one 32-bit
// DWORD which describes the stipple pattern. 1 is opaque, 0 is
// transparent.
//
// SetPatternScale -
// SetPatternScale -
// Stretches the stipple pattern in the u direction. Input is one
// floating-point value. 0.0f is no scaling, whereas 1.0f doubles
// the length of the stipple pattern.
//
// SetWidth -
// SetWidth -
// Specifies the thickness of the line in the v direction. Input is
// one floating-point value.
//
// SetAntialias -
// SetAntialias -
// Toggles line antialiasing. Input is a BOOL.
// TRUE = Antialiasing on.
// FALSE = Antialiasing off.
//
// SetGLLines -
// SetGLLines -
// Toggles non-antialiased OpenGL line emulation. Input is a BOOL.
// TRUE = OpenGL line emulation on.
// FALSE = OpenGL line emulation off.
//
// OpenGL line: Regular line:
// OpenGL line: Regular line:
// *\ *\
// | \ / \
// | \ *\ \
@ -683,7 +683,7 @@ typedef interface ID3DXLine *LPD3DXLINE;
// {D379BA7F-9042-4ac4-9F5E-58192A4C6BD8}
DEFINE_GUID(IID_ID3DXLine,
DEFINE_GUID(IID_ID3DXLine,
0xd379ba7f, 0x9042, 0x4ac4, 0x9f, 0x5e, 0x58, 0x19, 0x2a, 0x4c, 0x6b, 0xd8);
#undef INTERFACE
@ -705,7 +705,7 @@ DECLARE_INTERFACE_(ID3DXLine, IUnknown)
DWORD dwVertexListCount, D3DCOLOR Color) PURE;
STDMETHOD(DrawTransform)(THIS_ CONST D3DXVECTOR3 *pVertexList,
DWORD dwVertexListCount, CONST D3DXMATRIX* pTransform,
DWORD dwVertexListCount, CONST D3DXMATRIX* pTransform,
D3DCOLOR Color) PURE;
STDMETHOD(SetPattern)(THIS_ DWORD dwPattern) PURE;

54
src/dep/include/DXSDK/include/d3dx9effect.h
View File

@ -29,7 +29,7 @@
// This flag is used as a parameter to the D3DXCreateEffect family of APIs.
// When this flag is specified, the effect will be non-cloneable and will not
// contain any shader binary data.
// Furthermore, GetPassDesc will not return shader function pointers.
// Furthermore, GetPassDesc will not return shader function pointers.
// Setting this flag reduces effect memory usage by about 50%.
//----------------------------------------------------------------------------
@ -139,7 +139,7 @@ typedef interface ID3DXEffectPool ID3DXEffectPool;
typedef interface ID3DXEffectPool *LPD3DXEFFECTPOOL;
// {9537AB04-3250-412e-8213-FCD2F8677933}
DEFINE_GUID(IID_ID3DXEffectPool,
DEFINE_GUID(IID_ID3DXEffectPool,
0x9537ab04, 0x3250, 0x412e, 0x82, 0x13, 0xfc, 0xd2, 0xf8, 0x67, 0x79, 0x33);
@ -165,7 +165,7 @@ typedef interface ID3DXBaseEffect ID3DXBaseEffect;
typedef interface ID3DXBaseEffect *LPD3DXBASEEFFECT;
// {017C18AC-103F-4417-8C51-6BF6EF1E56BE}
DEFINE_GUID(IID_ID3DXBaseEffect,
DEFINE_GUID(IID_ID3DXBaseEffect,
0x17c18ac, 0x103f, 0x4417, 0x8c, 0x51, 0x6b, 0xf6, 0xef, 0x1e, 0x56, 0xbe);
@ -240,7 +240,7 @@ DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown)
//Set Range of an Array to pass to device
//Useful for sending only a subrange of an array down to the device
STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE hParameter, UINT uStart, UINT uEnd) PURE;
STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE hParameter, UINT uStart, UINT uEnd) PURE;
};
@ -248,7 +248,7 @@ DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown)
//----------------------------------------------------------------------------
// ID3DXEffectStateManager:
// ------------------------
// This is a user implemented interface that can be used to manage device
// This is a user implemented interface that can be used to manage device
// state changes made by an Effect.
//----------------------------------------------------------------------------
@ -256,7 +256,7 @@ typedef interface ID3DXEffectStateManager ID3DXEffectStateManager;
typedef interface ID3DXEffectStateManager *LPD3DXEFFECTSTATEMANAGER;
// {79AAB587-6DBC-4fa7-82DE-37FA1781C5CE}
DEFINE_GUID(IID_ID3DXEffectStateManager,
DEFINE_GUID(IID_ID3DXEffectStateManager,
0x79aab587, 0x6dbc, 0x4fa7, 0x82, 0xde, 0x37, 0xfa, 0x17, 0x81, 0xc5, 0xce);
#undef INTERFACE
@ -271,11 +271,11 @@ DECLARE_INTERFACE_(ID3DXEffectStateManager, IUnknown)
STDMETHOD_(ULONG, AddRef)(THIS) PURE;
STDMETHOD_(ULONG, Release)(THIS) PURE;
// The following methods are called by the Effect when it wants to make
// The following methods are called by the Effect when it wants to make
// the corresponding device call. Note that:
// 1. Users manage the state and are therefore responsible for making the
// the corresponding device calls themselves inside their callbacks.
// 2. Effects pay attention to the return values of the callbacks, and so
// 1. Users manage the state and are therefore responsible for making the
// the corresponding device calls themselves inside their callbacks.
// 2. Effects pay attention to the return values of the callbacks, and so
// users must pay attention to what they return in their callbacks.
STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX *pMatrix) PURE;
@ -307,7 +307,7 @@ typedef interface ID3DXEffect ID3DXEffect;
typedef interface ID3DXEffect *LPD3DXEFFECT;
// {F6CEB4B3-4E4C-40dd-B883-8D8DE5EA0CD5}
DEFINE_GUID(IID_ID3DXEffect,
DEFINE_GUID(IID_ID3DXEffect,
0xf6ceb4b3, 0x4e4c, 0x40dd, 0xb8, 0x83, 0x8d, 0x8d, 0xe5, 0xea, 0xc, 0xd5);
#undef INTERFACE
@ -381,10 +381,10 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect)
//Set Range of an Array to pass to device
//Usefull for sending only a subrange of an array down to the device
STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE hParameter, UINT uStart, UINT uEnd) PURE;
STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE hParameter, UINT uStart, UINT uEnd) PURE;
// ID3DXBaseEffect
// Pool
STDMETHOD(GetPool)(THIS_ LPD3DXEFFECTPOOL* ppPool) PURE;
@ -425,7 +425,7 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect)
// Cloning
STDMETHOD(CloneEffect)(THIS_ LPDIRECT3DDEVICE9 pDevice, LPD3DXEFFECT* ppEffect) PURE;
// Fast path for setting variables directly in ID3DXEffect
STDMETHOD(SetRawValue)(THIS_ D3DXHANDLE hParameter, LPCVOID pData, UINT ByteOffset, UINT Bytes) PURE;
};
@ -439,7 +439,7 @@ typedef interface ID3DXEffectCompiler ID3DXEffectCompiler;
typedef interface ID3DXEffectCompiler *LPD3DXEFFECTCOMPILER;
// {51B8A949-1A31-47e6-BEA0-4B30DB53F1E0}
DEFINE_GUID(IID_ID3DXEffectCompiler,
DEFINE_GUID(IID_ID3DXEffectCompiler,
0x51b8a949, 0x1a31, 0x47e6, 0xbe, 0xa0, 0x4b, 0x30, 0xdb, 0x53, 0xf1, 0xe0);
@ -511,10 +511,10 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect)
STDMETHOD(GetTexture)(THIS_ D3DXHANDLE hParameter, LPDIRECT3DBASETEXTURE9 *ppTexture) PURE;
STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE hParameter, LPDIRECT3DPIXELSHADER9 *ppPShader) PURE;
STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE hParameter, LPDIRECT3DVERTEXSHADER9 *ppVShader) PURE;
//Set Range of an Array to pass to device
//Usefull for sending only a subrange of an array down to the device
STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE hParameter, UINT uStart, UINT uEnd) PURE;
STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE hParameter, UINT uStart, UINT uEnd) PURE;
// ID3DXBaseEffect
// Parameter sharing, specialization, and information
@ -681,7 +681,7 @@ HRESULT WINAPI
LPCSTR pSrcFile,
CONST D3DXMACRO* pDefines,
LPD3DXINCLUDE pInclude,
LPCSTR pSkipConstants,
LPCSTR pSkipConstants,
DWORD Flags,
LPD3DXEFFECTPOOL pPool,
LPD3DXEFFECT* ppEffect,
@ -693,7 +693,7 @@ HRESULT WINAPI
LPCWSTR pSrcFile,
CONST D3DXMACRO* pDefines,
LPD3DXINCLUDE pInclude,
LPCSTR pSkipConstants,
LPCSTR pSkipConstants,
DWORD Flags,
LPD3DXEFFECTPOOL pPool,
LPD3DXEFFECT* ppEffect,
@ -713,7 +713,7 @@ HRESULT WINAPI
LPCSTR pSrcResource,
CONST D3DXMACRO* pDefines,
LPD3DXINCLUDE pInclude,
LPCSTR pSkipConstants,
LPCSTR pSkipConstants,
DWORD Flags,
LPD3DXEFFECTPOOL pPool,
LPD3DXEFFECT* ppEffect,
@ -726,7 +726,7 @@ HRESULT WINAPI
LPCWSTR pSrcResource,
CONST D3DXMACRO* pDefines,
LPD3DXINCLUDE pInclude,
LPCSTR pSkipConstants,
LPCSTR pSkipConstants,
DWORD Flags,
LPD3DXEFFECTPOOL pPool,
LPD3DXEFFECT* ppEffect,
@ -746,7 +746,7 @@ HRESULT WINAPI
UINT SrcDataLen,
CONST D3DXMACRO* pDefines,
LPD3DXINCLUDE pInclude,
LPCSTR pSkipConstants,
LPCSTR pSkipConstants,
DWORD Flags,
LPD3DXEFFECTPOOL pPool,
LPD3DXEFFECT* ppEffect,
@ -854,12 +854,12 @@ HRESULT WINAPI
// Parameters:
//----------------------------------------------------------------------------
HRESULT WINAPI
HRESULT WINAPI
D3DXDisassembleEffect(
LPD3DXEFFECT pEffect,
BOOL EnableColorCode,
LPD3DXEFFECT pEffect,
BOOL EnableColorCode,
LPD3DXBUFFER *ppDisassembly);
#ifdef __cplusplus

92
src/dep/include/DXSDK/include/d3dx9math.h
View File

@ -366,7 +366,7 @@ typedef struct _D3DMATRIX D3DXMATRIX, *LPD3DXMATRIX;
// This class helps keep matrices 16-byte aligned as preferred by P4 cpus.
// It aligns matrices on the stack and on the heap or in global scope.
// It does this using __declspec(align(16)) which works on VC7 and on VC 6
// with the processor pack. Unfortunately there is no way to detect the
// with the processor pack. Unfortunately there is no way to detect the
// latter so this is turned on only on VC7. On other compilers this is the
// the same as D3DXMATRIX.
//
@ -393,9 +393,9 @@ typedef struct _D3DXMATRIXA16 : public D3DXMATRIX
void* operator new[] ( size_t );
// delete operators
void operator delete ( void* ); // These are NOT virtual; Do not
void operator delete ( void* ); // These are NOT virtual; Do not
void operator delete[] ( void* ); // cast to D3DXMATRIX and delete.
// assignment operators
_D3DXMATRIXA16& operator = ( CONST D3DXMATRIX& );
@ -669,7 +669,7 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformCoord
// Transform (x, y, 0, 0) by matrix.
D3DXVECTOR2* WINAPI D3DXVec2TransformNormal
( D3DXVECTOR2 *pOut, CONST D3DXVECTOR2 *pV, CONST D3DXMATRIX *pM );
// Transform Array (x, y, 0, 1) by matrix.
D3DXVECTOR4* WINAPI D3DXVec2TransformArray
( D3DXVECTOR4 *pOut, UINT OutStride, CONST D3DXVECTOR2 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n);
@ -681,8 +681,8 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformCoordArray
// Transform Array (x, y, 0, 0) by matrix.
D3DXVECTOR2* WINAPI D3DXVec2TransformNormalArray
( D3DXVECTOR2 *pOut, UINT OutStride, CONST D3DXVECTOR2 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n );
#ifdef __cplusplus
}
@ -761,14 +761,14 @@ D3DXVECTOR4* WINAPI D3DXVec3Transform
D3DXVECTOR3* WINAPI D3DXVec3TransformCoord
( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV, CONST D3DXMATRIX *pM );
// Transform (x, y, z, 0) by matrix. If you transforming a normal by a
// non-affine matrix, the matrix you pass to this function should be the
// Transform (x, y, z, 0) by matrix. If you transforming a normal by a
// non-affine matrix, the matrix you pass to this function should be the
// transpose of the inverse of the matrix you would use to transform a coord.
D3DXVECTOR3* WINAPI D3DXVec3TransformNormal
( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV, CONST D3DXMATRIX *pM );
// Transform Array (x, y, z, 1) by matrix.
// Transform Array (x, y, z, 1) by matrix.
D3DXVECTOR4* WINAPI D3DXVec3TransformArray
( D3DXVECTOR4 *pOut, UINT OutStride, CONST D3DXVECTOR3 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n );
@ -776,8 +776,8 @@ D3DXVECTOR4* WINAPI D3DXVec3TransformArray
D3DXVECTOR3* WINAPI D3DXVec3TransformCoordArray
( D3DXVECTOR3 *pOut, UINT OutStride, CONST D3DXVECTOR3 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n );
// Transform (x, y, z, 0) by matrix. If you transforming a normal by a
// non-affine matrix, the matrix you pass to this function should be the
// Transform (x, y, z, 0) by matrix. If you transforming a normal by a
// non-affine matrix, the matrix you pass to this function should be the
// transpose of the inverse of the matrix you would use to transform a coord.
D3DXVECTOR3* WINAPI D3DXVec3TransformNormalArray
( D3DXVECTOR3 *pOut, UINT OutStride, CONST D3DXVECTOR3 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n );
@ -791,7 +791,7 @@ D3DXVECTOR3* WINAPI D3DXVec3Project
D3DXVECTOR3* WINAPI D3DXVec3Unproject
( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV, CONST D3DVIEWPORT9 *pViewport,
CONST D3DXMATRIX *pProjection, CONST D3DXMATRIX *pView, CONST D3DXMATRIX *pWorld);
// Project vector Array from object space into screen space
D3DXVECTOR3* WINAPI D3DXVec3ProjectArray
( D3DXVECTOR3 *pOut, UINT OutStride,CONST D3DXVECTOR3 *pV, UINT VStride,CONST D3DVIEWPORT9 *pViewport,
@ -878,7 +878,7 @@ D3DXVECTOR4* WINAPI D3DXVec4BaryCentric
// Transform vector by matrix.
D3DXVECTOR4* WINAPI D3DXVec4Transform
( D3DXVECTOR4 *pOut, CONST D3DXVECTOR4 *pV, CONST D3DXMATRIX *pM );
// Transform vector array by matrix.
D3DXVECTOR4* WINAPI D3DXVec4TransformArray
( D3DXVECTOR4 *pOut, UINT OutStride, CONST D3DXVECTOR4 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n );
@ -910,7 +910,7 @@ FLOAT WINAPI D3DXMatrixDeterminant
( CONST D3DXMATRIX *pM );
HRESULT WINAPI D3DXMatrixDecompose
( D3DXVECTOR3 *pOutScale, D3DXQUATERNION *pOutRotation,
( D3DXVECTOR3 *pOutScale, D3DXQUATERNION *pOutRotation,
D3DXVECTOR3 *pOutTranslation, CONST D3DXMATRIX *pM );
D3DXMATRIX* WINAPI D3DXMatrixTranspose
@ -975,9 +975,9 @@ D3DXMATRIX* WINAPI D3DXMatrixTransformation
// Build 2D transformation matrix in XY plane. NULL arguments are treated as identity.
// Mout = Msc-1 * Msr-1 * Ms * Msr * Msc * Mrc-1 * Mr * Mrc * Mt
D3DXMATRIX* WINAPI D3DXMatrixTransformation2D
( D3DXMATRIX *pOut, CONST D3DXVECTOR2* pScalingCenter,
FLOAT ScalingRotation, CONST D3DXVECTOR2* pScaling,
CONST D3DXVECTOR2* pRotationCenter, FLOAT Rotation,
( D3DXMATRIX *pOut, CONST D3DXVECTOR2* pScalingCenter,
FLOAT ScalingRotation, CONST D3DXVECTOR2* pScaling,
CONST D3DXVECTOR2* pRotationCenter, FLOAT Rotation,
CONST D3DXVECTOR2* pTranslation);
// Build affine transformation matrix. NULL arguments are treated as identity.
@ -989,7 +989,7 @@ D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation
// Build 2D affine transformation matrix in XY plane. NULL arguments are treated as identity.
// Mout = Ms * Mrc-1 * Mr * Mrc * Mt
D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation2D
( D3DXMATRIX *pOut, FLOAT Scaling, CONST D3DXVECTOR2* pRotationCenter,
( D3DXMATRIX *pOut, FLOAT Scaling, CONST D3DXVECTOR2* pRotationCenter,
FLOAT Rotation, CONST D3DXVECTOR2* pTranslation);
// Build a lookat matrix. (right-handed)
@ -1133,7 +1133,7 @@ D3DXQUATERNION* WINAPI D3DXQuaternionLn
// if q = (0, theta * v); exp(q) = (cos(theta), sin(theta) * v)
D3DXQUATERNION* WINAPI D3DXQuaternionExp
( D3DXQUATERNION *pOut, CONST D3DXQUATERNION *pQ );
// Spherical linear interpolation between Q1 (t == 0) and Q2 (t == 1).
// Expects unit quaternions.
D3DXQUATERNION* WINAPI D3DXQuaternionSlerp
@ -1148,11 +1148,11 @@ D3DXQUATERNION* WINAPI D3DXQuaternionSquad
CONST D3DXQUATERNION *pC, FLOAT t );
// Setup control points for spherical quadrangle interpolation
// from Q1 to Q2. The control points are chosen in such a way
// from Q1 to Q2. The control points are chosen in such a way
// to ensure the continuity of tangents with adjacent segments.
void WINAPI D3DXQuaternionSquadSetup
( D3DXQUATERNION *pAOut, D3DXQUATERNION *pBOut, D3DXQUATERNION *pCOut,
CONST D3DXQUATERNION *pQ0, CONST D3DXQUATERNION *pQ1,
CONST D3DXQUATERNION *pQ0, CONST D3DXQUATERNION *pQ1,
CONST D3DXQUATERNION *pQ2, CONST D3DXQUATERNION *pQ3 );
// Barycentric interpolation.
@ -1216,7 +1216,7 @@ D3DXPLANE* WINAPI D3DXPlaneFromPoints
// M should be the inverse transpose of the transformation desired.
D3DXPLANE* WINAPI D3DXPlaneTransform
( D3DXPLANE *pOut, CONST D3DXPLANE *pP, CONST D3DXMATRIX *pM );
// Transform an array of planes by a matrix. The vectors (a,b,c) must be normal.
// M should be the inverse transpose of the transformation desired.
D3DXPLANE* WINAPI D3DXPlaneTransformArray
@ -1286,7 +1286,7 @@ extern "C" {
// Calculate Fresnel term given the cosine of theta (likely obtained by
// taking the dot of two normals), and the refraction index of the material.
FLOAT WINAPI D3DXFresnelTerm
(FLOAT CosTheta, FLOAT RefractionIndex);
(FLOAT CosTheta, FLOAT RefractionIndex);
#ifdef __cplusplus
}
@ -1304,7 +1304,7 @@ typedef interface ID3DXMatrixStack ID3DXMatrixStack;
typedef interface ID3DXMatrixStack *LPD3DXMATRIXSTACK;
// {C7885BA7-F990-4fe7-922D-8515E477DD85}
DEFINE_GUID(IID_ID3DXMatrixStack,
DEFINE_GUID(IID_ID3DXMatrixStack,
0xc7885ba7, 0xf990, 0x4fe7, 0x92, 0x2d, 0x85, 0x15, 0xe4, 0x77, 0xdd, 0x85);
@ -1399,9 +1399,9 @@ DECLARE_INTERFACE_(ID3DXMatrixStack, IUnknown)
extern "C" {
#endif
HRESULT WINAPI
D3DXCreateMatrixStack(
DWORD Flags,
HRESULT WINAPI
D3DXCreateMatrixStack(
DWORD Flags,
LPD3DXMATRIXSTACK* ppStack);
#ifdef __cplusplus
@ -1414,7 +1414,7 @@ HRESULT WINAPI
//
// NOTE:
// * Most of these functions can take the same object as in and out parameters.
// The exceptions are the rotation functions.
// The exceptions are the rotation functions.
//
// * Out parameters are typically also returned as return values, so that
// the output of one function may be used as a parameter to another.
@ -1455,7 +1455,7 @@ extern "C" {
FLOAT* WINAPI D3DXSHEvalDirection
( FLOAT *pOut, UINT Order, CONST D3DXVECTOR3 *pDir );
//============================================================================
//
// D3DXSHRotate:
@ -1478,7 +1478,7 @@ FLOAT* WINAPI D3DXSHEvalDirection
FLOAT* WINAPI D3DXSHRotate
( FLOAT *pOut, UINT Order, CONST D3DXMATRIX *pMatrix, CONST FLOAT *pIn );
//============================================================================
//
// D3DXSHRotateZ:
@ -1501,7 +1501,7 @@ FLOAT* WINAPI D3DXSHRotate
FLOAT* WINAPI D3DXSHRotateZ
( FLOAT *pOut, UINT Order, FLOAT Angle, CONST FLOAT *pIn );
//============================================================================
//
// D3DXSHAdd:
@ -1545,7 +1545,7 @@ FLOAT* WINAPI D3DXSHAdd
FLOAT* WINAPI D3DXSHScale
( FLOAT *pOut, UINT Order, CONST FLOAT *pIn, CONST FLOAT Scale );
//============================================================================
//
// D3DXSHDot:
@ -1575,7 +1575,7 @@ FLOAT WINAPI D3DXSHDot
//
// D3DXSHEvalDirectionalLight:
// --------------------
// Evaluates a directional light and returns spectral SH data. The output
// Evaluates a directional light and returns spectral SH data. The output
// vector is computed so that if the intensity of R/G/B is unit the resulting
// exit radiance of a point directly under the light on a diffuse object with
// an albedo of 1 would be 1.0. This will compute 3 spectral samples, pROut
@ -1597,12 +1597,12 @@ FLOAT WINAPI D3DXSHDot
// pGOut
// Output SH vector for Green (optional.)
// pBOut
// Output SH vector for Blue (optional.)
// Output SH vector for Blue (optional.)
//
//============================================================================
HRESULT WINAPI D3DXSHEvalDirectionalLight
( UINT Order, CONST D3DXVECTOR3 *pDir,
( UINT Order, CONST D3DXVECTOR3 *pDir,
FLOAT RIntensity, FLOAT GIntensity, FLOAT BIntensity,
FLOAT *pROut, FLOAT *pGOut, FLOAT *pBOut );
@ -1610,10 +1610,10 @@ HRESULT WINAPI D3DXSHEvalDirectionalLight
//
// D3DXSHEvalSphericalLight:
// --------------------
// Evaluates a spherical light and returns spectral SH data. There is no
// Evaluates a spherical light and returns spectral SH data. There is no
// normalization of the intensity of the light like there is for directional
// lights, care has to be taken when specifiying the intensities. This will
// compute 3 spectral samples, pROut has to be specified, while pGout and
// lights, care has to be taken when specifiying the intensities. This will
// compute 3 spectral samples, pROut has to be specified, while pGout and
// pBout are optional.
//
// Parameters:
@ -1634,7 +1634,7 @@ HRESULT WINAPI D3DXSHEvalDirectionalLight
// pGOut
// Output SH vector for Green (optional.)
// pBOut
// Output SH vector for Blue (optional.)
// Output SH vector for Blue (optional.)
//
//============================================================================
@ -1672,7 +1672,7 @@ HRESULT WINAPI D3DXSHEvalSphericalLight
// pGOut
// Output SH vector for Green (optional.)
// pBOut
// Output SH vector for Blue (optional.)
// Output SH vector for Blue (optional.)
//
//============================================================================
@ -1680,7 +1680,7 @@ HRESULT WINAPI D3DXSHEvalConeLight
( UINT Order, CONST D3DXVECTOR3 *pDir, FLOAT Radius,
FLOAT RIntensity, FLOAT GIntensity, FLOAT BIntensity,
FLOAT *pROut, FLOAT *pGOut, FLOAT *pBOut );
//============================================================================
//
// D3DXSHEvalHemisphereLight:
@ -1692,7 +1692,7 @@ HRESULT WINAPI D3DXSHEvalConeLight
// is normalized so that a point on a perfectly diffuse surface with no
// shadowing and a normal pointed in the direction pDir would result in exit
// radiance with a value of 1 if the top color was white and the bottom color
// was black. This is a very simple model where Top represents the intensity
// was black. This is a very simple model where Top represents the intensity
// of the "sky" and Bottom represents the intensity of the "ground".
//
// Parameters:
@ -1709,7 +1709,7 @@ HRESULT WINAPI D3DXSHEvalConeLight
// pGOut
// Output SH vector for Green
// pBOut
// Output SH vector for Blue
// Output SH vector for Blue
//
//============================================================================
@ -1739,7 +1739,7 @@ HRESULT WINAPI D3DXSHEvalHemisphereLight
// pGOut
// Output SH vector for Green
// pBOut
// Output SH vector for Blue
// Output SH vector for Blue
//
//============================================================================

712
src/dep/include/DXSDK/include/d3dx9mesh.h
View File

File diff suppressed because it is too large Load Diff

54
src/dep/include/DXSDK/include/d3dx9shader.h
View File

@ -35,9 +35,9 @@
// you KNOW will work. (ie. have compiled before without this option.)
// Shaders are always validated by D3D before they are set to the device.
//
// D3DXSHADER_SKIPOPTIMIZATION
// D3DXSHADER_SKIPOPTIMIZATION
// Instructs the compiler to skip optimization steps during code generation.
// Unless you are trying to isolate a problem in your code using this option
// Unless you are trying to isolate a problem in your code using this option
// is not recommended.
//
// D3DXSHADER_PACKMATRIX_ROWMAJOR
@ -45,8 +45,8 @@
// on input and output from the shader.
//
// D3DXSHADER_PACKMATRIX_COLUMNMAJOR
// Unless explicitly specified, matrices will be packed in column-major
// order on input and output from the shader. This is generally more
// Unless explicitly specified, matrices will be packed in column-major
// order on input and output from the shader. This is generally more
// efficient, since it allows vector-matrix multiplication to be performed
// using a series of dot-products.
//
@ -56,16 +56,16 @@
//
// D3DXSHADER_FORCE_VS_SOFTWARE_NOOPT
// Force compiler to compile against the next highest available software
// target for vertex shaders. This flag also turns optimizations off,
// and debugging on.
// target for vertex shaders. This flag also turns optimizations off,
// and debugging on.
//
// D3DXSHADER_FORCE_PS_SOFTWARE_NOOPT
// Force compiler to compile against the next highest available software
// target for pixel shaders. This flag also turns optimizations off,
// target for pixel shaders. This flag also turns optimizations off,
// and debugging on.
//
// D3DXSHADER_NO_PRESHADER
// Disables Preshaders. Using this flag will cause the compiler to not
// Disables Preshaders. Using this flag will cause the compiler to not
// pull out static expression for evaluation on the host cpu
//
// D3DXSHADER_AVOID_FLOW_CONTROL
@ -258,7 +258,7 @@ typedef interface ID3DXConstantTable ID3DXConstantTable;
typedef interface ID3DXConstantTable *LPD3DXCONSTANTTABLE;
// {AB3C758F-093E-4356-B762-4DB18F1B3A01}
DEFINE_GUID(IID_ID3DXConstantTable,
DEFINE_GUID(IID_ID3DXConstantTable,
0xab3c758f, 0x93e, 0x4356, 0xb7, 0x62, 0x4d, 0xb1, 0x8f, 0x1b, 0x3a, 0x1);
@ -314,7 +314,7 @@ typedef interface ID3DXTextureShader ID3DXTextureShader;
typedef interface ID3DXTextureShader *LPD3DXTEXTURESHADER;
// {3E3D67F8-AA7A-405d-A857-BA01D4758426}
DEFINE_GUID(IID_ID3DXTextureShader,
DEFINE_GUID(IID_ID3DXTextureShader,
0x3e3d67f8, 0xaa7a, 0x405d, 0xa8, 0x57, 0xba, 0x1, 0xd4, 0x75, 0x84, 0x26);
#undef INTERFACE
@ -369,7 +369,7 @@ typedef interface ID3DXFragmentLinker ID3DXFragmentLinker;
typedef interface ID3DXFragmentLinker *LPD3DXFRAGMENTLINKER;
// {1A2C0CC2-E5B6-4ebc-9E8D-390E057811B6}
DEFINE_GUID(IID_ID3DXFragmentLinker,
DEFINE_GUID(IID_ID3DXFragmentLinker,
0x1a2c0cc2, 0xe5b6, 0x4ebc, 0x9e, 0x8d, 0x39, 0xe, 0x5, 0x78, 0x11, 0xb6);
#undef INTERFACE
@ -584,7 +584,7 @@ HRESULT WINAPI
// Name of the entrypoint function where execution should begin.
// pProfile
// Instruction set to be used when generating code. Currently supported
// profiles are "vs_1_1", "vs_2_0", "vs_2_a", "vs_2_sw", "ps_1_1",
// profiles are "vs_1_1", "vs_2_0", "vs_2_a", "vs_2_sw", "ps_1_1",
// "ps_1_2", "ps_1_3", "ps_1_4", "ps_2_0", "ps_2_a", "ps_2_sw", "tx_1_0"
// Flags
// See D3DXSHADER_xxx flags.
@ -701,9 +701,9 @@ HRESULT WINAPI
HRESULT WINAPI
D3DXDisassembleShader(
CONST DWORD* pShader,
BOOL EnableColorCode,
LPCSTR pComments,
CONST DWORD* pShader,
BOOL EnableColorCode,
LPCSTR pComments,
LPD3DXBUFFER* ppDisassembly);
@ -771,7 +771,7 @@ UINT WINAPI
//----------------------------------------------------------------------------
// D3DXGetShaderVersion:
// -----------------------
// Returns the shader version of a given shader. Returns zero if the shader
// Returns the shader version of a given shader. Returns zero if the shader
// function is NULL.
//
// Parameters:
@ -869,13 +869,13 @@ HRESULT WINAPI
// pFunction
// Pointer to the function DWORD stream
// ppTextureShader
// Returns a ID3DXTextureShader object which can be used to procedurally
// Returns a ID3DXTextureShader object which can be used to procedurally
// fill the contents of a texture using the D3DXFillTextureTX functions.
//----------------------------------------------------------------------------
HRESULT WINAPI
D3DXCreateTextureShader(
CONST DWORD* pFunction,
CONST DWORD* pFunction,
LPD3DXTEXTURESHADER* ppTextureShader);
@ -982,7 +982,7 @@ HRESULT WINAPI
//----------------------------------------------------------------------------
// D3DXCreateFragmentLinker:
// -------------------------
// Creates a fragment linker with a given cache size. The interface returned
// Creates a fragment linker with a given cache size. The interface returned
// can be used to link together shader fragments. (both HLSL & ASM fragements)
//
// Parameters:
@ -1036,15 +1036,15 @@ HRESULT WINAPI
// these are the same messages you will see in your debug output.
//----------------------------------------------------------------------------
HRESULT WINAPI
HRESULT WINAPI
D3DXPreprocessShaderFromFileA(
LPCSTR pSrcFile,
CONST D3DXMACRO* pDefines,
LPD3DXINCLUDE pInclude,
LPD3DXBUFFER* ppShaderText,
LPD3DXBUFFER* ppErrorMsgs);
HRESULT WINAPI
HRESULT WINAPI
D3DXPreprocessShaderFromFileW(
LPCWSTR pSrcFile,
CONST D3DXMACRO* pDefines,
@ -1057,8 +1057,8 @@ HRESULT WINAPI
#else
#define D3DXPreprocessShaderFromFile D3DXPreprocessShaderFromFileA
#endif
HRESULT WINAPI
HRESULT WINAPI
D3DXPreprocessShaderFromResourceA(
HMODULE hSrcModule,
LPCSTR pSrcResource,
@ -1067,7 +1067,7 @@ HRESULT WINAPI
LPD3DXBUFFER* ppShaderText,
LPD3DXBUFFER* ppErrorMsgs);
HRESULT WINAPI
HRESULT WINAPI
D3DXPreprocessShaderFromResourceW(
HMODULE hSrcModule,
LPCWSTR pSrcResource,
@ -1082,7 +1082,7 @@ HRESULT WINAPI
#define D3DXPreprocessShaderFromResource D3DXPreprocessShaderFromResourceA
#endif
HRESULT WINAPI
HRESULT WINAPI
D3DXPreprocessShader(
LPCSTR pSrcData,
UINT SrcDataSize,
@ -1117,7 +1117,7 @@ typedef struct _D3DXSHADER_CONSTANTTABLE
DWORD Constants; // number of constants
DWORD ConstantInfo; // D3DXSHADER_CONSTANTINFO[Constants] offset
DWORD Flags; // flags shader was compiled with
DWORD Target; // LPCSTR offset
DWORD Target; // LPCSTR offset
} D3DXSHADER_CONSTANTTABLE, *LPD3DXSHADER_CONSTANTTABLE;

48
src/dep/include/DXSDK/include/d3dx9shape.h
View File

@ -22,7 +22,7 @@ extern "C" {
//-------------------------------------------------------------------------
// D3DXCreatePolygon:
// D3DXCreatePolygon:
// ------------------
// Creates a mesh containing an n-sided polygon. The polygon is centered
// at the origin.
@ -35,17 +35,17 @@ extern "C" {
// ppMesh The mesh object which will be created
// ppAdjacency Returns a buffer containing adjacency info. Can be NULL.
//-------------------------------------------------------------------------
HRESULT WINAPI
HRESULT WINAPI
D3DXCreatePolygon(
LPDIRECT3DDEVICE9 pDevice,
FLOAT Length,
UINT Sides,
FLOAT Length,
UINT Sides,
LPD3DXMESH* ppMesh,
LPD3DXBUFFER* ppAdjacency);
//-------------------------------------------------------------------------
// D3DXCreateBox:
// D3DXCreateBox:
// --------------
// Creates a mesh containing an axis-aligned box. The box is centered at
// the origin.
@ -59,9 +59,9 @@ HRESULT WINAPI
// ppMesh The mesh object which will be created
// ppAdjacency Returns a buffer containing adjacency info. Can be NULL.
//-------------------------------------------------------------------------
HRESULT WINAPI
HRESULT WINAPI
D3DXCreateBox(
LPDIRECT3DDEVICE9 pDevice,
LPDIRECT3DDEVICE9 pDevice,
FLOAT Width,
FLOAT Height,
FLOAT Depth,
@ -86,14 +86,14 @@ HRESULT WINAPI
// ppMesh The mesh object which will be created
// ppAdjacency Returns a buffer containing adjacency info. Can be NULL.
//-------------------------------------------------------------------------
HRESULT WINAPI
HRESULT WINAPI
D3DXCreateCylinder(
LPDIRECT3DDEVICE9 pDevice,
FLOAT Radius1,
FLOAT Radius2,
FLOAT Length,
UINT Slices,
UINT Stacks,
FLOAT Radius1,
FLOAT Radius2,
FLOAT Length,
UINT Slices,
UINT Stacks,
LPD3DXMESH* ppMesh,
LPD3DXBUFFER* ppAdjacency);
@ -115,9 +115,9 @@ HRESULT WINAPI
//-------------------------------------------------------------------------
HRESULT WINAPI
D3DXCreateSphere(
LPDIRECT3DDEVICE9 pDevice,
FLOAT Radius,
UINT Slices,
LPDIRECT3DDEVICE9 pDevice,
FLOAT Radius,
UINT Slices,
UINT Stacks,
LPD3DXMESH* ppMesh,
LPD3DXBUFFER* ppAdjacency);
@ -129,7 +129,7 @@ HRESULT WINAPI
// Creates a mesh containing a torus. The generated torus is centered at
// the origin, and its axis is aligned with the Z-axis.
//
// Parameters:
// Parameters:
//
// pDevice The D3D device with which the mesh is going to be used.
// InnerRadius Inner radius of the torus (should be >= 0.0f)
@ -143,19 +143,19 @@ HRESULT WINAPI
D3DXCreateTorus(
LPDIRECT3DDEVICE9 pDevice,
FLOAT InnerRadius,
FLOAT OuterRadius,
FLOAT OuterRadius,
UINT Sides,
UINT Rings,
UINT Rings,
LPD3DXMESH* ppMesh,
LPD3DXBUFFER* ppAdjacency);
//-------------------------------------------------------------------------
// D3DXCreateTeapot:
// D3DXCreateTeapot:
// -----------------
// Creates a mesh containing a teapot.
//
// Parameters:
// Parameters:
//
// pDevice The D3D device with which the mesh is going to be used.
// ppMesh The mesh object which will be created
@ -169,8 +169,8 @@ HRESULT WINAPI
//-------------------------------------------------------------------------
// D3DXCreateText:
// ---------------
// D3DXCreateText:
// ---------------
// Creates a mesh containing the specified text using the font associated
// with the device context.
//
@ -215,7 +215,7 @@ HRESULT WINAPI
#ifdef __cplusplus
}
#endif //__cplusplus
#endif //__cplusplus
#endif //__D3DX9SHAPES_H__

74
src/dep/include/DXSDK/include/d3dx9tex.h
View File

@ -27,14 +27,14 @@
// from the source image.
// D3DX_FILTER_LINEAR
// Each destination pixel is computed by linearly interpolating between
// the nearest pixels in the source image. This filter works best
// the nearest pixels in the source image. This filter works best
// when the scale on each axis is less than 2.
// D3DX_FILTER_TRIANGLE
// Every pixel in the source image contributes equally to the
// destination image. This is the slowest of all the filters.
// D3DX_FILTER_BOX
// Each pixel is computed by averaging a 2x2(x2) box pixels from
// the source image. Only works when the dimensions of the
// Each pixel is computed by averaging a 2x2(x2) box pixels from
// the source image. Only works when the dimensions of the
// destination are half those of the source. (as with mip maps)
//
// And can be OR'd with any of these optional flags:
@ -107,7 +107,7 @@
// D3DX_NORMALMAP_MIRROR
// Same as specifying D3DX_NORMALMAP_MIRROR_U | D3DX_NORMALMAP_MIRROR_V
// D3DX_NORMALMAP_INVERTSIGN
// Inverts the direction of each normal
// Inverts the direction of each normal
// D3DX_NORMALMAP_COMPUTE_OCCLUSION
// Compute the per pixel Occlusion term and encodes it into the alpha.
// An Alpha of 1 means that the pixel is not obscured in anyway, and
@ -141,7 +141,7 @@
// D3DX_CHANNEL_ALPHA
// Indicates the alpha channel should be used
// D3DX_CHANNEL_LUMINANCE
// Indicates the luminaces of the red green and blue channels should be
// Indicates the luminaces of the red green and blue channels should be
// used.
//
//----------------------------------------------------------------------------
@ -186,10 +186,10 @@ typedef enum _D3DXIMAGE_FILEFORMAT
// Parameters:
// pOut
// Pointer to a vector which the function uses to return its result.
// X,Y,Z,W will be mapped to R,G,B,A respectivly.
// X,Y,Z,W will be mapped to R,G,B,A respectivly.
// pTexCoord
// Pointer to a vector containing the coordinates of the texel currently
// being evaluated. Textures and VolumeTexture texcoord components
// Pointer to a vector containing the coordinates of the texel currently
// being evaluated. Textures and VolumeTexture texcoord components
// range from 0 to 1. CubeTexture texcoord component range from -1 to 1.
// pTexelSize
// Pointer to a vector containing the dimensions of the current texel.
@ -198,12 +198,12 @@ typedef enum _D3DXIMAGE_FILEFORMAT
//
//----------------------------------------------------------------------------
typedef VOID (WINAPI *LPD3DXFILL2D)(D3DXVECTOR4 *pOut,
typedef VOID (WINAPI *LPD3DXFILL2D)(D3DXVECTOR4 *pOut,
CONST D3DXVECTOR2 *pTexCoord, CONST D3DXVECTOR2 *pTexelSize, LPVOID pData);
typedef VOID (WINAPI *LPD3DXFILL3D)(D3DXVECTOR4 *pOut,
typedef VOID (WINAPI *LPD3DXFILL3D)(D3DXVECTOR4 *pOut,
CONST D3DXVECTOR3 *pTexCoord, CONST D3DXVECTOR3 *pTexelSize, LPVOID pData);
//----------------------------------------------------------------------------
@ -211,7 +211,7 @@ typedef VOID (WINAPI *LPD3DXFILL3D)(D3DXVECTOR4 *pOut,
// ---------------
// This structure is used to return a rough description of what the
// the original contents of an image file looked like.
//
//
// Width
// Width of original image in pixels
// Height
@ -274,7 +274,7 @@ extern "C" {
// SrcDataSize
// Size in bytes of file in memory.
// pSrcInfo
// Pointer to a D3DXIMAGE_INFO structure to be filled in with the
// Pointer to a D3DXIMAGE_INFO structure to be filled in with the
// description of the data in the source image file.
//
//----------------------------------------------------------------------------
@ -359,10 +359,10 @@ HRESULT WINAPI
// ColorKey
// Color to replace with transparent black, or 0 to disable colorkey.
// This is always a 32-bit ARGB color, independent of the source image
// format. Alpha is significant, and should usually be set to FF for
// format. Alpha is significant, and should usually be set to FF for
// opaque colorkeys. (ex. Opaque black == 0xff000000)
// pSrcInfo
// Pointer to a D3DXIMAGE_INFO structure to be filled in with the
// Pointer to a D3DXIMAGE_INFO structure to be filled in with the
// description of the data in the source image file, or NULL.
//
//----------------------------------------------------------------------------
@ -468,7 +468,7 @@ HRESULT WINAPI
// ColorKey
// Color to replace with transparent black, or 0 to disable colorkey.
// This is always a 32-bit ARGB color, independent of the source image
// format. Alpha is significant, and should usually be set to FF for
// format. Alpha is significant, and should usually be set to FF for
// opaque colorkeys. (ex. Opaque black == 0xff000000)
//
//----------------------------------------------------------------------------
@ -514,7 +514,7 @@ HRESULT WINAPI
// ColorKey
// Color to replace with transparent black, or 0 to disable colorkey.
// This is always a 32-bit ARGB color, independent of the source image
// format. Alpha is significant, and should usually be set to FF for
// format. Alpha is significant, and should usually be set to FF for
// opaque colorkeys. (ex. Opaque black == 0xff000000)
//
//----------------------------------------------------------------------------
@ -637,10 +637,10 @@ HRESULT WINAPI
// ColorKey
// Color to replace with transparent black, or 0 to disable colorkey.
// This is always a 32-bit ARGB color, independent of the source image
// format. Alpha is significant, and should usually be set to FF for
// format. Alpha is significant, and should usually be set to FF for
// opaque colorkeys. (ex. Opaque black == 0xff000000)
// pSrcInfo
// Pointer to a D3DXIMAGE_INFO structure to be filled in with the
// Pointer to a D3DXIMAGE_INFO structure to be filled in with the
// description of the data in the source image file, or NULL.
//
//----------------------------------------------------------------------------
@ -744,7 +744,7 @@ HRESULT WINAPI
// ColorKey
// Color to replace with transparent black, or 0 to disable colorkey.
// This is always a 32-bit ARGB color, independent of the source image
// format. Alpha is significant, and should usually be set to FF for
// format. Alpha is significant, and should usually be set to FF for
// opaque colorkeys. (ex. Opaque black == 0xff000000)
//
//----------------------------------------------------------------------------
@ -794,7 +794,7 @@ HRESULT WINAPI
// ColorKey
// Color to replace with transparent black, or 0 to disable colorkey.
// This is always a 32-bit ARGB color, independent of the source image
// format. Alpha is significant, and should usually be set to FF for
// format. Alpha is significant, and should usually be set to FF for
// opaque colorkeys. (ex. Opaque black == 0xff000000)
//
//----------------------------------------------------------------------------
@ -1022,15 +1022,15 @@ HRESULT WINAPI
// SrcDataSize
// Size in bytes of file in memory.
// Width, Height, Depth, Size
// Size in pixels. If zero or D3DX_DEFAULT, the size will be taken from
// the file and rounded up to a power of two. If D3DX_DEFAULT_NONPOW2,
// Size in pixels. If zero or D3DX_DEFAULT, the size will be taken from
// the file and rounded up to a power of two. If D3DX_DEFAULT_NONPOW2,
// and the device supports NONPOW2 textures, the size will not be rounded.
// If D3DX_FROM_FILE, the size will be taken exactly as it is in the file,
// If D3DX_FROM_FILE, the size will be taken exactly as it is in the file,
// and the call will fail if this violates device capabilities.
// MipLevels
// Number of mip levels. If zero or D3DX_DEFAULT, a complete mipmap
// chain will be created. If D3DX_FROM_FILE, the size will be taken
// exactly as it is in the file, and the call will fail if this violates
// chain will be created. If D3DX_FROM_FILE, the size will be taken
// exactly as it is in the file, and the call will fail if this violates
// device capabilities.
// Usage
// Texture usage flags
@ -1052,10 +1052,10 @@ HRESULT WINAPI
// ColorKey
// Color to replace with transparent black, or 0 to disable colorkey.
// This is always a 32-bit ARGB color, independent of the source image
// format. Alpha is significant, and should usually be set to FF for
// format. Alpha is significant, and should usually be set to FF for
// opaque colorkeys. (ex. Opaque black == 0xff000000)
// pSrcInfo
// Pointer to a D3DXIMAGE_INFO structure to be filled in with the
// Pointer to a D3DXIMAGE_INFO structure to be filled in with the
// description of the data in the source image file, or NULL.
// pPalette
// 256 color palette to be filled in, or NULL
@ -1607,7 +1607,7 @@ HRESULT WINAPI
// pPalette
// 256 color palette to be used, or NULL for non-palettized formats
// SrcLevel
// The level whose image is used to generate the subsequent levels.
// The level whose image is used to generate the subsequent levels.
// Filter
// D3DX_FILTER flags controlling how each miplevel is filtered.
// Or D3DX_DEFAULT for D3DX_FILTER_BOX,
@ -1636,10 +1636,10 @@ HRESULT WINAPI
// pTexture, pCubeTexture, pVolumeTexture
// Pointer to the texture to be filled.
// pFunction
// Pointer to user provided evalutor function which will be used to
// Pointer to user provided evalutor function which will be used to
// compute the value of each texel.
// pData
// Pointer to an arbitrary block of user defined data. This pointer
// Pointer to an arbitrary block of user defined data. This pointer
// will be passed to the function provided in pFunction
//-----------------------------------------------------------------------------
@ -1665,7 +1665,7 @@ HRESULT WINAPI
// D3DXFillTextureTX:
// ------------------
// Uses a TX Shader target to function to fill each texel of each mip level
// of a given texture. The TX Shader target should be a compiled function
// of a given texture. The TX Shader target should be a compiled function
// taking 2 paramters and returning a float4 color.
//
// Paramters:
@ -1675,7 +1675,7 @@ HRESULT WINAPI
// Pointer to the texture shader to be used to fill in the texture
//----------------------------------------------------------------------------
HRESULT WINAPI
HRESULT WINAPI
D3DXFillTextureTX(
LPDIRECT3DTEXTURE9 pTexture,
LPD3DXTEXTURESHADER pTextureShader);
@ -1685,9 +1685,9 @@ HRESULT WINAPI
D3DXFillCubeTextureTX(
LPDIRECT3DCUBETEXTURE9 pCubeTexture,
LPD3DXTEXTURESHADER pTextureShader);
HRESULT WINAPI
HRESULT WINAPI
D3DXFillVolumeTextureTX(
LPDIRECT3DVOLUMETEXTURE9 pVolumeTexture,
LPD3DXTEXTURESHADER pTextureShader);
@ -1704,7 +1704,7 @@ HRESULT WINAPI
// pTexture
// Pointer to the destination texture
// pSrcTexture
// Pointer to the source heightmap texture
// Pointer to the source heightmap texture
// pSrcPalette
// Source palette of 256 colors, or NULL
// Flags

20
src/dep/include/DXSDK/include/d3dx9xof.h
View File

@ -82,23 +82,23 @@ typedef struct _D3DXF_FILELOADMEMORY
#if defined( _WIN32 ) && !defined( _NO_COM )
// {cef08cf9-7b4f-4429-9624-2a690a933201}
DEFINE_GUID( IID_ID3DXFile,
DEFINE_GUID( IID_ID3DXFile,
0xcef08cf9, 0x7b4f, 0x4429, 0x96, 0x24, 0x2a, 0x69, 0x0a, 0x93, 0x32, 0x01 );
// {cef08cfa-7b4f-4429-9624-2a690a933201}
DEFINE_GUID( IID_ID3DXFileSaveObject,
DEFINE_GUID( IID_ID3DXFileSaveObject,
0xcef08cfa, 0x7b4f, 0x4429, 0x96, 0x24, 0x2a, 0x69, 0x0a, 0x93, 0x32, 0x01 );
// {cef08cfb-7b4f-4429-9624-2a690a933201}
DEFINE_GUID( IID_ID3DXFileSaveData,
DEFINE_GUID( IID_ID3DXFileSaveData,
0xcef08cfb, 0x7b4f, 0x4429, 0x96, 0x24, 0x2a, 0x69, 0x0a, 0x93, 0x32, 0x01 );
// {cef08cfc-7b4f-4429-9624-2a690a933201}
DEFINE_GUID( IID_ID3DXFileEnumObject,
DEFINE_GUID( IID_ID3DXFileEnumObject,
0xcef08cfc, 0x7b4f, 0x4429, 0x96, 0x24, 0x2a, 0x69, 0x0a, 0x93, 0x32, 0x01 );
// {cef08cfd-7b4f-4429-9624-2a690a933201}
DEFINE_GUID( IID_ID3DXFileData,
DEFINE_GUID( IID_ID3DXFileData,
0xcef08cfd, 0x7b4f, 0x4429, 0x96, 0x24, 0x2a, 0x69, 0x0a, 0x93, 0x32, 0x01 );
#endif // defined( _WIN32 ) && !defined( _NO_COM )
@ -155,7 +155,7 @@ DECLARE_INTERFACE_( ID3DXFile, IUnknown )
STDMETHOD( QueryInterface )( THIS_ REFIID, LPVOID* ) PURE;
STDMETHOD_( ULONG, AddRef )( THIS ) PURE;
STDMETHOD_( ULONG, Release )( THIS ) PURE;
STDMETHOD( CreateEnumObject )( THIS_ LPCVOID, D3DXF_FILELOADOPTIONS,
ID3DXFileEnumObject** ) PURE;
STDMETHOD( CreateSaveObject )( THIS_ LPCVOID, D3DXF_FILESAVEOPTIONS,
@ -176,7 +176,7 @@ DECLARE_INTERFACE_( ID3DXFileSaveObject, IUnknown )
STDMETHOD( QueryInterface )( THIS_ REFIID, LPVOID* ) PURE;
STDMETHOD_( ULONG, AddRef )( THIS ) PURE;
STDMETHOD_( ULONG, Release )( THIS ) PURE;
STDMETHOD( GetFile )( THIS_ ID3DXFile** ) PURE;
STDMETHOD( AddDataObject )( THIS_ REFGUID, LPCSTR, CONST GUID*,
SIZE_T, LPCVOID, ID3DXFileSaveData** ) PURE;
@ -195,7 +195,7 @@ DECLARE_INTERFACE_( ID3DXFileSaveData, IUnknown )
STDMETHOD( QueryInterface )( THIS_ REFIID, LPVOID* ) PURE;
STDMETHOD_( ULONG, AddRef )( THIS ) PURE;
STDMETHOD_( ULONG, Release )( THIS ) PURE;
STDMETHOD( GetSave )( THIS_ ID3DXFileSaveObject** ) PURE;
STDMETHOD( GetName )( THIS_ LPSTR, SIZE_T* ) PURE;
STDMETHOD( GetId )( THIS_ LPGUID ) PURE;
@ -217,7 +217,7 @@ DECLARE_INTERFACE_( ID3DXFileEnumObject, IUnknown )
STDMETHOD( QueryInterface )( THIS_ REFIID, LPVOID* ) PURE;
STDMETHOD_( ULONG, AddRef )( THIS ) PURE;
STDMETHOD_( ULONG, Release )( THIS ) PURE;
STDMETHOD( GetFile )( THIS_ ID3DXFile** ) PURE;
STDMETHOD( GetChildren )( THIS_ SIZE_T* ) PURE;
STDMETHOD( GetChild )( THIS_ SIZE_T, ID3DXFileData** ) PURE;
@ -237,7 +237,7 @@ DECLARE_INTERFACE_( ID3DXFileData, IUnknown )
STDMETHOD( QueryInterface )( THIS_ REFIID, LPVOID* ) PURE;
STDMETHOD_( ULONG, AddRef )( THIS ) PURE;
STDMETHOD_( ULONG, Release )( THIS ) PURE;
STDMETHOD( GetEnum )( THIS_ ID3DXFileEnumObject** ) PURE;
STDMETHOD( GetName )( THIS_ LPSTR, SIZE_T* ) PURE;
STDMETHOD( GetId )( THIS_ LPGUID ) PURE;

398
src/dep/include/DXSDK/include/d3dxcore.h
View File

@ -18,7 +18,7 @@
typedef struct ID3DXContext *LPD3DXCONTEXT;
// {9B74ED7A-BBEF-11d2-9F8E-0000F8080835}
DEFINE_GUID(IID_ID3DXContext,
DEFINE_GUID(IID_ID3DXContext,
0x9b74ed7a, 0xbbef, 0x11d2, 0x9f, 0x8e, 0x0, 0x0, 0xf8, 0x8, 0x8, 0x35);
@ -29,22 +29,22 @@ DEFINE_GUID(IID_ID3DXContext,
//-------------------------------------------------------------------------
// D3DX_DEFAULT:
// ---------
// A predefined value that could be used for any parameter in D3DX APIs or
// member functions that is an enumerant or a handle. The D3DX
// documentation indicates wherever D3DX_DEFAULT may be used,
// A predefined value that could be used for any parameter in D3DX APIs or
// member functions that is an enumerant or a handle. The D3DX
// documentation indicates wherever D3DX_DEFAULT may be used,
// and how it will be interpreted in each situation.
//-------------------------------------------------------------------------
#define D3DX_DEFAULT ULONG_MAX
//-------------------------------------------------------------------------
// D3DX_DEFAULT_FLOAT:
// ------------------
// Similar to D3DX_DEFAULT, but used for floating point parameters.
// The D3DX documentation indicates wherever D3DX_DEFAULT_FLOAT may be used,
// The D3DX documentation indicates wherever D3DX_DEFAULT_FLOAT may be used,
// and how it will be interpreted in each situation.
//-------------------------------------------------------------------------
#define D3DX_DEFAULT_FLOAT FLT_MAX
//-------------------------------------------------------------------------
// Hardware Acceleration Level:
// ---------------------------
@ -55,39 +55,39 @@ DEFINE_GUID(IID_ID3DXContext,
// D3DXGetDeviceDescription().
//
// The only case these pre-defines should be used as device indices is if
// a particular level of acceleration is required, and given more than
// a particular level of acceleration is required, and given more than
// one capable device on the computer, it does not matter which one
// is used.
//
// The method of selection is as follows: If one of the D3DX devices on
// the primary DDraw device supports a requested hardware acceleration
// level, it will be used. Otherwise, the first matching device discovered
// by D3DX will be used.
// The method of selection is as follows: If one of the D3DX devices on
// the primary DDraw device supports a requested hardware acceleration
// level, it will be used. Otherwise, the first matching device discovered
// by D3DX will be used.
//
// Of course, it is possible for no match to exist for any of the
// pre-defines on a particular computer. Passing such a value into the
// D3DX apis will simply cause them to fail, reporting that no match
// is available.
//
//
// D3DX_HWLEVEL_NULL: Null implementation (draws nothing)
// D3DX_HWLEVEL_REFERENCE: Reference implementation (slowest)
// D3DX_HWLEVEL_2D: 2D acceleration only (RGB rasterizer used)
// D3DX_HWLEVEL_RASTER: Rasterization acceleration (likely most useful)
// D3DX_HWLEVEL_TL: Transform and lighting acceleration
// D3DX_HWLEVEL_TL: Transform and lighting acceleration
// D3DX_DEFAULT: The highest level of acceleration available
// on the primary DDraw device.
//-------------------------------------------------------------------------
#define D3DX_HWLEVEL_NULL (D3DX_DEFAULT - 1)
#define D3DX_HWLEVEL_REFERENCE (D3DX_DEFAULT - 2)
#define D3DX_HWLEVEL_2D (D3DX_DEFAULT - 3)
#define D3DX_HWLEVEL_RASTER (D3DX_DEFAULT - 4)
#define D3DX_HWLEVEL_TL (D3DX_DEFAULT - 5)
#define D3DX_HWLEVEL_2D (D3DX_DEFAULT - 3)
#define D3DX_HWLEVEL_RASTER (D3DX_DEFAULT - 4)
#define D3DX_HWLEVEL_TL (D3DX_DEFAULT - 5)
//-------------------------------------------------------------------------
// Surface Class:
// -------------
// These are the various types of 2D-surfaces classified according to their
// usage. Note that a number of them overlap. e.g. STENCILBUFFERS and
// usage. Note that a number of them overlap. e.g. STENCILBUFFERS and
// DEPTHBUFFERS overlap (since in DX7 implementation the stencil and depth
// bits are part of the same pixel format).
//
@ -95,15 +95,15 @@ DEFINE_GUID(IID_ID3DXContext,
// -----------------------------------------
// D3DX_SC_DEPTHBUFFER: All ddpfs which have the DDPF_ZPIXELS or the
// DDPF_ZBUFFER flags set.
// D3DX_SC_STENCILBUFFER: All ddpfs which have the DDPF_STENCILBUFFER
// D3DX_SC_STENCILBUFFER: All ddpfs which have the DDPF_STENCILBUFFER
// flag set.
// D3DX_SC_BUMPMAP: All ddpfs which have the DDPF_BUMPLUMINANCE
// D3DX_SC_BUMPMAP: All ddpfs which have the DDPF_BUMPLUMINANCE
// or the DDPF_BUMPDUDV flags set.
// D3DX_SC_LUMINANCEMAP: All ddpfs which have the DDPF_BUMPLUMINANCE
// or the DDPF_LUMINANCE flags set.
// D3DX_SC_COLORTEXTURE: All the surfaces that have color information in
// them and can be used for texturing.
// D3DX_SC_COLORRENDERTGT: All the surfaces that contain color
// D3DX_SC_COLORRENDERTGT: All the surfaces that contain color
// information and can be used as render targets.
//-------------------------------------------------------------------------
#define D3DX_SC_DEPTHBUFFER 0x01
@ -116,11 +116,11 @@ DEFINE_GUID(IID_ID3DXContext,
//-------------------------------------------------------------------------
// Surface Formats:
// ---------------
// These are the various types of surface formats that can be enumerated,
// there is no DDPIXELFORMAT structure in D3DX, the enums carry the meaning
// These are the various types of surface formats that can be enumerated,
// there is no DDPIXELFORMAT structure in D3DX, the enums carry the meaning
// (like FOURCCs).
//
// All the surface classes are represented here.
// All the surface classes are represented here.
//
//-------------------------------------------------------------------------
typedef enum _D3DX_SURFACEFORMAT
@ -162,10 +162,10 @@ typedef enum _D3DX_SURFACEFORMAT
} D3DX_SURFACEFORMAT;
//-------------------------------------------------------------------------
// Filtering types for Texture APIs
// Filtering types for Texture APIs
//
// -------------
// These are the various filter types for generation of mip-maps
// These are the various filter types for generation of mip-maps
//
// D3DX_FILTERTYPE
// -----------------------------------------
@ -187,7 +187,7 @@ typedef enum _D3DX_FILTERTYPE
//-------------------------------------------------------------------------
// D3DX_VIDMODEDESC: Display mode description.
// ----------------
// width: Screen Width
// width: Screen Width
// height: Screen Height
// bpp: Bits per pixel
// refreshRate: Refresh rate
@ -216,10 +216,10 @@ typedef struct _D3DX_VIDMODEDESC
// a particular driver revision on a particular video card.
// driverDesc: String describing the driver
// monitor: Handle to the video monitor used by this device (multimon
// specific). Devices that use different monitors on a
// specific). Devices that use different monitors on a
// multimon system report different values in this field.
// Therefore, to test for a multimon system, an application
// should look for more than one different monitor handle in
// Therefore, to test for a multimon system, an application
// should look for more than one different monitor handle in
// the list of D3DX devices.
// onPrimary: Indicates if this device is on the primary monitor
// (multimon specific).
@ -228,12 +228,12 @@ typedef struct _D3DX_VIDMODEDESC
typedef struct _D3DX_DEVICEDESC
{
DWORD deviceIndex;
DWORD deviceIndex;
DWORD hwLevel;
GUID ddGuid;
GUID d3dDeviceGuid;
GUID ddDeviceID;
char driverDesc[D3DX_DRIVERDESC_LENGTH];
GUID ddGuid;
GUID d3dDeviceGuid;
GUID ddDeviceID;
char driverDesc[D3DX_DRIVERDESC_LENGTH];
HMONITOR monitor;
BOOL onPrimary;
} D3DX_DEVICEDESC;
@ -244,7 +244,7 @@ typedef struct _D3DX_DEVICEDESC
#ifdef __cplusplus
extern "C" {
#endif //__cplusplus
//-------------------------------------------------------------------------
// D3DXInitialize: The very first call a D3DX app must make.
//-------------------------------------------------------------------------
@ -258,27 +258,27 @@ HRESULT WINAPI
D3DXUninitialize();
//-------------------------------------------------------------------------
// D3DXGetDeviceCount: Returns the maximum number of D3DXdevices
// D3DXGetDeviceCount: Returns the maximum number of D3DXdevices
// ------------------ available.
//
// D3DXGetDeviceDescription: Lists the 2D and 3D capabilities of the devices.
// D3DXGetDeviceDescription: Lists the 2D and 3D capabilities of the devices.
// ------------------------ Also, the various guids needed by ddraw and d3d.
//
// Params:
// Params:
// [in] DWORD deviceIndex: Which device? Starts at 0.
// [in] D3DX_DEVICEDESC* pd3dxDevice: Pointer to the D3DX_DEVICEDESC
// structure to be filled in.
//-------------------------------------------------------------------------
DWORD WINAPI
DWORD WINAPI
D3DXGetDeviceCount();
HRESULT WINAPI
D3DXGetDeviceDescription(DWORD deviceIndex,
D3DXGetDeviceDescription(DWORD deviceIndex,
D3DX_DEVICEDESC* pd3dxDeviceDesc);
//-------------------------------------------------------------------------
// D3DXGetMaxNumVideoModes: Returns the maximum number of video-modes .
// -----------------------
// -----------------------
//
// Params:
// [in] DWORD deviceIndex: The device being referred to.
@ -290,9 +290,9 @@ HRESULT WINAPI
//
// Note: These queries will simply give you a list of modes that the
// display adapter tells DirectX that it supports.
// There is no guarantee that D3DXCreateContext(Ex) will succeed
// with all listed video modes. This is a fundamental limitation
// of the current DirectX architecture which D3DX cannot hide in
// There is no guarantee that D3DXCreateContext(Ex) will succeed
// with all listed video modes. This is a fundamental limitation
// of the current DirectX architecture which D3DX cannot hide in
// any clean way.
//
// Params:
@ -303,14 +303,14 @@ HRESULT WINAPI
// [out] D3DX_VIDMODEDESC* pModeList: Pointer to the D3DX_VIDMODEDESC
// structure that will be filled in.
//-------------------------------------------------------------------------
DWORD WINAPI
D3DXGetMaxNumVideoModes(DWORD deviceIndex,
DWORD WINAPI
D3DXGetMaxNumVideoModes(DWORD deviceIndex,
DWORD flags);
HRESULT WINAPI
D3DXGetVideoMode(DWORD deviceIndex,
DWORD flags,
DWORD modeIndex,
D3DXGetVideoMode(DWORD deviceIndex,
DWORD flags,
DWORD modeIndex,
D3DX_VIDMODEDESC* pModeDesc);
#define D3DX_GVM_REFRESHRATE 0x00000001
@ -320,31 +320,31 @@ HRESULT WINAPI
// video mode.
//
// D3DXGetSurfaceFormat: Describes one of the supported surface formats.
// ---------------------
// ---------------------
//
// Params:
// [in] DWORD deviceIndex: The device being referred to.
// [in] D3DX_VIDMODEDESC* pDesc: The display mode at which the supported
// surface formats are requested. If it is
// NULL, the current display mode is
// NULL, the current display mode is
// assumed.
// [in] DWORD surfClassFlags: Required surface classes. Only surface
// formats which support all specified
// surface classes will be returned.
// formats which support all specified
// surface classes will be returned.
// (Multiple surface classes may be specified
// using bitwise OR.)
// using bitwise OR.)
// [in] DWORD which: Which surface formats to retrieve. Starts at 0.
// [out] D3DX_SURFACEFORMAT* pFormat: The surface format
//-------------------------------------------------------------------------
DWORD WINAPI
D3DXGetMaxSurfaceFormats(DWORD deviceIndex,
DWORD WINAPI
D3DXGetMaxSurfaceFormats(DWORD deviceIndex,
D3DX_VIDMODEDESC* pDesc,
DWORD surfClassFlags);
HRESULT WINAPI
D3DXGetSurfaceFormat(DWORD deviceIndex,
D3DX_VIDMODEDESC* pDesc,
DWORD surfClassFlags,
DWORD surfaceIndex,
DWORD surfClassFlags,
DWORD surfaceIndex,
D3DX_SURFACEFORMAT* pFormat);
@ -357,26 +357,26 @@ HRESULT WINAPI
// [out] D3DX_VIDMODEDESC* pVidMode: The current video mode
//-------------------------------------------------------------------------
HRESULT WINAPI
D3DXGetCurrentVideoMode(DWORD deviceIndex,
D3DXGetCurrentVideoMode(DWORD deviceIndex,
D3DX_VIDMODEDESC* pVidMode);
//-------------------------------------------------------------------------
// D3DXGetDeviceCaps: Lists all the capabilities of a device at a display
// D3DXGetDeviceCaps: Lists all the capabilities of a device at a display
// mode.
// ----------------
//
// Params:
// [in] DWORD deviceIndex: The device being referred to.
// [in] D3DX_VIDMODEDESC* pDesc: If this is NULL, we will return the
// caps at the current display mode of
// [in] D3DX_VIDMODEDESC* pDesc: If this is NULL, we will return the
// caps at the current display mode of
// the device.
// [out] D3DDEVICEDESC7* pD3DDeviceDesc7: D3D Caps ( NULL to ignore
// [out] D3DDEVICEDESC7* pD3DDeviceDesc7: D3D Caps ( NULL to ignore
// parameter)
// [out] DDCAPS7* pDDHalCaps: DDraw HAL Caps (NULL to ignore parameter)
// [out] DDCAPS7* pDDHelCaps: DDraw HEL Caps (NULL to ignore paramter)
//-------------------------------------------------------------------------
HRESULT WINAPI
D3DXGetDeviceCaps(DWORD deviceIndex,
D3DXGetDeviceCaps(DWORD deviceIndex,
D3DX_VIDMODEDESC* pVidMode,
D3DDEVICEDESC7* pD3DCaps,
DDCAPS* pDDHALCaps,
@ -385,7 +385,7 @@ HRESULT WINAPI
//-------------------------------------------------------------------------
// D3DXCreateContext: Initializes the chosen device. It is the simplest init
// ----------------- function available. Parameters are treated the same
// as the matching subset of parameters in
// as the matching subset of parameters in
// D3DXCreateContextEx, documented below.
// Remaining D3DXCreateContextEx parameters that are
// not present in D3DXCreateContext are treated as
@ -398,29 +398,29 @@ HRESULT WINAPI
//
// Note: Do not expect D3DXCreateContext(Ex) to be fail-safe (as with any
// API). Supported device capablilites should be used as a guide
// for choosing parameter values. Keep in mind that there will
// for choosing parameter values. Keep in mind that there will
// inevitably be some combinations of parameters that just do not work.
//
//
// Params:
// [in] DWORD deviceIndex: The device being referred to.
// [in] DWORD deviceIndex: The device being referred to.
// [in] DWORD flags: The valid flags are D3DX_CONTEXT_FULLSCREEN, and
// D3DX_CONTEXT_OFFSCREEN. These flags cannot both
// be specified. If no flags are specified, the
// context defaults to windowed mode.
//
// [in] HWND hwnd: Device window. See note.
// [in] HWND hwndFocus: Window which receives keyboard messages from
// the device window. The device window should be
// a child of focus window. Useful for multimon
// [in] HWND hwndFocus: Window which receives keyboard messages from
// the device window. The device window should be
// a child of focus window. Useful for multimon
// applications. See note.
// NOTE:
// windowed:
// hwnd must be a valid window. hwndFocus must be NULL or
// NOTE:
// windowed:
// hwnd must be a valid window. hwndFocus must be NULL or
// D3DX_DEFAULT.
//
// fullscreen:
// fullscreen:
// Either hwnd or hwndFocus must be a valid window. (Both cannot
// be NULL or D3DX_DEFAULT). If hwnd is NULL or D3DX_DEFAULT,
// be NULL or D3DX_DEFAULT). If hwnd is NULL or D3DX_DEFAULT,
// a default device window will be created as a child of hwndFocus.
//
// offscreen:
@ -429,7 +429,7 @@ HRESULT WINAPI
// [in] DWORD numColorBits: If D3DX_DEFAULT is passed for windowed mode,
// the current desktop's color depth is chosen.
// For full screen mode, D3DX_DEFAULT causes 16
// bit color to be used.
// bit color to be used.
// [in] DWORD numAlphaBits: If D3DX_DEFAULT is passed, 0 is chosen.
// [in] DWORD numDepthbits: If D3DX_DEFAULT is passed,
// the highest available number of depth bits
@ -440,10 +440,10 @@ HRESULT WINAPI
//
// NOTE: If both numDepthBits and numStencilBits are D3DX_DEFAULT,
// D3DX first picks the highest available number of stencil
// bits. Then, for the chosen number of stencil bits,
// bits. Then, for the chosen number of stencil bits,
// the highest available number of depth bits is chosen.
// If only one of numStencilBits or numDepthBits
// is D3DX_DEFAULT, the highest number of bits available
// If only one of numStencilBits or numDepthBits
// is D3DX_DEFAULT, the highest number of bits available
// for this parameter is chosen out of only the formats
// that support the number of bits requested for the
// fixed parameter.
@ -457,47 +457,47 @@ HRESULT WINAPI
// fullscreen: D3DX_DEFAULT means 1. Any number of back buffers can be
// specified.
//
// offscreen: D3DX_DEFAULT means 0. You cannot specify additional back
// offscreen: D3DX_DEFAULT means 0. You cannot specify additional back
// buffers.
//
// [in] DWORD width: Width, in pixels, or D3DX_DEFAULT. See note.
// [in] DWORD height: Height, in pixels, or D3DX_DEFAULT. See note.
//
// NOTE:
// NOTE:
// windowed: If either width or height is D3DX_DEFAULT, both values
// default to the dimensions of the client area of hwnd.
//
// fullscreen: If either width or height is D3DX_DEFAULT, width
// fullscreen: If either width or height is D3DX_DEFAULT, width
// defaults to 640, and height defaults to 480.
//
// offscreen: An error is returned if either width or height is
// offscreen: An error is returned if either width or height is
// D3DX_DEFAULT.
//
// [in] DWORD refreshRate: D3DX_DEFAULT means we let ddraw choose for
// [in] DWORD refreshRate: D3DX_DEFAULT means we let ddraw choose for
// us. Ignored for windowed and offscreen modes.
// [out] LPD3DXCONTEXT* ppCtx: This is the Context object that is used for
// rendering on that device.
//
//-------------------------------------------------------------------------
HRESULT WINAPI
D3DXCreateContext(DWORD deviceIndex,
D3DXCreateContext(DWORD deviceIndex,
DWORD flags,
HWND hwnd,
DWORD width,
DWORD width,
DWORD height,
LPD3DXCONTEXT* ppCtx);
HRESULT WINAPI
D3DXCreateContextEx(DWORD deviceIndex,
D3DXCreateContextEx(DWORD deviceIndex,
DWORD flags,
HWND hwnd,
HWND hwndFocus,
HWND hwndFocus,
DWORD numColorBits,
DWORD numAlphaBits,
DWORD numDepthbits,
DWORD numStencilBits,
DWORD numBackBuffers,
DWORD width,
DWORD width,
DWORD height,
DWORD refreshRate,
LPD3DXCONTEXT* ppCtx);
@ -518,12 +518,12 @@ HRESULT WINAPI
// size needs to be passed in.
//-------------------------------------------------------------------------
void WINAPI
D3DXGetErrorString(HRESULT hr,
DWORD strLength,
D3DXGetErrorString(HRESULT hr,
DWORD strLength,
LPSTR pStr);
//-------------------------------------------------------------------------
// D3DXMakeDDPixelFormat: Fills in a DDPIXELFORMAT structure based on the
// D3DXMakeDDPixelFormat: Fills in a DDPIXELFORMAT structure based on the
// --------------------- D3DX surface format requested.
//
// Params:
@ -532,12 +532,12 @@ void WINAPI
// surface format.
//-------------------------------------------------------------------------
HRESULT WINAPI
D3DXMakeDDPixelFormat(D3DX_SURFACEFORMAT d3dxFormat,
D3DXMakeDDPixelFormat(D3DX_SURFACEFORMAT d3dxFormat,
DDPIXELFORMAT* pddpf);
//-------------------------------------------------------------------------
// D3DXMakeSurfaceFormat: Determines the surface format corresponding to
// --------------------- a given DDPIXELFORMAT.
// D3DXMakeSurfaceFormat: Determines the surface format corresponding to
// --------------------- a given DDPIXELFORMAT.
//
// Params:
// [in] DDPIXELFORMAT* pddpf: Pixel format.
@ -550,17 +550,17 @@ D3DX_SURFACEFORMAT WINAPI
#ifdef __cplusplus
}
#endif //__cplusplus
#endif //__cplusplus
///////////////////////////////////////////////////////////////////////////
// Interfaces:
///////////////////////////////////////////////////////////////////////////
//-------------------------------------------------------------------------
// ID3DXContext interface:
// ID3DXContext interface:
//
// This encapsulates all the stuff that the app might
// want to do at initialization time and any global control over d3d and
// This encapsulates all the stuff that the app might
// want to do at initialization time and any global control over d3d and
// ddraw.
//-------------------------------------------------------------------------
@ -568,14 +568,14 @@ D3DX_SURFACEFORMAT WINAPI
DECLARE_INTERFACE_(ID3DXContext, IUnknown)
{
//
// IUnknown methods
// IUnknown methods
//
STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* ppvObj) PURE;
STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD_(ULONG,Release)(THIS) PURE;
// Get the DDraw and Direct3D objects to call DirectDraw or
// Direct3D Immediate Mode functions.
// Direct3D Immediate Mode functions.
// If the objects don't exist (because they have not
// been created for some reason) NULL is returned.
// All the objects returned in the following Get* functions
@ -592,53 +592,53 @@ DECLARE_INTERFACE_(ID3DXContext, IUnknown)
STDMETHOD_(LPDIRECTDRAWSURFACE7,GetZBuffer)(THIS) PURE;
STDMETHOD_(LPDIRECTDRAWSURFACE7,GetBackBuffer)(THIS_ DWORD which) PURE;
// Get the associated window handles
// Get the associated window handles
STDMETHOD_(HWND,GetWindow)(THIS) PURE;
STDMETHOD_(HWND,GetFocusWindow)(THIS) PURE;
//
//
// Various Get methods, in case the user had specified default
// parameters
//
STDMETHOD(GetDeviceIndex)(THIS_
LPDWORD pDeviceIndex,
STDMETHOD(GetDeviceIndex)(THIS_
LPDWORD pDeviceIndex,
LPDWORD pHwLevel) PURE;
STDMETHOD_(DWORD, GetNumBackBuffers)(THIS) PURE;
STDMETHOD(GetNumBits)(THIS_
LPDWORD pColorBits,
LPDWORD pColorBits,
LPDWORD pDepthBits,
LPDWORD pAlphaBits,
LPDWORD pAlphaBits,
LPDWORD pStencilBits) PURE;
STDMETHOD(GetBufferSize)(THIS_
LPDWORD pWidth,
STDMETHOD(GetBufferSize)(THIS_
LPDWORD pWidth,
LPDWORD pHeight) PURE;
// Get the flags that were used to create this context
STDMETHOD_(DWORD, GetCreationFlags)(THIS) PURE;
STDMETHOD_(DWORD, GetRefreshRate)(THIS) PURE;
// Restoring surfaces in case stuff is lost
STDMETHOD(RestoreSurfaces)(THIS) PURE;
// Resize all the buffers to the new width and height
STDMETHOD(Resize)(THIS_ DWORD width, DWORD height) PURE;
// Update the frame using a flip or a blit,
// If the D3DX_UPDATE_NOVSYNC flag is set, blit is used if the
// If the D3DX_UPDATE_NOVSYNC flag is set, blit is used if the
// driver cannot flip without waiting for vsync in full-screen mode.
STDMETHOD(UpdateFrame)(THIS_ DWORD flags) PURE;
// Render a string at the specified coordinates, with the specified
// colour. This is only provided as a convenience for
// Render a string at the specified coordinates, with the specified
// colour. This is only provided as a convenience for
// debugging/information during development.
// topLeftX and topLeftY represent the location of the top left corner
// of the string, on the render target.
// of the string, on the render target.
// The coordinate and color parameters each have a range of 0.0-1.0
STDMETHOD(DrawDebugText)(THIS_
float topLeftX,
float topLeftX,
float topLeftY,
D3DCOLOR color,
LPSTR pString) PURE;
@ -670,9 +670,9 @@ DECLARE_INTERFACE_(ID3DXContext, IUnknown)
#ifdef __cplusplus
extern "C" {
#endif //__cplusplus
//-------------------------------------------------------------------------
// D3DXCheckTextureRequirements: Return information about texture creation
// D3DXCheckTextureRequirements: Return information about texture creation
// ---------------------------- (used by CreateTexture, CreateTextureFromFile
// and CreateCubeMapTexture)
//
@ -680,33 +680,33 @@ extern "C" {
//
// pd3dDevice
// The D3D device with which the texture is going to be used.
// pFlags
// pFlags
// allows specification of D3DX_TEXTURE_NOMIPMAP
// D3DX_TEXTURE_NOMIPMAP may be returned in the case where mipmap creation
// D3DX_TEXTURE_NOMIPMAP may be returned in the case where mipmap creation
// is not supported.
// pWidth
// width in pixels or NULL
// width in pixels or NULL
// returns corrected width
// pHeight
// pHeight
// height in pixels or NULL
// returns corrected height
// pPixelFormat
// surface format
// surface format
// returns best match to input format
//
// Notes: 1. Unless the flags is set to specifically prevent creating
// Notes: 1. Unless the flags is set to specifically prevent creating
// mipmaps, mipmaps are generated all the way till 1x1 surface.
// 2. width, height and pixelformat are altered based on available
// 2. width, height and pixelformat are altered based on available
// hardware. For example:
// a. Texture dimensions may be required to be powers of 2
// b. We may require width == height for some devices
// c. If PixelFormat is unavailable, a best fit is made
//-------------------------------------------------------------------------
HRESULT WINAPI
HRESULT WINAPI
D3DXCheckTextureRequirements( LPDIRECT3DDEVICE7 pd3dDevice,
LPDWORD pFlags,
LPDWORD pWidth,
LPDWORD pHeight,
LPDWORD pFlags,
LPDWORD pWidth,
LPDWORD pHeight,
D3DX_SURFACEFORMAT* pPixelFormat);
//-------------------------------------------------------------------------
@ -717,18 +717,18 @@ HRESULT WINAPI
//
// pd3dDevice
// The D3D device with which the texture is going to be used.
// pFlags
// pFlags
// allows specification of D3DX_TEXTURE_NOMIPMAP
// D3DX_TEXTURE_NOMIPMAP may be returned in the case where mipmap creation
// D3DX_TEXTURE_NOMIPMAP may be returned in the case where mipmap creation
// is not supported. Additionally, D3DX_TEXTURE_STAGE<n> can be specified
// to indicate which texture stage the texture is for e.g.
// D3D_TEXTURE_STAGE1 indicates that the texture is for use with texture
// to indicate which texture stage the texture is for e.g.
// D3D_TEXTURE_STAGE1 indicates that the texture is for use with texture
// stage one. Stage Zero is the default if no TEXTURE_STAGE flags are
// set.
// pWidth
// width in pixels; 0 or NULL is unacceptable
// returns corrected width
// pHeight
// pHeight
// height in pixels; 0 or NULL is unacceptable
// returns corrected height
// pPixelFormat
@ -742,13 +742,13 @@ HRESULT WINAPI
// pNumMipMaps
// the number of mipmaps actually generated
//
// Notes: See notes for D3DXCheckTextureRequirements.
// Notes: See notes for D3DXCheckTextureRequirements.
//-------------------------------------------------------------------------
HRESULT WINAPI
HRESULT WINAPI
D3DXCreateTexture( LPDIRECT3DDEVICE7 pd3dDevice,
LPDWORD pFlags,
LPDWORD pWidth,
LPDWORD pHeight,
LPDWORD pFlags,
LPDWORD pWidth,
LPDWORD pHeight,
D3DX_SURFACEFORMAT* pPixelFormat,
LPDIRECTDRAWPALETTE pDDPal,
LPDIRECTDRAWSURFACE7* ppDDSurf,
@ -762,12 +762,12 @@ HRESULT WINAPI
//
// pd3dDevice
// The D3D device with which the texture is going to be used.
// pFlags
// pFlags
// allows specification of D3DX_TEXTURE_NOMIPMAP
// D3DX_TEXTURE_NOMIPMAP may be returned in the case where mipmap creation
// D3DX_TEXTURE_NOMIPMAP may be returned in the case where mipmap creation
// is not supported. Additionally, D3DX_TEXTURE_STAGE<n> can be specified
// to indicate which texture stage the texture is for e.g.
// D3D_TEXTURE_STAGE1 indicates that the texture is for use with texture
// to indicate which texture stage the texture is for e.g.
// D3D_TEXTURE_STAGE1 indicates that the texture is for use with texture
// stage one. Stage Zero is the default if no TEXTURE_STAGE flags are
// set.
// cubefaces
@ -784,7 +784,7 @@ HRESULT WINAPI
// pWidth
// width in pixels; 0 or NULL is unacceptable
// returns corrected width
// pHeight
// pHeight
// height in pixels; 0 or NULL is unacceptable
// returns corrected height
// pPixelFormat
@ -796,18 +796,18 @@ HRESULT WINAPI
// ppDDSurf
// the ddraw surface that will be created
// pNumMipMaps
// the number of mipmaps generated for a particular face of the
// the number of mipmaps generated for a particular face of the
// cubemap.
//
// Notes: See notes for D3DXCheckTextureRequirements.
// Notes: See notes for D3DXCheckTextureRequirements.
//-------------------------------------------------------------------------
HRESULT WINAPI
HRESULT WINAPI
D3DXCreateCubeMapTexture( LPDIRECT3DDEVICE7 pd3dDevice,
LPDWORD pFlags,
LPDWORD pFlags,
DWORD cubefaces,
D3DCOLOR colorEmptyFaces,
LPDWORD pWidth,
LPDWORD pHeight,
LPDWORD pWidth,
LPDWORD pHeight,
D3DX_SURFACEFORMAT *pPixelFormat,
LPDIRECTDRAWPALETTE pDDPal,
LPDIRECTDRAWSURFACE7* ppDDSurf,
@ -815,7 +815,7 @@ HRESULT WINAPI
//-------------------------------------------------------------------------
// D3DXCreateTextureFromFile: Create a texture object from a file or from the
// D3DXCreateTextureFromFile: Create a texture object from a file or from the
// ------------------------- resource. Only BMP and DIB are supported from the
// resource portion of the executable.
//
@ -823,24 +823,24 @@ HRESULT WINAPI
//
// pd3dDevice
// The D3D device with which the texture is going to be used.
// pFlags
// pFlags
// allows specification of D3DX_TEXTURE_NOMIPMAP
// D3DX_TEXTURE_NOMIPMAP may be returned in the case where mipmap creation
// D3DX_TEXTURE_NOMIPMAP may be returned in the case where mipmap creation
// is not supported. Additionally, D3DX_TEXTURE_STAGE<n> can be specified
// to indicate which texture stage the texture is for e.g.
// D3D_TEXTURE_STAGE1 indicates that the texture is for use with texture
// to indicate which texture stage the texture is for e.g.
// D3D_TEXTURE_STAGE1 indicates that the texture is for use with texture
// stage one. Stage Zero is the default if no TEXTURE_STAGE flags are
// set.
// pWidth
// Width in pixels. If 0 or D3DX_DEFAULT, the width will be taken
// pWidth
// Width in pixels. If 0 or D3DX_DEFAULT, the width will be taken
// from the file
// returns corrected width
// pHeight
// Height in pixels. If 0 or D3DX_DEFAULT, the height will be taken
// pHeight
// Height in pixels. If 0 or D3DX_DEFAULT, the height will be taken
// from the file
// returns corrected height
// pPixelFormat
// If D3DX_SF_UNKNOWN is passed in, pixel format closest to the bitmap
// If D3DX_SF_UNKNOWN is passed in, pixel format closest to the bitmap
// will be chosen
// returns actual format that was used
// pDDPal
@ -851,21 +851,21 @@ HRESULT WINAPI
// pNumMipMaps
// The number of mipmaps generated.
// pSrcName
// File name. BMP, DIB, DDS, are supported.
//
// TGA is supported for the following cases: 16, 24, 32bpp direct color and 8bpp palettized.
// Also, 8, 16bpp grayscale is supported. RLE versions of the above
// TGA formats are also supported. ColorKey and Premultiplied Alpha
// File name. BMP, DIB, DDS, are supported.
//
// TGA is supported for the following cases: 16, 24, 32bpp direct color and 8bpp palettized.
// Also, 8, 16bpp grayscale is supported. RLE versions of the above
// TGA formats are also supported. ColorKey and Premultiplied Alpha
// are not currently supported for TGA files.
// returns created format
//
// Notes: See notes for D3DXCheckTextureRequirements.
// Notes: See notes for D3DXCheckTextureRequirements.
//-------------------------------------------------------------------------
HRESULT WINAPI
HRESULT WINAPI
D3DXCreateTextureFromFile( LPDIRECT3DDEVICE7 pd3dDevice,
LPDWORD pFlags,
LPDWORD pWidth,
LPDWORD pHeight,
LPDWORD pFlags,
LPDWORD pWidth,
LPDWORD pHeight,
D3DX_SURFACEFORMAT* pPixelFormat,
LPDIRECTDRAWPALETTE pDDPal,
LPDIRECTDRAWSURFACE7* ppDDSurf,
@ -874,19 +874,19 @@ HRESULT WINAPI
D3DX_FILTERTYPE filterType);
//-------------------------------------------------------------------------
// D3DXLoadTextureFromFile: Load from a file into a mipmap level. Doing the
// D3DXLoadTextureFromFile: Load from a file into a mipmap level. Doing the
// ----------------------- necessary color conversion and rescaling. File
// format support is identical to
// format support is identical to
// D3DXCreateTextureFromFile's.
//
// pd3dDevice
// The D3D device with which the texture is going to be used.
// pTexture
// a pointer to a DD7Surface which was created with either
// a pointer to a DD7Surface which was created with either
// CreateTextureFromFile or CreateTexture.
// mipMapLevel
// indicates mipmap level
// Note:
// Note:
// 1. Error if mipmap level doesn't exist
// 2. If D3DX_DEFAULT and equal number of mipmap levels exist
// then all the source mip-levels are loaded
@ -894,37 +894,37 @@ HRESULT WINAPI
// 4. If the dest has miplevels and source doesn't, we expand
// 5. If there are unequal numbers of miplevels, we expand
// pSrcName
// File name. BMP, DIB, DDS, are supported.
// For details on TGA support, refer to the comments for
// File name. BMP, DIB, DDS, are supported.
// For details on TGA support, refer to the comments for
// D3DXCreateTextureFromFile
// pSrcRect
// the source rectangle or null (whole surface)
// pDestRect
// the destination rectangle or null (whole surface)
// filterType
// filterType
// filter used for mipmap generation
//-------------------------------------------------------------------------
HRESULT WINAPI
HRESULT WINAPI
D3DXLoadTextureFromFile( LPDIRECT3DDEVICE7 pd3dDevice,
LPDIRECTDRAWSURFACE7 pTexture,
DWORD mipMapLevel,
LPSTR pSrcName,
RECT* pSrcRect,
LPSTR pSrcName,
RECT* pSrcRect,
RECT* pDestRect,
D3DX_FILTERTYPE filterType);
//-------------------------------------------------------------------------
// D3DXLoadTextureFromSurface: Load from a DDraw Surface into a mipmap level.
// D3DXLoadTextureFromSurface: Load from a DDraw Surface into a mipmap level.
// -------------------------- Doing the necessary color conversion.
//
// pd3dDevice
// The D3D device with which the texture is going to be used.
// pTexture
// a pointer to a DD7Surface which was created with either
// a pointer to a DD7Surface which was created with either
// CreateTextureFromFile or CreateTexture.
// mipMapLevel
// indicates mipmap level
// Note:
// Note:
// 1. Error if mipmap level doesn't exist
// 2. If D3DX_DEFAULT and equal number of mipmap levels exist
// then all the source mip-levels are loaded
@ -937,15 +937,15 @@ HRESULT WINAPI
// the source rectangle or null (whole surface)
// pDestRect
// the destination rectangle or null (whole surface)
// filterType
// filterType
// filter used for mipmap generation
//-------------------------------------------------------------------------
HRESULT WINAPI
HRESULT WINAPI
D3DXLoadTextureFromSurface( LPDIRECT3DDEVICE7 pd3dDevice,
LPDIRECTDRAWSURFACE7 pTexture,
DWORD mipMapLevel,
LPDIRECTDRAWSURFACE7 pSurfaceSrc,
RECT* pSrcRect,
LPDIRECTDRAWSURFACE7 pSurfaceSrc,
RECT* pSrcRect,
RECT* pDestRect,
D3DX_FILTERTYPE filterType);
@ -956,11 +956,11 @@ HRESULT WINAPI
// pd3dDevice
// The D3D device with which the texture is going to be used.
// pTexture
// a pointer to a DD7Surface which was created with either
// a pointer to a DD7Surface which was created with either
// CreateTextureFromFile or CreateTexture.
// mipMapLevel
// indicates mipmap level
// Note:
// Note:
// 1. Error if mipmap level doesn't exist
// 2. If D3DX_DEFAULT and equal number of mipmap levels exist
// then all the source mip-levels are loaded
@ -970,7 +970,7 @@ HRESULT WINAPI
// pMemory
// pointer to source memory from which the texture will be loaded
// pDDPal
// DirectDraw Palette, that the app passes in optionally if the memory is
// DirectDraw Palette, that the app passes in optionally if the memory is
// supposed to be paletteized.
// srcPixelFormat
// PixelFormat of the source.
@ -978,15 +978,15 @@ HRESULT WINAPI
// The pitch of the memory or D3DX_DEFAULT (based on srcPixelFormat)
// pDestRect
// The destination rectangle or null (whole surface)
// filterType
// filterType
// filter used for mipmap generation
//
//
// Assumptions: The source (memory) is loaded in full
//-------------------------------------------------------------------------
HRESULT WINAPI
D3DXLoadTextureFromMemory( LPDIRECT3DDEVICE7 pd3dDevice,
HRESULT WINAPI
D3DXLoadTextureFromMemory( LPDIRECT3DDEVICE7 pd3dDevice,
LPDIRECTDRAWSURFACE7 pTexture,
DWORD mipMapLevel,
DWORD mipMapLevel,
LPVOID pMemory,
LPDIRECTDRAWPALETTE pDDPal,
D3DX_SURFACEFORMAT srcPixelFormat,
@ -996,10 +996,10 @@ HRESULT WINAPI
#ifdef __cplusplus
}
#endif //__cplusplus
#endif //__cplusplus
//-------------------------------------------------------------------------
// Flags for texture create functions; applies to
// Flags for texture create functions; applies to
// D3DXCreateTexture, D3DXCreateCubeMapTexture and D3DXCreateTextureFromFile.
//

84
src/dep/include/DXSDK/include/d3dxerr.h
View File

@ -1,14 +1,14 @@
//----------------------------------------------------------------------
//
// d3dxerr.h -- 0xC code definitions for the D3DX API
//
// Copyright (c) Microsoft Corp. All rights reserved.
//
//
// d3dxerr.h -- 0xC code definitions for the D3DX API
//
// Copyright (c) Microsoft Corp. All rights reserved.
//
//----------------------------------------------------------------------
#ifndef __D3DXERR_H__
#define __D3DXERR_H__
//
//
//
// Values are 32 bit values layed out as follows:
//
@ -48,7 +48,7 @@
// MessageText:
//
// Out of memory.
//
//
#define D3DXERR_NOMEMORY ((HRESULT)0xC8770BB8L)
@ -58,7 +58,7 @@
// MessageText:
//
// A NULL pointer was passed as a parameter.
//
//
#define D3DXERR_NULLPOINTER ((HRESULT)0xC8770BB9L)
@ -68,7 +68,7 @@
// MessageText:
//
// The Device Index passed in is invalid.
//
//
#define D3DXERR_INVALIDD3DXDEVICEINDEX ((HRESULT)0xC8770BBAL)
@ -78,7 +78,7 @@
// MessageText:
//
// DirectDraw has not been created.
//
//
#define D3DXERR_NODIRECTDRAWAVAILABLE ((HRESULT)0xC8770BBBL)
@ -88,7 +88,7 @@
// MessageText:
//
// Direct3D has not been created.
//
//
#define D3DXERR_NODIRECT3DAVAILABLE ((HRESULT)0xC8770BBCL)
@ -98,7 +98,7 @@
// MessageText:
//
// Direct3D device has not been created.
//
//
#define D3DXERR_NODIRECT3DDEVICEAVAILABLE ((HRESULT)0xC8770BBDL)
@ -108,7 +108,7 @@
// MessageText:
//
// Primary surface has not been created.
//
//
#define D3DXERR_NOPRIMARYAVAILABLE ((HRESULT)0xC8770BBEL)
@ -118,7 +118,7 @@
// MessageText:
//
// Z buffer has not been created.
//
//
#define D3DXERR_NOZBUFFERAVAILABLE ((HRESULT)0xC8770BBFL)
@ -128,7 +128,7 @@
// MessageText:
//
// Backbuffer has not been created.
//
//
#define D3DXERR_NOBACKBUFFERAVAILABLE ((HRESULT)0xC8770BC0L)
@ -138,7 +138,7 @@
// MessageText:
//
// Failed to update caps database after changing display mode.
//
//
#define D3DXERR_COULDNTUPDATECAPS ((HRESULT)0xC8770BC1L)
@ -148,7 +148,7 @@
// MessageText:
//
// Could not create Z buffer.
//
//
#define D3DXERR_NOZBUFFER ((HRESULT)0xC8770BC2L)
@ -158,7 +158,7 @@
// MessageText:
//
// Display mode is not valid.
//
//
#define D3DXERR_INVALIDMODE ((HRESULT)0xC8770BC3L)
@ -168,7 +168,7 @@
// MessageText:
//
// One or more of the parameters passed is invalid.
//
//
#define D3DXERR_INVALIDPARAMETER ((HRESULT)0xC8770BC4L)
@ -178,7 +178,7 @@
// MessageText:
//
// D3DX failed to initialize itself.
//
//
#define D3DXERR_INITFAILED ((HRESULT)0xC8770BC5L)
@ -188,7 +188,7 @@
// MessageText:
//
// D3DX failed to start up.
//
//
#define D3DXERR_STARTUPFAILED ((HRESULT)0xC8770BC6L)
@ -198,7 +198,7 @@
// MessageText:
//
// D3DXInitialize() must be called first.
//
//
#define D3DXERR_D3DXNOTSTARTEDYET ((HRESULT)0xC8770BC7L)
@ -208,7 +208,7 @@
// MessageText:
//
// D3DX is not initialized yet.
//
//
#define D3DXERR_NOTINITIALIZED ((HRESULT)0xC8770BC8L)
@ -218,7 +218,7 @@
// MessageText:
//
// Failed to render text to the surface.
//
//
#define D3DXERR_FAILEDDRAWTEXT ((HRESULT)0xC8770BC9L)
@ -228,7 +228,7 @@
// MessageText:
//
// Bad D3DX context.
//
//
#define D3DXERR_BADD3DXCONTEXT ((HRESULT)0xC8770BCAL)
@ -238,7 +238,7 @@
// MessageText:
//
// The requested device capabilities are not supported.
//
//
#define D3DXERR_CAPSNOTSUPPORTED ((HRESULT)0xC8770BCBL)
@ -248,7 +248,7 @@
// MessageText:
//
// The image file format is unrecognized.
//
//
#define D3DXERR_UNSUPPORTEDFILEFORMAT ((HRESULT)0xC8770BCCL)
@ -258,7 +258,7 @@
// MessageText:
//
// The image file loading library error.
//
//
#define D3DXERR_IFLERROR ((HRESULT)0xC8770BCDL)
@ -268,7 +268,7 @@
// MessageText:
//
// Could not obtain device caps.
//
//
#define D3DXERR_FAILEDGETCAPS ((HRESULT)0xC8770BCEL)
@ -278,7 +278,7 @@
// MessageText:
//
// Resize does not work for full-screen.
//
//
#define D3DXERR_CANNOTRESIZEFULLSCREEN ((HRESULT)0xC8770BCFL)
@ -288,7 +288,7 @@
// MessageText:
//
// Resize does not work for non-windowed contexts.
//
//
#define D3DXERR_CANNOTRESIZENONWINDOWED ((HRESULT)0xC8770BD0L)
@ -298,7 +298,7 @@
// MessageText:
//
// Front buffer already exists.
//
//
#define D3DXERR_FRONTBUFFERALREADYEXISTS ((HRESULT)0xC8770BD1L)
@ -308,7 +308,7 @@
// MessageText:
//
// The app is using the primary in full-screen mode.
//
//
#define D3DXERR_FULLSCREENPRIMARYEXISTS ((HRESULT)0xC8770BD2L)
@ -318,7 +318,7 @@
// MessageText:
//
// Could not get device context.
//
//
#define D3DXERR_GETDCFAILED ((HRESULT)0xC8770BD3L)
@ -328,7 +328,7 @@
// MessageText:
//
// Could not bitBlt.
//
//
#define D3DXERR_BITBLTFAILED ((HRESULT)0xC8770BD4L)
@ -338,7 +338,7 @@
// MessageText:
//
// There is no surface backing up this texture.
//
//
#define D3DXERR_NOTEXTURE ((HRESULT)0xC8770BD5L)
@ -348,7 +348,7 @@
// MessageText:
//
// There is no such miplevel for this surface.
//
//
#define D3DXERR_MIPLEVELABSENT ((HRESULT)0xC8770BD6L)
@ -358,7 +358,7 @@
// MessageText:
//
// The surface is not paletted.
//
//
#define D3DXERR_SURFACENOTPALETTED ((HRESULT)0xC8770BD7L)
@ -368,7 +368,7 @@
// MessageText:
//
// An error occured while enumerating surface formats.
//
//
#define D3DXERR_ENUMFORMATSFAILED ((HRESULT)0xC8770BD8L)
@ -378,7 +378,7 @@
// MessageText:
//
// D3DX only supports color depths of 16 bit or greater.
//
//
#define D3DXERR_COLORDEPTHTOOLOW ((HRESULT)0xC8770BD9L)
@ -388,7 +388,7 @@
// MessageText:
//
// The file format is invalid.
//
//
#define D3DXERR_INVALIDFILEFORMAT ((HRESULT)0xC8770BDAL)
@ -398,7 +398,7 @@
// MessageText:
//
// No suitable match found.
//
//
#define D3DXERR_NOMATCHFOUND ((HRESULT)0xC8770BDBL)

4
src/dep/include/DXSDK/include/d3dxmath.h
View File

@ -648,7 +648,7 @@ extern "C" {
float WINAPI D3DXMatrixfDeterminant
( const D3DXMATRIX *pM );
// Matrix multiplication. The result represents the transformation M2
// Matrix multiplication. The result represents the transformation M2
// followed by the transformation M1. (Out = M1 * M2)
D3DXMATRIX* WINAPI D3DXMatrixMultiply
( D3DXMATRIX *pOut, const D3DXMATRIX *pM1, const D3DXMATRIX *pM2 );
@ -829,7 +829,7 @@ D3DXQUATERNION* WINAPI D3DXQuaternionRotationAxis
D3DXQUATERNION* WINAPI D3DXQuaternionRotationYawPitchRoll
( D3DXQUATERNION *pOut, float yaw, float pitch, float roll );
// Quaternion multiplication. The result represents the rotation Q2
// Quaternion multiplication. The result represents the rotation Q2
// followed by the rotation Q1. (Out = Q2 * Q1)
D3DXQUATERNION* WINAPI D3DXQuaternionMultiply
( D3DXQUATERNION *pOut, const D3DXQUATERNION *pQ1,

108
src/dep/include/DXSDK/include/d3dxshapes.h
View File

@ -18,7 +18,7 @@
typedef struct ID3DXSimpleShape *LPD3DXSIMPLESHAPE;
// {CFCD4602-EB7B-11d2-A440-00A0C90629A8}
DEFINE_GUID( IID_ID3DXSimpleShape,
DEFINE_GUID( IID_ID3DXSimpleShape,
0xcfcd4602, 0xeb7b, 0x11d2, 0xa4, 0x40, 0x0, 0xa0, 0xc9, 0x6, 0x29, 0xa8 );
@ -27,12 +27,12 @@ DEFINE_GUID( IID_ID3DXSimpleShape,
///////////////////////////////////////////////////////////////////////////
//-------------------------------------------------------------------------
// ID3DXSimpleShape interface:
// ID3DXSimpleShape interface:
//-------------------------------------------------------------------------
DECLARE_INTERFACE_(ID3DXSimpleShape, IUnknown)
{
// IUnknown methods
// IUnknown methods
STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* ppvObj) PURE;
STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD_(ULONG,Release)(THIS) PURE;
@ -59,131 +59,131 @@ extern "C" {
// ---------------- specified. It returns a vertex buffer that can be used
// for drawing or manipulation by the program later on.
//
// Params:
// [in] LPDIRECT3DDEVICE7 pDevice: The device to create off.
// Params:
// [in] LPDIRECT3DDEVICE7 pDevice: The device to create off.
// [in] float sideSize: Length of a side.
// [in] DWORD numTexCoords: The number of texture coordinates desired
// in the vertex-buffer. (Default is 1)
// D3DX_DEFAULT is a valid input.
// [out] IDirect3DVertexBuffer7** ppVB: The output shape interface.
//-------------------------------------------------------------------------
HRESULT WINAPI
HRESULT WINAPI
D3DXCreatePolygon(LPDIRECT3DDEVICE7 pDevice,
float sideSize,
DWORD numSides,
DWORD numTexCoords,
float sideSize,
DWORD numSides,
DWORD numTexCoords,
LPD3DXSIMPLESHAPE* ppShape );
//-------------------------------------------------------------------------
// D3DXCreateBox: Creates a box (cuboid) of given dimensions using the
// D3DXCreateBox: Creates a box (cuboid) of given dimensions using the
// ------------ device. It returns a vertex buffer that can
// be used for drawing or manipulation by the program later on.
//
// Params:
// [in] LPDIRECT3DDEVICE7 pDevice: The device to create off.
// Params:
// [in] LPDIRECT3DDEVICE7 pDevice: The device to create off.
// [in] float width: Width of the box (along x-axis)
// [in] float height: Height of the box (along y-axis)
// [in] float depth: Depth of the box (along z-axis)
// [in] DWORD numTexCoords: The number of texture coordinates desired
// in the vertex-buffer. Default is 1.
// in the vertex-buffer. Default is 1.
// D3DX_DEFAULT is a valid input here.
// [out] LPD3DXSIMPLESHAPE* ppShape: The output vertex-buffer.
//-------------------------------------------------------------------------
HRESULT WINAPI
D3DXCreateBox(LPDIRECT3DDEVICE7 pDevice,
HRESULT WINAPI
D3DXCreateBox(LPDIRECT3DDEVICE7 pDevice,
float width,
float height,
float depth,
DWORD numTexCoords,
DWORD numTexCoords,
LPD3DXSIMPLESHAPE* ppShape );
//-------------------------------------------------------------------------
// D3DXCreateCylinder: Creates a cylinder of given dimensions using the
// D3DXCreateCylinder: Creates a cylinder of given dimensions using the
// ----------------- device. It returns a vertex buffer that
// can be used for drawing or manipulation by the program
// later on.
//
// Params:
// [in] LPDIRECT3DDEVICE7 pDevice: The device to create off.
// Params:
// [in] LPDIRECT3DDEVICE7 pDevice: The device to create off.
// [in] float baseRadius: Base-radius (default is 1.0f, shd be >= 0.0f)
// [in] float topRadius: Top-radius (default is 1.0f, shd be >= 0.0f)
// [in] float height: Height (default is 1.0f, shd be >= 0.0f)
// [in] DWORD numSlices: Number of slices about the main axis.
// (default is 8) D3DX_DEFAULT is a valid input.
// [in] DWORD numStacks: Number of stacks along the main axis.
// [in] DWORD numStacks: Number of stacks along the main axis.
// (default is 8) D3DX_DEFAULT is a valid input.
// [in] DWORD numTexCoords: The number of texture coordinates desired
// in the vertex-buffer. Default is 1.
// in the vertex-buffer. Default is 1.
// D3DX_DEFAULT is a valid input here.
// [out] LPD3DXSIMPLESHAPE* ppShape: The output shape interface.
//-------------------------------------------------------------------------
HRESULT WINAPI
HRESULT WINAPI
D3DXCreateCylinder(LPDIRECT3DDEVICE7 pDevice,
float baseRadius,
float topRadius,
float height,
DWORD numSlices,
DWORD numStacks,
DWORD numTexCoords,
float baseRadius,
float topRadius,
float height,
DWORD numSlices,
DWORD numStacks,
DWORD numTexCoords,
LPD3DXSIMPLESHAPE* ppShape );
//-------------------------------------------------------------------------
// D3DXCreateTorus: Creates a torus of given dimensions using the
// D3DXCreateTorus: Creates a torus of given dimensions using the
// -------------- device specified. It returns a vertex buffer that can
// be used for drawing or manipulation by the program later
// on. It draws a doughnut, centered at (0, 0, 0) whose axis
// on. It draws a doughnut, centered at (0, 0, 0) whose axis
// is aligned with the z-axis. With the innerRadius used
// as the radius of the cross-section (minor-Radius) and
// the outerRadius used as the radius of the central 'hole'.
// as the radius of the cross-section (minor-Radius) and
// the outerRadius used as the radius of the central 'hole'.
//
// Params:
// [in] LPDIRECT3DDEVICE7 pDevice: The device to create off.
// Params:
// [in] LPDIRECT3DDEVICE7 pDevice: The device to create off.
// [in] float innerRadius: inner radius (default is 1.0f, shd be >= 0.0f)
// [in] float outerRadius: outer radius (default is 2.0f, shd be >= 0.0f)
// [in] DWORD numSides: Number of sides in the cross-section
// [in] DWORD numSides: Number of sides in the cross-section
// (default is 8). D3DX_DEFAULT is a valid input.
// [in] DWORD numRings: Number of rings making up the torus
// [in] DWORD numRings: Number of rings making up the torus
// (default is 8) D3DX_DEFAULT is a valid input.
// [in] DWORD numTexCoords: The number of texture coordinates desired
// in the vertex-buffer. Default is 1.
// in the vertex-buffer. Default is 1.
// D3DX_DEFAULT is a valid input here.
// [out] LPD3DXSIMPLESHAPE* ppShape: The output shape interface.
//-------------------------------------------------------------------------
HRESULT WINAPI
D3DXCreateTorus(LPDIRECT3DDEVICE7 pDevice,
float innerRadius,
float outerRadius,
float outerRadius,
DWORD numSides,
DWORD numRings,
DWORD numTexCoords,
DWORD numRings,
DWORD numTexCoords,
LPD3DXSIMPLESHAPE* ppShape );
//-------------------------------------------------------------------------
// D3DXCreateTeapot: Creates a teapot using the device specified.
// D3DXCreateTeapot: Creates a teapot using the device specified.
// ---------------- It returns a vertex buffer that can be used for
// drawing or manipulation by the program later on.
//
// Params:
// [in] LPDIRECT3DDEVICE7 pDevice: The device to create off.
// Params:
// [in] LPDIRECT3DDEVICE7 pDevice: The device to create off.
// [in] DWORD numTexCoords: The number of texture coordinates desired
// in the vertex-buffer. Default is 1.
// in the vertex-buffer. Default is 1.
// D3DX_DEFAULT is a valid input here.
// [out] LPD3DXSIMPLESHAPE* ppShape: The output shape interface.
//-------------------------------------------------------------------------
HRESULT WINAPI
D3DXCreateTeapot(LPDIRECT3DDEVICE7 pDevice,
DWORD numTexCoords,
DWORD numTexCoords,
LPD3DXSIMPLESHAPE* ppShape);
//-------------------------------------------------------------------------
// D3DXCreateSphere: Creates a cylinder of given dimensions using the
// ---------------- device specified.
// ---------------- device specified.
// It returns a vertex buffer that can be used for
// drawing or manipulation by the program later on.
//
// Params:
// [in] LPDIRECT3DDEVICE7 pDevice: The device to create off.
// Params:
// [in] LPDIRECT3DDEVICE7 pDevice: The device to create off.
// [in] float radius: radius (default is 1.0f, shd be >= 0.0f)
// [in] float height: Height (default is 1.0f, shd be >= 0.0f)
// [in] DWORD numSlices: Number of slices about the main axis
@ -191,19 +191,19 @@ HRESULT WINAPI
// [in] DWORD numStacks: Number of stacks along the main axis
// (default is 8) D3DX_DEFAULT is a valid input.
// [in] DWORD numTexCoords: The number of texture coordinates desired
// in the vertex-buffer. Default is 1.
// in the vertex-buffer. Default is 1.
// D3DX_DEFAULT is a valid input here.
// [out] LPD3DXSIMPLESHAPE* ppShape: The output shape interface.
//-------------------------------------------------------------------------
HRESULT WINAPI
D3DXCreateSphere(LPDIRECT3DDEVICE7 pDevice,
float radius,
DWORD numSlices,
D3DXCreateSphere(LPDIRECT3DDEVICE7 pDevice,
float radius,
DWORD numSlices,
DWORD numStacks,
DWORD numTexCoords,
DWORD numTexCoords,
LPD3DXSIMPLESHAPE* ppShape);
#ifdef __cplusplus
}
#endif //__cplusplus
#endif //__cplusplus
#endif //__D3DXSHAPES_H__

146
src/dep/include/DXSDK/include/d3dxsprite.h
View File

@ -6,15 +6,15 @@
// Content: D3DX sprite helper functions
//
// These functions allow you to use sprites with D3DX. A "sprite" is
// loosely defined as a 2D image that you want to transfer to the
// loosely defined as a 2D image that you want to transfer to the
// rendering target. The source image can be a texture created
// with the help of the D3DX texture loader; though advanced users may
// want to create their own. A helper function (PrepareDeviceForSprite)
// is provided to make it easy to set up render states on a device.
// (Again, advanced users can use their own created devices.)
// is provided to make it easy to set up render states on a device.
// (Again, advanced users can use their own created devices.)
//
// There are two general techniques for sprites; the simpler one just
// specifies a destination rectangle and a rotation anlge. A more
// specifies a destination rectangle and a rotation anlge. A more
// powerful technique supports rendering to non-rectangular quads.
//
// Both techniques support clipping, alpha, and rotation. More
@ -46,14 +46,14 @@ extern "C" {
// Warning: This function modifies render states and may impact performance
// negatively on some 3D hardware if it is called too often per frame.
//
// Warning: If the render state changes (other than through calls to
// BltSprite or WarpSprite), you will need to call this function again before
// Warning: If the render state changes (other than through calls to
// BltSprite or WarpSprite), you will need to call this function again before
// calling BltSprite or WarpSprite.
//
// Details: This function modifies the the rendering first texture stage and
// it modifies some renderstates for the entire device. Here is the exact
// Details: This function modifies the the rendering first texture stage and
// it modifies some renderstates for the entire device. Here is the exact
// list:
//
//
// SetTextureStageState(0, D3DTSS_COLORARG1, D3DTA_TEXTURE);
// SetTextureStageState(0, D3DTSS_COLOROP, D3DTOP_SELECTARG1);
// SetTextureStageState(0, D3DTSS_ALPHAARG1, D3DTA_TEXTURE);
@ -61,7 +61,7 @@ extern "C" {
// SetTextureStageState(0, D3DTSS_ALPHAOP, D3DTOP_MODULATE);
// SetTextureStageState(0, D3DTSS_MINFILTER, D3DTFN_LINEAR);
// SetTextureStageState(0, D3DTSS_MAGFILTER, D3DTFG_LINEAR);
//
//
// SetRenderState(D3DRENDERSTATE_SRCBLEND, D3DBLEND_SRCALPHA);
// SetRenderState(D3DRENDERSTATE_DESTBLEND, D3DBLEND_INVSRCALPHA);
// SetRenderState(D3DRENDERSTATE_ALPHABLENDENABLE, TRUE);
@ -72,51 +72,51 @@ extern "C" {
// - or -
// SetRenderState(D3DRENDERSTATE_ZENABLE, TRUE);
//
// Parameters:
// Parameters:
// pd3dDevice - a pointer to the d3d device that you wish to prepare
// for use with D3DX Sprite Services
// ZEnable - a flag indicating whether you want the sprites to
// check and update the Z buffer as part of rendering.
// If ZEnable is FALSE, OR you are using
// alpha-blending, then it is necessary to render your
// sprites from back-to-front.
// sprites from back-to-front.
//
//-------------------------------------------------------------------------
#ifdef __cplusplus
HRESULT WINAPI
D3DXPrepareDeviceForSprite( LPDIRECT3DDEVICE7 pd3dDevice,
D3DXPrepareDeviceForSprite( LPDIRECT3DDEVICE7 pd3dDevice,
BOOL ZEnable = FALSE);
#else
HRESULT WINAPI
D3DXPrepareDeviceForSprite( LPDIRECT3DDEVICE7 pd3dDevice,
D3DXPrepareDeviceForSprite( LPDIRECT3DDEVICE7 pd3dDevice,
BOOL ZEnable);
#endif
//-------------------------------------------------------------------------
// The D3DXDrawBasicSprite() function performs blitting of source images onto
// a 3D rendering device. This function only calls SetTexture on the first
// renderstage with the parameter (pd3dTexture) if that parameter is non-null.
// This function assumes that D3DXPrepareDeviceForSprite has been called on
// the device or that caller has in some other way correctly prepared the
// The D3DXDrawBasicSprite() function performs blitting of source images onto
// a 3D rendering device. This function only calls SetTexture on the first
// renderstage with the parameter (pd3dTexture) if that parameter is non-null.
// This function assumes that D3DXPrepareDeviceForSprite has been called on
// the device or that caller has in some other way correctly prepared the
// renderstates.
//
// This function supports scaling, rotations, alpha-blending, and choosing
// This function supports scaling, rotations, alpha-blending, and choosing
// a source sub-rect.
//
//
// Rotation angle is specified in radians. Both rotations and scales
// are applied around the center of the sprite; where the center of the
// sprite is half the width/height of the sprite, plus the offset parameter.
// sprite is half the width/height of the sprite, plus the offset parameter.
//
// Use the offset parameter if you want the sprite's center to be something
// Use the offset parameter if you want the sprite's center to be something
// other than the image center.
//
// The destination point indicates where you would like the center of
// the sprite to draw to.
//
// Parameters:
// Parameters:
// pd3dTexture - a pointer to the surface containing the texture
// pd3dDevice - a pointer to the d3d device to render to. It is
// assumed that render states are set up. (See
@ -125,42 +125,42 @@ HRESULT WINAPI
// components of the vector must be in screen
// space.
// alpha - alpha value to apply to sprite. 1.0 means totally
// opaque; and 0.0 means totally transparent.
// opaque; and 0.0 means totally transparent.
// WARNING: If you are using alpha, then you should render
// from back to front in order to avoid rendering
// artifacts.
// angleRad - angle of rotation around the 'center' of the rect
// scale - a uniform scale that is applied to the source rect
// to specify the size of the image that is rendered
// pOffset - offset from the center of the source rect to use as the
// pOffset - offset from the center of the source rect to use as the
// center of rotation
// pSourceRect - a rect that indicates what portion of the source
// source texture to use. If NULL is passed, then the
// entire source is used. If the source texture was
// entire source is used. If the source texture was
// created via D3DX, then the rect should be specified
// in the coordinates of the original image (so that you
// don't have to worry about stretching/scaling that D3DX
// may have done to make the image work with your current
// 3D Device.) Note that horizontal or vertical mirroring
// may be simply accomplished by swapping the left/right
// 3D Device.) Note that horizontal or vertical mirroring
// may be simply accomplished by swapping the left/right
// or top/bottom fields of this RECT.
//-------------------------------------------------------------------------
#ifdef __cplusplus
HRESULT WINAPI
D3DXDrawSpriteSimple(LPDIRECTDRAWSURFACE7 pd3dTexture,
LPDIRECT3DDEVICE7 pd3dDevice,
const D3DXVECTOR3 *ppointDest,
HRESULT WINAPI
D3DXDrawSpriteSimple(LPDIRECTDRAWSURFACE7 pd3dTexture,
LPDIRECT3DDEVICE7 pd3dDevice,
const D3DXVECTOR3 *ppointDest,
float alpha = 1.0f,
float scale = 1.0f,
float angleRad = 0.0f,
const D3DXVECTOR2 *pOffset = NULL,
const RECT *pSourceRect = NULL);
#else
HRESULT WINAPI
D3DXDrawSpriteSimple(LPDIRECTDRAWSURFACE7 pd3dTexture,
LPDIRECT3DDEVICE7 pd3dDevice,
D3DXVECTOR3 *ppointDest,
HRESULT WINAPI
D3DXDrawSpriteSimple(LPDIRECTDRAWSURFACE7 pd3dTexture,
LPDIRECT3DDEVICE7 pd3dDevice,
D3DXVECTOR3 *ppointDest,
float alpha,
float scale,
float angleRad,
@ -169,20 +169,20 @@ HRESULT WINAPI
#endif
//-------------------------------------------------------------------------
// The D3DXDrawSprite() function transforms source images onto a 3D
// The D3DXDrawSprite() function transforms source images onto a 3D
// rendering device. It takes a general 4x4 matrix which is use to transform
// the points of a default rect: (left=-.5, top=-.5, right=+.5, bottom=+.5).
// (This default rect was chosen so that it was centered around the origin
// to ease setting up rotations. And it was chosen to have a width/height of one
// to ease setting up scales.)
//
// This function only calls SetTexture on the first
// renderstage with the parameter (pd3dTexture) if that parameter is non-null.
// This function assumes that D3DXPrepareDeviceForSprite has been called on
// the device or that caller has in some other way correctly prepared the
//
// This function only calls SetTexture on the first
// renderstage with the parameter (pd3dTexture) if that parameter is non-null.
// This function assumes that D3DXPrepareDeviceForSprite has been called on
// the device or that caller has in some other way correctly prepared the
// renderstates.
//
// This function supports alpha-blending, and choosing
// This function supports alpha-blending, and choosing
// a source sub-rect. (A value of NULL for source sub-rect means the entire
// texture is used.)
//
@ -191,23 +191,23 @@ HRESULT WINAPI
// that value to D3D as the rhw field of a TLVERTEX. If the value for w is
// zero, then it use 1 as the rhw.
//
// Parameters:
// Parameters:
// pd3dTexture - a pointer to the surface containing the texture
// pd3dDevice - a pointer to the d3d device to render to. It is
// assumed that render states are set up. (See
// D3DXPrepareDeviceForSprite)
// pMatrixTransform - 4x4 matrix that specifies the transformation
// that will be applied to the default -.5 to +.5
// that will be applied to the default -.5 to +.5
// rectangle.
// alpha - alpha value to apply to sprite. 1.0 means totally
// opaque; and 0.0 means totally transparent.
// opaque; and 0.0 means totally transparent.
// WARNING: If you are using alpha, then you should render
// from back to front in order to avoid rendering
// artifacts.Furthermore, you should avoid scenarios where
// artifacts.Furthermore, you should avoid scenarios where
// semi-transparent objects intersect.
// pSourceRect - a rect that indicates what portion of the source
// source texture to use. If NULL is passed, then the
// entire source is used. If the source texture was
// entire source is used. If the source texture was
// created via D3DX, then the rect should be specified
// in the coordinates of the original image (so that you
// don't have to worry about stretching/scaling that D3DX
@ -215,21 +215,21 @@ HRESULT WINAPI
// 3D Device.) Note that mirroring may be simply accomplished
// by swapping the left/right or top/bottom fields of
// this RECT.
//
//
//-------------------------------------------------------------------------
#ifdef __cplusplus
HRESULT WINAPI
D3DXDrawSpriteTransform(LPDIRECTDRAWSURFACE7 pd3dTexture,
LPDIRECT3DDEVICE7 pd3dDevice,
const D3DXMATRIX *pMatrixTransform,
HRESULT WINAPI
D3DXDrawSpriteTransform(LPDIRECTDRAWSURFACE7 pd3dTexture,
LPDIRECT3DDEVICE7 pd3dDevice,
const D3DXMATRIX *pMatrixTransform,
float alpha = 1.0f,
const RECT *pSourceRect = NULL);
#else
HRESULT WINAPI
D3DXDrawSpriteTransform(LPDIRECTDRAWSURFACE7 pd3dTexture,
LPDIRECT3DDEVICE7 pd3dDevice,
D3DXMATRIX *pMatrixTransform,
HRESULT WINAPI
D3DXDrawSpriteTransform(LPDIRECTDRAWSURFACE7 pd3dTexture,
LPDIRECT3DDEVICE7 pd3dDevice,
D3DXMATRIX *pMatrixTransform,
float alpha,
RECT *pSourceRect);
#endif
@ -239,13 +239,13 @@ HRESULT WINAPI
// creates a matrix corresponding to simple properties. This matrix is
// set up to pass directly to D3DXTransformSprite.
//
// Parameters:
// Parameters:
// pMatrix - a pointer to the result matrix
// prectDest - a pointer to the target rectangle for the sprite
// angleRad - angle of rotation around the 'center' of the rect
// pOffset - offset from the center of the source rect to use as the
// pOffset - offset from the center of the source rect to use as the
// center of rotation
//
//
//-------------------------------------------------------------------------
#ifdef __cplusplus
@ -268,7 +268,7 @@ void WINAPI
// quad ABCD is broken into two triangles ABC and ACD which are rendered
// via DrawPrim.
//
// Parameters:
// Parameters:
// pd3dTexture - a pointer to the surface containing the texture
// pd3dDevice - a pointer to the d3d device to render to. It is
// assumed that render states are set up. (See
@ -279,14 +279,14 @@ void WINAPI
// will take the reciprocal of that value to pass as
// as the rhw (i.e. reciprocal homogenous w).
// alpha - alpha value to apply to sprite. 1.0 means totally
// opaque; and 0.0 means totally transparent.
// opaque; and 0.0 means totally transparent.
// WARNING: If you are using alpha, then you should render
// from back to front in order to avoid rendering
// artifacts.Furthermore, you should avoid scenarios where
// artifacts.Furthermore, you should avoid scenarios where
// semi-transparent objects intersect.
// pSourceRect - a rect that indicates what portion of the source
// source texture to use. If NULL is passed, then the
// entire source is used. If the source texture was
// entire source is used. If the source texture was
// created via D3DX, then the rect should be specified
// in the coordinates of the original image (so that you
// don't have to worry about stretching/scaling that D3DX
@ -297,17 +297,17 @@ void WINAPI
//-------------------------------------------------------------------------
#ifdef __cplusplus
HRESULT WINAPI
D3DXDrawSprite3D(LPDIRECTDRAWSURFACE7 pd3dTexture,
LPDIRECT3DDEVICE7 pd3dDevice,
const D3DXVECTOR4 quad[4],
HRESULT WINAPI
D3DXDrawSprite3D(LPDIRECTDRAWSURFACE7 pd3dTexture,
LPDIRECT3DDEVICE7 pd3dDevice,
const D3DXVECTOR4 quad[4],
float alpha = 1.0f,
const RECT *pSourceRect = NULL);
#else
HRESULT WINAPI
D3DXDrawSprite3D(LPDIRECTDRAWSURFACE7 pd3dTexture,
LPDIRECT3DDEVICE7 pd3dDevice,
D3DXVECTOR4 quad[4],
HRESULT WINAPI
D3DXDrawSprite3D(LPDIRECTDRAWSURFACE7 pd3dTexture,
LPDIRECT3DDEVICE7 pd3dDevice,
D3DXVECTOR4 quad[4],
float alpha,
RECT *pSourceRect);
#endif

20
src/dep/include/DXSDK/include/ddraw.h
View File

@ -2264,7 +2264,7 @@ typedef struct _DDSURFACEDESC2
union
{
DWORD dwBackBufferCount; // number of back buffers requested
DWORD dwDepth; // the depth if this is a volume texture
DWORD dwDepth; // the depth if this is a volume texture
} DUMMYUNIONNAMEN(5);
union
{
@ -2887,7 +2887,7 @@ typedef struct _DDCOLORCONTROL
#define DDSCAPS2_NPATCHES 0x02000000L
/*
* This bit is reserved for internal use
* This bit is reserved for internal use
*/
#define DDSCAPS2_RESERVED3 0x04000000L
@ -2939,12 +2939,12 @@ typedef struct _DDCOLORCONTROL
#define DDSCAPS3_MULTISAMPLE_QUALITY_SHIFT 5
/*
* This bit is reserved for internal use
* This bit is reserved for internal use
*/
#define DDSCAPS3_RESERVED1 0x00000100L
/*
* This bit is reserved for internal use
* This bit is reserved for internal use
*/
#define DDSCAPS3_RESERVED2 0x00000200L
@ -4408,7 +4408,7 @@ typedef struct _DDCOLORCONTROL
* that moves surface contents from an offscreen back buffer to the primary
* surface). The driver is not allowed to "queue" more than three such blts.
* The "end" of the presentation blt is indicated, since the
* blt may be clipped, in which case the runtime will call the driver with
* blt may be clipped, in which case the runtime will call the driver with
* several blts. All blts (even if not clipped) are tagged with DDBLT_PRESENTATION
* and the last (even if not clipped) additionally with DDBLT_LAST_PRESENTATION.
* Thus the true rule is that the driver must not schedule a DDBLT_PRESENTATION
@ -4422,12 +4422,12 @@ typedef struct _DDCOLORCONTROL
* When excessive queueing occurs, applications become unusable because the application
* visibly lags user input, and such problems make windowed interactive applications impossible.
* Some drivers may not have sufficient knowledge of their hardware's FIFO to know
* when a certain blt has been retired. Such drivers should code cautiously, and
* when a certain blt has been retired. Such drivers should code cautiously, and
* simply not allow any frames to be queued at all. DDBLT_LAST_PRESENTATION should cause
* such drivers to return DDERR_WASSTILLDRAWING until the accelerator is completely
* finished- exactly as if the application had called Lock on the source surface
* before calling Blt.
* In other words, the driver is allowed and encouraged to
* before calling Blt.
* In other words, the driver is allowed and encouraged to
* generate as much latency as it can, but never more than 3 frames worth.
* Implementation detail: Drivers should count blts against the SOURCE surface, not
* against the primary surface. This enables multiple parallel windowed application
@ -4435,7 +4435,7 @@ typedef struct _DDCOLORCONTROL
* This flag is passed only to DX8 or higher drivers.
*
* APPLICATIONS DO NOT SET THESE FLAGS. THEY ARE SET BY THE DIRECTDRAW RUNTIME.
*
*
*/
#define DDBLT_PRESENTATION 0x10000000l
#define DDBLT_LAST_PRESENTATION 0x20000000l
@ -4474,7 +4474,7 @@ typedef struct _DDCOLORCONTROL
* NOTE: APPLICATIONS SHOULD NOT SET THIS FLAG. THIS FLAG IS INTENDED
* FOR USE BY THE DIRECT3D RUNTIME. Use IDirect3DSwapChain9::Present
* and specify D3DPRESENT_LINEAR_CONTENT in order to use this functionality.
*/
*/
#define DDBLT_EXTENDED_LINEAR_CONTENT 0x00000004l

114
src/dep/include/DXSDK/include/dinput.h
View File

@ -843,27 +843,27 @@ typedef const DICONFIGUREDEVICESPARAMS *LPCDICONFIGUREDEVICESPARAMS;
typedef struct _DIDEVICEIMAGEINFOA {
CHAR tszImagePath[MAX_PATH];
DWORD dwFlags;
DWORD dwFlags;
// These are valid if DIDIFT_OVERLAY is present in dwFlags.
DWORD dwViewID;
RECT rcOverlay;
DWORD dwViewID;
RECT rcOverlay;
DWORD dwObjID;
DWORD dwcValidPts;
POINT rgptCalloutLine[5];
RECT rcCalloutRect;
DWORD dwTextAlign;
POINT rgptCalloutLine[5];
RECT rcCalloutRect;
DWORD dwTextAlign;
} DIDEVICEIMAGEINFOA, *LPDIDEVICEIMAGEINFOA;
typedef struct _DIDEVICEIMAGEINFOW {
WCHAR tszImagePath[MAX_PATH];
DWORD dwFlags;
DWORD dwFlags;
// These are valid if DIDIFT_OVERLAY is present in dwFlags.
DWORD dwViewID;
RECT rcOverlay;
DWORD dwViewID;
RECT rcOverlay;
DWORD dwObjID;
DWORD dwcValidPts;
POINT rgptCalloutLine[5];
RECT rcCalloutRect;
DWORD dwTextAlign;
POINT rgptCalloutLine[5];
RECT rcCalloutRect;
DWORD dwTextAlign;
} DIDEVICEIMAGEINFOW, *LPDIDEVICEIMAGEINFOW;
#ifdef UNICODE
typedef DIDEVICEIMAGEINFOW DIDEVICEIMAGEINFO;
@ -2761,8 +2761,8 @@ extern HRESULT WINAPI DirectInputCreateEx(HINSTANCE hinst, DWORD dwVersion, REFI
#define DI_TRUNCATED ((HRESULT)0x00000008L)
/*
* The settings have been successfully applied but could not be
* persisted.
* The settings have been successfully applied but could not be
* persisted.
*/
#define DI_SETTINGSNOTSAVED ((HRESULT)0x0000000BL)
@ -2970,7 +2970,7 @@ extern HRESULT WINAPI DirectInputCreateEx(HINSTANCE hinst, DWORD dwVersion, REFI
/*
* A mapper file function failed because reading or writing the user or IHV
* A mapper file function failed because reading or writing the user or IHV
* settings file failed.
*/
#define DIERR_MAPFILEFAIL 0x8004020BL
@ -3126,12 +3126,12 @@ extern HRESULT WINAPI DirectInputCreateEx(HINSTANCE hinst, DWORD dwVersion, REFI
#define DIKEYBOARD_MYCOMPUTER 0x810004EB /* My Computer */
#define DIKEYBOARD_MAIL 0x810004EC /* Mail */
#define DIKEYBOARD_MEDIASELECT 0x810004ED /* Media Select */
/*--- MOUSE
Physical Mouse Device ---*/
#define DIMOUSE_XAXISAB (0x82000200 |DIMOFS_X ) /* X Axis-absolute: Some mice natively report absolute coordinates */
#define DIMOUSE_XAXISAB (0x82000200 |DIMOFS_X ) /* X Axis-absolute: Some mice natively report absolute coordinates */
#define DIMOUSE_YAXISAB (0x82000200 |DIMOFS_Y ) /* Y Axis-absolute: Some mice natively report absolute coordinates */
#define DIMOUSE_XAXIS (0x82000300 |DIMOFS_X ) /* X Axis */
#define DIMOUSE_YAXIS (0x82000300 |DIMOFS_Y ) /* Y Axis */
@ -3254,7 +3254,7 @@ extern HRESULT WINAPI DirectInputCreateEx(HINSTANCE hinst, DWORD dwVersion, REFI
#define DIBUTTON_DRIVINGT_DEVICE 0x030044FE /* Show input device and controls */
#define DIBUTTON_DRIVINGT_PAUSE 0x030044FC /* Start / Pause / Restart game */
/*--- Flight Simulator - Civilian
/*--- Flight Simulator - Civilian
Plane control is the primary objective ---*/
#define DIVIRTUAL_FLYING_CIVILIAN 0x04000000
#define DIAXIS_FLYINGC_BANK 0x04008A01 /* Roll ship left / right */
@ -3282,7 +3282,7 @@ extern HRESULT WINAPI DirectInputCreateEx(HINSTANCE hinst, DWORD dwVersion, REFI
#define DIBUTTON_FLYINGC_DEVICE 0x040044FE /* Show input device and controls */
#define DIBUTTON_FLYINGC_PAUSE 0x040044FC /* Start / Pause / Restart game */
/*--- Flight Simulator - Military
/*--- Flight Simulator - Military
Aerial combat is the primary objective ---*/
#define DIVIRTUAL_FLYING_MILITARY 0x05000000
#define DIAXIS_FLYINGM_BANK 0x05008A01 /* Bank - Roll ship left / right */
@ -3379,7 +3379,7 @@ extern HRESULT WINAPI DirectInputCreateEx(HINSTANCE hinst, DWORD dwVersion, REFI
#define DIBUTTON_SPACESIM_DEVICE 0x070044FE /* Show input device and controls */
#define DIBUTTON_SPACESIM_PAUSE 0x070044FC /* Start / Pause / Restart game */
/*--- Fighting - First Person
/*--- Fighting - First Person
Hand to Hand combat is primary objective ---*/
#define DIVIRTUAL_FIGHTING_HAND2HAND 0x08000000
#define DIAXIS_FIGHTINGH_LATERAL 0x08008201 /* Sidestep left/right */
@ -4243,42 +4243,42 @@ extern HRESULT WINAPI DirectInputCreateEx(HINSTANCE hinst, DWORD dwVersion, REFI
#define DIBUTTON_MECHA_PAUSE 0x290044FC /* Start / Pause / Restart game */
/*
* "ANY" semantics can be used as a last resort to get mappings for actions
* that match nothing in the chosen virtual genre. These semantics will be
* mapped at a lower priority that virtual genre semantics. Also, hardware
* vendors will not be able to provide sensible mappings for these unless
* "ANY" semantics can be used as a last resort to get mappings for actions
* that match nothing in the chosen virtual genre. These semantics will be
* mapped at a lower priority that virtual genre semantics. Also, hardware
* vendors will not be able to provide sensible mappings for these unless
* they provide application specific mappings.
*/
#define DIAXIS_ANY_X_1 0xFF00C201
#define DIAXIS_ANY_X_2 0xFF00C202
#define DIAXIS_ANY_Y_1 0xFF014201
#define DIAXIS_ANY_Y_2 0xFF014202
#define DIAXIS_ANY_Z_1 0xFF01C201
#define DIAXIS_ANY_Z_2 0xFF01C202
#define DIAXIS_ANY_R_1 0xFF024201
#define DIAXIS_ANY_R_2 0xFF024202
#define DIAXIS_ANY_U_1 0xFF02C201
#define DIAXIS_ANY_U_2 0xFF02C202
#define DIAXIS_ANY_V_1 0xFF034201
#define DIAXIS_ANY_V_2 0xFF034202
#define DIAXIS_ANY_A_1 0xFF03C201
#define DIAXIS_ANY_A_2 0xFF03C202
#define DIAXIS_ANY_B_1 0xFF044201
#define DIAXIS_ANY_B_2 0xFF044202
#define DIAXIS_ANY_C_1 0xFF04C201
#define DIAXIS_ANY_C_2 0xFF04C202
#define DIAXIS_ANY_S_1 0xFF054201
#define DIAXIS_ANY_S_2 0xFF054202
#define DIAXIS_ANY_X_1 0xFF00C201
#define DIAXIS_ANY_X_2 0xFF00C202
#define DIAXIS_ANY_Y_1 0xFF014201
#define DIAXIS_ANY_Y_2 0xFF014202
#define DIAXIS_ANY_Z_1 0xFF01C201
#define DIAXIS_ANY_Z_2 0xFF01C202
#define DIAXIS_ANY_R_1 0xFF024201
#define DIAXIS_ANY_R_2 0xFF024202
#define DIAXIS_ANY_U_1 0xFF02C201
#define DIAXIS_ANY_U_2 0xFF02C202
#define DIAXIS_ANY_V_1 0xFF034201
#define DIAXIS_ANY_V_2 0xFF034202
#define DIAXIS_ANY_A_1 0xFF03C201
#define DIAXIS_ANY_A_2 0xFF03C202
#define DIAXIS_ANY_B_1 0xFF044201
#define DIAXIS_ANY_B_2 0xFF044202
#define DIAXIS_ANY_C_1 0xFF04C201
#define DIAXIS_ANY_C_2 0xFF04C202
#define DIAXIS_ANY_S_1 0xFF054201
#define DIAXIS_ANY_S_2 0xFF054202
#define DIAXIS_ANY_1 0xFF004201
#define DIAXIS_ANY_2 0xFF004202
#define DIAXIS_ANY_3 0xFF004203
#define DIAXIS_ANY_4 0xFF004204
#define DIAXIS_ANY_1 0xFF004201
#define DIAXIS_ANY_2 0xFF004202
#define DIAXIS_ANY_3 0xFF004203
#define DIAXIS_ANY_4 0xFF004204
#define DIPOV_ANY_1 0xFF004601
#define DIPOV_ANY_2 0xFF004602
#define DIPOV_ANY_3 0xFF004603
#define DIPOV_ANY_4 0xFF004604
#define DIPOV_ANY_1 0xFF004601
#define DIPOV_ANY_2 0xFF004602
#define DIPOV_ANY_3 0xFF004603
#define DIPOV_ANY_4 0xFF004604
#define DIBUTTON_ANY(instance) ( 0xFF004400 | instance )
@ -4322,13 +4322,13 @@ WINMMAPI MMRESULT WINAPI joyConfigChanged( DWORD dwFlags );
#ifndef DIJ_RINGZERO
/*
* Invoke the joystick control panel directly, using the passed window handle
* as the parent of the dialog. This API is only supported for compatibility
* purposes; new applications should use the RunControlPanel method of a
* Invoke the joystick control panel directly, using the passed window handle
* as the parent of the dialog. This API is only supported for compatibility
* purposes; new applications should use the RunControlPanel method of a
* device interface for a game controller.
* The API is called by using the function pointer returned by
* GetProcAddress( hCPL, TEXT("ShowJoyCPL") ) where hCPL is a HMODULE returned
* by LoadLibrary( TEXT("joy.cpl") ). The typedef is provided to allow
* GetProcAddress( hCPL, TEXT("ShowJoyCPL") ) where hCPL is a HMODULE returned
* by LoadLibrary( TEXT("joy.cpl") ). The typedef is provided to allow
* declaration and casting of an appropriately typed variable.
*/
void WINAPI ShowJoyCPL( HWND hWnd );

16
src/dep/include/DXSDK/include/dinputd.h
View File

@ -699,19 +699,19 @@ typedef struct IDirectInputJoyConfig8 *LPDIRECTINPUTJOYCONFIG8;
#define DIERR_DRIVERLAST 0x800403FFL
/*
* Unless the specific driver has been precisely identified, no meaning
* should be attributed to these values other than that the driver
* originated the error. However, to illustrate the types of error that
* may be causing the failure, the PID force feedback driver distributed
* Unless the specific driver has been precisely identified, no meaning
* should be attributed to these values other than that the driver
* originated the error. However, to illustrate the types of error that
* may be causing the failure, the PID force feedback driver distributed
* with DirectX 7 could return the following errors:
*
* DIERR_DRIVERFIRST + 1
* DIERR_DRIVERFIRST + 1
* The requested usage was not found.
* DIERR_DRIVERFIRST + 2
* DIERR_DRIVERFIRST + 2
* The parameter block couldn't be downloaded to the device.
* DIERR_DRIVERFIRST + 3
* DIERR_DRIVERFIRST + 3
* PID initialization failed.
* DIERR_DRIVERFIRST + 4
* DIERR_DRIVERFIRST + 4
* The provided values couldn't be scaled.
*/

12
src/dep/include/DXSDK/include/dls1.h
View File

@ -31,7 +31,7 @@
// LIST [] 'ins ' [dlid,insh,RGNLIST,ARTLIST,INFOLIST]
//
// RGNLIST
// LIST [] 'lrgn'
// LIST [] 'lrgn'
// LIST [] 'rgn ' [rgnh,wsmp,wlnk,ARTLIST]
// LIST [] 'rgn ' [rgnh,wsmp,wlnk,ARTLIST]
// LIST [] 'rgn ' [rgnh,wsmp,wlnk,ARTLIST]
@ -43,7 +43,7 @@
// '3rd1' Possible 3rd party articulation structure 1
// '3rd2' Possible 3rd party articulation structure 2 .... and so on
//
// WAVEPOOL
// WAVEPOOL
// ptbl [] [pool table]
// LIST [] 'wvpl'
// [path],
@ -55,7 +55,7 @@
// LIST [] 'wave' [dlid,RIFFWAVE]
//
// INFOLIST
// LIST [] 'INFO'
// LIST [] 'INFO'
// 'icmt' 'One of those crazy comments.'
// 'icop' 'Copyright (C) 1996 Sonic Foundry'
//
@ -86,7 +86,7 @@
#define FOURCC_VERS mmioFOURCC('v','e','r','s')
/*/////////////////////////////////////////////////////////////////////////
// Articulation connection graph definitions
// Articulation connection graph definitions
/////////////////////////////////////////////////////////////////////////*/
/* Generic Sources */
@ -140,7 +140,7 @@ typedef struct _DLSVERSION {
DWORD dwVersionMS;
DWORD dwVersionLS;
}DLSVERSION, FAR *LPDLSVERSION;
typedef struct _CONNECTION {
USHORT usSource;
@ -223,7 +223,7 @@ typedef struct _WAVELINK { /* any paths or links are stored right after struct *
#define POOL_CUE_NULL 0xffffffffl
typedef struct _POOLCUE {
typedef struct _POOLCUE {
ULONG ulOffset; /* Offset to the entry in the list */
}POOLCUE, FAR *LPPOOLCUE;

52
src/dep/include/DXSDK/include/dls2.h
View File

@ -1,50 +1,50 @@
/*
dls2.h
Description:
Interface defines and structures for the DLS2 extensions of DLS.
Written by Microsoft 1998. Released for public use.
*/
#ifndef _INC_DLS2
#define _INC_DLS2
/*
FOURCC's used in the DLS2 file, in addition to DLS1 chunks
*/
#define FOURCC_RGN2 mmioFOURCC('r','g','n','2')
#define FOURCC_LAR2 mmioFOURCC('l','a','r','2')
#define FOURCC_ART2 mmioFOURCC('a','r','t','2')
#define FOURCC_CDL mmioFOURCC('c','d','l',' ')
#define FOURCC_DLID mmioFOURCC('d','l','i','d')
/*
Articulation connection graph definitions. These are in addition to
the definitions in the DLS1 header.
*/
/* Generic Sources (in addition to DLS1 sources. */
#define CONN_SRC_POLYPRESSURE 0x0007 /* Polyphonic Pressure */
#define CONN_SRC_CHANNELPRESSURE 0x0008 /* Channel Pressure */
#define CONN_SRC_VIBRATO 0x0009 /* Vibrato LFO */
#define CONN_SRC_MONOPRESSURE 0x000a /* MIDI Mono pressure */
/* Midi Controllers */
#define CONN_SRC_CC91 0x00db /* Reverb Send */
#define CONN_SRC_CC93 0x00dd /* Chorus Send */
/* Generic Destinations */
#define CONN_DST_GAIN 0x0001 /* Same as CONN_DST_ ATTENUATION, but more appropriate terminology. */
#define CONN_DST_KEYNUMBER 0x0005 /* Key Number Generator */
/* Audio Channel Output Destinations */
#define CONN_DST_LEFT 0x0010 /* Left Channel Send */
#define CONN_DST_RIGHT 0x0011 /* Right Channel Send */
@ -54,32 +54,32 @@
#define CONN_DST_LFE_CHANNEL 0x0015 /* LFE Channel Send */
#define CONN_DST_CHORUS 0x0080 /* Chorus Send */
#define CONN_DST_REVERB 0x0081 /* Reverb Send */
/* Vibrato LFO Destinations */
#define CONN_DST_VIB_FREQUENCY 0x0114 /* Vibrato Frequency */
#define CONN_DST_VIB_STARTDELAY 0x0115 /* Vibrato Start Delay */
/* EG1 Destinations */
#define CONN_DST_EG1_DELAYTIME 0x020B /* EG1 Delay Time */
#define CONN_DST_EG1_HOLDTIME 0x020C /* EG1 Hold Time */
#define CONN_DST_EG1_SHUTDOWNTIME 0x020D /* EG1 Shutdown Time */
/* EG2 Destinations */
#define CONN_DST_EG2_DELAYTIME 0x030F /* EG2 Delay Time */
#define CONN_DST_EG2_HOLDTIME 0x0310 /* EG2 Hold Time */
/* Filter Destinations */
#define CONN_DST_FILTER_CUTOFF 0x0500 /* Filter Cutoff Frequency */
#define CONN_DST_FILTER_Q 0x0501 /* Filter Resonance */
/* Transforms */
#define CONN_TRN_CONVEX 0x0002 /* Convex Transform */
#define CONN_TRN_SWITCH 0x0003 /* Switch Transform */
/* Conditional chunk operators */
#define DLS_CDL_AND 0x0001 /* X = X & Y */
#define DLS_CDL_OR 0x0002 /* X = X | Y */
@ -99,7 +99,7 @@
#define DLS_CDL_CONST 0x0010 /* 32-bit constant */
#define DLS_CDL_QUERY 0x0011 /* 32-bit value returned from query */
#define DLS_CDL_QUERYSUPPORTED 0x0012 /* Test to see if query is supported by synth */
/*
Loop and release
*/

18
src/dep/include/DXSDK/include/dmdls.h
View File

@ -40,7 +40,7 @@ typedef struct _DMUS_DOWNLOADINFO
#define DMUS_DOWNLOADINFO_WAVE 2
#define DMUS_DOWNLOADINFO_INSTRUMENT2 3 /* New version for better DLS2 support. */
/* Support for oneshot and streaming wave data
/* Support for oneshot and streaming wave data
*/
#define DMUS_DOWNLOADINFO_WAVEARTICULATION 4 /* Wave articulation data */
#define DMUS_DOWNLOADINFO_STREAMINGWAVE 5 /* One chunk of a streaming */
@ -49,7 +49,7 @@ typedef struct _DMUS_DOWNLOADINFO
#define DMUS_DEFAULT_SIZE_OFFSETTABLE 1
/* Flags for DMUS_INSTRUMENT's ulFlags member */
#define DMUS_INSTRUMENT_GM_INSTRUMENT (1 << 0)
typedef struct _DMUS_OFFSETTABLE
@ -60,11 +60,11 @@ typedef struct _DMUS_OFFSETTABLE
typedef struct _DMUS_INSTRUMENT
{
ULONG ulPatch;
ULONG ulFirstRegionIdx;
ULONG ulFirstRegionIdx;
ULONG ulGlobalArtIdx; /* If zero the instrument does not have an articulation */
ULONG ulFirstExtCkIdx; /* If zero no 3rd party entenstion chunks associated with the instrument */
ULONG ulCopyrightIdx; /* If zero no Copyright information associated with the instrument */
ULONG ulFlags;
ULONG ulFlags;
} DMUS_INSTRUMENT;
typedef struct _DMUS_REGION
@ -138,14 +138,14 @@ typedef struct _DMUS_ARTICULATION2 /* Articulation chunk for DMUS_DOWNL
ULONG ulNextArtIdx; /* Additional articulation chunks */
} DMUS_ARTICULATION2;
#define DMUS_MIN_DATA_SIZE 4
#define DMUS_MIN_DATA_SIZE 4
/* The actual number is determined by cbSize of struct _DMUS_EXTENSIONCHUNK */
typedef struct _DMUS_EXTENSIONCHUNK
{
ULONG cbSize; /* Size of extension chunk */
ULONG ulNextExtCkIdx; /* If zero no more 3rd party entenstion chunks */
FOURCC ExtCkID;
FOURCC ExtCkID;
BYTE byExtCk[DMUS_MIN_DATA_SIZE]; /* The actual number that follows is determined by cbSize */
} DMUS_EXTENSIONCHUNK;
@ -160,7 +160,7 @@ typedef struct _DMUS_COPYRIGHT
typedef struct _DMUS_WAVEDATA
{
ULONG cbSize;
BYTE byData[DMUS_MIN_DATA_SIZE];
BYTE byData[DMUS_MIN_DATA_SIZE];
} DMUS_WAVEDATA;
typedef struct _DMUS_WAVE
@ -168,7 +168,7 @@ typedef struct _DMUS_WAVE
ULONG ulFirstExtCkIdx; /* If zero no 3rd party entenstion chunks associated with the wave */
ULONG ulCopyrightIdx; /* If zero no Copyright information associated with the wave */
ULONG ulWaveDataIdx; /* Location of actual wave data. */
WAVEFORMATEX WaveformatEx;
WAVEFORMATEX WaveformatEx;
} DMUS_WAVE;
typedef struct _DMUS_NOTERANGE *LPDMUS_NOTERANGE;
@ -194,6 +194,6 @@ typedef struct _DMUS_WAVEDL
} DMUS_WAVEDL,
*LPDMUS_WAVEDL;
#endif
#endif

52
src/dep/include/DXSDK/include/dmerror.h
View File

@ -16,7 +16,7 @@
#define MAKE_HRESULT(sev,fac,code) \
((HRESULT) (((unsigned long)(sev)<<31) | ((unsigned long)(fac)<<16) | ((unsigned long)(code))) )
#endif
#define MAKE_DMHRESULTSUCCESS(code) MAKE_HRESULT(0, FACILITY_DIRECTMUSIC, (DMUS_ERRBASE + (code)))
#define MAKE_DMHRESULTERROR(code) MAKE_HRESULT(1, FACILITY_DIRECTMUSIC, (DMUS_ERRBASE + (code)))
@ -75,8 +75,8 @@
/* DMUS_S_OVER_CHORD
*
* Returned from IDirectMusicPerformance::MusicToMIDI(), this indicates
* that no note has been calculated because the music value has the note
* Returned from IDirectMusicPerformance::MusicToMIDI(), this indicates
* that no note has been calculated because the music value has the note
* at a position higher than the top note of the chord. This applies only
* to DMUS_PLAYMODE_NORMALCHORD play mode. This success code indicates
* that the caller should not do anything with the note. It is not meant
@ -87,10 +87,10 @@
/* DMUS_S_UP_OCTAVE
*
* Returned from IDirectMusicPerformance::MIDIToMusic(), and
* IDirectMusicPerformance::MusicToMIDI(), this indicates
* that the note conversion generated a note value that is below 0,
* IDirectMusicPerformance::MusicToMIDI(), this indicates
* that the note conversion generated a note value that is below 0,
* so it has been bumped up one or more octaves to be in the proper
* MIDI range of 0 through 127.
* MIDI range of 0 through 127.
* Note that this is valid for MIDIToMusic() when using play modes
* DMUS_PLAYMODE_FIXEDTOCHORD and DMUS_PLAYMODE_FIXEDTOKEY, both of
* which store MIDI values in wMusicValue. With MusicToMIDI(), it is
@ -102,10 +102,10 @@
/* DMUS_S_DOWN_OCTAVE
*
* Returned from IDirectMusicPerformance::MIDIToMusic(), and
* IDirectMusicPerformance::MusicToMIDI(), this indicates
* that the note conversion generated a note value that is above 127,
* IDirectMusicPerformance::MusicToMIDI(), this indicates
* that the note conversion generated a note value that is above 127,
* so it has been bumped down one or more octaves to be in the proper
* MIDI range of 0 through 127.
* MIDI range of 0 through 127.
* Note that this is valid for MIDIToMusic() when using play modes
* DMUS_PLAYMODE_FIXEDTOCHORD and DMUS_PLAYMODE_FIXEDTOKEY, both of
* which store MIDI values in wMusicValue. With MusicToMIDI(), it is
@ -139,7 +139,7 @@
/* DMUS_E_PORTS_OPEN
*
* The requested operation cannot be performed while there are
* The requested operation cannot be performed while there are
* instantiated ports in any process in the system.
*/
#define DMUS_E_PORTS_OPEN MAKE_DMHRESULTERROR(0x0102)
@ -183,7 +183,7 @@
/* DMUS_E_ALREADY_LOADED
*
* Second attempt to load a DLS collection that is currently open.
* Second attempt to load a DLS collection that is currently open.
*/
#define DMUS_E_ALREADY_LOADED MAKE_DMHRESULTERROR(0x0111)
@ -250,7 +250,7 @@
/* DMUS_E_GET_UNSUPPORTED
*
* The specified property item may not be retrieved from the target object.
*/
*/
#define DMUS_E_GET_UNSUPPORTED MAKE_DMHRESULTERROR(0x0124)
/* DMUS_E_NOTMONO
@ -285,7 +285,7 @@
/* DMUS_E_NOTPCM
*
* Downoaded DLS wave is not in PCM format.
* Downoaded DLS wave is not in PCM format.
*/
#define DMUS_E_NOTPCM MAKE_DMHRESULTERROR(0x012A)
@ -297,7 +297,7 @@
/* DMUS_E_BADOFFSETTABLE
*
* Offset Table for download buffer has errors.
* Offset Table for download buffer has errors.
*/
#define DMUS_E_BADOFFSETTABLE MAKE_DMHRESULTERROR(0x012C)
@ -316,7 +316,7 @@
/* DMUS_E_ALREADYOPEN
*
* An attempt was made to open the software synthesizer while it was already
* An attempt was made to open the software synthesizer while it was already
* open.
* ASSERT?
*/
@ -324,7 +324,7 @@
/* DMUS_E_ALREADYCLOSE
*
* An attempt was made to close the software synthesizer while it was already
* An attempt was made to close the software synthesizer while it was already
* open.
* ASSERT?
*/
@ -332,7 +332,7 @@
/* DMUS_E_SYNTHNOTCONFIGURED
*
* The operation could not be completed because the software synth has not
* The operation could not be completed because the software synth has not
* yet been fully configured.
* ASSERT?
*/
@ -353,7 +353,7 @@
/* DMUS_E_DMUSIC_RELEASED
*
* The operation cannot be performed because the final instance of the
* DirectMusic object was released. Ports cannot be used after final
* DirectMusic object was released. Ports cannot be used after final
* release of the DirectMusic object.
*/
#define DMUS_E_DMUSIC_RELEASED MAKE_DMHRESULTERROR(0x0134)
@ -400,7 +400,7 @@
/* DMUS_E_INVALIDBUFFER
*
* Invalid DirectSound buffer was handed to port.
* Invalid DirectSound buffer was handed to port.
*/
#define DMUS_E_INVALIDBUFFER MAKE_DMHRESULTERROR(0x013B)
@ -535,7 +535,7 @@
* The track does not support clock time playback or getparam.
*/
#define DMUS_E_TRACK_NO_CLOCKTIME_SUPPORT MAKE_DMHRESULTERROR(0x0167)
/* DMUS_E_NO_MASTER_CLOCK
*
* There is no master clock in the performance. Be sure to call
@ -642,8 +642,8 @@
#define DMUS_E_CONNOT_CONVERT DMUS_E_CANNOT_CONVERT
/* DMUS_E_DESCEND_CHUNK_FAIL
*
* DMUS_E_DESCEND_CHUNK_FAIL is returned when the end of the file
*
* DMUS_E_DESCEND_CHUNK_FAIL is returned when the end of the file
* was reached before the desired chunk was found.
*/
#define DMUS_E_DESCEND_CHUNK_FAIL MAKE_DMHRESULTERROR(0x0210)
@ -778,23 +778,23 @@
/* DMUS_E_AUDIOPATHS_NOT_VALID
*
* The Performance has set up some PChannels using the AssignPChannel command, which
* The Performance has set up some PChannels using the AssignPChannel command, which
* makes it not capable of supporting audio paths.
*/
#define DMUS_E_AUDIOPATHS_NOT_VALID MAKE_DMHRESULTERROR(0x0226)
/* DMUS_E_AUDIOPATHS_IN_USE
*
* This is the inverse of the previous error.
* This is the inverse of the previous error.
* The Performance has set up some audio paths, which makes is incompatible
* with the calls to allocate pchannels, etc.
* with the calls to allocate pchannels, etc.
*/
#define DMUS_E_AUDIOPATHS_IN_USE MAKE_DMHRESULTERROR(0x0227)
/* DMUS_E_NO_AUDIOPATH_CONFIG
*
* A segment was asked for its embedded audio path configuration,
* but there isn't any.
* but there isn't any.
*/
#define DMUS_E_NO_AUDIOPATH_CONFIG MAKE_DMHRESULTERROR(0x0228)

4
src/dep/include/DXSDK/include/dmksctrl.h
View File

@ -39,8 +39,8 @@
0x28F54685L, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96
#endif /* STATIC_IID_IKsControl */
/*
* Warning: This will prevent the rest of ks.h from being pulled in if ks.h is
/*
* Warning: This will prevent the rest of ks.h from being pulled in if ks.h is
* included after dmksctrl.h. Make sure you do not include both headers in
* the same source file.
*/

112
src/dep/include/DXSDK/include/dmplugin.h
View File

@ -35,7 +35,7 @@ interface IDirectMusicSegment8;
interface IDirectMusicSegmentState;
interface IDirectMusicSegmentState8;
interface IDirectMusicGraph;
#ifndef __cplusplus
#ifndef __cplusplus
typedef interface IDirectMusicTrack IDirectMusicTrack;
typedef interface IDirectMusicTool IDirectMusicTool;
typedef interface IDirectMusicTool8 IDirectMusicTool8;
@ -70,12 +70,12 @@ DECLARE_INTERFACE_(IDirectMusicTool, IUnknown)
STDMETHOD(Init) (THIS_ IDirectMusicGraph* pGraph) PURE;
STDMETHOD(GetMsgDeliveryType) (THIS_ DWORD* pdwDeliveryType ) PURE;
STDMETHOD(GetMediaTypeArraySize)(THIS_ DWORD* pdwNumElements ) PURE;
STDMETHOD(GetMediaTypes) (THIS_ DWORD** padwMediaTypes,
STDMETHOD(GetMediaTypes) (THIS_ DWORD** padwMediaTypes,
DWORD dwNumElements) PURE;
STDMETHOD(ProcessPMsg) (THIS_ IDirectMusicPerformance* pPerf,
STDMETHOD(ProcessPMsg) (THIS_ IDirectMusicPerformance* pPerf,
DMUS_PMSG* pPMSG) PURE;
STDMETHOD(Flush) (THIS_ IDirectMusicPerformance* pPerf,
DMUS_PMSG* pPMSG,
STDMETHOD(Flush) (THIS_ IDirectMusicPerformance* pPerf,
DMUS_PMSG* pPMSG,
REFERENCE_TIME rtTime) PURE;
};
@ -94,18 +94,18 @@ DECLARE_INTERFACE_(IDirectMusicTool8, IDirectMusicTool)
STDMETHOD(Init) (THIS_ IDirectMusicGraph* pGraph) PURE;
STDMETHOD(GetMsgDeliveryType) (THIS_ DWORD* pdwDeliveryType ) PURE;
STDMETHOD(GetMediaTypeArraySize)(THIS_ DWORD* pdwNumElements ) PURE;
STDMETHOD(GetMediaTypes) (THIS_ DWORD** padwMediaTypes,
STDMETHOD(GetMediaTypes) (THIS_ DWORD** padwMediaTypes,
DWORD dwNumElements) PURE;
STDMETHOD(ProcessPMsg) (THIS_ IDirectMusicPerformance* pPerf,
STDMETHOD(ProcessPMsg) (THIS_ IDirectMusicPerformance* pPerf,
DMUS_PMSG* pPMSG) PURE;
STDMETHOD(Flush) (THIS_ IDirectMusicPerformance* pPerf,
DMUS_PMSG* pPMSG,
STDMETHOD(Flush) (THIS_ IDirectMusicPerformance* pPerf,
DMUS_PMSG* pPMSG,
REFERENCE_TIME rtTime) PURE;
/* IDirectMusicTool8 */
STDMETHOD(Clone) (THIS_ IDirectMusicTool ** ppTool) PURE;
};
/* The following flags are sent in the IDirectMusicTrack::Play() method */
/* inside the dwFlags parameter */
typedef enum enumDMUS_TRACKF_FLAGS
@ -141,32 +141,32 @@ DECLARE_INTERFACE_(IDirectMusicTrack, IUnknown)
/* IDirectMusicTrack */
STDMETHOD(Init) (THIS_ IDirectMusicSegment* pSegment) PURE;
STDMETHOD(InitPlay) (THIS_ IDirectMusicSegmentState* pSegmentState,
IDirectMusicPerformance* pPerformance,
void** ppStateData,
STDMETHOD(InitPlay) (THIS_ IDirectMusicSegmentState* pSegmentState,
IDirectMusicPerformance* pPerformance,
void** ppStateData,
DWORD dwVirtualTrackID,
DWORD dwFlags) PURE;
STDMETHOD(EndPlay) (THIS_ void* pStateData) PURE;
STDMETHOD(Play) (THIS_ void* pStateData,
MUSIC_TIME mtStart,
MUSIC_TIME mtEnd,
MUSIC_TIME mtOffset,
DWORD dwFlags,
IDirectMusicPerformance* pPerf,
IDirectMusicSegmentState* pSegSt,
STDMETHOD(Play) (THIS_ void* pStateData,
MUSIC_TIME mtStart,
MUSIC_TIME mtEnd,
MUSIC_TIME mtOffset,
DWORD dwFlags,
IDirectMusicPerformance* pPerf,
IDirectMusicSegmentState* pSegSt,
DWORD dwVirtualID) PURE;
STDMETHOD(GetParam) (THIS_ REFGUID rguidType,
MUSIC_TIME mtTime,
MUSIC_TIME* pmtNext,
void* pParam) PURE;
STDMETHOD(SetParam) (THIS_ REFGUID rguidType,
MUSIC_TIME mtTime,
STDMETHOD(GetParam) (THIS_ REFGUID rguidType,
MUSIC_TIME mtTime,
MUSIC_TIME* pmtNext,
void* pParam) PURE;
STDMETHOD(SetParam) (THIS_ REFGUID rguidType,
MUSIC_TIME mtTime,
void* pParam) PURE;
STDMETHOD(IsParamSupported) (THIS_ REFGUID rguidType) PURE;
STDMETHOD(AddNotificationType) (THIS_ REFGUID rguidNotificationType) PURE;
STDMETHOD(RemoveNotificationType) (THIS_ REFGUID rguidNotificationType) PURE;
STDMETHOD(Clone) (THIS_ MUSIC_TIME mtStart,
MUSIC_TIME mtEnd,
STDMETHOD(Clone) (THIS_ MUSIC_TIME mtStart,
MUSIC_TIME mtEnd,
IDirectMusicTrack** ppTrack) PURE;
};
@ -183,50 +183,50 @@ DECLARE_INTERFACE_(IDirectMusicTrack8, IDirectMusicTrack)
/* IDirectMusicTrack */
STDMETHOD(Init) (THIS_ IDirectMusicSegment* pSegment) PURE;
STDMETHOD(InitPlay) (THIS_ IDirectMusicSegmentState* pSegmentState,
IDirectMusicPerformance* pPerformance,
void** ppStateData,
STDMETHOD(InitPlay) (THIS_ IDirectMusicSegmentState* pSegmentState,
IDirectMusicPerformance* pPerformance,
void** ppStateData,
DWORD dwVirtualTrackID,
DWORD dwFlags) PURE;
STDMETHOD(EndPlay) (THIS_ void* pStateData) PURE;
STDMETHOD(Play) (THIS_ void* pStateData,
MUSIC_TIME mtStart,
MUSIC_TIME mtEnd,
MUSIC_TIME mtOffset,
DWORD dwFlags,
IDirectMusicPerformance* pPerf,
IDirectMusicSegmentState* pSegSt,
STDMETHOD(Play) (THIS_ void* pStateData,
MUSIC_TIME mtStart,
MUSIC_TIME mtEnd,
MUSIC_TIME mtOffset,
DWORD dwFlags,
IDirectMusicPerformance* pPerf,
IDirectMusicSegmentState* pSegSt,
DWORD dwVirtualID) PURE;
STDMETHOD(GetParam) (THIS_ REFGUID rguidType,
MUSIC_TIME mtTime,
MUSIC_TIME* pmtNext,
void* pParam) PURE;
STDMETHOD(SetParam) (THIS_ REFGUID rguidType,
MUSIC_TIME mtTime,
STDMETHOD(GetParam) (THIS_ REFGUID rguidType,
MUSIC_TIME mtTime,
MUSIC_TIME* pmtNext,
void* pParam) PURE;
STDMETHOD(SetParam) (THIS_ REFGUID rguidType,
MUSIC_TIME mtTime,
void* pParam) PURE;
STDMETHOD(IsParamSupported) (THIS_ REFGUID rguidType) PURE;
STDMETHOD(AddNotificationType) (THIS_ REFGUID rguidNotificationType) PURE;
STDMETHOD(RemoveNotificationType) (THIS_ REFGUID rguidNotificationType) PURE;
STDMETHOD(Clone) (THIS_ MUSIC_TIME mtStart,
MUSIC_TIME mtEnd,
STDMETHOD(Clone) (THIS_ MUSIC_TIME mtStart,
MUSIC_TIME mtEnd,
IDirectMusicTrack** ppTrack) PURE;
/* IDirectMusicTrack8 */
STDMETHOD(PlayEx) (THIS_ void* pStateData,
REFERENCE_TIME rtStart,
REFERENCE_TIME rtEnd,
REFERENCE_TIME rtOffset,
DWORD dwFlags,
IDirectMusicPerformance* pPerf,
IDirectMusicSegmentState* pSegSt,
DWORD dwVirtualID) PURE;
STDMETHOD(PlayEx) (THIS_ void* pStateData,
REFERENCE_TIME rtStart,
REFERENCE_TIME rtEnd,
REFERENCE_TIME rtOffset,
DWORD dwFlags,
IDirectMusicPerformance* pPerf,
IDirectMusicSegmentState* pSegSt,
DWORD dwVirtualID) PURE;
STDMETHOD(GetParamEx) (THIS_ REFGUID rguidType, /* Command type. */
REFERENCE_TIME rtTime, /* Time, in ref time if dwFlags == DMUS_TRACK_PARAMF_CLOCK. Otherwise, music time. */
REFERENCE_TIME* prtNext, /* Time of next parameter, relative to rtTime, in music or clock time units. */
void* pParam, /* Pointer to the parameter data. */
void * pStateData, /* State data for track instance. */
DWORD dwFlags) PURE; /* Control flags. */
STDMETHOD(SetParamEx) (THIS_ REFGUID rguidType,
REFERENCE_TIME rtTime,
STDMETHOD(SetParamEx) (THIS_ REFGUID rguidType,
REFERENCE_TIME rtTime,
void* pParam, /* Pointer to the parameter data. */
void * pStateData, /* State data for track instance. */
DWORD dwFlags) PURE; /* Control flags. */

6
src/dep/include/DXSDK/include/dmusbuff.h
View File

@ -16,8 +16,8 @@
* Immediately following the header is the event data. The header+data
* size is rounded to the nearest quadword (8 bytes).
*/
#include <pshpack4.h> /* Do not pad at end - that's where the data is */
#include <pshpack4.h> /* Do not pad at end - that's where the data is */
typedef struct _DMUS_EVENTHEADER *LPDMUS_EVENTHEADER;
typedef struct _DMUS_EVENTHEADER
{
@ -31,7 +31,7 @@ typedef struct _DMUS_EVENTHEADER
#define DMUS_EVENT_STRUCTURED 0x00000001 /* Unstructured data (SysEx, etc.) */
/* The number of bytes to allocate for an event with 'cb' data bytes.
*/
*/
#define QWORD_ALIGN(x) (((x) + 7) & ~7)
#define DMUS_EVENT_SIZE(cb) QWORD_ALIGN(sizeof(DMUS_EVENTHEADER) + cb)

64
src/dep/include/DXSDK/include/dmusics.h
View File

@ -18,7 +18,7 @@
interface IDirectMusicSynth;
interface IDirectMusicSynthSink;
#ifndef __cplusplus
#ifndef __cplusplus
typedef interface IDirectMusicSynth IDirectMusicSynth;
typedef interface IDirectMusicSynthSink IDirectMusicSynthSink;
#endif
@ -30,7 +30,7 @@ typedef struct _DMUS_VOICE_STATE
{
BOOL bExists;
SAMPLE_POSITION spPosition;
} DMUS_VOICE_STATE;
} DMUS_VOICE_STATE;
#endif /* _DMUS_VOICE_STATE_DEFINED */
@ -53,14 +53,14 @@ DECLARE_INTERFACE_(IDirectMusicSynth, IUnknown)
STDMETHOD(Open) (THIS_ LPDMUS_PORTPARAMS pPortParams) PURE;
STDMETHOD(Close) (THIS) PURE;
STDMETHOD(SetNumChannelGroups) (THIS_ DWORD dwGroups) PURE;
STDMETHOD(Download) (THIS_ LPHANDLE phDownload,
LPVOID pvData,
STDMETHOD(Download) (THIS_ LPHANDLE phDownload,
LPVOID pvData,
LPBOOL pbFree ) PURE;
STDMETHOD(Unload) (THIS_ HANDLE hDownload,
HRESULT ( CALLBACK *lpFreeHandle)(HANDLE,HANDLE),
HANDLE hUserData ) PURE;
STDMETHOD(PlayBuffer) (THIS_ REFERENCE_TIME rt,
LPBYTE pbBuffer,
STDMETHOD(Unload) (THIS_ HANDLE hDownload,
HRESULT ( CALLBACK *lpFreeHandle)(HANDLE,HANDLE),
HANDLE hUserData ) PURE;
STDMETHOD(PlayBuffer) (THIS_ REFERENCE_TIME rt,
LPBYTE pbBuffer,
DWORD cbBuffer) PURE;
STDMETHOD(GetRunningStats) (THIS_ LPDMUS_SYNTHSTATS pStats) PURE;
STDMETHOD(GetPortCaps) (THIS_ LPDMUS_PORTCAPS pCaps) PURE;
@ -68,8 +68,8 @@ DECLARE_INTERFACE_(IDirectMusicSynth, IUnknown)
STDMETHOD(GetLatencyClock) (THIS_ IReferenceClock **ppClock) PURE;
STDMETHOD(Activate) (THIS_ BOOL fEnable) PURE;
STDMETHOD(SetSynthSink) (THIS_ IDirectMusicSynthSink *pSynthSink) PURE;
STDMETHOD(Render) (THIS_ short *pBuffer,
DWORD dwLength,
STDMETHOD(Render) (THIS_ short *pBuffer,
DWORD dwLength,
LONGLONG llPosition) PURE;
STDMETHOD(SetChannelPriority) (THIS_ DWORD dwChannelGroup,
DWORD dwChannel,
@ -96,14 +96,14 @@ DECLARE_INTERFACE_(IDirectMusicSynth8, IDirectMusicSynth)
STDMETHOD(Open) (THIS_ LPDMUS_PORTPARAMS pPortParams) PURE;
STDMETHOD(Close) (THIS) PURE;
STDMETHOD(SetNumChannelGroups) (THIS_ DWORD dwGroups) PURE;
STDMETHOD(Download) (THIS_ LPHANDLE phDownload,
LPVOID pvData,
STDMETHOD(Download) (THIS_ LPHANDLE phDownload,
LPVOID pvData,
LPBOOL pbFree ) PURE;
STDMETHOD(Unload) (THIS_ HANDLE hDownload,
HRESULT ( CALLBACK *lpFreeHandle)(HANDLE,HANDLE),
HANDLE hUserData ) PURE;
STDMETHOD(PlayBuffer) (THIS_ REFERENCE_TIME rt,
LPBYTE pbBuffer,
STDMETHOD(Unload) (THIS_ HANDLE hDownload,
HRESULT ( CALLBACK *lpFreeHandle)(HANDLE,HANDLE),
HANDLE hUserData ) PURE;
STDMETHOD(PlayBuffer) (THIS_ REFERENCE_TIME rt,
LPBYTE pbBuffer,
DWORD cbBuffer) PURE;
STDMETHOD(GetRunningStats) (THIS_ LPDMUS_SYNTHSTATS pStats) PURE;
STDMETHOD(GetPortCaps) (THIS_ LPDMUS_PORTCAPS pCaps) PURE;
@ -111,8 +111,8 @@ DECLARE_INTERFACE_(IDirectMusicSynth8, IDirectMusicSynth)
STDMETHOD(GetLatencyClock) (THIS_ IReferenceClock **ppClock) PURE;
STDMETHOD(Activate) (THIS_ BOOL fEnable) PURE;
STDMETHOD(SetSynthSink) (THIS_ IDirectMusicSynthSink *pSynthSink) PURE;
STDMETHOD(Render) (THIS_ short *pBuffer,
DWORD dwLength,
STDMETHOD(Render) (THIS_ short *pBuffer,
DWORD dwLength,
LONGLONG llPosition) PURE;
STDMETHOD(SetChannelPriority) (THIS_ DWORD dwChannelGroup,
DWORD dwChannel,
@ -125,21 +125,21 @@ DECLARE_INTERFACE_(IDirectMusicSynth8, IDirectMusicSynth)
STDMETHOD(GetAppend) (THIS_ DWORD* pdwAppend) PURE;
/* IDirectMusicSynth8 */
STDMETHOD(PlayVoice) (THIS_ REFERENCE_TIME rt,
DWORD dwVoiceId,
DWORD dwChannelGroup,
DWORD dwChannel,
DWORD dwDLId,
STDMETHOD(PlayVoice) (THIS_ REFERENCE_TIME rt,
DWORD dwVoiceId,
DWORD dwChannelGroup,
DWORD dwChannel,
DWORD dwDLId,
long prPitch, /* PREL not defined here */
long vrVolume, /* VREL not defined here */
SAMPLE_TIME stVoiceStart,
SAMPLE_TIME stLoopStart,
SAMPLE_TIME stLoopEnd) PURE;
STDMETHOD(StopVoice) (THIS_ REFERENCE_TIME rt,
STDMETHOD(StopVoice) (THIS_ REFERENCE_TIME rt,
DWORD dwVoiceId ) PURE;
STDMETHOD(GetVoiceState) (THIS_ DWORD dwVoice[],
STDMETHOD(GetVoiceState) (THIS_ DWORD dwVoice[],
DWORD cbVoice,
DMUS_VOICE_STATE dwVoiceState[] ) PURE;
STDMETHOD(Refresh) (THIS_ DWORD dwDownloadID,
@ -147,7 +147,7 @@ DECLARE_INTERFACE_(IDirectMusicSynth8, IDirectMusicSynth)
STDMETHOD(AssignChannelToBuses) (THIS_ DWORD dwChannelGroup,
DWORD dwChannel,
LPDWORD pdwBuses,
DWORD cBuses) PURE;
DWORD cBuses) PURE;
};
#undef INTERFACE
@ -166,11 +166,11 @@ DECLARE_INTERFACE_(IDirectMusicSynthSink, IUnknown)
STDMETHOD(Activate) (THIS_ BOOL fEnable) PURE;
STDMETHOD(SampleToRefTime) (THIS_ LONGLONG llSampleTime,
REFERENCE_TIME *prfTime) PURE;
STDMETHOD(RefTimeToSample) (THIS_ REFERENCE_TIME rfTime,
STDMETHOD(RefTimeToSample) (THIS_ REFERENCE_TIME rfTime,
LONGLONG *pllSampleTime) PURE;
STDMETHOD(SetDirectSound) (THIS_ LPDIRECTSOUND pDirectSound,
LPDIRECTSOUNDBUFFER pDirectSoundBuffer) PURE;
STDMETHOD(GetDesiredBufferSize) (THIS_ LPDWORD pdwBufferSizeInSamples) PURE;
LPDIRECTSOUNDBUFFER pDirectSoundBuffer) PURE;
STDMETHOD(GetDesiredBufferSize) (THIS_ LPDWORD pdwBufferSizeInSamples) PURE;
};
DEFINE_GUID(IID_IDirectMusicSynth, 0x9823661, 0x5c85, 0x11d2, 0xaf, 0xa6, 0x0, 0xaa, 0x0, 0x24, 0xd8, 0xb6);
@ -188,6 +188,6 @@ DEFINE_GUID(GUID_DMUS_PROP_SetSynthSink,0x0a3a5ba5, 0x37b6, 0x11d2, 0xb9, 0xf9,
* Item 0: A DWORD boolean indicating whether or not the sink requires an IDirectSound interface. The
* default is FALSE if this property item is not implemented by the sink.
*/
DEFINE_GUID(GUID_DMUS_PROP_SinkUsesDSound, 0xbe208857, 0x8952, 0x11d2, 0xba, 0x1c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12);
DEFINE_GUID(GUID_DMUS_PROP_SinkUsesDSound, 0xbe208857, 0x8952, 0x11d2, 0xba, 0x1c, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12);
#endif

6
src/dep/include/DXSDK/include/dpaddr.h
View File

@ -221,9 +221,9 @@ typedef struct sockaddr SOCKADDR;
/*
*
* This function is no longer supported. It is recommended that CoCreateInstance be used to create
* DirectPlay8 address objects.
*
* This function is no longer supported. It is recommended that CoCreateInstance be used to create
* DirectPlay8 address objects.
*
* HRESULT WINAPI DirectPlay8AddressCreate( const GUID * pcIID, void **ppvInterface, IUnknown *pUnknown);
*

112
src/dep/include/DXSDK/include/dplay.h
View File

@ -63,7 +63,7 @@ DEFINE_GUID(CLSID_DirectPlay,0xd1eb6d20, 0x8923, 0x11d0, 0x9d, 0x97, 0x0, 0xa0,
// GUID for IPX service provider
// {685BC400-9D2C-11cf-A9CD-00AA006886E3}
DEFINE_GUID(DPSPGUID_IPX,
DEFINE_GUID(DPSPGUID_IPX,
0x685bc400, 0x9d2c, 0x11cf, 0xa9, 0xcd, 0x0, 0xaa, 0x0, 0x68, 0x86, 0xe3);
// GUID for TCP/IP service provider
@ -149,16 +149,16 @@ typedef struct
DWORD dwSize; // Size of structure, in bytes
DWORD dwFlags; // DPCAPS_xxx flags
DWORD dwMaxBufferSize; // Maximum message size, in bytes, for this service provider
DWORD dwMaxQueueSize; // Obsolete.
DWORD dwMaxQueueSize; // Obsolete.
DWORD dwMaxPlayers; // Maximum players/groups (local + remote)
DWORD dwHundredBaud; // Bandwidth in 100 bits per second units;
DWORD dwHundredBaud; // Bandwidth in 100 bits per second units;
// i.e. 24 is 2400, 96 is 9600, etc.
DWORD dwLatency; // Estimated latency; 0 = unknown
DWORD dwMaxLocalPlayers; // Maximum # of locally created players allowed
DWORD dwHeaderLength; // Maximum header length, in bytes, on messages
// added by the service provider
DWORD dwTimeout; // Service provider's suggested timeout value
// This is how long DirectPlay will wait for
// This is how long DirectPlay will wait for
// responses to system messages
} DPCAPS, FAR *LPDPCAPS;
@ -272,11 +272,11 @@ typedef DPSESSIONDESC2 * VOL LPDPSESSIONDESC2_V;
* A constant pointer to DPSESSIONDESC2
*/
typedef const DPSESSIONDESC2 FAR *LPCDPSESSIONDESC2;
/*
* Applications cannot create new players in this session.
*/
#define DPSESSION_NEWPLAYERSDISABLED 0x00000001
#define DPSESSION_NEWPLAYERSDISABLED 0x00000001
/*
* If the DirectPlay object that created the session, the host,
@ -287,8 +287,8 @@ typedef const DPSESSIONDESC2 FAR *LPCDPSESSIONDESC2;
#define DPSESSION_MIGRATEHOST 0x00000004
/*
* This flag tells DirectPlay not to set the idPlayerTo and idPlayerFrom
* fields in player messages. This cuts two DWORD's off the message
* This flag tells DirectPlay not to set the idPlayerTo and idPlayerFrom
* fields in player messages. This cuts two DWORD's off the message
* overhead.
*/
#define DPSESSION_NOMESSAGEID 0x00000008
@ -302,7 +302,7 @@ typedef const DPSESSIONDESC2 FAR *LPCDPSESSIONDESC2;
#define DPSESSION_JOINDISABLED 0x00000020
/*
* This flag tells DirectPlay to detect when remote players
* This flag tells DirectPlay to detect when remote players
* exit abnormally (e.g. their computer or modem gets unplugged)
*/
#define DPSESSION_KEEPALIVE 0x00000040
@ -337,7 +337,7 @@ typedef const DPSESSIONDESC2 FAR *LPCDPSESSIONDESC2;
/*
* This flag tells DirectPlay to only download information about the
* DPPLAYER_SERVERPLAYER.
* DPPLAYER_SERVERPLAYER.
*/
#define DPSESSION_CLIENTSERVER 0x00001000
@ -377,13 +377,13 @@ typedef const DPSESSIONDESC2 FAR *LPCDPSESSIONDESC2;
* on old broken behavior.
*/
#define DPSESSION_NOSESSIONDESCMESSAGES 0x00020000
/*
* DPNAME
* Used to hold the name of a DirectPlay entity
* like a player or a group
*/
typedef struct
typedef struct
{
DWORD dwSize; // Size of structure
DWORD dwFlags; // Not used. Must be zero.
@ -410,7 +410,7 @@ typedef const DPNAME FAR *LPCDPNAME;
* DPCREDENTIALS
* Used to hold the user name and password of a DirectPlay user
*/
typedef struct
typedef struct
{
DWORD dwSize; // Size of structure
DWORD dwFlags; // Not used. Must be zero.
@ -418,17 +418,17 @@ typedef struct
{ // User name of the account
LPWSTR lpszUsername; // Unicode
LPSTR lpszUsernameA; // ANSI
};
};
union
{ // Password of the account
LPWSTR lpszPassword; // Unicode
LPSTR lpszPasswordA; // ANSI
};
};
union
{ // Domain name of the account
LPWSTR lpszDomain; // Unicode
LPSTR lpszDomainA; // ANSI
};
};
} DPCREDENTIALS, FAR *LPDPCREDENTIALS;
typedef const DPCREDENTIALS FAR *LPCDPCREDENTIALS;
@ -438,7 +438,7 @@ typedef const DPCREDENTIALS FAR *LPCDPCREDENTIALS;
* Used to describe the security properties of a DirectPlay
* session instance
*/
typedef struct
typedef struct
{
DWORD dwSize; // Size of structure
DWORD dwFlags; // Not used. Must be zero.
@ -462,7 +462,7 @@ typedef const DPSECURITYDESC FAR *LPCDPSECURITYDESC;
* DPACCOUNTDESC
* Used to describe a user membership account
*/
typedef struct
typedef struct
{
DWORD dwSize; // Size of structure
DWORD dwFlags; // Not used. Must be zero.
@ -515,14 +515,14 @@ typedef struct
{ // Message string
LPWSTR lpszMessage; // Unicode
LPSTR lpszMessageA; // ANSI
};
};
} DPCHAT, FAR * LPDPCHAT;
/*
* SGBUFFER
* Scatter Gather Buffer used for SendEx
*/
typedef struct
typedef struct
{
UINT len; // length of buffer data
PUCHAR pData; // pointer to buffer data
@ -546,10 +546,10 @@ typedef BOOL (FAR PASCAL * LPDPENUMSESSIONSCALLBACK2)(
/*
* This flag is set on the EnumSessions callback dwFlags parameter when
* the time out has occurred. There will be no session data for this
* callback. If *lpdwTimeOut is set to a non-zero value and the
* EnumSessionsCallback function returns TRUE then EnumSessions will
* continue waiting until the next timeout occurs. Timeouts are in
* the time out has occurred. There will be no session data for this
* callback. If *lpdwTimeOut is set to a non-zero value and the
* EnumSessionsCallback function returns TRUE then EnumSessions will
* continue waiting until the next timeout occurs. Timeouts are in
* milliseconds.
*/
#define DPESC_TIMEDOUT 0x00000001
@ -588,7 +588,7 @@ typedef BOOL (FAR PASCAL * LPDPENUMDPCALLBACK)(
typedef BOOL (FAR PASCAL * LPDPENUMDPCALLBACKA)(
LPGUID lpguidSP,
LPSTR lpSPName,
DWORD dwMajorVersion,
DWORD dwMajorVersion,
DWORD dwMinorVersion,
LPVOID lpContext);
@ -1151,7 +1151,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
#define DPENUMPLAYERS_GROUP 0x00000020
/*
* Enumerate players or groups in another session
* Enumerate players or groups in another session
* (must supply lpguidInstance)
*/
#define DPENUMPLAYERS_SESSION 0x00000080
@ -1252,7 +1252,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
/*
* Enumerate sessions which can be joined
*/
#define DPENUMSESSIONS_AVAILABLE 0x00000001
#define DPENUMSESSIONS_AVAILABLE 0x00000001
/*
* Enumerate all sessions even if they can't be joined.
@ -1269,7 +1269,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
* Stop an asynchronous enum sessions
*/
#define DPENUMSESSIONS_STOPASYNC 0x00000020
/*
* Enumerate sessions even if they require a password
*/
@ -1291,13 +1291,13 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
* The latency returned should be for guaranteed message sending.
* Default is non-guaranteed messaging.
*/
#define DPGETCAPS_GUARANTEED 0x00000001
#define DPGETCAPS_GUARANTEED 0x00000001
/****************************************************************************
*
* GetGroupData, GetPlayerData API flags
* Remote and local Group/Player data is maintained separately.
* Remote and local Group/Player data is maintained separately.
* Default is DPGET_REMOTE.
*
****************************************************************************/
@ -1309,7 +1309,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
#define DPGET_REMOTE 0x00000000
/*
* Get the local data (set by this DirectPlay object
* Get the local data (set by this DirectPlay object
* using DPSET_LOCAL)
*/
#define DPGET_LOCAL 0x00000001
@ -1351,7 +1351,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
#define DPLCONNECTION_CREATESESSION DPOPEN_CREATE
/*
* This application should join the session described by
* This application should join the session described by
* the DPSESIONDESC structure with the lpAddress data
*/
#define DPLCONNECTION_JOINSESSION DPOPEN_JOIN
@ -1369,7 +1369,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
#define DPRECEIVE_ALL 0x00000001
/*
* Get the first message in the queue directed to a specific player
* Get the first message in the queue directed to a specific player
*/
#define DPRECEIVE_TOPLAYER 0x00000002
@ -1436,7 +1436,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
#define DPSEND_ASYNC 0x00000200
/*
* When an message is completed, don't tell me.
* When an message is completed, don't tell me.
* by default the application is notified with a system message.
*/
#define DPSEND_NOSENDCOMPLETEMSG 0x00000400
@ -1457,7 +1457,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
*
****************************************************************************/
/*
/*
* Propagate the data to all players in the session
*/
#define DPSET_REMOTE 0x00000000
@ -1480,7 +1480,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
*
****************************************************************************/
/*
/*
* Get Send Queue - requires Service Provider Support
*/
#define DPMESSAGEQUEUE_SEND 0x00000001
@ -1497,7 +1497,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
*
****************************************************************************/
/*
* Start an asynchronous connect which returns status codes
*/
@ -1508,7 +1508,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
*
* DirectPlay system messages and message data structures
*
* All system message come 'From' player DPID_SYSMSG. To determine what type
* All system message come 'From' player DPID_SYSMSG. To determine what type
* of message it is, cast the lpData from Receive to DPMSG_GENERIC and check
* the dwType member against one of the following DPSYS_xxx constants. Once
* a match is found, cast the lpData to the corresponding of the DPMSG_xxx
@ -1521,25 +1521,25 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
* Use DPMSG_CREATEPLAYERORGROUP. Check dwPlayerType to see if it
* is a player or a group.
*/
#define DPSYS_CREATEPLAYERORGROUP 0x0003
#define DPSYS_CREATEPLAYERORGROUP 0x0003
/*
* A player has been deleted from the session
* Use DPMSG_DESTROYPLAYERORGROUP
*/
#define DPSYS_DESTROYPLAYERORGROUP 0x0005
#define DPSYS_DESTROYPLAYERORGROUP 0x0005
/*
* A player has been added to a group
* Use DPMSG_ADDPLAYERTOGROUP
*/
#define DPSYS_ADDPLAYERTOGROUP 0x0007
#define DPSYS_ADDPLAYERTOGROUP 0x0007
/*
* A player has been removed from a group
* Use DPMSG_DELETEPLAYERFROMGROUP
*/
#define DPSYS_DELETEPLAYERFROMGROUP 0x0021
#define DPSYS_DELETEPLAYERFROMGROUP 0x0021
/*
* This DirectPlay object lost its connection with all the
@ -1581,7 +1581,7 @@ DECLARE_INTERFACE_( IDirectPlay4, IDirectPlay3 )
* A group has been added to a group
* Use DPMSG_ADDGROUPTOGROUP
*/
#define DPSYS_ADDGROUPTOGROUP 0x0105
#define DPSYS_ADDGROUPTOGROUP 0x0105
/*
* A group has been removed from a group
@ -1776,7 +1776,7 @@ typedef DPMSG_SESSIONLOST FAR *LPDPMSG_SESSIONLOST;
* DPMSG_SECUREMESSAGE
* System message generated when a player requests a secure send
*/
typedef struct
typedef struct
{
DWORD dwType; // Message Type
DWORD dwFlags; // Signed/Encrypted
@ -1787,7 +1787,7 @@ typedef struct
/*
* DPMSG_STARTSESSION
* System message containing all information required to
* System message containing all information required to
* start a new session
*/
typedef struct
@ -1882,7 +1882,7 @@ typedef struct
#define DPERR_UNAVAILABLE MAKE_DPHRESULT( 250 )
#define DPERR_UNSUPPORTED E_NOTIMPL
#define DPERR_BUSY MAKE_DPHRESULT( 270 )
#define DPERR_USERCANCEL MAKE_DPHRESULT( 280 )
#define DPERR_USERCANCEL MAKE_DPHRESULT( 280 )
#define DPERR_NOINTERFACE E_NOINTERFACE
#define DPERR_CANNOTCREATESERVER MAKE_DPHRESULT( 290 )
#define DPERR_PLAYERLOST MAKE_DPHRESULT( 300 )
@ -1999,16 +1999,16 @@ typedef BOOL (PASCAL *LPDPENUMPLAYERSCALLBACK)(
typedef struct
{
DWORD dwSize;
GUID guidSession;
DWORD_PTR dwSession;
DWORD dwMaxPlayers;
DWORD dwCurrentPlayers;
DWORD dwFlags;
GUID guidSession;
DWORD_PTR dwSession;
DWORD dwMaxPlayers;
DWORD dwCurrentPlayers;
DWORD dwFlags;
char szSessionName[DPSESSIONNAMELEN];
char szUserField[DPUSERRESERVED];
DWORD_PTR dwReserved1;
char szPassword[DPPASSWORDLEN];
DWORD_PTR dwReserved2;
DWORD_PTR dwReserved1;
char szPassword[DPPASSWORDLEN];
DWORD_PTR dwReserved2;
DWORD_PTR dwUser1;
DWORD_PTR dwUser2;
DWORD_PTR dwUser3;
@ -2137,7 +2137,7 @@ DEFINE_GUID(IID_IDirectPlay, 0x5454e9a0, 0xdb65, 0x11ce, 0x92, 0x1c, 0x00, 0xaa,
#define IDirectPlay_AddRef(p) (p)->AddRef()
#define IDirectPlay_Release(p) (p)->Release()
#endif // IDirectPlay interface macros
#endif // IDirectPlay interface macros
#ifdef __cplusplus
};

14
src/dep/include/DXSDK/include/dplay8.h
View File

@ -43,11 +43,11 @@ DEFINE_GUID(CLSID_DirectPlay8Peer,
// CLSIDs added for DirectX 9
// {FC47060E-6153-4b34-B975-8E4121EB7F3C}
DEFINE_GUID(CLSID_DirectPlay8ThreadPool,
DEFINE_GUID(CLSID_DirectPlay8ThreadPool,
0xfc47060e, 0x6153, 0x4b34, 0xb9, 0x75, 0x8e, 0x41, 0x21, 0xeb, 0x7f, 0x3c);
// {E4C1D9A2-CBF7-48bd-9A69-34A55E0D8941}
DEFINE_GUID(CLSID_DirectPlay8NATResolver,
DEFINE_GUID(CLSID_DirectPlay8NATResolver,
0xe4c1d9a2, 0xcbf7, 0x48bd, 0x9a, 0x69, 0x34, 0xa5, 0x5e, 0xd, 0x89, 0x41);
/****************************************************************************
@ -75,11 +75,11 @@ DEFINE_GUID(IID_IDirectPlay8Peer,
// IIDs added for DirectX 9
// {0D22EE73-4A46-4a0d-89B2-045B4D666425}
DEFINE_GUID(IID_IDirectPlay8ThreadPool,
DEFINE_GUID(IID_IDirectPlay8ThreadPool,
0xd22ee73, 0x4a46, 0x4a0d, 0x89, 0xb2, 0x4, 0x5b, 0x4d, 0x66, 0x64, 0x25);
// {A9E213F2-9A60-486f-BF3B-53408B6D1CBB}
DEFINE_GUID(IID_IDirectPlay8NATResolver,
DEFINE_GUID(IID_IDirectPlay8NATResolver,
0xa9e213f2, 0x9a60, 0x486f, 0xbf, 0x3b, 0x53, 0x40, 0x8b, 0x6d, 0x1c, 0xbb);
/****************************************************************************
@ -113,7 +113,7 @@ DEFINE_GUID(CLSID_DP8SP_TCPIP,
// {995513AF-3027-4b9a-956E-C772B3F78006}
DEFINE_GUID(CLSID_DP8SP_BLUETOOTH,
DEFINE_GUID(CLSID_DP8SP_BLUETOOTH,
0x995513af, 0x3027, 0x4b9a, 0x95, 0x6e, 0xc7, 0x72, 0xb3, 0xf7, 0x80, 0x6);
@ -932,11 +932,11 @@ typedef struct _DPNMSG_NAT_RESOLVER_QUERY
/*
* This function is no longer supported. It is recommended that CoCreateInstance be used to create
* This function is no longer supported. It is recommended that CoCreateInstance be used to create
* DirectPlay8 objects.
*
* extern HRESULT WINAPI DirectPlay8Create( const CLSID * pcIID, void **ppvInterface, IUnknown *pUnknown );
*
*
*/

48
src/dep/include/DXSDK/include/dplobby.h
View File

@ -420,19 +420,19 @@ DECLARE_INTERFACE_( IDirectPlayLobby3, IDirectPlayLobby )
/*
* Applications registered with this flag want voice to automatically
* be enabled for their application. All players will be launched into
* an 'n'-way voice conference when the application is started. The
* user will be able to enable this flag for existing non-voice
* an 'n'-way voice conference when the application is started. The
* user will be able to enable this flag for existing non-voice
* directplay applications.
*/
#define DPLAPP_AUTOVOICE 0x00000001
#define DPLAPP_AUTOVOICE 0x00000001
/*
* Applications that do their own voice conferencing should register with
* this flag to avoid allowing the user to enable other voice chat
* this flag to avoid allowing the user to enable other voice chat
* capabilites during the same session. This is to avoid users forcing
* the DPLAPP_AUTOVOICE flag for the application.
*/
#define DPLAPP_SELFVOICE 0x00000002
#define DPLAPP_SELFVOICE 0x00000002
/****************************************************************************
*
@ -486,7 +486,7 @@ typedef struct _DPLMSG_SETPROPERTY
/*
* DPLMSG_SETPROPERTYRESPONSE
* Standard message returned by a lobby to confirm a
* Standard message returned by a lobby to confirm a
* DPLMSG_SETPROPERTY message.
*/
typedef struct _DPLMSG_SETPROPERTYRESPONSE
@ -613,11 +613,11 @@ typedef struct _DPLMSG_NEWSESSIONHOST
*
* Request whether the lobby supports standard. Lobby with respond with either
* TRUE or FALSE or may not respond at all.
*
*
* Property data is a single BOOL with TRUE or FALSE
*/
// {762CCDA1-D916-11d0-BA39-00C04FD7ED67}
DEFINE_GUID(DPLPROPERTY_MessagesSupported,
DEFINE_GUID(DPLPROPERTY_MessagesSupported,
0x762ccda1, 0xd916, 0x11d0, 0xba, 0x39, 0x0, 0xc0, 0x4f, 0xd7, 0xed, 0x67);
/*
@ -629,7 +629,7 @@ DEFINE_GUID(DPLPROPERTY_MessagesSupported,
* Property data is a single GUID.
*/
// {F56920A0-D218-11d0-BA39-00C04FD7ED67}
DEFINE_GUID(DPLPROPERTY_LobbyGuid,
DEFINE_GUID(DPLPROPERTY_LobbyGuid,
0xf56920a0, 0xd218, 0x11d0, 0xba, 0x39, 0x0, 0xc0, 0x4f, 0xd7, 0xed, 0x67);
/*
@ -641,7 +641,7 @@ DEFINE_GUID(DPLPROPERTY_LobbyGuid,
* Property data is the DPLDATA_PLAYERDATA structure
*/
// {B4319322-D20D-11d0-BA39-00C04FD7ED67}
DEFINE_GUID(DPLPROPERTY_PlayerGuid,
DEFINE_GUID(DPLPROPERTY_PlayerGuid,
0xb4319322, 0xd20d, 0x11d0, 0xba, 0x39, 0x0, 0xc0, 0x4f, 0xd7, 0xed, 0x67);
/*
@ -659,13 +659,13 @@ typedef struct _DPLDATA_PLAYERGUID
/*
* DPLPROPERTY_PlayerScore
*
* Used to send an array of long integers to the lobby indicating the
* Used to send an array of long integers to the lobby indicating the
* score of a player.
*
* Property data is the DPLDATA_PLAYERSCORE structure.
*/
// {48784000-D219-11d0-BA39-00C04FD7ED67}
DEFINE_GUID(DPLPROPERTY_PlayerScore,
DEFINE_GUID(DPLPROPERTY_PlayerScore,
0x48784000, 0xd219, 0x11d0, 0xba, 0x39, 0x0, 0xc0, 0x4f, 0xd7, 0xed, 0x67);
/*
@ -715,7 +715,7 @@ typedef DPADDRESS FAR *LPDPADDRESS;
*/
// {1318F560-912C-11d0-9DAA-00A0C90A43CB}
DEFINE_GUID(DPAID_TotalSize,
DEFINE_GUID(DPAID_TotalSize,
0x1318f560, 0x912c, 0x11d0, 0x9d, 0xaa, 0x0, 0xa0, 0xc9, 0xa, 0x43, 0xcb);
/*
@ -726,7 +726,7 @@ DEFINE_GUID(DPAID_TotalSize,
*/
// {07D916C0-E0AF-11cf-9C4E-00A0C905425E}
DEFINE_GUID(DPAID_ServiceProvider,
DEFINE_GUID(DPAID_ServiceProvider,
0x7d916c0, 0xe0af, 0x11cf, 0x9c, 0x4e, 0x0, 0xa0, 0xc9, 0x5, 0x42, 0x5e);
/*
@ -737,7 +737,7 @@ DEFINE_GUID(DPAID_ServiceProvider,
*/
// {59B95640-9667-11d0-A77D-0000F803ABFC}
DEFINE_GUID(DPAID_LobbyProvider,
DEFINE_GUID(DPAID_LobbyProvider,
0x59b95640, 0x9667, 0x11d0, 0xa7, 0x7d, 0x0, 0x0, 0xf8, 0x3, 0xab, 0xfc);
/*
@ -748,11 +748,11 @@ DEFINE_GUID(DPAID_LobbyProvider,
*/
// {78EC89A0-E0AF-11cf-9C4E-00A0C905425E}
DEFINE_GUID(DPAID_Phone,
DEFINE_GUID(DPAID_Phone,
0x78ec89a0, 0xe0af, 0x11cf, 0x9c, 0x4e, 0x0, 0xa0, 0xc9, 0x5, 0x42, 0x5e);
// {BA5A7A70-9DBF-11d0-9CC1-00A0C905425E}
DEFINE_GUID(DPAID_PhoneW,
DEFINE_GUID(DPAID_PhoneW,
0xba5a7a70, 0x9dbf, 0x11d0, 0x9c, 0xc1, 0x0, 0xa0, 0xc9, 0x5, 0x42, 0x5e);
/*
@ -763,11 +763,11 @@ DEFINE_GUID(DPAID_PhoneW,
*/
// {F6DCC200-A2FE-11d0-9C4F-00A0C905425E}
DEFINE_GUID(DPAID_Modem,
DEFINE_GUID(DPAID_Modem,
0xf6dcc200, 0xa2fe, 0x11d0, 0x9c, 0x4f, 0x0, 0xa0, 0xc9, 0x5, 0x42, 0x5e);
// {01FD92E0-A2FF-11d0-9C4F-00A0C905425E}
DEFINE_GUID(DPAID_ModemW,
DEFINE_GUID(DPAID_ModemW,
0x1fd92e0, 0xa2ff, 0x11d0, 0x9c, 0x4f, 0x0, 0xa0, 0xc9, 0x5, 0x42, 0x5e);
/*
@ -778,11 +778,11 @@ DEFINE_GUID(DPAID_ModemW,
*/
// {C4A54DA0-E0AF-11cf-9C4E-00A0C905425E}
DEFINE_GUID(DPAID_INet,
DEFINE_GUID(DPAID_INet,
0xc4a54da0, 0xe0af, 0x11cf, 0x9c, 0x4e, 0x0, 0xa0, 0xc9, 0x5, 0x42, 0x5e);
// {E63232A0-9DBF-11d0-9CC1-00A0C905425E}
DEFINE_GUID(DPAID_INetW,
DEFINE_GUID(DPAID_INetW,
0xe63232a0, 0x9dbf, 0x11d0, 0x9c, 0xc1, 0x0, 0xa0, 0xc9, 0x5, 0x42, 0x5e);
/*
@ -791,9 +791,9 @@ DEFINE_GUID(DPAID_INetW,
* Chunk is the port number used for creating the apps TCP and UDP sockets.
* WORD value (i.e. 47624).
*/
// {E4524541-8EA5-11d1-8A96-006097B01411}
DEFINE_GUID(DPAID_INetPort,
DEFINE_GUID(DPAID_INetPort,
0xe4524541, 0x8ea5, 0x11d1, 0x8a, 0x96, 0x0, 0x60, 0x97, 0xb0, 0x14, 0x11);
#ifdef BIGMESSAGEDEFENSE
@ -831,7 +831,7 @@ typedef DPCOMPORTADDRESS FAR *LPDPCOMPORTADDRESS;
*/
// {F2F0CE00-E0AF-11cf-9C4E-00A0C905425E}
DEFINE_GUID(DPAID_ComPort,
DEFINE_GUID(DPAID_ComPort,
0xf2f0ce00, 0xe0af, 0x11cf, 0x9c, 0x4e, 0x0, 0xa0, 0xc9, 0x5, 0x42, 0x5e);
/****************************************************************************

36
src/dep/include/DXSDK/include/dplobby8.h
View File

@ -23,11 +23,11 @@ extern "C" {
****************************************************************************/
// {667955AD-6B3B-43ca-B949-BC69B5BAFF7F}
DEFINE_GUID(CLSID_DirectPlay8LobbiedApplication,
DEFINE_GUID(CLSID_DirectPlay8LobbiedApplication,
0x667955ad, 0x6b3b, 0x43ca, 0xb9, 0x49, 0xbc, 0x69, 0xb5, 0xba, 0xff, 0x7f);
// {3B2B6775-70B6-45af-8DEA-A209C69559F3}
DEFINE_GUID(CLSID_DirectPlay8LobbyClient,
DEFINE_GUID(CLSID_DirectPlay8LobbyClient,
0x3b2b6775, 0x70b6, 0x45af, 0x8d, 0xea, 0xa2, 0x9, 0xc6, 0x95, 0x59, 0xf3);
/****************************************************************************
@ -46,7 +46,7 @@ DEFINE_GUID(IID_IDirectPlay8LobbyClient,
/****************************************************************************
*
* DirectPlay8Lobby Interface Pointer
* DirectPlay8Lobby Interface Pointer
*
****************************************************************************/
@ -77,7 +77,7 @@ typedef struct IDirectPlay8LobbyClient *PDIRECTPLAY8LOBBYCLIENT;
//
#define DPLHANDLE_ALLCONNECTIONS 0xFFFFFFFF
//
//
// The associated game session has suceeded in connecting / hosting
//
#define DPLSESSION_CONNECTED 0x0001
@ -92,12 +92,12 @@ typedef struct IDirectPlay8LobbyClient *PDIRECTPLAY8LOBBYCLIENT;
#define DPLSESSION_DISCONNECTED 0x0003
//
// The associated game session has terminated
// The associated game session has terminated
//
#define DPLSESSION_TERMINATED 0x0004
//
// The associated game session's host has migrated
//
// The associated game session's host has migrated
//
#define DPLSESSION_HOSTMIGRATED 0x0005
@ -120,10 +120,10 @@ typedef struct IDirectPlay8LobbyClient *PDIRECTPLAY8LOBBYCLIENT;
//
// Launch a new instance of the application to connect to
//
//
#define DPLCONNECT_LAUNCHNEW 0x0001
//
//
// Launch a new instance of the application if one is not waiting
//
#define DPLCONNECT_LAUNCHNOTFOUND 0x0002
@ -133,7 +133,7 @@ typedef struct IDirectPlay8LobbyClient *PDIRECTPLAY8LOBBYCLIENT;
//
#define DPLCONNECTSETTINGS_HOST 0x0001
//
//
// Disable parameter validation
//
#define DPLINITIALIZE_DISABLEPARAMVAL 0x0001
@ -144,14 +144,14 @@ typedef struct IDirectPlay8LobbyClient *PDIRECTPLAY8LOBBYCLIENT;
*
****************************************************************************/
//
//
// Information on a registered game
//
typedef struct _DPL_APPLICATION_INFO {
GUID guidApplication; // GUID of the application
PWSTR pwszApplicationName; // Name of the application
DWORD dwNumRunning; // # of instances of this application running
DWORD dwNumWaiting; // # of instances of this application waiting
DWORD dwNumWaiting; // # of instances of this application waiting
DWORD dwFlags; // Flags
} DPL_APPLICATION_INFO, *PDPL_APPLICATION_INFO;
@ -208,7 +208,7 @@ typedef struct _DPL_PROGRAM_DESC {
****************************************************************************/
//
// A connection was established
// A connection was established
// (DPL_MSGID_CONNECT)
//
typedef struct _DPL_MESSAGE_CONNECT
@ -221,7 +221,7 @@ typedef struct _DPL_MESSAGE_CONNECT
PVOID pvConnectionContext; // Context value for this connection (user set)
} DPL_MESSAGE_CONNECT, *PDPL_MESSAGE_CONNECT;
//
//
// Connection settings have been updated
// (DPL_MSGID_CONNECTION_SETTINGS)
//
@ -254,7 +254,7 @@ typedef struct _DPL_MESSAGE_RECEIVE
DWORD dwSize; // Size of this structure
DPNHANDLE hSender; // Handle of the connection that is from
BYTE *pBuffer; // Contents of the message
DWORD dwBufferSize; // Size of the message context
DWORD dwBufferSize; // Size of the message context
PVOID pvConnectionContext; // Context value for this connection
} DPL_MESSAGE_RECEIVE, *PDPL_MESSAGE_RECEIVE;
@ -275,10 +275,10 @@ typedef struct _DPL_MESSAGE_SESSION_STATUS
* DirectPlay8Lobby Create
*
****************************************************************************/
/*
* This function is no longer supported. It is recommended that CoCreateInstance be used to create
* DirectPlay8 lobby objects.
* This function is no longer supported. It is recommended that CoCreateInstance be used to create
* DirectPlay8 lobby objects.
*
* extern HRESULT WINAPI DirectPlay8LobbyCreate( const GUID * pcIID, void **ppvInterface, IUnknown *pUnknown);
*

6
src/dep/include/DXSDK/include/dpnathlp.h
View File

@ -61,7 +61,7 @@ DEFINE_GUID(CLSID_DirectPlayNATHelpPAST,
****************************************************************************/
// {154940B6-2278-4a2f-9101-9BA9F431F603}
DEFINE_GUID(IID_IDirectPlayNATHelp,
DEFINE_GUID(IID_IDirectPlayNATHelp,
0x154940b6, 0x2278, 0x4a2f, 0x91, 0x1, 0x9b, 0xa9, 0xf4, 0x31, 0xf6, 0x3);
/****************************************************************************
@ -160,7 +160,7 @@ typedef DWORD_PTR DPNHHANDLE, * PDPNHHANDLE;
* DirectPlay NAT Helper structures
*
****************************************************************************/
typedef struct _DPNHCAPS
{
DWORD dwSize; // size of this structure, must be filled in prior to calling GetCaps
@ -179,7 +179,7 @@ typedef struct _DPNHCAPS
****************************************************************************/
#define DPNHADDRESSTYPE_TCP 0x01 // the mappings are for TCP ports instead of UDP
#define DPNHADDRESSTYPE_FIXEDPORTS 0x02 // the mappings are for ports which are the same on the Internet gateway
#define DPNHADDRESSTYPE_FIXEDPORTS 0x02 // the mappings are for ports which are the same on the Internet gateway
#define DPNHADDRESSTYPE_SHAREDPORTS 0x04 // the mappings are for shared UDP fixed ports
#define DPNHADDRESSTYPE_LOCALFIREWALL 0x08 // the addresses are opened on a local firewall
#define DPNHADDRESSTYPE_GATEWAY 0x10 // the addresses are registered with an Internet gateway

2
src/dep/include/DXSDK/include/dsetup.h
View File

@ -90,7 +90,7 @@ typedef struct _DSETUP_CB_PROGRESS
DWORD dwOverallProgress;
} DSETUP_CB_PROGRESS;
enum _DSETUP_CB_PROGRESS_PHASE
{
DSETUP_INITIALIZING,

84
src/dep/include/DXSDK/include/dvoice.h
View File

@ -28,15 +28,15 @@ extern "C" {
// {B9F3EB85-B781-4ac1-8D90-93A05EE37D7D}
DEFINE_GUID(CLSID_DirectPlayVoiceClient,
DEFINE_GUID(CLSID_DirectPlayVoiceClient,
0xb9f3eb85, 0xb781, 0x4ac1, 0x8d, 0x90, 0x93, 0xa0, 0x5e, 0xe3, 0x7d, 0x7d);
// {D3F5B8E6-9B78-4a4c-94EA-CA2397B663D3}
DEFINE_GUID(CLSID_DirectPlayVoiceServer,
DEFINE_GUID(CLSID_DirectPlayVoiceServer,
0xd3f5b8e6, 0x9b78, 0x4a4c, 0x94, 0xea, 0xca, 0x23, 0x97, 0xb6, 0x63, 0xd3);
// {0F0F094B-B01C-4091-A14D-DD0CD807711A}
DEFINE_GUID(CLSID_DirectPlayVoiceTest,
DEFINE_GUID(CLSID_DirectPlayVoiceTest,
0xf0f094b, 0xb01c, 0x4091, 0xa1, 0x4d, 0xdd, 0xc, 0xd8, 0x7, 0x71, 0x1a);
/****************************************************************************
@ -47,11 +47,11 @@ DEFINE_GUID(CLSID_DirectPlayVoiceTest,
// {1DFDC8EA-BCF7-41d6-B295-AB64B3B23306}
DEFINE_GUID(IID_IDirectPlayVoiceClient,
DEFINE_GUID(IID_IDirectPlayVoiceClient,
0x1dfdc8ea, 0xbcf7, 0x41d6, 0xb2, 0x95, 0xab, 0x64, 0xb3, 0xb2, 0x33, 0x6);
// {FAA1C173-0468-43b6-8A2A-EA8A4F2076C9}
DEFINE_GUID(IID_IDirectPlayVoiceServer,
DEFINE_GUID(IID_IDirectPlayVoiceServer,
0xfaa1c173, 0x468, 0x43b6, 0x8a, 0x2a, 0xea, 0x8a, 0x4f, 0x20, 0x76, 0xc9);
// {D26AF734-208B-41da-8224-E0CE79810BE1}
@ -77,7 +77,7 @@ DEFINE_GUID(DPVCTGUID_GSM,
0x24768c60, 0x5a0d, 0x11d3, 0x9b, 0xe4, 0x52, 0x54, 0x0, 0xd9, 0x85, 0xe7);
// MS-PCM 64 kbit/s
//
//
// {8DE12FD4-7CB3-48ce-A7E8-9C47A22E8AC5}
DEFINE_GUID(DPVCTGUID_NONE,
0x8de12fd4, 0x7cb3, 0x48ce, 0xa7, 0xe8, 0x9c, 0x47, 0xa2, 0x2e, 0x8a, 0xc5);
@ -181,7 +181,7 @@ typedef DWORD DVID, *LPDVID, *PDVID;
#define DVBUFFERAGGRESSIVENESS_MAX 0x00000064
#define DVBUFFERAGGRESSIVENESS_DEFAULT 0x00000000
//
//
// Buffer Quality Value Ranges
//
#define DVBUFFERQUALITY_MIN 0x00000001
@ -205,7 +205,7 @@ typedef DWORD DVID, *LPDVID, *PDVID;
//
#define DVID_REMAINING 0xFFFFFFFF
//
//
// Input level range
//
#define DVINPUTLEVEL_MIN 0x00000000
@ -231,7 +231,7 @@ typedef DWORD DVID, *LPDVID, *PDVID;
#define DVTHRESHOLD_MAX 0x00000063 // 99 decimal
//
// Threshold field is not used
// Threshold field is not used
//
#define DVTHRESHOLD_UNUSED 0xFFFFFFFE
@ -250,7 +250,7 @@ typedef DWORD DVID, *LPDVID, *PDVID;
****************************************************************************/
//
//
// Enable automatic adjustment of the recording volume
//
#define DVCLIENTCONFIG_AUTORECORDVOLUME 0x00000008
@ -260,37 +260,37 @@ typedef DWORD DVID, *LPDVID, *PDVID;
//
#define DVCLIENTCONFIG_AUTOVOICEACTIVATED 0x00000020
//
//
// Enable echo suppression
//
#define DVCLIENTCONFIG_ECHOSUPPRESSION 0x08000000
//
//
// Voice Activation manual mode
//
#define DVCLIENTCONFIG_MANUALVOICEACTIVATED 0x00000004
//
//
// Only playback voices that have buffers created for them
//
#define DVCLIENTCONFIG_MUTEGLOBAL 0x00000010
//
//
// Mute the playback
//
#define DVCLIENTCONFIG_PLAYBACKMUTE 0x00000002
//
// Mute the recording
// Mute the recording
//
#define DVCLIENTCONFIG_RECORDMUTE 0x00000001
//
//
// Complete the operation before returning
//
#define DVFLAGS_SYNC 0x00000001
//
//
// Just check to see if wizard has been run, and if so what it's results were
//
#define DVFLAGS_QUERYONLY 0x00000002
@ -300,7 +300,7 @@ typedef DWORD DVID, *LPDVID, *PDVID;
//
#define DVFLAGS_NOHOSTMIGRATE 0x00000008
//
//
// Allow the back button to be enabled in the wizard
//
#define DVFLAGS_ALLOWBACK 0x00000010
@ -310,13 +310,13 @@ typedef DWORD DVID, *LPDVID, *PDVID;
//
#define DVSESSION_NOHOSTMIGRATION 0x00000001
//
//
// Server controlled targetting
//
#define DVSESSION_SERVERCONTROLTARGET 0x00000002
//
// Use DirectSound Normal Mode instead of priority
// Use DirectSound Normal Mode instead of priority
//
#define DVSOUNDCONFIG_NORMALMODE 0x00000001
@ -325,29 +325,29 @@ typedef DWORD DVID, *LPDVID, *PDVID;
//
#define DVSOUNDCONFIG_AUTOSELECT 0x00000002
//
//
// Run in half duplex mode
//
#define DVSOUNDCONFIG_HALFDUPLEX 0x00000004
//
//
// No volume controls are available for the recording device
//
#define DVSOUNDCONFIG_NORECVOLAVAILABLE 0x00000010
//
//
// Disable capture sharing
//
#define DVSOUNDCONFIG_NOFOCUS 0x20000000
//
//
// Set system conversion quality to high
//
#define DVSOUNDCONFIG_SETCONVERSIONQUALITY 0x00000008
//
// Enable strict focus mode
//
//
#define DVSOUNDCONFIG_STRICTFOCUS 0x40000000
//
@ -355,7 +355,7 @@ typedef DWORD DVID, *LPDVID, *PDVID;
//
#define DVPLAYERCAPS_HALFDUPLEX 0x00000001
//
//
// Specifies that player is the local player
//
#define DVPLAYERCAPS_LOCAL 0x00000002
@ -385,7 +385,7 @@ typedef struct
{
DWORD dwSize; // Size of this structure
DWORD dwFlags; // Flags for client config (DVCLIENTCONFIG_...)
LONG lRecordVolume; // Recording volume
LONG lRecordVolume; // Recording volume
LONG lPlaybackVolume; // Playback volume
DWORD dwThreshold; // Voice Activation Threshold
DWORD dwBufferQuality; // Buffer quality
@ -421,7 +421,7 @@ typedef struct
DWORD dwBufferAggressiveness; // Buffer aggresiveness
} DVSESSIONDESC, *LPDVSESSIONDESC, *PDVSESSIONDESC;
//
//
// DirectPlayVoice Client Sound Device Configuration
// (Connect / GetSoundDeviceConfig)
//
@ -458,7 +458,7 @@ typedef struct
//
// A new player has entered the voice session
// (DVMSGID_CREATEVOICEPLAYER)
//
//
typedef struct
{
DWORD dwSize; // Size of this structure
@ -488,9 +488,9 @@ typedef struct
HRESULT hrResult; // Result of the Disconnect() call
} DVMSG_DISCONNECTRESULT, *LPDVMSG_DISCONNECTRESULT, *PDVMSG_DISCONNECTRESULT;
//
//
// The voice session host has migrated.
// (DVMSGID_HOSTMIGRATED)
// (DVMSGID_HOSTMIGRATED)
//
typedef struct
{
@ -548,14 +548,14 @@ typedef struct
PVOID pvPlayerContext; // Context value for the player
} DVMSG_PLAYEROUTPUTLEVEL, *LPDVMSG_PLAYEROUTPUTLEVEL, *PDVMSG_PLAYEROUTPUTLEVEL;
//
//
// An audio stream from the specified player has started playing back on the local client.
// (DVMSGID_PLAYERVOICESTART).
//
typedef struct
{
DWORD dwSize; // Size of this structure
DVID dvidSourcePlayerID; // DVID of the Player
DVID dvidSourcePlayerID; // DVID of the Player
PVOID pvPlayerContext; // Context value for this player
} DVMSG_PLAYERVOICESTART, *LPDVMSG_PLAYERVOICESTART, *PDVMSG_PLAYERVOICESTART;
@ -570,7 +570,7 @@ typedef struct
PVOID pvPlayerContext; // Context value for this player
} DVMSG_PLAYERVOICESTOP, *LPDVMSG_PLAYERVOICESTOP, *PDVMSG_PLAYERVOICESTOP;
//
//
// Transmission has started on the local machine
// (DVMSGID_RECORDSTART)
//
@ -581,10 +581,10 @@ typedef struct
PVOID pvLocalPlayerContext; // Context value for the local player
} DVMSG_RECORDSTART, *LPDVMSG_RECORDSTART, *PDVMSG_RECORDSTART;
//
//
// Transmission has stopped on the local machine
// (DVMSGID_RECORDSTOP)
//
//
typedef struct
{
DWORD dwSize; // Size of this structure
@ -592,7 +592,7 @@ typedef struct
PVOID pvLocalPlayerContext; // Context value for the local player
} DVMSG_RECORDSTOP, *LPDVMSG_RECORDSTOP, *PDVMSG_RECORDSTOP;
//
//
// The voice session has been lost
// (DVMSGID_SESSIONLOST)
//
@ -609,7 +609,7 @@ typedef struct
typedef struct
{
DWORD dwSize; // Size of this structure
DWORD dwNumTargets; // # of targets
DWORD dwNumTargets; // # of targets
PDVID pdvidTargets; // An array of DVIDs specifying the current targets
} DVMSG_SETTARGETS, *LPDVMSG_SETTARGETS, *PDVMSG_SETTARGETS;
@ -621,11 +621,11 @@ typedef struct
****************************************************************************/
/*
*
* This function is no longer supported. It is recommended that CoCreateInstance be used to create
* DirectPlay voice objects.
*
* extern HRESULT WINAPI DirectPlayVoiceCreate( const GUID * pcIID, void **ppvInterface, IUnknown *pUnknown);
* This function is no longer supported. It is recommended that CoCreateInstance be used to create
* DirectPlay voice objects.
*
* extern HRESULT WINAPI DirectPlayVoiceCreate( const GUID * pcIID, void **ppvInterface, IUnknown *pUnknown);
*
*/

18
src/dep/include/DXSDK/include/dxdiag.h
View File

@ -77,13 +77,13 @@ typedef struct IDxDiagContainer *LPDXDIAGCONTAINER, *PDXDIAGCONTAINER;
typedef struct _DXDIAG_INIT_PARAMS
{
DWORD dwSize; // Size of this structure.
DWORD dwDxDiagHeaderVersion; // Pass in DXDIAG_DX9_SDK_VERSION. This verifies
DWORD dwSize; // Size of this structure.
DWORD dwDxDiagHeaderVersion; // Pass in DXDIAG_DX9_SDK_VERSION. This verifies
// the header and dll are correctly matched.
BOOL bAllowWHQLChecks; // If true, allow dxdiag to check if drivers are
// digital signed as logo'd by WHQL which may
BOOL bAllowWHQLChecks; // If true, allow dxdiag to check if drivers are
// digital signed as logo'd by WHQL which may
// connect via internet to update WHQL certificates.
VOID* pReserved; // Reserved. Must be NULL.
VOID* pReserved; // Reserved. Must be NULL.
} DXDIAG_INIT_PARAMS;
@ -104,9 +104,9 @@ DECLARE_INTERFACE_(IDxDiagProvider,IUnknown)
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID *ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
/*** IDxDiagProvider methods ***/
STDMETHOD(Initialize) (THIS_ DXDIAG_INIT_PARAMS* pParams) PURE;
STDMETHOD(Initialize) (THIS_ DXDIAG_INIT_PARAMS* pParams) PURE;
STDMETHOD(GetRootContainer) (THIS_ IDxDiagContainer **ppInstance) PURE;
};
@ -122,11 +122,11 @@ DECLARE_INTERFACE_(IDxDiagContainer,IUnknown)
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID *ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
/*** IDxDiagContainer methods ***/
STDMETHOD(GetNumberOfChildContainers) (THIS_ DWORD *pdwCount) PURE;
STDMETHOD(EnumChildContainerNames) (THIS_ DWORD dwIndex, LPWSTR pwszContainer, DWORD cchContainer) PURE;
STDMETHOD(GetChildContainer) (THIS_ LPCWSTR pwszContainer, IDxDiagContainer **ppInstance) PURE;
STDMETHOD(GetChildContainer) (THIS_ LPCWSTR pwszContainer, IDxDiagContainer **ppInstance) PURE;
STDMETHOD(GetNumberOfProps) (THIS_ DWORD *pdwCount) PURE;
STDMETHOD(EnumPropNames) (THIS_ DWORD dwIndex, LPWSTR pwszPropName, DWORD cchPropName) PURE;
STDMETHOD(GetProp) (THIS_ LPCWSTR pwszPropName, VARIANT *pvarProp) PURE;

Some files were not shown because too many files have changed in this diff Show More