bug fixes, enforcing best practices

docs/src/progress/renderertodo.md

@@ -383,6 +383,8 @@ Transvoxel implementation
 Transvoxel implementation
  - Scaling LODed chunks by lod level
 
+Fix items falling below the ground
+
 # TODO
 
 
@@ -399,7 +401,6 @@ Audio FX for everything
 
  = Coding = 
 Sour spot, sweet spot for damage hitboxes and hurtboxes
-Fix items falling below the ground
 Sub menu on title screen that allows changing control mappings
 Redo hitboxes to have capsules and also chaining between frames (but not between swinging the camera around)
  - Introduce block hitbox (blockbox) type

src/main/java/electrosphere/engine/loadingthreads/ClientLoading.java

@@ -188,43 +188,6 @@ public class ClientLoading {
         }
 
         
-        /**
-         * Test LODed chunk
-         */
-        float[][][] isoValues = new float[ServerTerrainChunk.CHUNK_DATA_GENERATOR_SIZE][ServerTerrainChunk.CHUNK_DATA_GENERATOR_SIZE][ServerTerrainChunk.CHUNK_DATA_GENERATOR_SIZE];
-        int[][][] atlasValues = new int[ServerTerrainChunk.CHUNK_DATA_GENERATOR_SIZE][ServerTerrainChunk.CHUNK_DATA_GENERATOR_SIZE][ServerTerrainChunk.CHUNK_DATA_GENERATOR_SIZE];
-        float[][] edgeIsoValues = new float[ServerTerrainChunk.CHUNK_DATA_GENERATOR_SIZE + ServerTerrainChunk.CHUNK_DIMENSION][ServerTerrainChunk.CHUNK_DATA_GENERATOR_SIZE + ServerTerrainChunk.CHUNK_DIMENSION];
-        int[][] edgeAtlasValues = new int[ServerTerrainChunk.CHUNK_DATA_GENERATOR_SIZE + ServerTerrainChunk.CHUNK_DIMENSION][ServerTerrainChunk.CHUNK_DATA_GENERATOR_SIZE + ServerTerrainChunk.CHUNK_DIMENSION];
-        for(int x = 0; x < ServerTerrainChunk.CHUNK_DATA_GENERATOR_SIZE; x++){
-            for(int y = 0; y < ServerTerrainChunk.CHUNK_DATA_GENERATOR_SIZE; y++){
-                for(int z = 0; z < ServerTerrainChunk.CHUNK_DATA_GENERATOR_SIZE; z++){
-                    if(x < 5 && y < 5){
-                        isoValues[x][y][z] = 1.0f;
-                    }
-                    atlasValues[x][y][z] = 1;
-                }
-                if(y < 10 && x < 10){
-                    edgeIsoValues[x][y] = 1.0f;
-                }
-                if(y == 3 && x == 3){
-                    edgeIsoValues[x][y] = -1.0f;
-                }
-                edgeAtlasValues[x][y] = 1;
-            }
-        }
-        TransvoxelChunkData chunkData = new TransvoxelChunkData(
-            isoValues,
-            atlasValues,
-            1
-        );
-        chunkData.addZNegativeEdge(
-            edgeIsoValues,
-            edgeAtlasValues
-        );
-        Entity transvoxelEntityTest = TerrainChunk.clientCreateTerrainChunkEntity(chunkData, 1, Globals.voxelTextureAtlas);
-        ClientEntityUtils.initiallyPositionEntity(transvoxelEntityTest, new Vector3d(3,3,3));
-
-        
         /*
         Targeting crosshair
         */

src/main/java/electrosphere/menu/ingame/MenuGeneratorsLevelEditor.java

