Projects >> AbFab3D >>7556140ecce670d2cce23b9f89b0b05a90d381c2

Chunk
Conflicting content
        return Math.abs(max);
    }
<<<<<<< HEAD


=======
    
    /**
     * Get the total number of voxels of a cube.
     * 
     * @param xVoxels Number of voxels in the x direction
     * @param yVoxels Number of voxels in the y direction
     * @param zVoxels Number of voxels in the z direction
     * @return The number of voxels of the cube
     */
    private int getCubeTotalVoxelCount(int xVoxels, int yVoxels, int zVoxels) {
    	return xVoxels * yVoxels * zVoxels;
    }
    
    /**
     * Get the total number of exterior voxels of a cube.
     * 
     * @param xVoxels Number of voxels in the x direction
     * @param yVoxels Number of voxels in the y direction
     * @param zVoxels Number of voxels in the z direction
     * @return The number of exterior voxels of the cube
     */
    private int getCubeExteriorVoxelCount(int xVoxels, int yVoxels, int zVoxels) {
        // expected number of exterior voxels should be the following formula:
        //   (exteriorVoxels per face in XY plane * 2) + 
        //   (exteriorVoxels per face in XZ plane * 2) + 
        //   (exteriorVoxels per face in YZ plane * 2) -
        //   (numEdges in X dir * gridWidth) -
        //   (numEdges in Y dir * gridHeight) -
        //   (numEdges in Z dir * gridDepth) +
        //   (number of corners)
		return (xVoxels * yVoxels * 2) + (xVoxels * zVoxels * 2) + (yVoxels * zVoxels * 2) - 
			   (4 * xVoxels) - (4 * yVoxels) - (4 * zVoxels) + 8;
    }
    
    /**
     * Get the total number of interior voxels of a cube.
     * 
     * @param xVoxels Number of voxels in the x direction
     * @param yVoxels Number of voxels in the y direction
     * @param zVoxels Number of voxels in the z direction
     * @return The number of interior voxels of the cube
     */
    private int getCubeInteriorVoxelCount(int xVoxels, int yVoxels, int zVoxels) {
		return (xVoxels - 2) * (yVoxels - 2) * (xVoxels - 2);
    }
    
>>>>>>> 1f681b1e21ccf3f9ac391c0d17574526d4dc69af
    /**
     * Generate an X3D file 
     * @param filename
Solution content
        return Math.abs(max);
    }

    /**
     * Get the total number of voxels of a cube.
     *
     * @param xVoxels Number of voxels in the x direction
     * @param yVoxels Number of voxels in the y direction
     * @param zVoxels Number of voxels in the z direction
     * @return The number of voxels of the cube
     */
    private int getCubeTotalVoxelCount(int xVoxels, int yVoxels, int zVoxels) {
        return xVoxels * yVoxels * zVoxels;
    }

    /**
     * Get the total number of exterior voxels of a cube.
     *
     * @param xVoxels Number of voxels in the x direction
     * @param yVoxels Number of voxels in the y direction
     * @param zVoxels Number of voxels in the z direction
     * @return The number of exterior voxels of the cube
     */
    private int getCubeExteriorVoxelCount(int xVoxels, int yVoxels, int zVoxels) {
        // expected number of exterior voxels should be the following formula:
        //   (exteriorVoxels per face in XY plane * 2) +
        //   (exteriorVoxels per face in XZ plane * 2) +
        //   (exteriorVoxels per face in YZ plane * 2) -
        //   (numEdges in X dir * gridWidth) -
        //   (numEdges in Y dir * gridHeight) -
        //   (numEdges in Z dir * gridDepth) +
        //   (number of corners)
        return (xVoxels * yVoxels * 2) + (xVoxels * zVoxels * 2) + (yVoxels * zVoxels * 2) -
               (4 * xVoxels) - (4 * yVoxels) - (4 * zVoxels) + 8;
    }

    /**
     * Get the total number of interior voxels of a cube.
     *
     * @param xVoxels Number of voxels in the x direction
     * @param yVoxels Number of voxels in the y direction
     * @param zVoxels Number of voxels in the z direction
     * @return The number of interior voxels of the cube
     */
    private int getCubeInteriorVoxelCount(int xVoxels, int yVoxels, int zVoxels) {
        return (xVoxels - 2) * (yVoxels - 2) * (xVoxels - 2);
    }

    /**
     * Generate an X3D file
     * @param filename
File
TestTriangleModelCreator.java
Developer's decision
Version 2
Kind of conflict
Comment
Method declaration