BRNSystems/irrlicht
1
0
Fork 0
forked from Mirrorlandia_minetest/irrlicht
Code Pull Requests Activity

Merging r6107 through r6116 from trunk to ogl-es branch

Browse Source 
Caught up with trunk again.
Not yet tested beside compiling (quick test failed, but seems like nothing from the new changes).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6117 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien 2020-06-12 20:47:40 +00:00
parent 20b3d56987
commit 562c0fb6f1
13 changed files with 277 additions and 319 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
changes.txt
View File

@ -9,6 +9,15 @@ Changes in ogl-es (not yet released - will be merged with trunk at some point)
-------------------------- --------------------------
Changes in 1.9 (not yet released) Changes in 1.9 (not yet released)
- Fix potential reading/writing 1 byte behind it's own buffer in PLY loader.
Thanks @wolfgang for report and patch (http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=52627&p=305573#p305573)
- ICursorControl::isVisible is now always returning the flag set in setVisible.
This changes the behaviour on Win32 somewhat when Windows returned a CURSOR_SUPPRESSED state (touch-screen input).
Previously we set IsVisible it to false when CURSOR_SUPPRESSED was set.
Also we handle the CURSOR_SUPPRESSED state slightly different now and still try to hide cursors once when requested.
- Improvements to B3D writer for speed, readability and handling of low framerate animations.
Thanks @JLouisB for the patch (For more info, see: http://irrlicht.sourceforge.net/forum/viewtopic.php?f=2&t=50067&start=15)
- Add another render pass ESNRP_GUI which is drawn last and is p.E. useful for rendering gui nodes in the scenemanager.
- BurningVideo: 0.51 - BurningVideo: 0.51
- 10 year anniversary update - 10 year anniversary update
- Lighting model reworked. moved to eyespace like openGL. [Specular Highlights, Fog, Sphere/Reflection Map] - Lighting model reworked. moved to eyespace like openGL. [Specular Highlights, Fog, Sphere/Reflection Map]

2
include/ICursorControl.h
View File

@ -104,7 +104,7 @@ namespace gui
virtual void setVisible(bool visible) = 0; virtual void setVisible(bool visible) = 0;
//! Returns if the cursor is currently visible. //! Returns if the cursor is currently visible.
/** \return True if the cursor is visible, false if not. */ /** \return True if the cursor flag is set to visible, false if not. */
virtual bool isVisible() const = 0; virtual bool isVisible() const = 0;
//! Sets the new position of the cursor. //! Sets the new position of the cursor.

12
include/ISceneManager.h
View File

@ -52,7 +52,9 @@ namespace scene
{ {
//! Enumeration for render passes. //! Enumeration for render passes.
/** A parameter passed to the registerNodeForRendering() method of the ISceneManager, /** A parameter passed to the registerNodeForRendering() method of the ISceneManager,
specifying when the node wants to be drawn in relation to the other nodes. */ specifying when the node wants to be drawn in relation to the other nodes.
Note: Despite the numbering this is not used as bit-field.
*/
enum E_SCENE_NODE_RENDER_PASS enum E_SCENE_NODE_RENDER_PASS
{ {
//! No pass currently active //! No pass currently active
@ -92,7 +94,11 @@ namespace scene
ESNRP_TRANSPARENT_EFFECT =32, ESNRP_TRANSPARENT_EFFECT =32,
//! Drawn after the solid nodes, before the transparent nodes, the time for drawing shadow volumes //! Drawn after the solid nodes, before the transparent nodes, the time for drawing shadow volumes
ESNRP_SHADOW =64 ESNRP_SHADOW =64,
//! Drawn after transparent effect nodes. For custom gui's. Unsorted (in order nodes registered themselves).
ESNRP_GUI = 128
}; };
class IAnimatedMesh; class IAnimatedMesh;
@ -1122,6 +1128,8 @@ namespace scene
\param pass: Specifies when the node wants to be drawn in relation to the other nodes. \param pass: Specifies when the node wants to be drawn in relation to the other nodes.
For example, if the node is a shadow, it usually wants to be drawn after all other nodes For example, if the node is a shadow, it usually wants to be drawn after all other nodes
and will use ESNRP_SHADOW for this. See scene::E_SCENE_NODE_RENDER_PASS for details. and will use ESNRP_SHADOW for this. See scene::E_SCENE_NODE_RENDER_PASS for details.
Note: This is _not_ a bitfield. If you want to register a note for several render passes, then
call this function once for each pass.
\return scene will be rendered ( passed culling ) */ \return scene will be rendered ( passed culling ) */
virtual u32 registerNodeForRendering(ISceneNode* node, virtual u32 registerNodeForRendering(ISceneNode* node,
E_SCENE_NODE_RENDER_PASS pass = ESNRP_AUTOMATIC) = 0; E_SCENE_NODE_RENDER_PASS pass = ESNRP_AUTOMATIC) = 0;

475
source/Irrlicht/CB3DMeshWriter.cpp
View File

@ -50,20 +50,19 @@ bool CB3DMeshWriter::writeMesh(io::IWriteFile* file, IMesh* const mesh, s32 flag
return false; return false;
#endif #endif
Size = 0;
file->write("BB3D", 4); file->write("BB3D", 4);
file->write(&Size, sizeof(u32)); // Updated later once known. file->write("size", 4); // BB3D chunk size, updated later
int version = 1; const u32 version = 1;
write(file, &version, sizeof(int)); file->write(&version, 4);
// //
const u32 numBeshBuffers = mesh->getMeshBufferCount(); const u32 numMeshBuffers = mesh->getMeshBufferCount();
array<SB3dTexture> texs; array<SB3dTexture> texs;
map<ITexture *, u32> tex2id; // TODO: texture pointer as key not sufficient as same texture can have several id's map<ITexture *, u32> tex2id; // TODO: texture pointer as key not sufficient as same texture can have several id's
u32 texsizes = 0; u32 texsizes = 0;
for (u32 i = 0; i < numBeshBuffers; i++) for (u32 i = 0; i < numMeshBuffers; i++)
{ {
const IMeshBuffer * const mb = mesh->getMeshBuffer(i); const IMeshBuffer * const mb = mesh->getMeshBuffer(i);
const SMaterial &mat = mb->getMaterial(); const SMaterial &mat = mb->getMaterial();
@ -93,192 +92,122 @@ bool CB3DMeshWriter::writeMesh(io::IWriteFile* file, IMesh* const mesh, s32 flag
} }
} }
write(file, "TEXS", 4); file->write("TEXS", 4);
write(file, &texsizes, 4); file->write(&texsizes, 4);
u32 numTexture = texs.size(); u32 numTexture = texs.size();
for (u32 i = 0; i < numTexture; i++) for (u32 i = 0; i < numTexture; i++)
{ {
write(file, texs[i].TextureName.c_str(), texs[i].TextureName.size() + 1); file->write(texs[i].TextureName.c_str(), texs[i].TextureName.size() + 1);
write(file, &texs[i].Flags, 7*4); file->write(&texs[i].Flags, 7*4);
} }
// //
const u32 brushsize = (7 * 4 + 1) * numBeshBuffers + numBeshBuffers * 4 * MATERIAL_MAX_TEXTURES + 4; file->write("BRUS", 4);
write(file, "BRUS", 4); const u32 brushSizeAdress = file->getPos();
write(file, &brushsize, 4); file->write(&brushSizeAdress, 4); // BRUSH chunk size, updated later
u32 brushcheck = Size;
const u32 usedtex = MATERIAL_MAX_TEXTURES;
write(file, &usedtex, 4);
for (u32 i = 0; i < numBeshBuffers; i++) const u32 usedtex = MATERIAL_MAX_TEXTURES;
file->write(&usedtex, 4);
for (u32 i = 0; i < numMeshBuffers; i++)
{ {
const IMeshBuffer * const mb = mesh->getMeshBuffer(i); const IMeshBuffer * const mb = mesh->getMeshBuffer(i);
const SMaterial &mat = mb->getMaterial(); const SMaterial &mat = mb->getMaterial();
write(file, "", 1); file->write("", 1);
float f = 1; float f = 1;
write(file, &f, 4); file->write(&f, 4);
write(file, &f, 4); file->write(&f, 4);
write(file, &f, 4); file->write(&f, 4);
write(file, &f, 4); file->write(&f, 4);
f = 0; f = 0;
write(file, &f, 4); file->write(&f, 4);
u32 tmp = 1; u32 tmp = 1;
write(file, &tmp, 4); file->write(&tmp, 4);
tmp = 0; tmp = 0;
write(file, &tmp, 4); file->write(&tmp, 4);
for (u32 j = 0; j < MATERIAL_MAX_TEXTURES; j++) for (u32 j = 0; j < MATERIAL_MAX_TEXTURES; j++)
{ {
s32 id = -1;
if (mat.getTexture(j)) if (mat.getTexture(j))
{ {
const u32 id = tex2id[mat.getTexture(j)]; id = tex2id[mat.getTexture(j)];
write(file, &id, 4);
}
else
{
const int id = -1;
write(file, &id, 4);
} }
file->write(&id, 4);
} }
} }
writeSizeFrom(file, brushSizeAdress+4, brushSizeAdress); // BRUSH chunk size
// Check brushsize file->write("NODE", 4);
brushcheck = Size - brushcheck; u32 nodeSizeAdress = file->getPos();
if (brushcheck != brushsize) file->write(&nodeSizeAdress, 4); // NODE chunk size, updated later
{
printf("Failed in brush size calculation, size %u advanced %u\n",
brushsize, brushcheck);
}
write(file, "NODE", 4);
// Calculate node size
u32 nodesize = 41 + 8 + 4 + 8;
u32 bonesSize = 0;
if(ISkinnedMesh *skinnedMesh = getSkinned(mesh))
{
if (!skinnedMesh->isStatic())
{
bonesSize += 20;
}
const core::array<ISkinnedMesh::SJoint*> rootJoints = getRootJoints(skinnedMesh);
for (u32 i = 0; i < rootJoints.size(); i++)
{
bonesSize += getJointChunkSize(skinnedMesh, rootJoints[i]);
}
nodesize += bonesSize;
// -------------------
}
// VERT data
nodesize += 12;
const u32 texcoords = getUVlayerCount(mesh);
for (u32 i = 0; i < numBeshBuffers; i++)
{
nodesize += 8 + 4;
const IMeshBuffer * const mb = mesh->getMeshBuffer(i);
nodesize += mb->getVertexCount() * 10 * 4;
nodesize += mb->getVertexCount() * texcoords * 2 * 4;
nodesize += mb->getIndexCount() * 4;
}
write(file, &nodesize, 4);
u32 nodecheck = Size;
// Node // Node
write(file, "", 1); file->write("", 1);
float f = 0;
write(file, &f, 4);
write(file, &f, 4);
write(file, &f, 4);
f = 1; // position
write(file, &f, 4); writeVector3(file, core::vector3df(0.f, 0.f, 0.f));
write(file, &f, 4);
write(file, &f, 4);
write(file, &f, 4); // scale
f = 0; writeVector3(file, core::vector3df(1.f, 1.f, 1.f));
write(file, &f, 4);
write(file, &f, 4); // rotation
write(file, &f, 4); writeQuaternion(file, core::quaternion(0.f, 0.f, 0.f, 1.f));
// Mesh // Mesh
write(file, "MESH", 4); file->write("MESH", 4);
const u32 meshsize = nodesize - 41 - 8 - bonesSize; const u32 meshSizeAdress = file->getPos();
write(file, &meshsize, 4); file->write(&meshSizeAdress, 4); // MESH chunk size, updated later
s32 brushID = -1; s32 brushID = -1;
write(file, &brushID, 4); file->write(&brushID, 4);
// Verts // Verts
write(file, "VRTS", 4); file->write("VRTS", 4);
u32 vertsize = 12; const u32 verticesSizeAdress = file->getPos();
file->write(&verticesSizeAdress, 4);
for (u32 i = 0; i < numBeshBuffers; i++) u32 flagsB3D = 3; // 1=normal values present, 2=rgba values present
{ file->write(&flagsB3D, 4);
const IMeshBuffer * const mb = mesh->getMeshBuffer(i);
vertsize += mb->getVertexCount() * 10 * 4 + const u32 texcoordsCount = getUVlayerCount(mesh);
mb->getVertexCount() * texcoords * 2 * 4; file->write(&texcoordsCount, 4);
}
write(file, &vertsize, 4);
u32 vertcheck = Size;
int flagsB3D = 3;
write(file, &flagsB3D, 4);
write(file, &texcoords, 4);
flagsB3D = 2; flagsB3D = 2;
write(file, &flagsB3D, 4); file->write(&flagsB3D, 4);
for (u32 i = 0; i < numBeshBuffers; i++) for (u32 i = 0; i < numMeshBuffers; i++)
{ {
const IMeshBuffer * const mb = mesh->getMeshBuffer(i); const IMeshBuffer * const mb = mesh->getMeshBuffer(i);
irr::u32 numVertices = mb->getVertexCount(); const u32 numVertices = mb->getVertexCount();
for (u32 j = 0; j < numVertices; j++) for (u32 j = 0; j < numVertices; j++)
{ {
const vector3df &pos = mb->getPosition(j); const vector3df &pos = mb->getPosition(j);
write(file, &pos.X, 4); writeVector3(file, pos);
write(file, &pos.Y, 4);
write(file, &pos.Z, 4);
const vector3df &n = mb->getNormal(j); const vector3df &n = mb->getNormal(j);
write(file, &n.X, 4); writeVector3(file, n);
write(file, &n.Y, 4);
write(file, &n.Z, 4);
const u32 zero = 0;
switch (mb->getVertexType()) switch (mb->getVertexType())
{ {
case EVT_STANDARD: case EVT_STANDARD:
{ {
S3DVertex *v = (S3DVertex *) mb->getVertices(); S3DVertex *v = (S3DVertex *) mb->getVertices();
const SColorf col(v[j].Color); const SColorf col(v[j].Color);
write(file, &col.r, 4); writeColor(file, col);
write(file, &col.g, 4);
write(file, &col.b, 4);
write(file, &col.a, 4);
write(file, &v[j].TCoords.X, 4); const core::vector2df uv1 = v[j].TCoords;
write(file, &v[j].TCoords.Y, 4); writeVector2(file, uv1);
if (texcoords == 2) if (texcoordsCount == 2)
{ {
write(file, &zero, 4); writeVector2(file, core::vector2df(0.f, 0.f));
write(file, &zero, 4);
} }
} }
break; break;
@ -286,101 +215,93 @@ bool CB3DMeshWriter::writeMesh(io::IWriteFile* file, IMesh* const mesh, s32 flag
{ {
S3DVertex2TCoords *v = (S3DVertex2TCoords *) mb->getVertices(); S3DVertex2TCoords *v = (S3DVertex2TCoords *) mb->getVertices();
const SColorf col(v[j].Color); const SColorf col(v[j].Color);
write(file, &col.r, 4); writeColor(file, col);
write(file, &col.g, 4);
write(file, &col.b, 4);
write(file, &col.a, 4);
write(file, &v[j].TCoords.X, 4); const core::vector2df uv1 = v[j].TCoords;
write(file, &v[j].TCoords.Y, 4); writeVector2(file, uv1);
write(file, &v[j].TCoords2.X, 4); const core::vector2df uv2 = v[j].TCoords;
write(file, &v[j].TCoords2.Y, 4); writeVector2(file, uv2);
} }
break; break;
case EVT_TANGENTS: case EVT_TANGENTS:
{ {
S3DVertexTangents *v = (S3DVertexTangents *) mb->getVertices(); S3DVertexTangents *v = (S3DVertexTangents *) mb->getVertices();
const SColorf col(v[j].Color); const SColorf col(v[j].Color);
write(file, &col.r, 4); writeColor(file, col);
write(file, &col.g, 4);
write(file, &col.b, 4);
write(file, &col.a, 4);
write(file, &v[j].TCoords.X, 4); const core::vector2df uv1 = v[j].TCoords;
write(file, &v[j].TCoords.Y, 4); writeVector2(file, uv1);
if (texcoords == 2) if (texcoordsCount == 2)
{ {
write(file, &zero, 4); writeVector2(file, core::vector2df(0.f, 0.f));
write(file, &zero, 4);
} }
} }
break; break;
} }
} }
} }
// Check vertsize writeSizeFrom(file, verticesSizeAdress+4, verticesSizeAdress); // VERT chunk size
vertcheck = Size - vertcheck;
if (vertcheck != vertsize)
{
printf("Failed in vertex size calculation, size %u advanced %u\n",
vertsize, vertcheck);
}
u32 currentMeshBufferIndex = 0; u32 currentMeshBufferIndex = 0;
// Tris // Tris
for (u32 i = 0; i < numBeshBuffers; i++) for (u32 i = 0; i < numMeshBuffers; i++)
{ {
const IMeshBuffer * const mb = mesh->getMeshBuffer(i); const IMeshBuffer * const mb = mesh->getMeshBuffer(i);
write(file, "TRIS", 4); file->write("TRIS", 4);
const u32 trisize = 4 + mb->getIndexCount() * 4; const u32 trisSizeAdress = file->getPos();
write(file, &trisize, 4); file->write(&trisSizeAdress, 4); // TRIS chunk size, updated later
u32 tricheck = Size; file->write(&i, 4);
write(file, &i, 4);
u32 numIndices = mb->getIndexCount(); u32 numIndices = mb->getIndexCount();
const u16 * const idx = (u16 *) mb->getIndices(); const u16 * const idx = (u16 *) mb->getIndices();
for (u32 j = 0; j < numIndices; j += 3) for (u32 j = 0; j < numIndices; j += 3)
{ {
u32 tmp = idx[j] + currentMeshBufferIndex; u32 tmp = idx[j] + currentMeshBufferIndex;
write(file, &tmp, sizeof(u32)); file->write(&tmp, sizeof(u32));
tmp = idx[j + 1] + currentMeshBufferIndex; tmp = idx[j + 1] + currentMeshBufferIndex;
write(file, &tmp, sizeof(u32)); file->write(&tmp, sizeof(u32));
tmp = idx[j + 2] + currentMeshBufferIndex; tmp = idx[j + 2] + currentMeshBufferIndex;
write(file, &tmp, sizeof(u32)); file->write(&tmp, sizeof(u32));
} }
writeSizeFrom(file, trisSizeAdress+4, trisSizeAdress); // TRIS chunk size
// Check that tris calculation was ok
tricheck = Size - tricheck;
if (tricheck != trisize)
{
printf("Failed in tris size calculation, size %u advanced %u\n",
trisize, tricheck);
}
currentMeshBufferIndex += mb->getVertexCount(); currentMeshBufferIndex += mb->getVertexCount();
} }
writeSizeFrom(file, meshSizeAdress+4, meshSizeAdress); // MESH chunk size
if(ISkinnedMesh *skinnedMesh = getSkinned(mesh)) if(ISkinnedMesh *skinnedMesh = getSkinned(mesh))
{ {
// Write animation data // Write animation data
f32 animationSpeedMultiplier = 1.f;
if (!skinnedMesh->isStatic()) if (!skinnedMesh->isStatic())
{ {
write(file, "ANIM", 4); file->write("ANIM", 4);
const u32 animsize = 12; const u32 animsize = 12;
write(file, &animsize, 4); file->write(&animsize, 4);
const u32 flags = 0; const u32 flags = 0;
const u32 frames = skinnedMesh->getFrameCount(); f32 fps = skinnedMesh->getAnimationSpeed();
const f32 fps = skinnedMesh->getAnimationSpeed();
write(file, &flags, 4); /* B3D file format use integer as keyframe, so there is some potential issues if the model use float as keyframe (Irrlicht use float) with a low animation FPS value
write(file, &frames, 4); So we define a minimum animation FPS value to multiply the frame and FPS value if the FPS of the animation is too low to store the keyframe with integers */
write(file, &fps, 4); const int minimumAnimationFPS = 60;
if (fps < minimumAnimationFPS)
{
animationSpeedMultiplier = minimumAnimationFPS / fps;
fps = minimumAnimationFPS;
}
const u32 frames = static_cast<u32>(skinnedMesh->getFrameCount() * animationSpeedMultiplier);
file->write(&flags, 4);
file->write(&frames, 4);
file->write(&fps, 4);
} }
// Write joints // Write joints
@ -388,67 +309,49 @@ bool CB3DMeshWriter::writeMesh(io::IWriteFile* file, IMesh* const mesh, s32 flag
for (u32 i = 0; i < rootJoints.size(); i++) for (u32 i = 0; i < rootJoints.size(); i++)
{ {
writeJointChunk(file, skinnedMesh, rootJoints[i]); writeJointChunk(file, skinnedMesh, rootJoints[i], animationSpeedMultiplier);
} }
} }
// Check that node calculation was ok writeSizeFrom(file, nodeSizeAdress+4, nodeSizeAdress); // Node chunk size
nodecheck = Size - nodecheck; writeSizeFrom(file, 8, 4); // BB3D chunk size
if (nodecheck != nodesize)
{
printf("Failed in node size calculation, size %u advanced %u\n",
nodesize, nodecheck);
}
file->seek(4);
file->write(&Size, 4);
return true; return true;
} }
void CB3DMeshWriter::writeJointChunk(io::IWriteFile* file, ISkinnedMesh* mesh , ISkinnedMesh::SJoint* joint) void CB3DMeshWriter::writeJointChunk(io::IWriteFile* file, ISkinnedMesh* mesh, ISkinnedMesh::SJoint* joint, f32 animationSpeedMultiplier)
{ {
// Node // Node
write(file, "NODE", 4); file->write("NODE", 4);
const u32 nodeSizeAdress = file->getPos();
// Calculate node size file->write(&nodeSizeAdress, 4);
u32 nodesize = getJointChunkSize(mesh, joint);
nodesize -= 8; // The declaration + size of THIS chunk shouldn't be added to the size
write(file, &nodesize, 4);
core::stringc name = joint->Name; core::stringc name = joint->Name;
write(file, name.c_str(), name.size()); file->write(name.c_str(), name.size());
write(file, "", 1); file->write("", 1);
core::vector3df pos = joint->Animatedposition;
// Position // Position
write(file, &pos.X, 4); const core::vector3df pos = joint->Animatedposition;
write(file, &pos.Y, 4); writeVector3(file, pos);
write(file, &pos.Z, 4);
// Scale // Scale
core::vector3df scale = joint->Animatedscale; core::vector3df scale = joint->Animatedscale;
if (scale == core::vector3df(0, 0, 0)) if (scale == core::vector3df(0, 0, 0))
scale = core::vector3df(1, 1, 1); scale = core::vector3df(1, 1, 1);
write(file, &scale.X, 4); writeVector3(file, scale);
write(file, &scale.Y, 4);
write(file, &scale.Z, 4);
// Rotation // Rotation
core::quaternion quat = joint->Animatedrotation; const core::quaternion quat = joint->Animatedrotation;
write(file, &quat.W, 4); writeQuaternion(file, quat);
write(file, &quat.X, 4);
write(file, &quat.Y, 4);
write(file, &quat.Z, 4);
// Bone // Bone
write(file, "BONE", 4); file->write("BONE", 4);
u32 bonesize = 8 * joint->Weights.size(); u32 bonesize = 8 * joint->Weights.size();
write(file, &bonesize, 4); file->write(&bonesize, 4);
// Skinning ------------------ // Skinning ------------------
for (u32 i = 0; i < joint->Weights.size(); i++) for (u32 i = 0; i < joint->Weights.size(); i++)
@ -463,85 +366,83 @@ void CB3DMeshWriter::writeJointChunk(io::IWriteFile* file, ISkinnedMesh* mesh ,
b3dVertexID += mesh->getMeshBuffer(j)->getVertexCount(); b3dVertexID += mesh->getMeshBuffer(j)->getVertexCount();
} }
write(file, &b3dVertexID, 4); file->write(&b3dVertexID, 4);
write(file, &weight, 4); file->write(&weight, 4);
} }
// --------------------------- // ---------------------------
f32 floatBuffer[5];
// Animation keys // Animation keys
if (joint->PositionKeys.size()) if (joint->PositionKeys.size())
{ {
write(file, "KEYS", 4); file->write("KEYS", 4);
u32 keysSize = 4 * joint->PositionKeys.size() * 4; // X, Y and Z pos + frame u32 keysSize = 4 * joint->PositionKeys.size() * 4; // X, Y and Z pos + frame
keysSize += 4; // Flag to define the type of the key keysSize += 4; // Flag to define the type of the key
write(file, &keysSize, 4); file->write(&keysSize, 4);
u32 flag = 1; // 1 = flag for position keys u32 flag = 1; // 1 = flag for position keys
write(file, &flag, 4); file->write(&flag, 4);
for (u32 i = 0; i < joint->PositionKeys.size(); i++) for (u32 i = 0; i < joint->PositionKeys.size(); i++)
{ {
const s32 frame = static_cast<s32>(joint->PositionKeys[i].frame); const s32 frame = static_cast<s32>(joint->PositionKeys[i].frame * animationSpeedMultiplier);
file->write(&frame, 4);
const core::vector3df pos = joint->PositionKeys[i].position; const core::vector3df pos = joint->PositionKeys[i].position;
pos.getAs3Values(floatBuffer);
write (file, &frame, 4); file->write(floatBuffer, 12);
write (file, &pos.X, 4);
write (file, &pos.Y, 4);
write (file, &pos.Z, 4);
} }
} }
if (joint->RotationKeys.size()) if (joint->RotationKeys.size())
{ {
write(file, "KEYS", 4); file->write("KEYS", 4);
u32 keysSize = 4 * joint->RotationKeys.size() * 5; // W, X, Y and Z rot + frame u32 keysSize = 4 * joint->RotationKeys.size() * 5; // W, X, Y and Z rot + frame
keysSize += 4; // Flag keysSize += 4; // Flag
write(file, &keysSize, 4); file->write(&keysSize, 4);
u32 flag = 4; u32 flag = 4;
write(file, &flag, 4); file->write(&flag, 4);
for (u32 i = 0; i < joint->RotationKeys.size(); i++) for (u32 i = 0; i < joint->RotationKeys.size(); i++)
{ {
const s32 frame = static_cast<s32>(joint->RotationKeys[i].frame); const s32 frame = static_cast<s32>(joint->RotationKeys[i].frame * animationSpeedMultiplier);
const core::quaternion rot = joint->RotationKeys[i].rotation; const core::quaternion rot = joint->RotationKeys[i].rotation;
write (file, &frame, 4); memcpy(floatBuffer, &frame, 4);
floatBuffer[1] = rot.W;
write (file, &rot.W, 4); floatBuffer[2] = rot.X;
write (file, &rot.X, 4); floatBuffer[3] = rot.Y;
write (file, &rot.Y, 4); floatBuffer[4] = rot.Z;
write (file, &rot.Z, 4); file->write(floatBuffer, 20);
} }
} }
if (joint->ScaleKeys.size()) if (joint->ScaleKeys.size())
{ {
write(file, "KEYS", 4); file->write("KEYS", 4);
u32 keysSize = 4 * joint->ScaleKeys.size() * 4; // X, Y and Z scale + frame u32 keysSize = 4 * joint->ScaleKeys.size() * 4; // X, Y and Z scale + frame
keysSize += 4; // Flag keysSize += 4; // Flag
write(file, &keysSize, 4); file->write(&keysSize, 4);
u32 flag = 2; u32 flag = 2;
write(file, &flag, 4); file->write(&flag, 4);
for (u32 i = 0; i < joint->ScaleKeys.size(); i++) for (u32 i = 0; i < joint->ScaleKeys.size(); i++)
{ {
const s32 frame = static_cast<s32>(joint->ScaleKeys[i].frame); const s32 frame = static_cast<s32>(joint->ScaleKeys[i].frame * animationSpeedMultiplier);
file->write(&frame, 4);
const core::vector3df scale = joint->ScaleKeys[i].scale; const core::vector3df scale = joint->ScaleKeys[i].scale;
scale.getAs3Values(floatBuffer);
write (file, &frame, 4); file->write(floatBuffer, 12);
write (file, &scale.X, 4);
write (file, &scale.Y, 4);
write (file, &scale.Z, 4);
} }
} }
for (u32 i = 0; i < joint->Children.size(); i++) for (u32 i = 0; i < joint->Children.size(); i++)
{ {
writeJointChunk(file, mesh, joint->Children[i]); writeJointChunk(file, mesh, joint->Children[i], animationSpeedMultiplier);
} }
writeSizeFrom(file, nodeSizeAdress+4, nodeSizeAdress); // NODE chunk size
} }
@ -554,47 +455,6 @@ ISkinnedMesh* CB3DMeshWriter::getSkinned (IMesh *mesh)
return 0; return 0;
} }
u32 CB3DMeshWriter::getJointChunkSize(const ISkinnedMesh* mesh, ISkinnedMesh::SJoint* joint)
{
u32 chunkSize = 8 + 40; // Chunk declaration + chunk data
chunkSize += joint->Name.size() + 1; // the NULL character at the end of the string
u32 boneSize = joint->Weights.size() * 8; // vertex_id + weight = 8 bits per weight block
boneSize += 8; // declaration + size of he BONE chunk
u32 keysSize = 0;
if (joint->PositionKeys.size() != 0)
{
keysSize += 8; // KEYS + chunk size
keysSize += 4; // flags
keysSize += (joint->PositionKeys.size() * 16);
}
if (joint->RotationKeys.size() != 0)
{
keysSize += 8; // KEYS + chunk size
keysSize += 4; // flags
keysSize += (joint->RotationKeys.size() * 20);
}
if (joint->ScaleKeys.size() != 0)
{
keysSize += 8; // KEYS + chunk size
keysSize += 4; // flags
keysSize += (joint->ScaleKeys.size() * 16);
}
chunkSize += boneSize;
chunkSize += keysSize;
for (u32 i = 0; i < joint->Children.size(); ++i)
{
chunkSize += (getJointChunkSize(mesh, joint->Children[i]));
}
return chunkSize;
}
core::array<ISkinnedMesh::SJoint*> CB3DMeshWriter::getRootJoints(const ISkinnedMesh* mesh) core::array<ISkinnedMesh::SJoint*> CB3DMeshWriter::getRootJoints(const ISkinnedMesh* mesh)
{ {
core::array<ISkinnedMesh::SJoint*> roots; core::array<ISkinnedMesh::SJoint*> roots;
@ -635,10 +495,39 @@ u32 CB3DMeshWriter::getUVlayerCount(IMesh* mesh)
return 1; return 1;
} }
void CB3DMeshWriter::write(io::IWriteFile* file, const void *ptr, const u32 bytes) void CB3DMeshWriter::writeVector2(io::IWriteFile* file, const core::vector2df& vec2)
{ {
file->write(ptr, bytes); f32 buffer[2] = {vec2.X, vec2.Y};
Size += bytes; file->write(buffer, 8);
}
void CB3DMeshWriter::writeVector3(io::IWriteFile* file, const core::vector3df& vec3)
{
f32 buffer[3];
vec3.getAs3Values(buffer);
file->write(buffer, 12);
}
void CB3DMeshWriter::writeQuaternion(io::IWriteFile* file, const core::quaternion& quat)
{
f32 buffer[4] = {quat.W, quat.X, quat.Y, quat.Z};
file->write(buffer, 16);
}
void CB3DMeshWriter::writeColor(io::IWriteFile* file, const video::SColorf& color)
{
f32 buffer[4] = {color.r, color.g, color.b, color.a};
file->write(buffer, 16);
}
// Write the size from a given position to current position at a specific position in the file
void CB3DMeshWriter::writeSizeFrom(io::IWriteFile* file, const u32 from, const u32 adressToWrite)
{
const long back = file->getPos();
file->seek(adressToWrite);
const u32 sizeToWrite = back - from;
file->write(&sizeToWrite, 4);
file->seek(back);
} }
} // end namespace } // end namespace

