Skip to content

Conversation

Ali-RS
Copy link
Member

@Ali-RS Ali-RS commented Mar 11, 2021

After loading a terrain from j3o, calling TerrainQuad.getPatchSize() will return 0, because "patchSize" is ignored when writing to file. This patch should fix it.

@Ali-RS Ali-RS added this to the v3.4.0 milestone Mar 11, 2021
Copy link
Member

@stephengold stephengold left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Two requests:

  1. Update the copyright date to include 2021.
  2. Add a test case. You can use TestCloneMesh.java as a starting point.

@stephengold stephengold self-assigned this Mar 11, 2021
@Ali-RS
Copy link
Member Author

Ali-RS commented Mar 11, 2021

@stephengold thanks for reviewing.

Is this fine for the test?

/*
 * Copyright (c) 2021 jMonkeyEngine
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 * * Redistributions of source code must retain the above copyright
 *   notice, this list of conditions and the following disclaimer.
 *
 * * Redistributions in binary form must reproduce the above copyright
 *   notice, this list of conditions and the following disclaimer in the
 *   documentation and/or other materials provided with the distribution.
 *
 * * Neither the name of 'jMonkeyEngine' nor the names of its contributors
 *   may be used to endorse or promote products derived from this software
 *   without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

package com.jme3.terrain;

import com.jme3.export.binary.BinaryExporter;
import com.jme3.math.FastMath;
import com.jme3.terrain.collision.BaseAWTTest;
import com.jme3.terrain.geomipmap.TerrainQuad;
import com.jme3.terrain.heightmap.AbstractHeightMap;
import com.jme3.terrain.heightmap.ImageBasedHeightMap;
import com.jme3.texture.Texture;
import org.junit.Assert;
import org.junit.Test;

/**
 * Test saving/loading terrain.
 *
 * @author Ali-RS
 */
public class TestTerrainExporting extends BaseAWTTest {
    
    /**
     * Test saving/loading a TerrainQuad.
     */
    @Test
    public void testTerrainExporting() {

        Texture heightMapImage = getAssetManager().loadTexture("Textures/Terrain/splat/mountains512.png");
        AbstractHeightMap map = new ImageBasedHeightMap(heightMapImage.getImage(), 0.25f);
        map.load();

        TerrainQuad terrain = new TerrainQuad("Terrain", 65, 513, map.getHeightMap());

        TerrainQuad saveAndLoad = BinaryExporter.saveAndLoad(getAssetManager(), terrain);

        Assert.assertEquals(513, saveAndLoad.getTotalSize());
        Assert.assertEquals(65, saveAndLoad.getPatchSize());
        Assert.assertArrayEquals(terrain.getHeightMap(), saveAndLoad.getHeightMap(), FastMath.ZERO_TOLERANCE);
    }

}

@stephengold
Copy link
Member

That's sufficient. Thank you.

@stephengold stephengold added the bug Something that is supposed to work, but doesn't. More severe than a "defect". label Mar 11, 2021
@Ali-RS
Copy link
Member Author

Ali-RS commented Mar 11, 2021

Committed the new changes as requested.

@stephengold stephengold merged commit 27ee6e4 into jMonkeyEngine:master Mar 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something that is supposed to work, but doesn't. More severe than a "defect".
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants