37pre

assets/vivecraft/shaders/mixedreality.fsh

@@ -9,6 +9,7 @@ uniform mat4 projectionMatrix;
 uniform mat4 viewMatrix;
 uniform int pass;
 uniform vec3 keyColor;
+uniform int alphaMode;
 out vec4 out_Color;
 vec3 getFragmentPosition(vec2 coord) {
  vec4 posScreen = vec4(coord * 2.0 - 1.0, texture(depthTex, coord).x * 2.0 - 1.0, 1);
@@ -19,13 +20,17 @@ void main(void) {
  vec2 pos = (gl_FragCoord.xy - position) / resolution;
  vec3 fragPos = getFragmentPosition(pos);
  float fragHmdDot = dot(fragPos - hmdViewPosition, hmdPlaneNormal);
- if ((pass == 0 && fragHmdDot >= 0) || pass == 1) {
+ if (((pass == 0 || pass == 2) && fragHmdDot >= 0) || pass == 1) {
  vec4 color = texture(colorTex, pos);
- vec3 diff = color.rgb - keyColor; // The following code prevents actual colors from matching the key color and looking weird
- if (keyColor.r < 0.004 && keyColor.g < 0.004 && keyColor.b < 0.004 && color.r < 0.004 && color.g < 0.004 && color.b < 0.004) {
- color = vec4(0.004, 0.004, 0.004, 1);
- } else if (diff.r < 0.004 && diff.g < 0.004 && diff.b < 0.004) {
- color = vec4(color.r - 0.004, color.g - 0.004, color.b - 0.004, color.a);
+ if (pass == 2) {
+ color = vec4(1, 1, 1, 1);
+ } else if (alphaMode == 0) {
+ vec3 diff = color.rgb - keyColor; // The following code prevents actual colors from matching the key color and looking weird
+ if (keyColor.r < 0.004 && keyColor.g < 0.004 && keyColor.b < 0.004 && color.r < 0.004 && color.g < 0.004 && color.b < 0.004) {
+ color = vec4(0.004, 0.004, 0.004, 1);
+ } else if (diff.r < 0.004 && diff.g < 0.004 && diff.b < 0.004) {
+ color = vec4(color.r - 0.004, color.g - 0.004, color.b - 0.004, color.a);
+ }
  }
  out_Color = color;
  //out_Color = vec4(vec3( (distance(fragPos.xz,hmdViewPosition.xz)) / 3), 1); // Draw depth buffer

getchanges.py

@@ -34,11 +34,13 @@ def main(mcp_dir, patch_dir = "patches", orig_dir = ".minecraft_orig"):
  new_src_dir = os.path.join( base_dir , "src" )
  patch_base_dir = os.path.join( base_dir , patch_dir )
  patchsrc_base_dir = os.path.join( base_dir , "patchsrc" )
+ assets_base_dir = os.path.join(base_dir, "assets", "vivecraft" )
 
  try:
  shutil.rmtree( new_src_dir )
  shutil.rmtree( patch_base_dir )
  shutil.rmtree( patchsrc_base_dir )
+ shutil.rmtree( assets_base_dir )
  except OSError as e:
  pass
 
@@ -51,7 +53,11 @@ def main(mcp_dir, patch_dir = "patches", orig_dir = ".minecraft_orig"):
  if not os.path.exists( patchsrc_base_dir ):
  os.mkdir( patchsrc_base_dir )
 
+ if not os.path.exists( assets_base_dir ):
+ os.makedirs( assets_base_dir )
+
  mod_src_dir = os.path.join( mcp_dir , "src", "minecraft" )
+ assets_src_dir = os.path.join( mcp_dir , "src", "assets" )
  org_src_dir = os.path.join( mcp_dir , "src", orig_dir )
 
  for src_dir, dirs, files in os.walk(mod_src_dir):
@@ -91,10 +97,26 @@ def main(mcp_dir, patch_dir = "patches", orig_dir = ".minecraft_orig"):
  if os.path.exists( new_file ):
  os.remove( new_file )
  shutil.copy(mod_file, new_dir)
+
+ for asset_dir, dirs, files in os.walk(assets_src_dir):
+ pkg = os.path.relpath(asset_dir,assets_src_dir)
+ new_dir = os.path.join( assets_base_dir, pkg )
+ if not os.path.exists(new_dir):
+ os.mkdir(new_dir)
+ for file_ in files: 
+ new_file = os.path.join(new_dir, file_)
+ mod_file = os.path.join(asset_dir, file_)
+ print "Copy asset %s" % (mod_file)
+
+ #new class file, just replace
+ if os.path.exists( new_file ):
+ os.remove( new_file )
+ shutil.copy(mod_file, new_dir)
 
  removeEmptyFolders(patch_base_dir)
  removeEmptyFolders(new_src_dir)
  removeEmptyFolders(patchsrc_base_dir)
+ removeEmptyFolders(assets_base_dir)
 
 def removeEmptyFolders(path):
  if not os.path.isdir(path):

installer/Installer.java

@@ -1366,6 +1366,7 @@ public Installer(File targetDir)
  forgePanel.setLayout( new BoxLayout(forgePanel, BoxLayout.X_AXIS));
  //Create forge: no/yes buttons
  useForge = new JCheckBox();
+ useForge.setSelected(true); //and on that day, hundreds of clicks were saved.
  AbstractAction actf = new updateActionF();
  actf.putValue(AbstractAction.NAME, "Install Vivecraft with Forge " + FORGE_VERSION);
  useForge.setAction(actf);

minecriftversion.py

@@ -4,7 +4,7 @@
 of_json_name = "1.7.10_HD_U_D1"
 of_file_md5 = "57c724fe8335c82aef8d54c101043e60"
 minecrift_version_num = "1.7.10"
-minecrift_build = "jrbudda-36"
+minecrift_build = "jrbudda-37"
 of_file_extension = ".jar"
 mcp_version = "mcp908"
 mcp_uses_generics = False