11
source/Irrlicht/CB3DMeshWriter.h
View File

@ -33,17 +33,18 @@ public:
virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags=EMWF_NONE) _IRR_OVERRIDE_; virtual bool writeMesh(io::IWriteFile* file, scene::IMesh* mesh, s32 flags=EMWF_NONE) _IRR_OVERRIDE_;
private: private:
u32 Size; void writeJointChunk(io::IWriteFile* file, ISkinnedMesh* mesh , ISkinnedMesh::SJoint* joint, f32 animationSpeedMultiplier);
void writeJointChunk(io::IWriteFile* file, ISkinnedMesh* mesh , ISkinnedMesh::SJoint* joint);
u32 getJointChunkSize(const ISkinnedMesh* mesh, ISkinnedMesh::SJoint* joint); u32 getJointChunkSize(const ISkinnedMesh* mesh, ISkinnedMesh::SJoint* joint);
core::array<ISkinnedMesh::SJoint*> getRootJoints(const ISkinnedMesh* mesh); core::array<ISkinnedMesh::SJoint*> getRootJoints(const ISkinnedMesh* mesh);
u32 getUVlayerCount(IMesh *mesh); u32 getUVlayerCount(IMesh *mesh);
ISkinnedMesh* getSkinned (IMesh *mesh); ISkinnedMesh* getSkinned (IMesh *mesh);
void write(io::IWriteFile* file, const void *ptr, const u32 bytes); inline void writeVector2(io::IWriteFile* file, const core::vector2df& vec);
inline void writeVector3(io::IWriteFile* file, const core::vector3df& vec);
inline void writeQuaternion(io::IWriteFile* file, const core::quaternion& quat);
inline void writeColor(io::IWriteFile* file, const video::SColorf& color);
void writeSizeFrom(io::IWriteFile* file, const u32 from, const u32 adressToWrite);
}; };
} // end namespace } // end namespace

