Skip to content

feat: Replace SurfaceHeightFacet with ElevationFacet and SurfacesFacet #29

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

Merged
merged 1 commit into from
Nov 29, 2020
Merged

feat: Replace SurfaceHeightFacet with ElevationFacet and SurfacesFacet #29

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion src/main/java/org/terasology/moduletestingenvironment/fixtures/DummyWorldGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import org.terasology.registry.In;
import org.terasology.world.generation.BaseFacetedWorldGenerator;
import org.terasology.world.generation.WorldBuilder;
import org.terasology.world.generation.facets.SurfaceHeightFacet;
import org.terasology.world.generator.RegisterWorldGenerator;
import org.terasology.world.generator.plugin.WorldGeneratorPluginLibrary;

Expand Down
47 changes: 17 additions & 30 deletions ...main/java/org/terasology/moduletestingenvironment/fixtures/FlatSurfaceHeightProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,38 +14,15 @@
* limitations under the License.
*/
package org.terasology.moduletestingenvironment.fixtures;
/*
* Copyright 2014 MovingBlocks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import org.terasology.math.geom.BaseVector2i;
import org.terasology.world.generation.*;
import org.terasology.world.generation.facets.SeaLevelFacet;
import org.terasology.world.generation.facets.SurfaceHeightFacet;

import org.terasology.math.geom.BaseVector2i;
import org.terasology.world.generation.Facet;
import org.terasology.world.generation.FacetProvider;
import org.terasology.world.generation.GeneratingRegion;
import org.terasology.world.generation.Produces;
import org.terasology.world.generation.Requires;
import org.terasology.world.generation.facets.SeaLevelFacet;
import org.terasology.world.generation.facets.SurfaceHeightFacet;
import org.terasology.world.generation.facets.ElevationFacet;
import org.terasology.world.generation.facets.SurfacesFacet;

@Produces(SurfaceHeightFacet.class)
@Requires(@Facet(SeaLevelFacet.class))
@Produces({SurfacesFacet.class, ElevationFacet.class})
public class FlatSurfaceHeightProvider implements FacetProvider {
private int height;

Expand All @@ -59,13 +36,23 @@ public void setSeed(long seed) {

@Override
public void process(GeneratingRegion region) {
SurfaceHeightFacet facet = new SurfaceHeightFacet(region.getRegion(), region.getBorderForFacet(SurfaceHeightFacet.class));
ElevationFacet elevationFacet = new ElevationFacet(region.getRegion(), region.getBorderForFacet(ElevationFacet.class));
SurfacesFacet surfacesFacet = new SurfacesFacet(region.getRegion(), region.getBorderForFacet(SurfacesFacet.class));

for (BaseVector2i pos : elevationFacet.getRelativeRegion().contents()) {
elevationFacet.set(pos, height);
}

for (BaseVector2i pos : facet.getRelativeRegion().contents()) {
facet.set(pos, height);
if (surfacesFacet.getWorldRegion().minY() <= height && height <= surfacesFacet.getWorldRegion().maxY()) {
for (int x = surfacesFacet.getWorldRegion().minX(); x <= surfacesFacet.getWorldRegion().maxX(); x++) {
for (int z = surfacesFacet.getWorldRegion().minZ(); z <= surfacesFacet.getWorldRegion().maxZ(); z++) {
surfacesFacet.setWorld(x, height, z, true);
}
}
}

region.setRegionFacet(SurfaceHeightFacet.class, facet);
region.setRegionFacet(ElevationFacet.class, elevationFacet);
region.setRegionFacet(SurfacesFacet.class, surfacesFacet);
}
}