Skip to content

issue-279 #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
libertus21 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

issue-279 #282

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 35 additions & 4 deletions OpenTESArena/src/World/MapGeneration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,15 +507,46 @@ namespace MapGeneration
*outVoxelType = ArenaTypes::VoxelType::Wall;
outShapeInitCache->initDefaultBoxValues();
ArenaMeshUtils::WriteWallRendererGeometryBuffers(outShapeInitCache->verticesView, outShapeInitCache->normalsView, outShapeInitCache->texCoordsView);
ArenaMeshUtils::WriteWallRendererIndexBuffers(outShapeInitCache->indices0View, outShapeInitCache->indices1View, outShapeInitCache->indices2View);
ArenaMeshUtils::WriteWallRendererIndexBuffers(
outShapeInitCache->indices0View,
outShapeInitCache->indices1View,
outShapeInitCache->indices2View
);

const int textureIndex = mostSigByte - 1;
const int clampedTextureID = ArenaVoxelUtils::clampVoxelTextureID(textureIndex);
const int clampedTextureID = ArenaVoxelUtils::clampVoxelTextureID(textureIndex);
std::string voxelTextureFilename = ArenaVoxelUtils::getVoxelTextureFilename(clampedTextureID, inf);
const std::optional<int> voxelTextureSetIndex = ArenaVoxelUtils::getVoxelTextureSetIndex(clampedTextureID, inf);
*outTextureAsset0 = TextureAsset(std::move(voxelTextureFilename), voxelTextureSetIndex);
*outTextureAsset1 = *outTextureAsset0;
*outTextureAsset2 = *outTextureAsset0;

// Texture for the lower part (BOXCAP)
const std::optional<int> &boxCapID = inf.getBoxCap(8);
if (boxCapID.has_value())
{
const int boxCapTextureID = *boxCapID;
const int clampedBoxCapTextureID = ArenaVoxelUtils::clampVoxelTextureID(boxCapTextureID);
*outTextureAsset1 = TextureAsset(
ArenaVoxelUtils::getVoxelTextureFilename(clampedBoxCapTextureID, inf),
ArenaVoxelUtils::getVoxelTextureSetIndex(clampedBoxCapTextureID, inf));
}
else
{
*outTextureAsset1 = *outTextureAsset0;
}
//Texture for the upper part(use the texture of the ceiling)
const auto &ceiling = inf.getCeiling();
if (ceiling.textureIndex.has_value())
{
const int ceilingTextureID = *ceiling.textureIndex;
const int clampedCeilingTextureID = ArenaVoxelUtils::clampVoxelTextureID(ceilingTextureID);
*outTextureAsset2 = TextureAsset(
ArenaVoxelUtils::getVoxelTextureFilename(clampedCeilingTextureID, inf),
ArenaVoxelUtils::getVoxelTextureSetIndex(clampedCeilingTextureID, inf));
}
else
{
*outTextureAsset2 = *outTextureAsset0;
}
*outVertexShaderType = VertexShaderType::Basic;
outPixelShaderTypes[0] = PixelShaderType::Opaque;
outPixelShaderTypes[1] = PixelShaderType::Opaque;
Expand Down