@@ -52,6 +52,9 @@ public class MenuGeneratorsLevelEditor {
     //is the voxel selection window open
     static boolean voxelWindowOpen = false;
 
+    //vertical offset from cursor position to spawn things at
+    static final Vector3d cursorVerticalOffset = new Vector3d(0,0.05,0);
+
 
     /**
      * Creates the level editor side panel top view
@@ -172,7 +175,7 @@ public class MenuGeneratorsLevelEditor {
                 Vector3d eyePos = new Vector3d(CameraEntityUtils.getCameraEye(Globals.playerCamera));
                 Vector3d centerPos = new Vector3d(CameraEntityUtils.getCameraCenter(Globals.playerCamera));
                 Realm realm = Globals.realmManager.getRealms().iterator().next();
-                Vector3d cursorPos = realm.getCollisionEngine().rayCastPosition(new Vector3d(centerPos), new Vector3d(eyePos).mul(-1.0), 5.0);
+                Vector3d cursorPos = realm.getCollisionEngine().rayCastPosition(new Vector3d(centerPos), new Vector3d(eyePos).mul(-1.0), 5.0).add(cursorVerticalOffset);
                 CreatureUtils.serverSpawnBasicCreature(realm, cursorPos, data.getCreatureId(), null);
                 return false;
             }}));
@@ -202,7 +205,7 @@ public class MenuGeneratorsLevelEditor {
                 Vector3d eyePos = new Vector3d(CameraEntityUtils.getCameraEye(Globals.playerCamera));
                 Vector3d centerPos = new Vector3d(CameraEntityUtils.getCameraCenter(Globals.playerCamera));
                 Realm realm = Globals.realmManager.getRealms().iterator().next();
-                Vector3d cursorPos = realm.getCollisionEngine().rayCastPosition(new Vector3d(centerPos), new Vector3d(eyePos).mul(-1.0), 5.0);
+                Vector3d cursorPos = realm.getCollisionEngine().rayCastPosition(new Vector3d(centerPos), new Vector3d(eyePos).mul(-1.0), 5.0).add(cursorVerticalOffset);
                 FoliageUtils.serverSpawnTreeFoliage(realm, cursorPos, data.getName(), new Random().nextLong());
                 return false;
             }}));
@@ -232,7 +235,7 @@ public class MenuGeneratorsLevelEditor {
                 Vector3d eyePos = new Vector3d(CameraEntityUtils.getCameraEye(Globals.playerCamera));
                 Vector3d centerPos = new Vector3d(CameraEntityUtils.getCameraCenter(Globals.playerCamera));
                 Realm realm = Globals.realmManager.getRealms().iterator().next();
-                Vector3d cursorPos = realm.getCollisionEngine().rayCastPosition(new Vector3d(centerPos), new Vector3d(eyePos).mul(-1.0), 5.0);
+                Vector3d cursorPos = realm.getCollisionEngine().rayCastPosition(new Vector3d(centerPos), new Vector3d(eyePos).mul(-1.0), 5.0).add(cursorVerticalOffset);
                 ItemUtils.serverSpawnBasicItem(realm, cursorPos, item.getItemId());
                 return false;
             }}));
@@ -263,7 +266,7 @@ public class MenuGeneratorsLevelEditor {
                 Vector3d eyePos = new Vector3d(CameraEntityUtils.getCameraEye(Globals.playerCamera));
                 Vector3d centerPos = new Vector3d(CameraEntityUtils.getCameraCenter(Globals.playerCamera));
                 Realm realm = Globals.realmManager.getRealms().iterator().next();
-                Vector3d cursorPos = realm.getCollisionEngine().rayCastPosition(new Vector3d(centerPos), new Vector3d(eyePos).mul(-1.0), 5.0);
+                Vector3d cursorPos = realm.getCollisionEngine().rayCastPosition(new Vector3d(centerPos), new Vector3d(eyePos).mul(-1.0), 5.0).add(cursorVerticalOffset);
                 ObjectUtils.serverSpawnBasicObject(realm, cursorPos, object.getObjectId());
                 return false;
             }}));

src/main/java/electrosphere/renderer/pipelines/RenderScreenPipeline.java

@@ -24,13 +24,13 @@ public class RenderScreenPipeline implements RenderPipeline {
         //the leftover texture gets used to draw the screen framebuffer quad
         //which doesnt work
         openGLState.glActiveTexture(GL40.GL_TEXTURE0);
-        GL40.glBindTexture(GL40.GL_TEXTURE_2D, 0);
+        openGLState.glBindTexture(GL40.GL_TEXTURE_2D, 0);
         openGLState.glActiveTexture(GL40.GL_TEXTURE1);
-        GL40.glBindTexture(GL40.GL_TEXTURE_2D, 0);
+        openGLState.glBindTexture(GL40.GL_TEXTURE_2D, 0);
         openGLState.glActiveTexture(GL40.GL_TEXTURE2);
-        GL40.glBindTexture(GL40.GL_TEXTURE_2D, 0);
+        openGLState.glBindTexture(GL40.GL_TEXTURE_2D, 0);
         openGLState.glActiveTexture(GL40.GL_TEXTURE3);
-        GL40.glBindTexture(GL40.GL_TEXTURE_2D, 0);
+        openGLState.glBindTexture(GL40.GL_TEXTURE_2D, 0);
         openGLState.glActiveTexture(GL40.GL_TEXTURE0);
         
         openGLState.glDepthTest(false);

src/main/java/electrosphere/renderer/pipelines/VolumeBufferPipeline.java

@@ -40,7 +40,7 @@ public class VolumeBufferPipeline implements RenderPipeline {
         
         RenderingEngine.volumeDepthBackfaceFramebuffer.bind();
         GL40.glClear(GL40.GL_DEPTH_BUFFER_BIT);
-        GL40.glActiveTexture(GL40.GL_TEXTURE0);
+        openGLState.glActiveTexture(GL40.GL_TEXTURE0);
 //            glBindTexture(GL_TEXTURE_2D, woodTexture);
 //            renderScene(simpleDepthShader);