16
source/Irrlicht/CIrrDeviceWin32.h
View File

@ -148,11 +148,9 @@ namespace irr
while ( gotCursorInfo ) while ( gotCursorInfo )
{ {
#ifdef CURSOR_SUPPRESSED #ifdef CURSOR_SUPPRESSED
// new flag for Windows 8, where cursor // Since Windows 8 the cursor can be suppressed by a touch interface
// might be suppressed for touch interface if (visible && info.flags == CURSOR_SUPPRESSED)
if (info.flags == CURSOR_SUPPRESSED)
{ {
visible=false;
break; break;
} }
#endif #endif
@ -173,6 +171,16 @@ namespace irr
// yes, it really must be set each time // yes, it really must be set each time
info.cbSize = sizeof(CURSORINFO); info.cbSize = sizeof(CURSORINFO);
gotCursorInfo = GetCursorInfo(&info); gotCursorInfo = GetCursorInfo(&info);
#ifdef CURSOR_SUPPRESSED
// Not sure if a cursor which we tried to hide still can be suppressed.
// I have no touch-display for testing this and MSDN doesn't describe it.
// But adding this check shouldn't hurt and might prevent an endless loop.
if (!visible && info.flags == CURSOR_SUPPRESSED)
{
break;
}
#endif
} }
IsVisible = visible; IsVisible = visible;
} }

