aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-26 17:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed bad merge

Browse source
This commit is contained in:
Botanic 2013-10-26 00:57:50 -07:00
parent 906da99801
commit d467027f11
3 changed files with 51 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/georges/load_form.h
View file

@ -109,7 +109,7 @@ struct TLoadFormDicoEntry
} }
}; };
*/ */
const uint32 PACKED_SHEET_HEADER = "PKSH"; const uint32 PACKED_SHEET_HEADER = NELID("PKSH");
const uint32 PACKED_SHEET_VERSION = 5; const uint32 PACKED_SHEET_VERSION = 5;
// This Version may be used if you want to use the serialVersion() system in loadForm() // This Version may be used if you want to use the serialVersion() system in loadForm()
const uint32 PACKED_SHEET_VERSION_COMPATIBLE = 0; const uint32 PACKED_SHEET_VERSION_COMPATIBLE = 0;

98
code/nel/src/3d/vertex_program_parse.cpp
View file

@ -258,21 +258,21 @@ bool CVPParser::parseInputRegister(CVPOperand &operand, std::string &errorOutput
} }
switch (strValue) switch (strValue)
{ {
case "OPOS": operand.Value.InputRegisterValue = CVPOperand::IPosition; break; case 'OPOS': operand.Value.InputRegisterValue = CVPOperand::IPosition; break;
case "WGHT": operand.Value.InputRegisterValue = CVPOperand::IWeight; break; case 'WGHT': operand.Value.InputRegisterValue = CVPOperand::IWeight; break;
case "NRML": operand.Value.InputRegisterValue = CVPOperand::INormal; break; case 'NRML': operand.Value.InputRegisterValue = CVPOperand::INormal; break;
case "COL0": operand.Value.InputRegisterValue = CVPOperand::IPrimaryColor; break; case 'COL0': operand.Value.InputRegisterValue = CVPOperand::IPrimaryColor; break;
case "COL1": operand.Value.InputRegisterValue = CVPOperand::ISecondaryColor; break; case 'COL1': operand.Value.InputRegisterValue = CVPOperand::ISecondaryColor; break;
case "FOGC": operand.Value.InputRegisterValue = CVPOperand::IFogCoord; break; case 'FOGC': operand.Value.InputRegisterValue = CVPOperand::IFogCoord; break;
// texture argument // texture argument
case "TEX0": case 'TEX0':
case "TEX1": case 'TEX1':
case "TEX2": case 'TEX2':
case "TEX3": case 'TEX3':
case "TEX4": case 'TEX4':
case "TEX5": case 'TEX5':
case "TEX6": case 'TEX6':
case "TEX7": case 'TEX7':
operand.Value.InputRegisterValue = (CVPOperand::EInputRegister) (((CVPOperand::ITex0 + strValue) & 0xff) - '0'); operand.Value.InputRegisterValue = (CVPOperand::EInputRegister) (((CVPOperand::ITex0 + strValue) & 0xff) - '0');
break; break;
default: default:
@ -386,21 +386,21 @@ bool CVPParser::parseOutputRegister(CVPOperand &operand, std::string &errorOutpu
// convert to enum // convert to enum
switch(strValue) switch(strValue)
{ {
case "HPOS": operand.Value.OutputRegisterValue = CVPOperand::OHPosition; break; case 'HPOS': operand.Value.OutputRegisterValue = CVPOperand::OHPosition; break;
case "COL0": operand.Value.OutputRegisterValue = CVPOperand::OPrimaryColor; break; case 'COL0': operand.Value.OutputRegisterValue = CVPOperand::OPrimaryColor; break;
case "COL1": operand.Value.OutputRegisterValue = CVPOperand::OSecondaryColor; break; case 'COL1': operand.Value.OutputRegisterValue = CVPOperand::OSecondaryColor; break;
case "BFC0": operand.Value.OutputRegisterValue = CVPOperand::OBackFacePrimaryColor; break; case 'BFC0': operand.Value.OutputRegisterValue = CVPOperand::OBackFacePrimaryColor; break;
case "BFC1": operand.Value.OutputRegisterValue = CVPOperand::OBackFaceSecondaryColor; break; case 'BFC1': operand.Value.OutputRegisterValue = CVPOperand::OBackFaceSecondaryColor; break;
case "FOGC": operand.Value.OutputRegisterValue = CVPOperand::OFogCoord; break; case 'FOGC': operand.Value.OutputRegisterValue = CVPOperand::OFogCoord; break;
case "PSIZ": operand.Value.OutputRegisterValue = CVPOperand::OPointSize; break; case 'PSIZ': operand.Value.OutputRegisterValue = CVPOperand::OPointSize; break;
case "TEX0": operand.Value.OutputRegisterValue = CVPOperand::OTex0; break; case 'TEX0': operand.Value.OutputRegisterValue = CVPOperand::OTex0; break;
case "TEX1": operand.Value.OutputRegisterValue = CVPOperand::OTex1; break; case 'TEX1': operand.Value.OutputRegisterValue = CVPOperand::OTex1; break;
case "TEX2": operand.Value.OutputRegisterValue = CVPOperand::OTex2; break; case 'TEX2': operand.Value.OutputRegisterValue = CVPOperand::OTex2; break;
case "TEX3": operand.Value.OutputRegisterValue = CVPOperand::OTex3; break; case 'TEX3': operand.Value.OutputRegisterValue = CVPOperand::OTex3; break;
case "TEX4": operand.Value.OutputRegisterValue = CVPOperand::OTex4; break; case 'TEX4': operand.Value.OutputRegisterValue = CVPOperand::OTex4; break;
case "TEX5": operand.Value.OutputRegisterValue = CVPOperand::OTex5; break; case 'TEX5': operand.Value.OutputRegisterValue = CVPOperand::OTex5; break;
case "TEX6": operand.Value.OutputRegisterValue = CVPOperand::OTex6; break; case 'TEX6': operand.Value.OutputRegisterValue = CVPOperand::OTex6; break;
case "TEX7": operand.Value.OutputRegisterValue = CVPOperand::OTex7; break; case 'TEX7': operand.Value.OutputRegisterValue = CVPOperand::OTex7; break;
default: default:
errorOutput = "Can't read index for output register."; errorOutput = "Can't read index for output register.";
return false; return false;
@ -755,7 +755,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
} }
switch (instrStr) switch (instrStr)
{ {
case "ARL ": case 'ARL ':
instr.Opcode = CVPInstruction::ARL; instr.Opcode = CVPInstruction::ARL;
if (!parseOp2(instr, errorOutput)) return false; if (!parseOp2(instr, errorOutput)) return false;
if (!instr.Src1.Swizzle.isScalar()) if (!instr.Src1.Swizzle.isScalar())
@ -764,7 +764,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
return false; return false;
} }
break; break;
case "RSQ ": case 'RSQ ':
instr.Opcode = CVPInstruction::RSQ; instr.Opcode = CVPInstruction::RSQ;
if (!parseOp2(instr, errorOutput)) return false; if (!parseOp2(instr, errorOutput)) return false;
if (!instr.Src1.Swizzle.isScalar()) if (!instr.Src1.Swizzle.isScalar())
@ -773,8 +773,8 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
return false; return false;
} }
break; break;
case "EXP ": case 'EXP ':
case "EXPP": case 'EXPP':
instr.Opcode = CVPInstruction::EXPP; instr.Opcode = CVPInstruction::EXPP;
if (!parseOp2(instr, errorOutput)) return false; if (!parseOp2(instr, errorOutput)) return false;
if (!instr.Src1.Swizzle.isScalar()) if (!instr.Src1.Swizzle.isScalar())
@ -789,7 +789,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
return false; return false;
}*/ }*/
break; break;
case "LOG ": case 'LOG ':
instr.Opcode = CVPInstruction::LOG; instr.Opcode = CVPInstruction::LOG;
if (!parseOp2(instr, errorOutput)) return false; if (!parseOp2(instr, errorOutput)) return false;
if (!instr.Src1.Swizzle.isScalar()) if (!instr.Src1.Swizzle.isScalar())
@ -805,7 +805,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
} }
*/ */
break; break;
case "RCP ": case 'RCP ':
instr.Opcode = CVPInstruction::RCP; instr.Opcode = CVPInstruction::RCP;
if (!parseOp2(instr, errorOutput)) return false; if (!parseOp2(instr, errorOutput)) return false;
if (!instr.Src1.Swizzle.isScalar()) if (!instr.Src1.Swizzle.isScalar())
@ -815,60 +815,60 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
} }
break; break;
///////////////// /////////////////
case "MOV ": case 'MOV ':
instr.Opcode = CVPInstruction::MOV; instr.Opcode = CVPInstruction::MOV;
if (!parseOp2(instr, errorOutput)) return false; if (!parseOp2(instr, errorOutput)) return false;
break; break;
case "LIT ": case 'LIT ':
instr.Opcode = CVPInstruction::LIT; instr.Opcode = CVPInstruction::LIT;
if (!parseOp2(instr, errorOutput)) return false; if (!parseOp2(instr, errorOutput)) return false;
break; break;
///////////////// /////////////////
case "MAD ": case 'MAD ':
instr.Opcode = CVPInstruction::MAD; instr.Opcode = CVPInstruction::MAD;
if (!parseOp4(instr, errorOutput)) return false; if (!parseOp4(instr, errorOutput)) return false;
break; break;
///////////////// /////////////////
case "ADD ": case 'ADD ':
instr.Opcode = CVPInstruction::ADD; instr.Opcode = CVPInstruction::ADD;
if (!parseOp3(instr, errorOutput)) return false; if (!parseOp3(instr, errorOutput)) return false;
break; break;
///////////////// /////////////////
case "MUL ": case 'MUL ':
instr.Opcode = CVPInstruction::MUL; instr.Opcode = CVPInstruction::MUL;
if (!parseOp3(instr, errorOutput)) return false; if (!parseOp3(instr, errorOutput)) return false;
break; break;
case "DP3 ": case 'DP3 ':
instr.Opcode = CVPInstruction::DP3; instr.Opcode = CVPInstruction::DP3;
if (!parseOp3(instr, errorOutput)) return false; if (!parseOp3(instr, errorOutput)) return false;
break; break;
case "DP4 ": case 'DP4 ':
instr.Opcode = CVPInstruction::DP4; instr.Opcode = CVPInstruction::DP4;
if (!parseOp3(instr, errorOutput)) return false; if (!parseOp3(instr, errorOutput)) return false;
break; break;
case "DST ": case 'DST ':
instr.Opcode = CVPInstruction::DST; instr.Opcode = CVPInstruction::DST;
if (!parseOp3(instr, errorOutput)) return false; if (!parseOp3(instr, errorOutput)) return false;
break; break;
case "MIN ": case 'MIN ':
instr.Opcode = CVPInstruction::MIN; instr.Opcode = CVPInstruction::MIN;
if (!parseOp3(instr, errorOutput)) return false; if (!parseOp3(instr, errorOutput)) return false;
break; break;
case "MAX ": case 'MAX ':
instr.Opcode = CVPInstruction::MAX; instr.Opcode = CVPInstruction::MAX;
if (!parseOp3(instr, errorOutput)) return false; if (!parseOp3(instr, errorOutput)) return false;
break; break;
case "SLT ": case 'SLT ':
instr.Opcode = CVPInstruction::SLT; instr.Opcode = CVPInstruction::SLT;
if (!parseOp3(instr, errorOutput)) return false; if (!parseOp3(instr, errorOutput)) return false;
break; break;
case "SGE ": case 'SGE ':
instr.Opcode = CVPInstruction::SGE; instr.Opcode = CVPInstruction::SGE;
if (!parseOp3(instr, errorOutput)) return false; if (!parseOp3(instr, errorOutput)) return false;
break; break;
///////////////// /////////////////
case "END ": case 'END ':
endEncountered = true; endEncountered = true;
return true; return true;
break; break;
@ -885,7 +885,7 @@ bool CVPParser::parseInstruction(CVPInstruction &instr, std::string &errorOutput
} }
// it is not allowed to write to an adress register except for ARL // it is not allowed to write to an adress register except for ARL
if (instrStr != "ARL ") if (instrStr != NELID("ARL "))
{ {
if (instr.Dest.Type == CVPOperand::AddressRegister) if (instr.Dest.Type == CVPOperand::AddressRegister)
{ {

2
code/ryzom/client/src/character_cl.cpp
View file

@ -488,7 +488,7 @@ void CCharacterCL::stopAttachedFXForCurrrentAnim(bool stopLoopingFX)
{ {
if(!(*tmpItAttached)->FX.empty()) if(!(*tmpItAttached)->FX.empty())
{ {
if (!(*tmpItAttached)->FX.removeByID("STOP") && !(*tmpItAttached)->FX.removeByID("main")) if (!(*tmpItAttached)->FX.removeByID(NELID("STOP")) && !(*tmpItAttached)->FX.removeByID(NELID("main")))
{ {
(*tmpItAttached)->FX.activateEmitters(false); (*tmpItAttached)->FX.activateEmitters(false);
} }