4
source/Irrlicht/CPLYMeshFileLoader.cpp
View File

@ -572,7 +572,7 @@ c8* CPLYMeshFileLoader::getNextLine()
StartPointer = LineEndPointer + 1; StartPointer = LineEndPointer + 1;
// crlf split across buffer move // crlf split across buffer move
if (*StartPointer == '\n') if (StartPointer<EndPointer && *StartPointer == '\n')
{ {
*StartPointer = '\0'; *StartPointer = '\0';
++StartPointer; ++StartPointer;
@ -583,7 +583,7 @@ c8* CPLYMeshFileLoader::getNextLine()
while (pos < EndPointer && *pos && *pos != '\r' && *pos != '\n') while (pos < EndPointer && *pos && *pos != '\r' && *pos != '\n')
++pos; ++pos;
if ( pos < EndPointer && ( *(pos+1) == '\r' || *(pos+1) == '\n') ) if ( (pos+1) < EndPointer && ( *(pos+1) == '\r' || *(pos+1) == '\n') )
{ {
*pos = '\0'; *pos = '\0';
++pos; ++pos;

39
source/Irrlicht/CSceneManager.cpp
View File

@ -357,6 +357,7 @@ CSceneManager::CSceneManager(video::IVideoDriver* driver, io::IFileSystem* fs,
getProfiler().add(EPID_SM_RENDER_SHADOWS, L"shadows", L"Irrlicht scene"); getProfiler().add(EPID_SM_RENDER_SHADOWS, L"shadows", L"Irrlicht scene");
getProfiler().add(EPID_SM_RENDER_TRANSPARENT, L"transp.nodes", L"Irrlicht scene"); getProfiler().add(EPID_SM_RENDER_TRANSPARENT, L"transp.nodes", L"Irrlicht scene");
getProfiler().add(EPID_SM_RENDER_EFFECT, L"effectnodes", L"Irrlicht scene"); getProfiler().add(EPID_SM_RENDER_EFFECT, L"effectnodes", L"Irrlicht scene");
getProfiler().add(EPID_SM_RENDER_GUI_NODES, L"guinodes", L"Irrlicht scene");
getProfiler().add(EPID_SM_REGISTER, L"reg.render.node", L"Irrlicht scene"); getProfiler().add(EPID_SM_REGISTER, L"reg.render.node", L"Irrlicht scene");
} }
) )
@ -1403,6 +1404,13 @@ u32 CSceneManager::registerNodeForRendering(ISceneNode* node, E_SCENE_NODE_RENDE
} }
break; break;
case ESNRP_GUI:
if (!isCulled(node))
{
GuiNodeList.push_back(node);
taken = 1;
}
case ESNRP_NONE: // ignore this one case ESNRP_NONE: // ignore this one
break; break;
} }
@ -1430,6 +1438,7 @@ void CSceneManager::clearAllRegisteredNodesForRendering()
TransparentNodeList.clear(); TransparentNodeList.clear();
TransparentEffectNodeList.clear(); TransparentEffectNodeList.clear();
ShadowNodeList.clear(); ShadowNodeList.clear();
GuiNodeList.clear();
} }
//! This method is called just before the rendering process of the whole scene. //! This method is called just before the rendering process of the whole scene.
@ -1711,6 +1720,36 @@ void CSceneManager::drawAll()
TransparentEffectNodeList.set_used(0); TransparentEffectNodeList.set_used(0);
} }
// render custom gui nodes
{
IRR_PROFILE(CProfileScope psEffect(EPID_SM_RENDER_GUI_NODES);)
CurrentRenderPass = ESNRP_GUI;
Driver->getOverrideMaterial().Enabled = ((Driver->getOverrideMaterial().EnablePasses & CurrentRenderPass) != 0);
if (LightManager)
{
LightManager->OnRenderPassPreRender(CurrentRenderPass);
for (i=0; i<GuiNodeList.size(); ++i)
{
ISceneNode* node = GuiNodeList[i];
LightManager->OnNodePreRender(node);
node->render();
LightManager->OnNodePostRender(node);
}
}
else
{
for (i=0; i<GuiNodeList.size(); ++i)
GuiNodeList[i]->render();
}
#ifdef _IRR_SCENEMANAGER_DEBUG
Parameters->setAttribute("drawn_gui_nodes", (s32) GuiNodeList.size());
#endif
GuiNodeList.set_used(0);
}
if (LightManager) if (LightManager)
LightManager->OnPostRender(); LightManager->OnPostRender();

1
source/Irrlicht/CSceneManager.h
View File

@ -632,6 +632,7 @@ namespace scene
core::array<DefaultNodeEntry> SolidNodeList; core::array<DefaultNodeEntry> SolidNodeList;
core::array<TransparentNodeEntry> TransparentNodeList; core::array<TransparentNodeEntry> TransparentNodeList;
core::array<TransparentNodeEntry> TransparentEffectNodeList; core::array<TransparentNodeEntry> TransparentEffectNodeList;
core::array<ISceneNode*> GuiNodeList;
core::array<IMeshLoader*> MeshLoaderList; core::array<IMeshLoader*> MeshLoaderList;
core::array<ISceneLoader*> SceneLoaderList; core::array<ISceneLoader*> SceneLoaderList;

3
source/Irrlicht/CTRTextureLightMap2_Add.cpp
View File

@ -234,7 +234,7 @@ REALINLINE void CTRTextureLightMap2_Add::scanline_bilinear ()
#else #else
getSample_texture ( r0, g0, b0, &IT[0], tofix ( line.t[0][0].x,inversew), tofix ( line.t[0][0].y,inversew) ); getSample_texture ( r0, g0, b0, &IT[0], tofix ( line.t[0][0].x,inversew), tofix ( line.t[0][0].y,inversew) );
getSample_texture ( r1, g1, b1, &IT[1], tofix ( line.t[0][1].x,inversew), tofix ( line.t[0][1].y,inversew) ); getSample_texture ( r1, g1, b1, &IT[1], tofix ( line.t[1][0].x,inversew), tofix ( line.t[1][0].y,inversew) );
dst[i] = fix_to_sample( clampfix_maxcolor ( r0 + r1 ), dst[i] = fix_to_sample( clampfix_maxcolor ( r0 + r1 ),
clampfix_maxcolor ( g0 + g1 ), clampfix_maxcolor ( g0 + g1 ),
@ -641,6 +641,7 @@ namespace video
//! creates a flat triangle renderer //! creates a flat triangle renderer
IBurningShader* createTriangleRendererTextureLightMap2_Add(CBurningVideoDriver* driver) IBurningShader* createTriangleRendererTextureLightMap2_Add(CBurningVideoDriver* driver)
{ {
/* ETR_TEXTURE_GOURAUD_LIGHTMAP_ADD */
#ifdef _IRR_COMPILE_WITH_BURNINGSVIDEO_ #ifdef _IRR_COMPILE_WITH_BURNINGSVIDEO_
return new CTRTextureLightMap2_Add(driver); return new CTRTextureLightMap2_Add(driver);
#else #else

16
source/Irrlicht/CTriangleSelector.cpp
View File

@ -127,22 +127,22 @@ static void updateTriangles(u32& triangleCount, core::array<core::triangle3df>&
{ {
if ( bufferTransform ) if ( bufferTransform )
{ {
for (u32 index = 0; index < idxCnt; index += 3) for (u32 index = 2; index < idxCnt; index += 3)
{ {
core::triangle3df& tri = triangles[triangleCount++]; core::triangle3df& tri = triangles[triangleCount++];
bufferTransform->transformVect( tri.pointA, (*reinterpret_cast<const video::S3DVertex*>(&vertices[indices[index + 0]*vertexPitch])).Pos ); bufferTransform->transformVect( tri.pointA, (*reinterpret_cast<const video::S3DVertex*>(&vertices[indices[index - 2]*vertexPitch])).Pos );
bufferTransform->transformVect( tri.pointB, (*reinterpret_cast<const video::S3DVertex*>(&vertices[indices[index + 1]*vertexPitch])).Pos ); bufferTransform->transformVect( tri.pointB, (*reinterpret_cast<const video::S3DVertex*>(&vertices[indices[index - 1]*vertexPitch])).Pos );
bufferTransform->transformVect( tri.pointC, (*reinterpret_cast<const video::S3DVertex*>(&vertices[indices[index + 2]*vertexPitch])).Pos ); bufferTransform->transformVect( tri.pointC, (*reinterpret_cast<const video::S3DVertex*>(&vertices[indices[index - 0]*vertexPitch])).Pos );
} }
} }
else else
{ {
for (u32 index = 0; index < idxCnt; index += 3) for (u32 index = 2; index < idxCnt; index += 3)
{ {
core::triangle3df& tri = triangles[triangleCount++]; core::triangle3df& tri = triangles[triangleCount++];
tri.pointA = (*reinterpret_cast<const video::S3DVertex*>(&vertices[indices[index + 0]*vertexPitch])).Pos; tri.pointA = (*reinterpret_cast<const video::S3DVertex*>(&vertices[indices[index - 2]*vertexPitch])).Pos;
tri.pointB = (*reinterpret_cast<const video::S3DVertex*>(&vertices[indices[index + 1]*vertexPitch])).Pos; tri.pointB = (*reinterpret_cast<const video::S3DVertex*>(&vertices[indices[index - 1]*vertexPitch])).Pos;
tri.pointC = (*reinterpret_cast<const video::S3DVertex*>(&vertices[indices[index + 2]*vertexPitch])).Pos; tri.pointC = (*reinterpret_cast<const video::S3DVertex*>(&vertices[indices[index - 0]*vertexPitch])).Pos;
} }
} }
} }

6
source/Irrlicht/SoftwareDriver2_helper.h
View File

@ -495,10 +495,12 @@ inline tFixPoint s32_to_fixPoint (const s32 x)
return x << FIX_POINT_PRE; return x << FIX_POINT_PRE;
} }
#if 0
inline tFixPointu u32_to_fixPoint (const u32 x) inline tFixPointu u32_to_fixPoint (const u32 x)
{ {
return x << FIX_POINT_PRE; return x << FIX_POINT_PRE;
} }
#endif
inline u32 fixPointu_to_u32 (const tFixPointu x) inline u32 fixPointu_to_u32 (const tFixPointu x)
{ {
@ -641,13 +643,13 @@ REALINLINE tFixPoint saturateFix ( const tFixPoint a)
} }
#if 0
// rount fixpoint to int // rount fixpoint to int
inline s32 roundFix ( const tFixPoint x ) inline s32 roundFix ( const tFixPoint x )
{ {
return (s32)(( x + FIX_POINT_ZERO_DOT_FIVE ) >> FIX_POINT_PRE); return (s32)(( x + FIX_POINT_ZERO_DOT_FIVE ) >> FIX_POINT_PRE);
} }
#endif
// x in [0;1[ // x in [0;1[
#if 0 #if 0

2
source/Irrlicht/burning_shader_compile_fragment_default.h
View File

@ -34,7 +34,7 @@ private:
//! constructor //! constructor
burning_shader_class::burning_shader_color(CBurningVideoDriver* driver) burning_shader_class::burning_shader_class(CBurningVideoDriver* driver)
: IBurningShader(driver) : IBurningShader(driver)
{ {
#ifdef _DEBUG #ifdef _DEBUG